Fixes to make the os kernel test framework pass.

diff --git a/arch/hc1x/hcs12d/kernel/irq.c b/arch/hc1x/hcs12d/kernel/irq.c
index c1e4220dceebaa86e0d9c4031c9c510b46b9e3b4..b0210b522b9159bf0588f7b936ae4da5d7732b1a 100644 (file)
--- a/arch/hc1x/hcs12d/kernel/irq.c
+++ b/arch/hc1x/hcs12d/kernel/irq.c
@@ -112,7 +112,15 @@ void Irq_AttachIsr2(TaskType tid,void *int_ctrl,IrqType vector ) {
  * @param vector\r
  */\r
 void Irq_GenerateSoftInt( IrqType vector ) {\r
-       (void)vector;\r
+       if (vector == IRQ_TYPE_SWI)\r
+       {\r
+           asm("swi");\r
+       }\r
+\r
+       if (vector == IRQ_TYPE_ILLEGAL)\r
+       {\r
+            asm(".short 0x1830"); // Trap instruction\r
+       }\r
 }\r
 \r
 /**\r

diff --git a/arch/hc1x/hcs12d/scripts/linkscript_gcc.ldf b/arch/hc1x/hcs12d/scripts/linkscript_gcc.ldf
index cf747efbd17ee6d47fc5302c6349db5e18f5aa23..922e882475a1af35c053e0b847f9ad26b45be773 100644 (file)
--- a/arch/hc1x/hcs12d/scripts/linkscript_gcc.ldf
+++ b/arch/hc1x/hcs12d/scripts/linkscript_gcc.ldf
@@ -236,6 +236,7 @@ SECTIONS
     /* BANK_E MODULES */\r
     Port*.o(.text)\r
     Com*.o(.text)\r
+    test_*.o(.text)\r
 \r
     . = ALIGN(2);\r
   } > bank_E AT>bank_E_lma  =0xff\r

diff --git a/boards/hcs12_elmicro_card12/build_config.mk b/boards/hcs12_elmicro_card12/build_config.mk
index 8f42bad92d28e88f121dcbd89d513be882d8d6b2..b7688a03617a78efe1fd63f0c1754e8f41030aaf 100644 (file)
--- a/boards/hcs12_elmicro_card12/build_config.mk
+++ b/boards/hcs12_elmicro_card12/build_config.mk
@@ -13,7 +13,7 @@ MOD_AVAIL+=MCU GPT
 # System + Communication + Diagnostic
 MOD_AVAIL+=CANIF CANTP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM RTE
 # Additional
-MOD_AVAIL+=RAMLOG 
+MOD_AVAIL+=RAMLOG
 
 
 # Needed by us (These become USE_XXX=y and def-y += USE_XXX )

diff --git a/boards/hcs12_elmicro_card12/memory.ldf b/boards/hcs12_elmicro_card12/memory.ldf
index 22c9397e1876d859266c73d326614a10d0f4aea4..3d222ccde6a7d8e7ab76f76ad45dc9993d11b7ea 100644 (file)
--- a/boards/hcs12_elmicro_card12/memory.ldf
+++ b/boards/hcs12_elmicro_card12/memory.ldf
@@ -8,7 +8,7 @@
 page0 (rwx) : ORIGIN = 0x0, LENGTH = 256\r
 \r
 /* RAM */\r
-data (rwx)  : ORIGIN = 0x2000, LENGTH = 8k\r
+data (rwx)  : ORIGIN = 0x2000, LENGTH = 12k\r
 \r
 eeprom (rx): ORIGIN = 0x0400, LENGTH = 3k\r
 text (rx)  : ORIGIN = 0x4000, LENGTH = 48k\r

diff --git a/common/printf.c b/common/printf.c
index dfded21c1a6011e70ed3a00b255e8f62782cd38a..19d00c09965b6309370b42644ed5dff14068aa3d 100644 (file)
--- a/common/printf.c
+++ b/common/printf.c
@@ -322,7 +322,6 @@ int print(FILE *file, char **buffer, size_t n, const char *format, va_list ap)
                                /* Not supported or no flag */\r
                                flags = FL_NONE;\r
                                format--;\r
-                               break;\r
                        }\r
 \r
                        ch = *format++;\r