Removed not necessary defines in mpcxxxx.h headers.

SPI, homologized driver to use defines more appropriate in order to exclude some code.

diff --git a/arch/ppc/mpc55xx/drivers/Spi.c b/arch/ppc/mpc55xx/drivers/Spi.c
index 6b0b6cbafefa70035d4551f7848c2537bdf4592d..49312e91fc50a028d6888f05e9b95e6d5ff559dd 100644 (file)
--- a/arch/ppc/mpc55xx/drivers/Spi.c
+++ b/arch/ppc/mpc55xx/drivers/Spi.c
@@ -161,16 +161,12 @@
 #include "Det.h"\r
 #include "isr.h"\r
 /* ----------------------------[private define]------------------------------*/\r
-\r
-#if defined(CFG_MPC5516) || defined(CFG_MPC5517) || defined(CFG_MPC5668) || defined(CFG_MPC5567)\r
-#define SPI_CONTROLLER_TOTAL_CNT               4\r
-#elif defined(CFG_MPC5606B)\r
-#define SPI_CONTROLLER_TOTAL_CNT               6\r
-#elif defined(CFG_MPC5604B)\r
-#define SPI_CONTROLLER_TOTAL_CNT               3\r
-#elif defined(CFG_MPC560X)\r
-#define SPI_CONTROLLER_TOTAL_CNT               2\r
-#endif\r
+#define DSPI_CTRL_A    0\r
+#define DSPI_CTRL_B    1\r
+#define DSPI_CTRL_C    2\r
+#define DSPI_CTRL_D    3\r
+#define DSPI_CTRL_E    4\r
+#define DSPI_CTRL_F    5\r
 \r
 #if defined(CFG_MPC560X)\r
 #define DSPI_A_ISR_EOQF DSPI_0_ISR_EOQF\r
@@ -439,6 +435,18 @@ Spi_DmaConfigType  Spi_DmaConfig[SPI_CONTROLLER_CNT] = {
            .TxDmaChannel = DMA_DSPI_D_COMMAND_CHANNEL,\r
        }\r
 #endif\r
+#if (SPI_USE_HW_UNIT_4 == STD_ON )\r
+       {\r
+           .RxDmaChannel = DMA_DSPI_E_RESULT_CHANNEL,\r
+           .TxDmaChannel = DMA_DSPI_E_COMMAND_CHANNEL,\r
+       }\r
+#endif\r
+#if (SPI_USE_HW_UNIT_5 == STD_ON )\r
+       {\r
+           .RxDmaChannel = DMA_DSPI_F_RESULT_CHANNEL,\r
+           .TxDmaChannel = DMA_DSPI_F_COMMAND_CHANNEL,\r
+       }\r
+#endif\r
 };\r
 #endif\r
 \r
@@ -483,24 +491,36 @@ static const Spi_DataType *spiGetTxBuf(Spi_ChannelType ch, Spi_NumberOfDataType
 \r
 static void Spi_Isr(Spi_UnitType *uPtr );\r
 \r
+#if (SPI_USE_HW_UNIT_0 == STD_ON )\r
 static void Spi_Isr_A(void) {\r
        Spi_Isr(GET_SPI_UNIT_PTR(DSPI_CTRL_A));\r
 }\r
+#endif\r
+#if (SPI_USE_HW_UNIT_1 == STD_ON )\r
 static void Spi_Isr_B(void) {\r
        Spi_Isr(GET_SPI_UNIT_PTR(DSPI_CTRL_B));\r
 }\r
+#endif\r
+#if (SPI_USE_HW_UNIT_2 == STD_ON )\r
 static void Spi_Isr_C(void) {\r
        Spi_Isr(GET_SPI_UNIT_PTR(DSPI_CTRL_C));\r
 }\r
+#endif\r
+#if (SPI_USE_HW_UNIT_3 == STD_ON )\r
 static void Spi_Isr_D(void) {\r
        Spi_Isr(GET_SPI_UNIT_PTR(DSPI_CTRL_D));\r
 }\r
+#endif\r
+#if (SPI_USE_HW_UNIT_4 == STD_ON )\r
 static void Spi_Isr_E(void) {\r
        Spi_Isr(GET_SPI_UNIT_PTR(DSPI_CTRL_E));\r
 }\r
+#endif\r
+#if (SPI_USE_HW_UNIT_5 == STD_ON )\r
 static void Spi_Isr_F(void) {\r
        Spi_Isr(GET_SPI_UNIT_PTR(DSPI_CTRL_F));\r
 }\r
+#endif\r
 /* ----------------------------[public functions]----------------------------*/\r
 \r
 uint32 Spi_GetJobCnt(void);\r
@@ -1030,28 +1050,32 @@ static void Spi_SetupCTAR(      Spi_HWUnitType unit,
         */\r
 \r
        switch(unit) {\r
+#if (SPI_USE_HW_UNIT_0 == STD_ON )\r
        case 0:\r
                perClock = PERIPHERAL_CLOCK_DSPI_A;\r
                break;\r
+#endif\r
+#if (SPI_USE_HW_UNIT_1 == STD_ON )\r
        case 1:\r
                perClock = PERIPHERAL_CLOCK_DSPI_B;\r
                break;\r
-#if (SPI_CONTROLLER_TOTAL_CNT>2)\r
+#endif\r
+#if (SPI_USE_HW_UNIT_2 == STD_ON )\r
        case 2:\r
                perClock = PERIPHERAL_CLOCK_DSPI_C;\r
                break;\r
 #endif\r
-#if (SPI_CONTROLLER_TOTAL_CNT>3)\r
+#if (SPI_USE_HW_UNIT_3 == STD_ON )\r
        case 3:\r
                perClock = PERIPHERAL_CLOCK_DSPI_D;\r
                break;\r
 #endif\r
-#if (SPI_CONTROLLER_TOTAL_CNT>4)\r
+#if (SPI_USE_HW_UNIT_4 == STD_ON )\r
        case 4:\r
                perClock = PERIPHERAL_CLOCK_DSPI_E;\r
                break;\r
 #endif\r
-#if (SPI_CONTROLLER_TOTAL_CNT>5)\r
+#if (SPI_USE_HW_UNIT_5 == STD_ON )\r
        case 5:\r
                perClock = PERIPHERAL_CLOCK_DSPI_F;\r
                break;\r
@@ -1259,28 +1283,32 @@ static void Spi_InitController(Spi_UnitType *uPtr ) {
 \r
        // Install EOFQ int..\r
        switch (uPtr->hwUnit) {\r
+#if (SPI_USE_HW_UNIT_0 == STD_ON )\r
        case 0:\r
        ISR_INSTALL_ISR2("SPI_A",Spi_Isr_A, DSPI_A_ISR_EOQF, 15, 0);\r
        break;\r
+#endif\r
+#if (SPI_USE_HW_UNIT_1 == STD_ON )\r
        case 1:\r
        ISR_INSTALL_ISR2("SPI_B",Spi_Isr_B, DSPI_B_ISR_EOQF, 15, 0);\r
        break;\r
-#if (SPI_CONTROLLER_TOTAL_CNT > 2)\r
+#endif\r
+#if (SPI_USE_HW_UNIT_2 == STD_ON )\r
        case 2:\r
        ISR_INSTALL_ISR2("SPI_C",Spi_Isr_C, DSPI_C_ISR_EOQF, 15, 0);\r
        break;\r
 #endif\r
-#if (SPI_CONTROLLER_TOTAL_CNT > 3)\r
+#if (SPI_USE_HW_UNIT_3 == STD_ON )\r
        case 3:\r
        ISR_INSTALL_ISR2("SPI_D",Spi_Isr_D, DSPI_D_ISR_EOQF, 15, 0);\r
        break;\r
 #endif\r
-#if (SPI_CONTROLLER_TOTAL_CNT > 4)\r
+#if (SPI_USE_HW_UNIT_4 == STD_ON )\r
        case 4:\r
        ISR_INSTALL_ISR2("SPI_E",Spi_Isr_E, DSPI_E_ISR_EOQF, 15, 0);\r
        break;\r
 #endif\r
-#if (SPI_CONTROLLER_TOTAL_CNT > 5)\r
+#if (SPI_USE_HW_UNIT_5 == STD_ON )\r
        case 5:\r
        ISR_INSTALL_ISR2("SPI_F",Spi_Isr_F, DSPI_F_ISR_EOQF, 15, 0);\r
        break;\r

diff --git a/arch/ppc/mpc55xx/drivers/mpc5516.h b/arch/ppc/mpc55xx/drivers/mpc5516.h
index 6eaebfb5943f2df188e0d053016d712354aca328..8ffa61a188dae501d7effc56c9b9665a5cdb7fa7 100644 (file)
--- a/arch/ppc/mpc55xx/drivers/mpc5516.h
+++ b/arch/ppc/mpc55xx/drivers/mpc5516.h
@@ -3431,6 +3431,7 @@ CC_EXTENSION     typedef union uPIER1 {
 \r
 /* Define memories */\r
 \r
+#if 0\r
 #define SRAM_START  0x40000000\r
 #define SRAM_SIZE      0x10000\r
 #define SRAM_END    0x4000FFFF\r
@@ -3438,6 +3439,7 @@ CC_EXTENSION     typedef union uPIER1 {
 #define FLASH_START         0x0\r
 #define FLASH_SIZE      0x100000\r
 #define FLASH_END       0xFFFFF\r
+#endif\r
 \r
 /* Define instances of modules */\r
 //#define PBRIDGE_A (*( volatile struct PBRIDGE_A_tag *) 0xC3F00000)\r

diff --git a/arch/ppc/mpc55xx/drivers/mpc5554.h b/arch/ppc/mpc55xx/drivers/mpc5554.h
index dca1b6082fbab2a2c027d31700f86d857eb6479c..2f45951e15ee9657f49e65707e3ddd3bce3e98a1 100644 (file)
--- a/arch/ppc/mpc55xx/drivers/mpc5554.h
+++ b/arch/ppc/mpc55xx/drivers/mpc5554.h
@@ -3696,6 +3696,7 @@ extern "C" {
 \r
 /* Define memories */\r
 \r
+#if 0\r
 #define SRAM_START  0x40000000\r
 #define SRAM_SIZE      0x10000\r
 #define SRAM_END    0x4000FFFF\r
@@ -3703,6 +3704,7 @@ extern "C" {
 #define FLASH_START         0x0\r
 #define FLASH_SIZE     0x200000\r
 #define FLASH_END      0x1FFFFF\r
+#endif\r
 \r
 /* Define instances of modules */\r
 #define PBRIDGE_A (*( struct PBRIDGE_A_tag *) 0xC3F00000)\r

diff --git a/arch/ppc/mpc55xx/drivers/mpc5567.h b/arch/ppc/mpc55xx/drivers/mpc5567.h
index 96fd4f8290c9fa07bdaec5863927a6bb902a96f9..4ec7b41a8ae758209adff78ec4422c10b71f8b61 100644 (file)
--- a/arch/ppc/mpc55xx/drivers/mpc5567.h
+++ b/arch/ppc/mpc55xx/drivers/mpc5567.h
@@ -4130,6 +4130,7 @@ extern "C" {
 \r
 /* Define memories */\r
 \r
+#if 0\r
 #define SRAM_START  0x40000000\r
 #define SRAM_SIZE      0x14000\r
 #define SRAM_END    0x40013FFF\r
@@ -4137,6 +4138,7 @@ extern "C" {
 #define FLASH_START         0x0\r
 #define FLASH_SIZE      0x200000\r
 #define FLASH_END       0x1FFFFF\r
+#endif\r
 \r
 /* Define instances of modules */\r
 #define PBRIDGE_A (*( volatile struct PBRIDGE_A_tag *) 0xC3F00000)\r

diff --git a/arch/ppc/mpc55xx/drivers/mpc563m.h b/arch/ppc/mpc55xx/drivers/mpc563m.h
index 2d99fc717aa8a66a4ed4a13a6796d6ee17aa44d8..c39fe8e18083c2acb13611f26806c6ecc61e2b31 100644 (file)
--- a/arch/ppc/mpc55xx/drivers/mpc563m.h
+++ b/arch/ppc/mpc55xx/drivers/mpc563m.h
@@ -3433,6 +3433,7 @@ extern "C" {
 \r
 /* Define memories */\r
 \r
+#if 0\r
 #define SRAM_START  0x40000000\r
 #define SRAM_SIZE       0xC000\r
 #define SRAM_END    0x4000BFFF\r
@@ -3440,6 +3441,7 @@ extern "C" {
 #define FLASH_START         0x0\r
 #define FLASH_SIZE     0x100000\r
 #define FLASH_END       0xFFFFF\r
+#endif\r
 \r
 /* Define instances of modules */\r
 #define FMPLL     (*( volatile struct FMPLL_tag *)     0xC3F80000)\r

diff --git a/boards/mpc5516it/config/Spi_Cfg.h b/boards/mpc5516it/config/Spi_Cfg.h
index ca1d3006a4ee4c5bfe919b441060dc706342fe96..6ba42bc99e8b28de3ece72c2ab89b5b4846df574 100644 (file)
--- a/boards/mpc5516it/config/Spi_Cfg.h
+++ b/boards/mpc5516it/config/Spi_Cfg.h
@@ -22,11 +22,6 @@
 #include "mpc55xx.h"\r
 #include "Mcu.h"\r
 \r
-#define DSPI_CTRL_A    0\r
-#define DSPI_CTRL_B    1\r
-#define DSPI_CTRL_C    2\r
-#define DSPI_CTRL_D    3\r
-\r
 /*\r
  * General configuration\r
  */\r