Corrected bugs in can.c for mpc55xx.

diff --git a/arch/ppc/mpc55xx/drivers/Can.c b/arch/ppc/mpc55xx/drivers/Can.c
index f0a75b6a12e5499d4c4aefbc083bb8085913916e..e8e0a294f7b3614e04148ac41b70db7a9a55f2f0 100644 (file)
--- a/arch/ppc/mpc55xx/drivers/Can.c
+++ b/arch/ppc/mpc55xx/drivers/Can.c
@@ -283,7 +283,7 @@ Can_UnitType CanUnit[CAN_CONTROLLER_CNT] =
   },{\r
     .state = CANIF_CS_UNINIT,\r
   },\r
-#if defined(MPC5516) || defined(MPC5517) ||  defined(CFG_MPC5567)\r
+#if defined(CFG_MPC5516) || defined(CFG_MPC5517) ||  defined(CFG_MPC5567)\r
   {\r
     .state = CANIF_CS_UNINIT,\r
   },{\r
@@ -292,7 +292,7 @@ Can_UnitType CanUnit[CAN_CONTROLLER_CNT] =
     .state = CANIF_CS_UNINIT,\r
   },\r
 #endif\r
-#if defined(MPC5516) || defined(MPC5517)\r
+#if defined(CFG_MPC5516) || defined(CFG_MPC5517)\r
   {\r
     .state = CANIF_CS_UNINIT,\r
   }\r
@@ -348,34 +348,34 @@ static void Can_BusOff( int unit );
 \r
 void Can_A_Isr( void  ) {      Can_Isr(CAN_CTRL_A); }\r
 void Can_B_Isr( void  ) {      Can_Isr(CAN_CTRL_B); }\r
-#if defined(MPC5516) || defined(MPC5517) || defined(MPC5567)\r
+#if defined(CFG_MPC5516) || defined(CFG_MPC5517) || defined(CFG_MPC5567)\r
 void Can_C_Isr( void  ) {      Can_Isr(CAN_CTRL_C); }\r
 void Can_D_Isr( void  ) {      Can_Isr(CAN_CTRL_D); }\r
 void Can_E_Isr( void  ) {      Can_Isr(CAN_CTRL_E); }\r
 #endif\r
-#if defined(MPC5516) || defined(MPC5517)\r
+#if defined(CFG_MPC5516) || defined(CFG_MPC5517)\r
 void Can_F_Isr( void  ) {      Can_Isr(CAN_CTRL_F); }\r
 #endif\r
 \r
 void Can_A_Err( void  ) {      Can_Err(CAN_CTRL_A); }\r
 void Can_B_Err( void  ) {      Can_Err(CAN_CTRL_B); }\r
-#if defined(MPC5516) || defined(MPC5517) || defined(MPC5567)\r
+#if defined(CFG_MPC5516) || defined(CFG_MPC5517) || defined(CFG_MPC5567)\r
 void Can_C_Err( void  ) {      Can_Err(CAN_CTRL_C); }\r
 void Can_D_Err( void  ) {      Can_Err(CAN_CTRL_D); }\r
 void Can_E_Err( void  ) {      Can_Err(CAN_CTRL_E); }\r
 #endif\r
-#if defined(MPC5516) || defined(MPC5517)\r
+#if defined(CFG_MPC5516) || defined(CFG_MPC5517)\r
 void Can_F_Err( void  ) {      Can_Err(CAN_CTRL_F); }\r
 #endif\r
 \r
 void Can_A_BusOff( void  ) {   Can_BusOff(CAN_CTRL_A); }\r
 void Can_B_BusOff( void  ) {   Can_BusOff(CAN_CTRL_B); }\r
-#if defined(MPC5516) || defined(MPC5517) || defined(MPC5567)\r
+#if defined(CFG_MPC5516) || defined(CFG_MPC5517) || defined(CFG_MPC5567)\r
 void Can_C_BusOff( void  ) {   Can_BusOff(CAN_CTRL_C); }\r
 void Can_D_BusOff( void  ) {   Can_BusOff(CAN_CTRL_D); }\r
 void Can_E_BusOff( void  ) {   Can_BusOff(CAN_CTRL_E); }\r
 #endif\r
-#if defined(MPC5516) || defined(MPC5517)\r
+#if defined(CFG_MPC5516) || defined(CFG_MPC5517)\r
 void Can_F_BusOff( void  ) {   Can_BusOff(CAN_CTRL_F); }\r
 #endif\r
 //-------------------------------------------------------------------\r
@@ -742,7 +742,7 @@ void Can_Init( const Can_ConfigType *config ) {
        INSTALL_HANDLER16( "Can", Can_B_Isr,    FLEXCAN_B_IFLAG1_BUF0I,     2, 0 );\r
        ISR_INSTALL_ISR2(  "Can", Can_B_Isr,    FLEXCAN_B_IFLAG1_BUF31_16I, 2, 0 );\r
        break;\r
-#if defined(CFG_MPC5516) || defined(CFG_MPC5517) || defined(MPC5567)\r
+#if defined(CFG_MPC5516) || defined(CFG_MPC5517) || defined(CFG_MPC5567)\r
      case CAN_CTRL_C:\r
        ISR_INSTALL_ISR2(  "Can", Can_C_BusOff, FLEXCAN_C_ESR_BOFF_INT,     2, 0 );\r
        ISR_INSTALL_ISR2(  "Can", Can_C_Err,    FLEXCAN_C_ESR_ERR_INT,      2, 0 );\r