Fixes to mahi-1 merge

diff --git a/common/newlib_port.c b/common/newlib_port.c
index 3d13f79836871b0ac5c12a0e139bdd0fc22cad90..e8c7dcd5f877270f1a1ebeb684d6bd7d44afb3d2 100644 (file)
--- a/common/newlib_port.c
+++ b/common/newlib_port.c
@@ -237,9 +237,11 @@ int write(  int fd, const void *_buf, size_t nbytes)
 #endif\r
 \r
 #if defined(USE_RAMLOG)\r
-               char *buf = (char *)_buf;\r
-               for (int i = 0; i < nbytes; i++) {\r
-                       ramlog_chr (*(buf + i));\r
+               {\r
+                       char *buf = (char *)_buf;\r
+                       for (int i = 0; i < nbytes; i++) {\r
+                               ramlog_chr (*(buf + i));\r
+                       }\r
                }\r
 #endif\r
 \r

diff --git a/examples/blinker_node/build_config.mk b/examples/blinker_node/build_config.mk
index 86f3a519008dbb26b837824250e608be5e17b7c9..70a79e340d47b55379dca69ba372c0a3dafb07a3 100644 (file)
--- a/examples/blinker_node/build_config.mk
+++ b/examples/blinker_node/build_config.mk
@@ -1,7 +1,7 @@
 -include ../config/*.mk\r
 -include ../config/$(BOARDDIR)/*.mk\r
 \r
-MOD_USE+=ECUM KERNEL MCU WDG WDGM PORT DIO \r
+MOD_USE+=COMMON DET DIO ECUM KERNEL MCU NEWLIB WDG WDGM PORT  \r
 \r
 SELECT_CONSOLE = RAMLOG\r
 SELECT_OS_CONSOLE = RAMLOG\r

diff --git a/examples/switch_node/build_config.mk b/examples/switch_node/build_config.mk
index f21c8b4e76305893b69f76da465640a549c01bc1..3d1fd99beaf6e875a1410cfeaf76d50127398a42 100644 (file)
--- a/examples/switch_node/build_config.mk
+++ b/examples/switch_node/build_config.mk
@@ -1,7 +1,7 @@
 -include ../config/*.mk\r
 -include ../config/$(BOARDDIR)/*.mk\r
 \r
-MOD_USE+=KERNEL MCU ADC DMA \r
+MOD_USE+=ADC COMMON DET ECUM DMA KERNEL MCU NEWLIB \r
 \r
 SELECT_CONSOLE = RAMLOG\r
 SELECT_OS_CONSOLE = RAMLOG
\ No newline at end of file

diff --git a/include/Port.h b/include/Port.h
index dac283da00a2a83c81a6e10db7cf2a24720b0f68..23a5538f63d348796883c1060f8dd5b83fa9c655 100644 (file)
--- a/include/Port.h
+++ b/include/Port.h
@@ -68,6 +68,13 @@ typedef enum
     PORT_PIN_IN = 0, PORT_PIN_OUT,
 } Port_PinDirectionType;
 
+#if defined(CFG_HC1X)
+/** @req PORT124 */
+typedef uint8 Port_PinModeType;
+#else  // CFG_PPC, CFG_STM32_STAMP and others
+typedef uint32 Port_PinModeType;
+#endif
+
 void
 Port_Init(const Port_ConfigType *configType);
 #if ( PORT_PIN_DIRECTION_CHANGES_ALLOWED == STD_ON )

diff --git a/scripts/build_arm.sh b/scripts/build_arm.sh
index 1670702a80fafc91ad8b3d5dc09e5f26a3ed6229..0fb7da232c702b6050815616cdebb7671f0f7ea9 100755 (executable)
--- a/scripts/build_arm.sh
+++ b/scripts/build_arm.sh
@@ -17,20 +17,17 @@ make BOARDDIR=stm32_stm3210c all
 if [ $? -ne 0 ]; then quit 1
 fi
 
-export BDIR=system/kernel/testsystem/suite_01,system/kernel/testsystem/suite_02
+export BDIR=examples/simple 
 make BOARDDIR=stm32_stm3210c clean
 make BOARDDIR=stm32_stm3210c all
 if [ $? -ne 0 ]; then quit 1
 fi
 
-export BDIR=system/kernel/testsystem/suite_01,system/kernel/testsystem/suite_02
-make BOARDDIR=stm32_mcbstm32 clean
-make BOARDDIR=stm32_mcbstm32 all
-if [ $? -ne 0 ]; then quit 1
-fi
+# Problems memory..
+#export BDIR=system/kernel/testsystem/suite_01,system/kernel/testsystem/suite_02, system/kernel/testsystem/suite_03
+#make BOARDDIR=stm32_stm3210c clean
+#make BOARDDIR=stm32_stm3210c all
+#if [ $? -ne 0 ]; then quit 1
+#fi
+
 
-export BDIR=system/kernel/testsystem/suite_01,system/kernel/testsystem/suite_02
-make BOARDDIR=stm32_stm3210c clean
-make BOARDDIR=stm32_stm3210c all
-if [ $? -ne 0 ]; then quit 1
-fi

diff --git a/scripts/build_ppc.sh b/scripts/build_ppc.sh
index 178194a9fbe467a48b9bbcab75c46d472227b71f..84e703856ec604e2ac9e143192c2d60421f0ca9b 100644 (file)
--- a/scripts/build_ppc.sh
+++ b/scripts/build_ppc.sh
@@ -16,7 +16,7 @@ function quit {
 SCRIPT_DIR=`dirname $0`   
 ARCH=PPC
 source ${SCRIPT_DIR}/guess_cc.sh
-         
+                         
 export BDIR=system/kernel/testsystem/suite_01,system/kernel/testsystem/suite_02,,system/kernel/testsystem/suite_03
 make BOARDDIR=mpc5554sim clean 
 make BOARDDIR=mpc5554sim all 
@@ -43,20 +43,20 @@ fi
 # Build the examples...
 
 export BDIR=examples/blinker_node
-make BOARDDIR=mpc551xsim clean 
-make BOARDDIR=mpc551xsim all 
+make BOARDDIR=mpc5516it clean 
+make BOARDDIR=mpc5516it all 
 if [ $? -ne 0 ]; then quit 1
 fi
 
 export BDIR=examples/pwm_node
-make BOARDDIR=mpc551xsim clean 
-make BOARDDIR=mpc551xsim all 
+make BOARDDIR=mpc5516it clean 
+make BOARDDIR=mpc5516it all 
 if [ $? -ne 0 ]; then quit 1
 fi
 
 export BDIR=examples/pwm_node2
-make BOARDDIR=mpc551xsim clean 
-make BOARDDIR=mpc551xsim all 
+make BOARDDIR=mpc5516it clean 
+make BOARDDIR=mpc5516it all 
 if [ $? -ne 0 ]; then quit 1
 fi
 
@@ -66,15 +66,15 @@ make BOARDDIR=mpc551xsim all
 if [ $? -ne 0 ]; then quit 1
 fi
 
-export BDIR=examples/swith_node
-make BOARDDIR=mpc551xsim clean 
-make BOARDDIR=mpc551xsim all 
+export BDIR=examples/switch_node
+make BOARDDIR=mpc5516it clean 
+make BOARDDIR=mpc5516it all 
 if [ $? -ne 0 ]; then quit 1
 fi
 
 export BDIR=examples/tiny
-make BOARDDIR=mpc551xsim clean 
-make BOARDDIR=mpc551xsim all 
+make BOARDDIR=mpc5516it clean 
+make BOARDDIR=mpc5516it all 
 if [ $? -ne 0 ]; then quit 1
 fi