From: richardbarry Date: Sun, 18 Sep 2011 15:45:52 +0000 (+0000) Subject: Complete RX200 demo. X-Git-Tag: V7.0.2~7 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c631f7a8f0bcb4a7306a6fdffccc55febdaea0bc;p=freertos 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 dd2a67ae8..0d23d0710 100644 --- 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" "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX200_RX210-RSK_Renesas\RTOSDemo\main-full.c" [WORKSPACE_FILE_STATES] -"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX200_RX210-RSK_Renesas\RTOSDemo\main-blinky.c" 154 154 1096 423 0 1 -"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX200_RX210-RSK_Renesas\RTOSDemo\main-full.c" -4 -23 1302 648 1 0 +"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX200_RX210-RSK_Renesas\RTOSDemo\main-blinky.c" 110 110 1092 419 0 0 +"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX200_RX210-RSK_Renesas\RTOSDemo\main-full.c" 132 132 1092 419 0 1 [LOADED_PROJECTS] "RTOSDemo" [END] diff --git a/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/Blinky/Blinky.hdp b/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/Blinky/Blinky.hdp index b2e2cf4ec..26ef400ca 100644 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 a1e7c8215..f97d8e78b 100644 --- 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 ) /* Button interrupt handlers. */ -#pragma interrupt (prvIRQ1_Handler(vect=65)) +#pragma interrupt ( prvIRQ1_Handler( vect = 65, enable ) ) static void prvIRQ1_Handler( void ); -#pragma interrupt (prvIRQ3_Handler(vect=67)) +#pragma interrupt ( prvIRQ3_Handler( vect = 67, enable ) ) static void prvIRQ3_Handler( void ); -#pragma interrupt (prvIRQ4_Handler(vect=68)) +#pragma interrupt ( prvIRQ4_Handler(vect = 68, enable ) ) static void prvIRQ4_Handler( void ); /* @@ -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. */ struct _LCD_Params xLCDLine1 = { - LCD_LINE1, 215, cDataString1 + LCD_LINE1, 215, ( char * ) cDataString1 }; struct _LCD_Params xLCDLine2 = { - LCD_LINE2, 350, cDataString2 + LCD_LINE2, 350, ( char * ) cDataString2 }; diff --git a/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/FreeRTOSConfig.h b/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/FreeRTOSConfig.h index f2640ca83..aca1bf313 100644 --- a/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/FreeRTOSConfig.h +++ b/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/FreeRTOSConfig.h @@ -70,7 +70,7 @@ *----------------------------------------------------------*/ #define configUSE_PREEMPTION 1 -#define configUSE_IDLE_HOOK 0 +#define configUSE_IDLE_HOOK 1 #define configUSE_TICK_HOOK 0 #define configCPU_CLOCK_HZ ( ICLK_FREQUENCY ) /* Set in rskrx210def.h. */ #define configPERIPHERAL_CLOCK_HZ ( PCLK_FREQUENCY ) /* Set in rskrx210def.h. */ @@ -92,6 +92,7 @@ #define configMAX_PRIORITIES ( ( unsigned portBASE_TYPE ) 7 ) #define configMAX_CO_ROUTINE_PRIORITIES ( 2 ) + /* Software timer definitions. */ #define configUSE_TIMERS 1 #define configTIMER_TASK_PRIORITY ( 3 ) diff --git a/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/RTOSDemo.nav b/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/RTOSDemo.nav index 66e4cf616..2f918a35f 100644 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 404a9d4a1..0a64a117c 100644 --- 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] "FDT_UserBootAreaFiles" "" [GENERAL_DATA_CONFIGURATION_Blinky] -"PROJECT_FILES_MODIFIED_DATA_TAG" "TRUE" +"PROJECT_FILES_MODIFIED_DATA_TAG" "FALSE" [SESSIONS_Blinky] "DefaultSession" "SessionRX200_E1_E20_SYSTEM" 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 b111b64a9..eda0123ff 100644 --- 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" "{64753FED-D387-4B8C-A91D-D3419C869C07}C_EVAL_DENORMAL_MODE" "16777216" "{64753FED-D387-4B8C-A91D-D3419C869C07}C_EVAL_ROUND_MODE" "768" -"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_0" "000000000000889C" -"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_1" "0000000000000000" -"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_10" "00000000A5A5A5A5" -"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_11" "00000000A5A5A5A5" -"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_12" "00000000A5A5A5A5" -"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_13" "00000000A5A5A5A5" -"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_14" "000000000000E130" -"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_15" "0000000000000014" -"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_16" "000000000000889C" -"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_17" "000000000000E788" -"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_18" "0000000004030001" -"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_19" "00000000FFF881E1" -"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_2" "000000000000DEE4" +"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_0" "000000000000E7A8" +"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_1" "000000000000000A" +"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_10" "0000000000000064" +"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_11" "000000000000006E" +"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_12" "0000000000000078" +"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_13" "0000000000000082" +"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_14" "000000000000008C" +"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_15" "0000000000000096" +"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_16" "000000000000E6AC" +"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_17" "000000000000E7A8" +"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_18" "0000000000010000" +"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_19" "00000000FFF853D9" +"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_2" "0000000000000014" "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_20" "00000000FFF8177C" "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_21" "0000000000000000" "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_22" "0000000000000000" "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_23" "0000000000000000" "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_24" "1234567887650000" "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_25" "1234567887650000" -"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_3" "000000000000DEE4" -"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_4" "0000000000000010" -"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_5" "0000000000000000" -"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_6" "00000000A5A5A5A5" -"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_7" "00000000A5A5A5A5" -"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_8" "00000000A5A5A5A5" -"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_9" "00000000A5A5A5A5" +"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_3" "000000000000001E" +"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_4" "0000000000000028" +"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_5" "0000000000010000" +"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_6" "000000000000003C" +"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_7" "0000000000000046" +"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_8" "0000000000000050" +"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_9" "000000000000005A" "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_COUNT" "25" "{6C4D5B81-FD67-46A9-A089-EA44DCDE47FD}RAMMonitorManagerCtrlBlockInfoFileDir" "" "{6C4D5B81-FD67-46A9-A089-EA44DCDE47FD}RAMMonitorManagerCtrlBlockInfoFileName" "" @@ -476,7 +476,7 @@ [LANGUAGE] "English" [CONFIG_INFO_VD1] -1 +0 [CONFIG_INFO_VD2] 0 [CONFIG_INFO_VD3] @@ -565,7 +565,7 @@ [DOWNLOAD_MODULES_AFTER_BUILD] "TRUE" [REMOVE_BREAKPOINTS_ON_DOWNLOAD] -"FALSE" +"TRUE" [DISABLE_MEMORY_ACCESS_PRIOR_TO_COMMAND_FILE_EXECUTION] "FALSE" [LIMIT_DISASSEMBLY_MEMORY_ACCESS] 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 index 000000000..5f795a082 --- /dev/null +++ b/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/SessionRX200_E1_E20_SYSTEM.ini @@ -0,0 +1,35 @@ +[Init_DeviceSetting] +DebugMode=0 +PowerOut=0 +ResetRelease=0 +EmulatorSerial=E1:_9KM000237 +McuGroup=RX210 Group +Device=R5F52108 +McuFileDir=RX210Gr +SupplyVoltage=-1 +[CFG_MCU] +ProcessorMode=0 +LittleEndian=1 +PrevDevice=R5F52108 +EnableClockChange=1 +UseEXTAL=1 +EXTAL=20.0000 +WorkRam=3000 +[Init_CommunicationClock] +CommunicatonIF=1 +FineClock=1500000 +FineClockValue=1500000 +JtagClock=16.5 +JtagClockValue=10 +[Init_EmulatorSetting] +FirstStartUp=0 +HideNext=0 +ConnectionDlgAutoClose=1 +[CFG_SYSTEM] +CpuReWrite=0 +PerfCounterUser=0 +TraceDebugAs=0 +[Config_Property] +HideNext=0 +[CFG_FLASHCLEAR_R5F52108_00] +AreaCount=0 diff --git a/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/main-full.c b/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/main-full.c index 8522ab3b2..cae509806 100644 --- 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( ;; ); } /*-----------------------------------------------------------*/ - +volatile long temp = 0; static void prvCheckTimerCallback( xTimerHandle xTimer ) { static long lChangedTimerPeriodAlready = pdFALSE, lErrorStatus = pdPASS; static volatile unsigned long ulLastRegTest1CycleCount = 0UL, ulLastRegTest2CycleCount = 0UL; - +volatile long temp2; /* Check the standard demo tasks are running without error. */ if( xAreGenericQueueTasksStillRunning() != pdTRUE ) { lErrorStatus = pdFAIL; + temp = 1; } else if( xAreQueuePeekTasksStillRunning() != pdTRUE ) { lErrorStatus = pdFAIL; + temp = 2; } else if( xAreBlockingQueuesStillRunning() != pdTRUE ) { lErrorStatus = pdFAIL; + temp = 3; } else if( xAreBlockTimeTestTasksStillRunning() != pdTRUE ) { lErrorStatus = pdFAIL; + temp = 4; } else if( xAreSemaphoreTasksStillRunning() != pdTRUE ) { lErrorStatus = pdFAIL; + temp = 5; } else if( xArePollingQueuesStillRunning() != pdTRUE ) { lErrorStatus = pdFAIL; + temp = 6; } else if( xIsCreateTaskStillRunning() != pdTRUE ) { lErrorStatus = pdFAIL; + temp = 7; } else if( xAreIntegerMathsTaskStillRunning() != pdTRUE ) { lErrorStatus = pdFAIL; + temp = 8; } else if( xAreRecursiveMutexTasksStillRunning() != pdTRUE ) { lErrorStatus = pdFAIL; + temp = 9; } else if( xAreIntQueueTasksStillRunning() != pdPASS ) { lErrorStatus = pdFAIL; + temp = 10; } /* Check the reg test tasks are still cycling. They will stop incrementing @@ -357,11 +367,13 @@ static volatile unsigned long ulLastRegTest1CycleCount = 0UL, ulLastRegTest2Cycl if( ulRegTest1CycleCount == ulLastRegTest1CycleCount ) { lErrorStatus = pdFAIL; + temp = 11; } if( ulRegTest2CycleCount == ulLastRegTest2CycleCount ) { lErrorStatus = pdFAIL; + temp = 12; } ulLastRegTest1CycleCount = ulRegTest1CycleCount; @@ -375,6 +387,7 @@ static volatile unsigned long ulLastRegTest1CycleCount = 0UL, ulLastRegTest2Cycl /* Was an error detected this time through the callback execution? */ if( lErrorStatus != pdPASS ) { + temp2 = temp; if( lChangedTimerPeriodAlready == pdFALSE ) { lChangedTimerPeriodAlready = pdTRUE;