Fixed RAMLOG for msl_port, default config for dio and mcu for 5606

diff --git a/boards/mpc5606s/config/Dio_Cfg.h b/boards/mpc5606s/config/Dio_Cfg.h
index 14f6ff85affccf403ed4774efffc7f7b8786705c..494dcacc37fc8a2214c46fc5414edbb53995d35f 100644 (file)
--- a/boards/mpc5606s/config/Dio_Cfg.h
+++ b/boards/mpc5606s/config/Dio_Cfg.h
@@ -148,26 +148,26 @@ typedef enum
 #define DIO_CHANNEL_F10                80\r
 #define DIO_CHANNEL_F11                81\r
 #define DIO_CHANNEL_F12                82\r
-//#define DIO_CHANNEL_F13              93 , Reserved\r
-//#define DIO_CHANNEL_F14              94 , Reserved\r
-//#define DIO_CHANNEL_F15              95 , Reserved\r
-\r
-#define DIO_CHANNEL_G0         83\r
-#define DIO_CHANNEL_G1         84\r
-#define DIO_CHANNEL_G2         85\r
-#define DIO_CHANNEL_G3         86\r
-#define DIO_CHANNEL_G4         87\r
-#define DIO_CHANNEL_G5         88\r
-#define DIO_CHANNEL_G6         89\r
-#define DIO_CHANNEL_G7         90\r
-#define DIO_CHANNEL_G8         91\r
-#define DIO_CHANNEL_G9         92\r
-#define DIO_CHANNEL_G10                92\r
-#define DIO_CHANNEL_G11                94\r
-#define DIO_CHANNEL_G12                95\r
-#define DIO_CHANNEL_G13                96\r
-#define DIO_CHANNEL_G14                97\r
-#define DIO_CHANNEL_G15                98\r
+#define DIO_CHANNEL_F13                83\r
+#define DIO_CHANNEL_F14                84\r
+#define DIO_CHANNEL_F15                85\r
+\r
+#define DIO_CHANNEL_G0         86\r
+#define DIO_CHANNEL_G1         87\r
+#define DIO_CHANNEL_G2         88\r
+#define DIO_CHANNEL_G3         89\r
+#define DIO_CHANNEL_G4         90\r
+#define DIO_CHANNEL_G5         91\r
+#define DIO_CHANNEL_G6         92\r
+#define DIO_CHANNEL_G7         93\r
+#define DIO_CHANNEL_G8         94\r
+#define DIO_CHANNEL_G9         95\r
+#define DIO_CHANNEL_G10                96\r
+#define DIO_CHANNEL_G11                97\r
+#define DIO_CHANNEL_G12                98\r
+//#define DIO_CHANNEL_G13              99, reserved\r
+//#define DIO_CHANNEL_G14              100, reserved\r
+//#define DIO_CHANNEL_G15              101, reserved\r
 \r
 #define DIO_CHANNEL_H0         99\r
 #define DIO_CHANNEL_H1         100\r
@@ -230,18 +230,20 @@ extern const Dio_PortType DioPortConfigData[];
 extern const Dio_ChannelGroupType DioConfigData[];\r
 \r
 // Mapping of logical ports to physical \r
-#ifdef CFG_BRD_MPC5516IT\r
+#ifdef CFG_BRD_MPC5606S\r
 \r
 // Channels    \r
-#define DIO_CHANNEL_NAME_LEDS_LED4             (DIO_CHANNEL_D4)\r
-#define DIO_CHANNEL_NAME_LEDS_LED5             (DIO_CHANNEL_D5)\r
+#define DIO_CHANNEL_NAME_LEDS_LED4             (DIO_CHANNEL_E4)\r
+#define DIO_CHANNEL_NAME_LEDS_LED5             (DIO_CHANNEL_E5)\r
+#define DIO_CHANNEL_NAME_LEDS_LED6             (DIO_CHANNEL_E6)\r
+#define DIO_CHANNEL_NAME_LEDS_LED7             (DIO_CHANNEL_E7)\r
 \r
 // Standard board test led\r
 #define DIO_CHANNEL_NAME_BOARD_LED             DIO_CHANNEL_NAME_LEDS_LED4\r
 \r
 \r
 // Port\r
-#define DIO_PORT_NAME_LED_PORT                         (DIO_PORT_D)\r
+#define DIO_PORT_NAME_LED_PORT                         (DIO_PORT_E)\r
 \r
 // Channel group\r
 #define DIO_GROUP_NAME_LED_GRP_PTR             (&DioConfigData[0])\r

diff --git a/boards/mpc5606s/config/Mcu_Cfg.h b/boards/mpc5606s/config/Mcu_Cfg.h
index 353445807e2b577a6915461bd8a63dbf05eab12e..92be01f2c8953659758741406890ea26a392db08 100644 (file)
--- a/boards/mpc5606s/config/Mcu_Cfg.h
+++ b/boards/mpc5606s/config/Mcu_Cfg.h
@@ -25,7 +25,7 @@
 #ifndef MCU_CFG_H_\r
 #define MCU_CFG_H_\r
 \r
-#include "mpc55xx.h"\r
+#include "mpc5606s.h"\r
 \r
 /** Enable Development Error Trace */\r
 #define MCU_DEV_ERROR_DETECT   STD_ON\r

diff --git a/common/msl_port.c b/common/msl_port.c
index c0074dbd273835e6636c3b7c289b16002b099d60..9c661bd8a400352d2c9eeb60084c67f44ff5e0db 100644 (file)
--- a/common/msl_port.c
+++ b/common/msl_port.c
@@ -38,7 +38,6 @@ int  InitializeUART(void)
 \r
 int ReadUARTN( char* buf, int cnt )\r
 {\r
-       (void)g_TRBuffer[0];\r
        (void)buf;\r
        (void)cnt;\r
        return 0;\r
@@ -63,16 +62,17 @@ int WriteUARTN( char* buf, int cnt )
                        TWBUFF_TPTR = nLen;\r
                }\r
        }\r
+#endif\r
+#if defined(USE_RAMLOG)\r
+               {\r
+                       char *pbuf = buf;\r
+                       for (int i = 0; i < cnt; i++) {\r
+                               ramlog_chr (*(pbuf + i));\r
+                       }\r
+               }\r
+#endif\r
 \r
        return 0;\r
-\r
-#else\r
-\r
-       (void)buf;\r
-       (void)cnt;\r
-       return 0;\r
-\r
-#endif\r
 }\r
 \r
 int WriteUART1(char c) {\r