Complete RX200 demo.

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

diff --git a/Demo/RX200_RX210-RSK_Renesas/RTOSDemo.tws b/Demo/RX200_RX210-RSK_Renesas/RTOSDemo.tws
index dd2a67ae8881d832e86444214b42a1a394314f38..0d23d07102b69debe28f4f9b9c21dece2803e4ed 100644 (file)
--- a/Demo/RX200_RX210-RSK_Renesas/RTOSDemo.tws
+++ b/Demo/RX200_RX210-RSK_Renesas/RTOSDemo.tws
@@ -10,8 +10,8 @@
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX200_RX210-RSK_Renesas\RTOSDemo\main-blinky.c" \r
 "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX200_RX210-RSK_Renesas\RTOSDemo\main-full.c" \r
 [WORKSPACE_FILE_STATES]\r
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX200_RX210-RSK_Renesas\RTOSDemo\main-blinky.c" 154 154 1096 423 0 1 \r
-"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX200_RX210-RSK_Renesas\RTOSDemo\main-full.c" -4 -23 1302 648 1 0 \r
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX200_RX210-RSK_Renesas\RTOSDemo\main-blinky.c" 110 110 1092 419 0 0 \r
+"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX200_RX210-RSK_Renesas\RTOSDemo\main-full.c" 132 132 1092 419 0 1 \r
 [LOADED_PROJECTS]\r
 "RTOSDemo" \r
 [END]\r

diff --git a/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/Blinky/Blinky.hdp b/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/Blinky/Blinky.hdp
index b2e2cf4ec42d969c8255f0611884ef3264d91adf..26ef400cac40d9508601f38635a4044b689cc714 100644 (file)
Binary files a/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/Blinky/Blinky.hdp and b/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/Blinky/Blinky.hdp differ

diff --git a/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/ButtonAndLCD.c b/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/ButtonAndLCD.c
index a1e7c8215f7aff9e2c90ad7f50d49bf1204a83e8..f97d8e78b27f1dd25caa89023ca75f930b9ec5ed 100644 (file)
--- a/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/ButtonAndLCD.c
+++ b/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/ButtonAndLCD.c
@@ -83,13 +83,13 @@ to accept a button press as a unique press rather than just a bounce. */
 #define lcdMIN_TIME_BETWEEN_INTERRUPTS_MS ( 125UL / portTICK_RATE_MS )\r
 \r
 /* Button interrupt handlers. */\r
-#pragma interrupt (prvIRQ1_Handler(vect=65))\r
+#pragma interrupt ( prvIRQ1_Handler( vect = 65, enable ) )\r
 static void prvIRQ1_Handler( void );\r
 \r
-#pragma interrupt (prvIRQ3_Handler(vect=67))\r
+#pragma interrupt ( prvIRQ3_Handler( vect = 67, enable ) )\r
 static void prvIRQ3_Handler( void );\r
 \r
-#pragma interrupt (prvIRQ4_Handler(vect=68))\r
+#pragma interrupt ( prvIRQ4_Handler(vect = 68, enable ) )\r
 static void prvIRQ4_Handler( void );\r
 \r
 /* \r
@@ -155,12 +155,12 @@ static const char cDataString2[] = "........Rx210 Highlights....1.56 DMips/MHz..
 display, how long to delay for, and which string to use. */\r
 struct _LCD_Params xLCDLine1 = \r
 {\r
-       LCD_LINE1, 215, cDataString1    \r
+       LCD_LINE1, 215, ( char * ) cDataString1 \r
 };\r
 \r
 struct _LCD_Params xLCDLine2 = \r
 {\r
-       LCD_LINE2, 350, cDataString2\r
+       LCD_LINE2, 350, ( char * ) cDataString2\r
 };\r
 \r
 \r

diff --git a/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/FreeRTOSConfig.h b/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/FreeRTOSConfig.h
index f2640ca8394617bd864eab0546b7a5998485abc8..aca1bf313eb56c0934ebaa00065d9c0794110b3a 100644 (file)
--- a/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/FreeRTOSConfig.h
+++ b/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/FreeRTOSConfig.h
@@ -70,7 +70,7 @@
  *----------------------------------------------------------*/\r
 \r
 #define configUSE_PREEMPTION                   1\r
-#define configUSE_IDLE_HOOK                            0\r
+#define configUSE_IDLE_HOOK                            1\r
 #define configUSE_TICK_HOOK                            0\r
 #define configCPU_CLOCK_HZ                             ( ICLK_FREQUENCY ) /* Set in rskrx210def.h. */\r
 #define configPERIPHERAL_CLOCK_HZ              ( PCLK_FREQUENCY ) /* Set in rskrx210def.h. */\r
@@ -92,6 +92,7 @@
 \r
 #define configMAX_PRIORITIES                   ( ( unsigned portBASE_TYPE ) 7 )\r
 #define configMAX_CO_ROUTINE_PRIORITIES ( 2 )\r
+\r
 /* Software timer definitions. */\r
 #define configUSE_TIMERS                               1\r
 #define configTIMER_TASK_PRIORITY              ( 3 )\r

diff --git a/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/RTOSDemo.nav b/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/RTOSDemo.nav
index 66e4cf6162d95475fb703bfd7410e94ba85fe924..2f918a35faa2641dce9828b328f375ce1056ef2e 100644 (file)
Binary files a/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/RTOSDemo.nav and b/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/RTOSDemo.nav differ

diff --git a/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/RTOSDemo.tps b/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/RTOSDemo.tps
index 404a9d4a19ca8e1d31171e242dfc8d2a6207b8c9..0a64a117c0e975c51c50c5f0f3dbafd53b8abf54 100644 (file)
--- a/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/RTOSDemo.tps
+++ b/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/RTOSDemo.tps
@@ -16,7 +16,7 @@
 [GENERAL_DATA_PROJECT]\r
 "FDT_UserBootAreaFiles" "" \r
 [GENERAL_DATA_CONFIGURATION_Blinky]\r
-"PROJECT_FILES_MODIFIED_DATA_TAG" "TRUE" \r
+"PROJECT_FILES_MODIFIED_DATA_TAG" "FALSE" \r
 [SESSIONS_Blinky]\r
 "DefaultSession" \r
 "SessionRX200_E1_E20_SYSTEM" \r

diff --git a/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/SessionRX200_E1_E20_SYSTEM.hsf b/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/SessionRX200_E1_E20_SYSTEM.hsf
index b111b64a9a6049b8a25e7e25ff43c366bad4bfcb..eda0123ff8c18d9911164e758c010dbcca582c04 100644 (file)
--- a/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/SessionRX200_E1_E20_SYSTEM.hsf
+++ b/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/SessionRX200_E1_E20_SYSTEM.hsf
@@ -89,32 +89,32 @@
 "{5F75FDA0-6FF0-11D5-B7CE-00E029352378}PACtrlViews" "0" \r
 "{64753FED-D387-4B8C-A91D-D3419C869C07}C_EVAL_DENORMAL_MODE" "16777216" \r
 "{64753FED-D387-4B8C-A91D-D3419C869C07}C_EVAL_ROUND_MODE" "768" \r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_0" "000000000000889C" \r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_1" "0000000000000000" \r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_10" "00000000A5A5A5A5" \r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_11" "00000000A5A5A5A5" \r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_12" "00000000A5A5A5A5" \r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_13" "00000000A5A5A5A5" \r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_14" "000000000000E130" \r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_15" "0000000000000014" \r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_16" "000000000000889C" \r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_17" "000000000000E788" \r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_18" "0000000004030001" \r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_19" "00000000FFF881E1" \r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_2" "000000000000DEE4" \r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_0" "000000000000E7A8" \r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_1" "000000000000000A" \r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_10" "0000000000000064" \r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_11" "000000000000006E" \r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_12" "0000000000000078" \r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_13" "0000000000000082" \r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_14" "000000000000008C" \r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_15" "0000000000000096" \r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_16" "000000000000E6AC" \r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_17" "000000000000E7A8" \r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_18" "0000000000010000" \r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_19" "00000000FFF853D9" \r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_2" "0000000000000014" \r
 "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_20" "00000000FFF8177C" \r
 "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_21" "0000000000000000" \r
 "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_22" "0000000000000000" \r
 "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_23" "0000000000000000" \r
 "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_24" "1234567887650000" \r
 "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_25" "1234567887650000" \r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_3" "000000000000DEE4" \r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_4" "0000000000000010" \r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_5" "0000000000000000" \r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_6" "00000000A5A5A5A5" \r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_7" "00000000A5A5A5A5" \r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_8" "00000000A5A5A5A5" \r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_9" "00000000A5A5A5A5" \r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_3" "000000000000001E" \r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_4" "0000000000000028" \r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_5" "0000000000010000" \r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_6" "000000000000003C" \r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_7" "0000000000000046" \r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_8" "0000000000000050" \r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_9" "000000000000005A" \r
 "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_COUNT" "25" \r
 "{6C4D5B81-FD67-46A9-A089-EA44DCDE47FD}RAMMonitorManagerCtrlBlockInfoFileDir" "" \r
 "{6C4D5B81-FD67-46A9-A089-EA44DCDE47FD}RAMMonitorManagerCtrlBlockInfoFileName" "" \r
@@ -476,7 +476,7 @@
 [LANGUAGE]\r
 "English" \r
 [CONFIG_INFO_VD1]\r
-1 \r
+0 \r
 [CONFIG_INFO_VD2]\r
 0 \r
 [CONFIG_INFO_VD3]\r
@@ -565,7 +565,7 @@
 [DOWNLOAD_MODULES_AFTER_BUILD]\r
 "TRUE" \r
 [REMOVE_BREAKPOINTS_ON_DOWNLOAD]\r
-"FALSE" \r
+"TRUE" \r
 [DISABLE_MEMORY_ACCESS_PRIOR_TO_COMMAND_FILE_EXECUTION]\r
 "FALSE" \r
 [LIMIT_DISASSEMBLY_MEMORY_ACCESS]\r

diff --git a/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/SessionRX200_E1_E20_SYSTEM.ini b/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/SessionRX200_E1_E20_SYSTEM.ini
new file mode 100644 (file)
index 0000000..5f795a0
--- /dev/null
+++ b/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/SessionRX200_E1_E20_SYSTEM.ini
@@ -0,0 +1,35 @@
+[Init_DeviceSetting]\r
+DebugMode=0\r
+PowerOut=0\r
+ResetRelease=0\r
+EmulatorSerial=E1:_9KM000237\r
+McuGroup=RX210 Group\r
+Device=R5F52108\r
+McuFileDir=RX210Gr\r
+SupplyVoltage=-1\r
+[CFG_MCU]\r
+ProcessorMode=0\r
+LittleEndian=1\r
+PrevDevice=R5F52108\r
+EnableClockChange=1\r
+UseEXTAL=1\r
+EXTAL=20.0000\r
+WorkRam=3000\r
+[Init_CommunicationClock]\r
+CommunicatonIF=1\r
+FineClock=1500000\r
+FineClockValue=1500000\r
+JtagClock=16.5\r
+JtagClockValue=10\r
+[Init_EmulatorSetting]\r
+FirstStartUp=0\r
+HideNext=0\r
+ConnectionDlgAutoClose=1\r
+[CFG_SYSTEM]\r
+CpuReWrite=0\r
+PerfCounterUser=0\r
+TraceDebugAs=0\r
+[Config_Property]\r
+HideNext=0\r
+[CFG_FLASHCLEAR_R5F52108_00]\r
+AreaCount=0\r

diff --git a/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/main-full.c b/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/main-full.c
index 8522ab3b28de86b6427e96018604239a7457fd20..cae5098068669e67a0b23cda64809ef3d3e8c17b 100644 (file)
--- a/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/main-full.c
+++ b/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/main-full.c
@@ -304,52 +304,62 @@ extern void HardwareSetup( void );
        for( ;; );\r
 }\r
 /*-----------------------------------------------------------*/\r
-\r
+volatile long temp = 0;\r
 static void prvCheckTimerCallback( xTimerHandle xTimer )\r
 {\r
 static long lChangedTimerPeriodAlready = pdFALSE, lErrorStatus = pdPASS;\r
 static volatile unsigned long ulLastRegTest1CycleCount = 0UL, ulLastRegTest2CycleCount = 0UL;\r
-\r
+volatile long temp2;\r
        /* Check the standard demo tasks are running without error. */\r
        if( xAreGenericQueueTasksStillRunning() != pdTRUE )\r
        {\r
                lErrorStatus = pdFAIL;\r
+               temp = 1;\r
        }\r
        else if( xAreQueuePeekTasksStillRunning() != pdTRUE )\r
        {\r
                lErrorStatus = pdFAIL;\r
+               temp = 2;\r
        }\r
        else if( xAreBlockingQueuesStillRunning() != pdTRUE )\r
        {\r
                lErrorStatus = pdFAIL;\r
+               temp = 3;\r
        }\r
        else if( xAreBlockTimeTestTasksStillRunning() != pdTRUE )\r
        {\r
                lErrorStatus = pdFAIL;\r
+               temp = 4;\r
        }\r
        else if( xAreSemaphoreTasksStillRunning() != pdTRUE )\r
        {\r
                lErrorStatus = pdFAIL;\r
+               temp = 5;\r
        }\r
        else if( xArePollingQueuesStillRunning() != pdTRUE )\r
        {\r
                lErrorStatus = pdFAIL;\r
+               temp = 6;\r
        }\r
        else if( xIsCreateTaskStillRunning() != pdTRUE )\r
        {\r
                lErrorStatus = pdFAIL;\r
+               temp = 7;\r
        }\r
        else if( xAreIntegerMathsTaskStillRunning() != pdTRUE )\r
        {\r
                lErrorStatus = pdFAIL;\r
+               temp = 8;\r
        }\r
        else if( xAreRecursiveMutexTasksStillRunning() != pdTRUE )\r
        {\r
                lErrorStatus = pdFAIL;\r
+               temp = 9;\r
        }\r
        else if( xAreIntQueueTasksStillRunning() != pdPASS )\r
        {\r
                lErrorStatus = pdFAIL;\r
+               temp = 10;\r
        }\r
 \r
        /* Check the reg test tasks are still cycling.  They will stop incrementing\r
@@ -357,11 +367,13 @@ static volatile unsigned long ulLastRegTest1CycleCount = 0UL, ulLastRegTest2Cycl
        if( ulRegTest1CycleCount == ulLastRegTest1CycleCount )\r
        {\r
                lErrorStatus = pdFAIL;\r
+               temp = 11;\r
        }\r
 \r
        if( ulRegTest2CycleCount == ulLastRegTest2CycleCount )\r
        {\r
                lErrorStatus = pdFAIL;\r
+               temp = 12;\r
        }\r
 \r
        ulLastRegTest1CycleCount = ulRegTest1CycleCount;\r
@@ -375,6 +387,7 @@ static volatile unsigned long ulLastRegTest1CycleCount = 0UL, ulLastRegTest2Cycl
        /* Was an error detected this time through the callback execution? */\r
        if( lErrorStatus != pdPASS )\r
        {\r
+               temp2 = temp;\r
                if( lChangedTimerPeriodAlready == pdFALSE )\r
                {\r
                        lChangedTimerPeriodAlready = pdTRUE;\r