Complete RX200 demo.

pull/4/head
Richard Barry 14 years ago
parent 83f0af8764
commit d28bd0ff46

@ -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-blinky.c"
"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX200_RX210-RSK_Renesas\RTOSDemo\main-full.c" "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\RX200_RX210-RSK_Renesas\RTOSDemo\main-full.c"
[WORKSPACE_FILE_STATES] [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-blinky.c" 110 110 1092 419 0 0
"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-full.c" 132 132 1092 419 0 1
[LOADED_PROJECTS] [LOADED_PROJECTS]
"RTOSDemo" "RTOSDemo"
[END] [END]

@ -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 ) #define lcdMIN_TIME_BETWEEN_INTERRUPTS_MS ( 125UL / portTICK_RATE_MS )
/* Button interrupt handlers. */ /* Button interrupt handlers. */
#pragma interrupt (prvIRQ1_Handler(vect=65)) #pragma interrupt ( prvIRQ1_Handler( vect = 65, enable ) )
static void prvIRQ1_Handler( void ); static void prvIRQ1_Handler( void );
#pragma interrupt (prvIRQ3_Handler(vect=67)) #pragma interrupt ( prvIRQ3_Handler( vect = 67, enable ) )
static void prvIRQ3_Handler( void ); static void prvIRQ3_Handler( void );
#pragma interrupt (prvIRQ4_Handler(vect=68)) #pragma interrupt ( prvIRQ4_Handler(vect = 68, enable ) )
static void prvIRQ4_Handler( void ); 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. */ display, how long to delay for, and which string to use. */
struct _LCD_Params xLCDLine1 = struct _LCD_Params xLCDLine1 =
{ {
LCD_LINE1, 215, cDataString1 LCD_LINE1, 215, ( char * ) cDataString1
}; };
struct _LCD_Params xLCDLine2 = struct _LCD_Params xLCDLine2 =
{ {
LCD_LINE2, 350, cDataString2 LCD_LINE2, 350, ( char * ) cDataString2
}; };

@ -70,7 +70,7 @@
*----------------------------------------------------------*/ *----------------------------------------------------------*/
#define configUSE_PREEMPTION 1 #define configUSE_PREEMPTION 1
#define configUSE_IDLE_HOOK 0 #define configUSE_IDLE_HOOK 1
#define configUSE_TICK_HOOK 0 #define configUSE_TICK_HOOK 0
#define configCPU_CLOCK_HZ ( ICLK_FREQUENCY ) /* Set in rskrx210def.h. */ #define configCPU_CLOCK_HZ ( ICLK_FREQUENCY ) /* Set in rskrx210def.h. */
#define configPERIPHERAL_CLOCK_HZ ( PCLK_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_PRIORITIES ( ( unsigned portBASE_TYPE ) 7 )
#define configMAX_CO_ROUTINE_PRIORITIES ( 2 ) #define configMAX_CO_ROUTINE_PRIORITIES ( 2 )
/* Software timer definitions. */ /* Software timer definitions. */
#define configUSE_TIMERS 1 #define configUSE_TIMERS 1
#define configTIMER_TASK_PRIORITY ( 3 ) #define configTIMER_TASK_PRIORITY ( 3 )

@ -16,7 +16,7 @@
[GENERAL_DATA_PROJECT] [GENERAL_DATA_PROJECT]
"FDT_UserBootAreaFiles" "" "FDT_UserBootAreaFiles" ""
[GENERAL_DATA_CONFIGURATION_Blinky] [GENERAL_DATA_CONFIGURATION_Blinky]
"PROJECT_FILES_MODIFIED_DATA_TAG" "TRUE" "PROJECT_FILES_MODIFIED_DATA_TAG" "FALSE"
[SESSIONS_Blinky] [SESSIONS_Blinky]
"DefaultSession" "DefaultSession"
"SessionRX200_E1_E20_SYSTEM" "SessionRX200_E1_E20_SYSTEM"

@ -89,32 +89,32 @@
"{5F75FDA0-6FF0-11D5-B7CE-00E029352378}PACtrlViews" "0" "{5F75FDA0-6FF0-11D5-B7CE-00E029352378}PACtrlViews" "0"
"{64753FED-D387-4B8C-A91D-D3419C869C07}C_EVAL_DENORMAL_MODE" "16777216" "{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_EVAL_ROUND_MODE" "768"
"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_0" "000000000000889C" "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_0" "000000000000E7A8"
"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_1" "0000000000000000" "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_1" "000000000000000A"
"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_10" "00000000A5A5A5A5" "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_10" "0000000000000064"
"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_11" "00000000A5A5A5A5" "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_11" "000000000000006E"
"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_12" "00000000A5A5A5A5" "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_12" "0000000000000078"
"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_13" "00000000A5A5A5A5" "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_13" "0000000000000082"
"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_14" "000000000000E130" "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_14" "000000000000008C"
"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_15" "0000000000000014" "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_15" "0000000000000096"
"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_16" "000000000000889C" "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_16" "000000000000E6AC"
"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_17" "000000000000E788" "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_17" "000000000000E7A8"
"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_18" "0000000004030001" "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_18" "0000000000010000"
"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_19" "00000000FFF881E1" "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_19" "00000000FFF853D9"
"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_2" "000000000000DEE4" "{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_20" "00000000FFF8177C"
"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_21" "0000000000000000" "{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_22" "0000000000000000"
"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_23" "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_24" "1234567887650000"
"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_25" "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_3" "000000000000001E"
"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_4" "0000000000000010" "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_4" "0000000000000028"
"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_5" "0000000000000000" "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_5" "0000000000010000"
"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_6" "00000000A5A5A5A5" "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_6" "000000000000003C"
"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_7" "00000000A5A5A5A5" "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_7" "0000000000000046"
"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_8" "00000000A5A5A5A5" "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_8" "0000000000000050"
"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_9" "00000000A5A5A5A5" "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_9" "000000000000005A"
"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_COUNT" "25" "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_COUNT" "25"
"{6C4D5B81-FD67-46A9-A089-EA44DCDE47FD}RAMMonitorManagerCtrlBlockInfoFileDir" "" "{6C4D5B81-FD67-46A9-A089-EA44DCDE47FD}RAMMonitorManagerCtrlBlockInfoFileDir" ""
"{6C4D5B81-FD67-46A9-A089-EA44DCDE47FD}RAMMonitorManagerCtrlBlockInfoFileName" "" "{6C4D5B81-FD67-46A9-A089-EA44DCDE47FD}RAMMonitorManagerCtrlBlockInfoFileName" ""
@ -476,7 +476,7 @@
[LANGUAGE] [LANGUAGE]
"English" "English"
[CONFIG_INFO_VD1] [CONFIG_INFO_VD1]
1 0
[CONFIG_INFO_VD2] [CONFIG_INFO_VD2]
0 0
[CONFIG_INFO_VD3] [CONFIG_INFO_VD3]
@ -565,7 +565,7 @@
[DOWNLOAD_MODULES_AFTER_BUILD] [DOWNLOAD_MODULES_AFTER_BUILD]
"TRUE" "TRUE"
[REMOVE_BREAKPOINTS_ON_DOWNLOAD] [REMOVE_BREAKPOINTS_ON_DOWNLOAD]
"FALSE" "TRUE"
[DISABLE_MEMORY_ACCESS_PRIOR_TO_COMMAND_FILE_EXECUTION] [DISABLE_MEMORY_ACCESS_PRIOR_TO_COMMAND_FILE_EXECUTION]
"FALSE" "FALSE"
[LIMIT_DISASSEMBLY_MEMORY_ACCESS] [LIMIT_DISASSEMBLY_MEMORY_ACCESS]

@ -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

@ -304,52 +304,62 @@ extern void HardwareSetup( void );
for( ;; ); for( ;; );
} }
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
volatile long temp = 0;
static void prvCheckTimerCallback( xTimerHandle xTimer ) static void prvCheckTimerCallback( xTimerHandle xTimer )
{ {
static long lChangedTimerPeriodAlready = pdFALSE, lErrorStatus = pdPASS; static long lChangedTimerPeriodAlready = pdFALSE, lErrorStatus = pdPASS;
static volatile unsigned long ulLastRegTest1CycleCount = 0UL, ulLastRegTest2CycleCount = 0UL; static volatile unsigned long ulLastRegTest1CycleCount = 0UL, ulLastRegTest2CycleCount = 0UL;
volatile long temp2;
/* Check the standard demo tasks are running without error. */ /* Check the standard demo tasks are running without error. */
if( xAreGenericQueueTasksStillRunning() != pdTRUE ) if( xAreGenericQueueTasksStillRunning() != pdTRUE )
{ {
lErrorStatus = pdFAIL; lErrorStatus = pdFAIL;
temp = 1;
} }
else if( xAreQueuePeekTasksStillRunning() != pdTRUE ) else if( xAreQueuePeekTasksStillRunning() != pdTRUE )
{ {
lErrorStatus = pdFAIL; lErrorStatus = pdFAIL;
temp = 2;
} }
else if( xAreBlockingQueuesStillRunning() != pdTRUE ) else if( xAreBlockingQueuesStillRunning() != pdTRUE )
{ {
lErrorStatus = pdFAIL; lErrorStatus = pdFAIL;
temp = 3;
} }
else if( xAreBlockTimeTestTasksStillRunning() != pdTRUE ) else if( xAreBlockTimeTestTasksStillRunning() != pdTRUE )
{ {
lErrorStatus = pdFAIL; lErrorStatus = pdFAIL;
temp = 4;
} }
else if( xAreSemaphoreTasksStillRunning() != pdTRUE ) else if( xAreSemaphoreTasksStillRunning() != pdTRUE )
{ {
lErrorStatus = pdFAIL; lErrorStatus = pdFAIL;
temp = 5;
} }
else if( xArePollingQueuesStillRunning() != pdTRUE ) else if( xArePollingQueuesStillRunning() != pdTRUE )
{ {
lErrorStatus = pdFAIL; lErrorStatus = pdFAIL;
temp = 6;
} }
else if( xIsCreateTaskStillRunning() != pdTRUE ) else if( xIsCreateTaskStillRunning() != pdTRUE )
{ {
lErrorStatus = pdFAIL; lErrorStatus = pdFAIL;
temp = 7;
} }
else if( xAreIntegerMathsTaskStillRunning() != pdTRUE ) else if( xAreIntegerMathsTaskStillRunning() != pdTRUE )
{ {
lErrorStatus = pdFAIL; lErrorStatus = pdFAIL;
temp = 8;
} }
else if( xAreRecursiveMutexTasksStillRunning() != pdTRUE ) else if( xAreRecursiveMutexTasksStillRunning() != pdTRUE )
{ {
lErrorStatus = pdFAIL; lErrorStatus = pdFAIL;
temp = 9;
} }
else if( xAreIntQueueTasksStillRunning() != pdPASS ) else if( xAreIntQueueTasksStillRunning() != pdPASS )
{ {
lErrorStatus = pdFAIL; lErrorStatus = pdFAIL;
temp = 10;
} }
/* Check the reg test tasks are still cycling. They will stop incrementing /* 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 ) if( ulRegTest1CycleCount == ulLastRegTest1CycleCount )
{ {
lErrorStatus = pdFAIL; lErrorStatus = pdFAIL;
temp = 11;
} }
if( ulRegTest2CycleCount == ulLastRegTest2CycleCount ) if( ulRegTest2CycleCount == ulLastRegTest2CycleCount )
{ {
lErrorStatus = pdFAIL; lErrorStatus = pdFAIL;
temp = 12;
} }
ulLastRegTest1CycleCount = ulRegTest1CycleCount; ulLastRegTest1CycleCount = ulRegTest1CycleCount;
@ -375,6 +387,7 @@ static volatile unsigned long ulLastRegTest1CycleCount = 0UL, ulLastRegTest2Cycl
/* Was an error detected this time through the callback execution? */ /* Was an error detected this time through the callback execution? */
if( lErrorStatus != pdPASS ) if( lErrorStatus != pdPASS )
{ {
temp2 = temp;
if( lChangedTimerPeriodAlready == pdFALSE ) if( lChangedTimerPeriodAlready == pdFALSE )
{ {
lChangedTimerPeriodAlready = pdTRUE; lChangedTimerPeriodAlready = pdTRUE;

Loading…
Cancel
Save