Added volatile directive to mpc5516 registers to conform with mpc5567 declarations

diff --git a/arch/ppc/mpc55xx/drivers/Dma.c b/arch/ppc/mpc55xx/drivers/Dma.c
index 7c6952499e171bbe7b71854977bd9824b3c8a50b..5dee6186d74ee9e26c2c74f9a26274594c45835b 100644 (file)
--- a/arch/ppc/mpc55xx/drivers/Dma.c
+++ b/arch/ppc/mpc55xx/drivers/Dma.c
@@ -67,7 +67,7 @@ void Dma_ConfigureChannel (struct tcd_t *tcd, Dma_ChannelType channel)
   }\r
 }\r
 \r
-struct tcd_t * Dma_GetTcd( Dma_ChannelType channel ) {\r
+volatile struct tcd_t * Dma_GetTcd( Dma_ChannelType channel ) {\r
                return &EDMA.TCD[channel];\r
 }\r
 \r

diff --git a/arch/ppc/mpc55xx/drivers/Dma.h b/arch/ppc/mpc55xx/drivers/Dma.h
index 4c06433bcbdf0a98ec8e34b054f30957d141226d..98001b6e6a00f9c15dee0bf8f8c9d9a5ffd42688 100644 (file)
--- a/arch/ppc/mpc55xx/drivers/Dma.h
+++ b/arch/ppc/mpc55xx/drivers/Dma.h
@@ -157,7 +157,7 @@ void Dma_ConfigureSourceAddress (uint32_t sourceAddr, Dma_ChannelType channel);
 void Dma_StartChannel (Dma_ChannelType channel);\r
 void Dma_StopChannel (Dma_ChannelType channel);\r
 Std_ReturnType Dma_ChannelDone (Dma_ChannelType channel);\r
-struct tcd_t * Dma_GetTcd( Dma_ChannelType channel );\r
+volatile struct tcd_t * Dma_GetTcd( Dma_ChannelType channel );\r
 boolean Dma_CheckConfig( void );\r
 \r
 #endif /* DMA_H_ */\r

diff --git a/arch/ppc/mpc55xx/drivers/mpc5516.h b/arch/ppc/mpc55xx/drivers/mpc5516.h
index 1c45f62ad79bd79542ed507d69177d30c6da7952..ed4303a6a1f33799530d39d07f743e60f59c0d62 100644 (file)
--- a/arch/ppc/mpc55xx/drivers/mpc5516.h
+++ b/arch/ppc/mpc55xx/drivers/mpc5516.h
@@ -4251,47 +4251,47 @@ CC_EXTENSION     typedef union uPIER1 {
 #define FLASH_END       0xFFFFF\r
 \r
 /* Define instances of modules */\r
-//#define PBRIDGE_A (*( struct PBRIDGE_A_tag *) 0xC3F00000)\r
-#define MPU       (*( struct MPU_tag *)       0xFFF10000)\r
-#define SEMA4     (*( struct SEMA4_tag *)     0xFFF14000)\r
-\r
-#define MCM       (*( struct MCM_tag *)       0xFFF40000)\r
-#define EDMA      (*( struct EDMA_tag *)      0xFFF44000)\r
-#define INTC      (*( struct INTC_tag *)      0xFFF48000)\r
-\r
-#define EQADC     (*( struct EQADC_tag *)     0xFFF80000)\r
-\r
-#define I2C       (*( struct I2C_tag *)       0xFFF88000)\r
-\r
-#define DSPI_A    (*( struct DSPI_tag *)      0xFFF90000)\r
-#define DSPI_B    (*( struct DSPI_tag *)      0xFFF94000)\r
-#define DSPI_C    (*( struct DSPI_tag *)      0xFFF98000)\r
-#define DSPI_D    (*( struct DSPI_tag *)      0xFFF9C000)\r
-\r
-#define ESCI_A    (*( struct ESCI_tag *)      0xFFFA0000)\r
-#define ESCI_B    (*( struct ESCI_tag *)      0xFFFA4000)\r
-#define ESCI_C    (*( struct ESCI_tag *)      0xFFFA8000)\r
-#define ESCI_D    (*( struct ESCI_tag *)      0xFFFAC000)\r
-#define ESCI_E    (*( struct ESCI_tag *)      0xFFFB0000)\r
-#define ESCI_F    (*( struct ESCI_tag *)      0xFFFB4000)\r
-#define ESCI_G    (*( struct ESCI_tag *)      0xFFFB8000)\r
-#define ESCI_H    (*( struct ESCI_tag *)      0xFFFBC000)\r
-\r
-#define CAN_A     (*( struct FLEXCAN_tag *)  0xFFFC0000)\r
-#define CAN_B     (*( struct FLEXCAN_tag *)  0xFFFC4000)\r
-#define CAN_C     (*( struct FLEXCAN_tag *)  0xFFFC8000)\r
-#define CAN_D     (*( struct FLEXCAN_tag *)  0xFFFCC000)\r
-#define CAN_E     (*( struct FLEXCAN_tag *)  0xFFFD0000)\r
-#define CAN_F     (*( struct FLEXCAN_tag *)  0xFFFD4000)\r
-#define FR        (*( struct FR_tag *)       0xFFFD8000)\r
-#define DMAMUX    (*( struct DMAMUX_tag *)   0xFFFDC000)\r
-#define PIT       (*( struct PIT_tag *)      0xFFFE0000)\r
-#define EMIOS     (*( struct EMIOS_tag *)    0xFFFE4000)\r
-#define SIU       (*( struct SIU_tag *)      0xFFFE8000)\r
-#define CRP       (*( struct CRP_tag *)      0xFFFEC000)\r
-#define FMPLL     (*( struct FMPLL_tag *)    0xFFFF0000)\r
-#define EBI       (*( struct EBI_tag *)      0xFFFF4000)\r
-#define FLASH     (*( struct FLASH_tag *)    0xFFFF8000)\r
+//#define PBRIDGE_A (*( volatile struct PBRIDGE_A_tag *) 0xC3F00000)\r
+#define MPU       (*( volatile struct MPU_tag *)       0xFFF10000)\r
+#define SEMA4     (*( volatile struct SEMA4_tag *)     0xFFF14000)\r
+\r
+#define MCM       (*( volatile struct MCM_tag *)       0xFFF40000)\r
+#define EDMA      (*( volatile struct EDMA_tag *)      0xFFF44000)\r
+#define INTC      (*( volatile struct INTC_tag *)      0xFFF48000)\r
+\r
+#define EQADC     (*( volatile struct EQADC_tag *)     0xFFF80000)\r
+\r
+#define I2C       (*( volatile struct I2C_tag *)       0xFFF88000)\r
+\r
+#define DSPI_A    (*( volatile struct DSPI_tag *)      0xFFF90000)\r
+#define DSPI_B    (*( volatile struct DSPI_tag *)      0xFFF94000)\r
+#define DSPI_C    (*( volatile struct DSPI_tag *)      0xFFF98000)\r
+#define DSPI_D    (*( volatile struct DSPI_tag *)      0xFFF9C000)\r
+\r
+#define ESCI_A    (*( volatile struct ESCI_tag *)      0xFFFA0000)\r
+#define ESCI_B    (*( volatile struct ESCI_tag *)      0xFFFA4000)\r
+#define ESCI_C    (*( volatile struct ESCI_tag *)      0xFFFA8000)\r
+#define ESCI_D    (*( volatile struct ESCI_tag *)      0xFFFAC000)\r
+#define ESCI_E    (*( volatile struct ESCI_tag *)      0xFFFB0000)\r
+#define ESCI_F    (*( volatile struct ESCI_tag *)      0xFFFB4000)\r
+#define ESCI_G    (*( volatile struct ESCI_tag *)      0xFFFB8000)\r
+#define ESCI_H    (*( volatile struct ESCI_tag *)      0xFFFBC000)\r
+\r
+#define CAN_A     (*( volatile struct FLEXCAN_tag *)  0xFFFC0000)\r
+#define CAN_B     (*( volatile struct FLEXCAN_tag *)  0xFFFC4000)\r
+#define CAN_C     (*( volatile struct FLEXCAN_tag *)  0xFFFC8000)\r
+#define CAN_D     (*( volatile struct FLEXCAN_tag *)  0xFFFCC000)\r
+#define CAN_E     (*( volatile struct FLEXCAN_tag *)  0xFFFD0000)\r
+#define CAN_F     (*( volatile struct FLEXCAN_tag *)  0xFFFD4000)\r
+#define FR        (*( volatile struct FR_tag *)       0xFFFD8000)\r
+#define DMAMUX    (*( volatile struct DMAMUX_tag *)   0xFFFDC000)\r
+#define PIT       (*( volatile struct PIT_tag *)      0xFFFE0000)\r
+#define EMIOS     (*( volatile struct EMIOS_tag *)    0xFFFE4000)\r
+#define SIU       (*( volatile struct SIU_tag *)      0xFFFE8000)\r
+#define CRP       (*( volatile struct CRP_tag *)      0xFFFEC000)\r
+#define FMPLL     (*( volatile struct FMPLL_tag *)    0xFFFF0000)\r
+#define EBI       (*( volatile struct EBI_tag *)      0xFFFF4000)\r
+#define FLASH     (*( volatile struct FLASH_tag *)    0xFFFF8000)\r
 \r
 #ifdef __MWERKS__\r
 #pragma pop\r

diff --git a/arch/ppc/mpc55xx/kernel/irq.c b/arch/ppc/mpc55xx/kernel/irq.c
index d95ad9c8f3795ea9b8b6ade8003f63b0491f421f..a48e085c7a18cd21046cadb34434e9faeb2aeb26 100644 (file)
--- a/arch/ppc/mpc55xx/kernel/irq.c
+++ b/arch/ppc/mpc55xx/kernel/irq.c
@@ -145,7 +145,7 @@ void Irq_Init( void ) {
 \r
 void Irq_EOI( void ) {\r
 #if defined(CFG_MPC5516)\r
-       struct INTC_tag *intc = &INTC;\r
+       volatile struct INTC_tag *intc = &INTC;\r
        intc->EOIR_PRC0.R = 0;\r
 #elif defined(CFG_MPC5554)||defined(CFG_MPC5567)\r
        volatile struct INTC_tag *intc = &INTC;\r
@@ -175,7 +175,7 @@ void *Irq_Entry( void *stack_p )
        else\r
        {\r
 #if defined(CFG_MPC5516)\r
-               struct INTC_tag *intc = &INTC;\r
+               volatile struct INTC_tag *intc = &INTC;\r
                vector = (intc->IACKR_PRC0.B.INTVEC_PRC0);\r
 #elif defined(CFG_MPC5554)||defined(CFG_MPC5567)\r
                volatile struct INTC_tag *intc = &INTC;\r