Complete the RL78 demo. main.c still requires documentation in the comments at the...

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1588 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/Source/portable/IAR/RL78/ISR_Support.h b/Source/portable/IAR/RL78/ISR_Support.h
index c93cdaba49e49ae88a97860829090cd51e8f17d3..4e6f70c122628519c553ac4d55c19c35d18b5e69 100644 (file)
--- a/Source/portable/IAR/RL78/ISR_Support.h
+++ b/Source/portable/IAR/RL78/ISR_Support.h
@@ -69,7 +69,7 @@ portSAVE_CONTEXT MACRO
 \r
        PUSH      AX                    ; Save AX Register to stack.\r
        PUSH      HL\r
-#if configMEMORY_MODE == 1\r
+#if __DATA_MODEL__ == __DATA_MODEL_FAR__\r
        MOV       A, CS                 ; Save CS register.\r
        XCH       A, X\r
        MOV       A, ES                 ; Save ES register.\r
@@ -104,7 +104,7 @@ portRESTORE_CONTEXT MACRO
        MOVW      usCriticalNesting, AX\r
        POP           BC                    ; Restore the necessary general purpose registers.\r
        POP           DE\r
-#if configMEMORY_MODE == 1\r
+#if __DATA_MODEL__ == __DATA_MODEL_FAR__\r
        POP       AX                    ; Restore the ES register.\r
        MOV       ES, A\r
        XCH       A, X                  ; Restore the CS register.\r

diff --git a/Source/portable/IAR/RL78/port.c b/Source/portable/IAR/RL78/port.c
index 5a6f6c49988d08ceb79df78b3094b58ed7dd30fa..29bf14f080a58fd60ee4bff8d64ba5c35e084d42 100644 (file)
--- a/Source/portable/IAR/RL78/port.c
+++ b/Source/portable/IAR/RL78/port.c
@@ -117,7 +117,7 @@ portSTACK_TYPE *pxPortInitialiseStack( portSTACK_TYPE *pxTopOfStack, pdTASK_CODE
 {\r
 unsigned long *pulLocal;\r
 \r
-       #if configMEMORY_MODE == 1\r
+       #if __DATA_MODEL__ == __DATA_MODEL_FAR__\r
        {\r
                /* Parameters are passed in on the stack, and written using a 32bit value\r
                hence a space is left for the second two bytes. */\r

diff --git a/Source/portable/IAR/RL78/portmacro.h b/Source/portable/IAR/RL78/portmacro.h
index 1ab8112ec5db9d95532df3bca52d442ff4f82482..ec873d120d1ece20a1b06d251168555a025049ba 100644 (file)
--- a/Source/portable/IAR/RL78/portmacro.h
+++ b/Source/portable/IAR/RL78/portmacro.h
@@ -83,8 +83,13 @@ extern "C" {
 #define portSHORT       short\r
 #define portSTACK_TYPE  unsigned short\r
 #define portBASE_TYPE   short\r
-#define portPOINTER_SIZE_TYPE unsigned short\r
-#warning pointer size type will depend on data model.\r
+\r
+#if __DATA_MODEL__ == __DATA_MODEL_FAR__\r
+       #define portPOINTER_SIZE_TYPE unsigned long\r
+#else\r
+       #define portPOINTER_SIZE_TYPE unsigned short\r
+#endif\r
+\r
        \r
 #if (configUSE_16_BIT_TICKS==1)\r
        typedef unsigned int portTickType;\r