Small change to keep Diab och IoHwAb happy

fchen9 · Jan 27, 2012 · 393b6f9 · 393b6f9
1 parent 138cc3a
commit 393b6f9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/arch/ppc/mpc55xx/drivers/Spi.c b/arch/ppc/mpc55xx/drivers/Spi.c
@@ -1571,8 +1571,6 @@ static void Spi_WriteJob_FIFO( Spi_JobType jobIndex )
     const Spi_DataType *            buf;
     Spi_NumberOfDataType            copyCnt;
     Spi_NumberOfDataType            fifoLeft;
-    boolean                         done = 0;
-    boolean                         lastJob = 0;
 	int     i;
 	jobUnitPtr = &Spi_JobUnit[jobIndex];
 
@@ -1757,6 +1755,7 @@ static void Spi_JobWrite(Spi_JobType jobIndex) {
 }
 
 
+#if defined(USE_LDEBUG_PRINTF) && ( DEBUG_LVL <= DEBUG_HIGH )
 void Spi_PrintSeqInfo(const Spi_SequenceConfigType *seqConfigPtr) {
 	int i = 0;
 	uint32 job;
@@ -1765,8 +1764,10 @@ void Spi_PrintSeqInfo(const Spi_SequenceConfigType *seqConfigPtr) {
 	while ((job = seqConfigPtr->JobAssignment[i]) != JOB_NOT_VALID) {
 		DEBUG(DEBUG_HIGH,"%d ",job);
 		i++;
-	} DEBUG(DEBUG_HIGH,"\n");
+	}
+	DEBUG(DEBUG_HIGH,"\n");
 }
+#endif
 
 
 /**
@@ -2041,7 +2042,6 @@ void Spi_MainFunction_Driving(void) {
 	volatile struct DSPI_tag *spiHw;
 	uint32 confMask;
 	uint8 confNr;
-	Spi_UnitType *spiUnit;
 
 	// TODO: check that the queue is empty.. if so do the next job.
 	if (Spi_Global.asyncMode == SPI_POLLING_MODE) {
@@ -2055,7 +2055,6 @@ void Spi_MainFunction_Driving(void) {
 				if (spiHw->SR.B.TXRXS) {
 					// Still not done..
 				} else {
-					spiUnit = GET_SPI_UNIT_PTR(confNr);
 					Spi_Isr(confNr);
 				}
 			}

diff --git a/include/IoHwAb.h b/include/IoHwAb.h
@@ -59,7 +59,7 @@
 
 #define IOHWAB_E_INIT				0x01
 
-#define IOHWAB_E_PARAM_CHANNEL		0x11
+#define IOHWAB_E_PARAM_SIGNAL		0x11
 #define IOHWAB_E_PARAM_DUTY			0x12
 
 /******************************************* DET macros *******************************************/

diff --git a/include/IoHwAb_Types.h b/include/IoHwAb_Types.h
@@ -29,6 +29,8 @@ typedef sint32 IoHwAb_AnalogValueType;
 
 //typedef sint32 IoHwAb_ChannelType;
 
+typedef sint32 IoHwAb_SignalType;
+
 /* Duty cycle type (per mille) */
 typedef uint32 IoHwAb_DutyType;
 #define IOHWAB_DUTY_MIN		   0		/*   0% */