Small change to keep Diab och IoHwAb happy

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

diff --git a/include/IoHwAb.h b/include/IoHwAb.h
index 9c3bfc237d1a23dc7129579871799ce2d70a822f..d6eca1cd53dba140f802d68778380f81cb064d14 100644 (file)
--- a/include/IoHwAb.h
+++ b/include/IoHwAb.h
@@ -59,7 +59,7 @@
 \r
 #define IOHWAB_E_INIT                          0x01\r
 \r
-#define IOHWAB_E_PARAM_CHANNEL         0x11\r
+#define IOHWAB_E_PARAM_SIGNAL          0x11\r
 #define IOHWAB_E_PARAM_DUTY                    0x12\r
 \r
 /******************************************* DET macros *******************************************/\r

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