From c424171d66b8d1c7aa1d3a6a4eb565e694016b9e Mon Sep 17 00:00:00 2001 From: richardbarry Date: Sat, 16 Jan 2010 17:09:39 +0000 Subject: [PATCH] Still a work in progress. Checking in for backup only. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@960 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- Demo/SuperH_SH7216_Renesas/RTOSDemo.tws | 26 ++++--- .../RTOSDemo/FreeRTOSConfig.h | 6 +- .../RTOSDemo/RTOSDemo.nav | Bin 64575 -> 64478 bytes .../SessionSH7216_E10A-USB_SYSTEM__SH.hsf | 70 +++++++++--------- Demo/SuperH_SH7216_Renesas/RTOSDemo/main.c | 10 +-- 5 files changed, 57 insertions(+), 55 deletions(-) diff --git a/Demo/SuperH_SH7216_Renesas/RTOSDemo.tws b/Demo/SuperH_SH7216_Renesas/RTOSDemo.tws index 3ae1526c6..c2e6d55ea 100644 --- a/Demo/SuperH_SH7216_Renesas/RTOSDemo.tws +++ b/Demo/SuperH_SH7216_Renesas/RTOSDemo.tws @@ -7,23 +7,25 @@ [GENERAL_DATA] [BREAKPOINTS] [OPEN_WORKSPACE_FILES] -"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\PollQ.c" +"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\death.c" +"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\recmutex.c" "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\SuperH_SH7216_Renesas\RTOSDemo\FreeRTOSConfig.h" -"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\SuperH_SH7216_Renesas\RTOSDemo\intprg.c" "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\SuperH_SH7216_Renesas\RTOSDemo\main.c" -"C:\E\Dev\FreeRTOS\WorkingCopy\Source\portable\Renesas\SH2A_FPU\port.c" +"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\SuperH_SH7216_Renesas\RTOSDemo\regtest.src" +"C:\E\Dev\FreeRTOS\WorkingCopy\Source\portable\MemMang\heap_2.c" "C:\E\Dev\FreeRTOS\WorkingCopy\Source\portable\Renesas\SH2A_FPU\portasm.src" -"C:\E\Dev\FreeRTOS\WorkingCopy\Source\queue.c" +"C:\E\Dev\FreeRTOS\WorkingCopy\Source\portable\Renesas\SH2A_FPU\portmacro.h" "C:\E\Dev\FreeRTOS\WorkingCopy\Source\tasks.c" [WORKSPACE_FILE_STATES] -"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\PollQ.c" 44 44 838 434 0 2 -"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\SuperH_SH7216_Renesas\RTOSDemo\FreeRTOSConfig.h" 132 132 838 434 0 6 -"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\SuperH_SH7216_Renesas\RTOSDemo\intprg.c" 22 22 838 434 0 1 -"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\SuperH_SH7216_Renesas\RTOSDemo\main.c" 0 0 1075 659 0 0 -"C:\E\Dev\FreeRTOS\WorkingCopy\Source\portable\Renesas\SH2A_FPU\port.c" 66 66 838 434 0 3 -"C:\E\Dev\FreeRTOS\WorkingCopy\Source\portable\Renesas\SH2A_FPU\portasm.src" 88 88 838 434 0 4 -"C:\E\Dev\FreeRTOS\WorkingCopy\Source\queue.c" -4 -23 1044 659 1 7 -"C:\E\Dev\FreeRTOS\WorkingCopy\Source\tasks.c" 110 110 838 434 0 5 +"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\death.c" 132 132 860 400 0 6 +"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\recmutex.c" 0 0 904 312 0 7 +"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\SuperH_SH7216_Renesas\RTOSDemo\FreeRTOSConfig.h" 66 66 838 434 0 3 +"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\SuperH_SH7216_Renesas\RTOSDemo\main.c" 0 0 1044 659 0 0 +"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\SuperH_SH7216_Renesas\RTOSDemo\regtest.src" -4 -23 1044 471 1 8 +"C:\E\Dev\FreeRTOS\WorkingCopy\Source\portable\MemMang\heap_2.c" 198 198 838 434 0 1 +"C:\E\Dev\FreeRTOS\WorkingCopy\Source\portable\Renesas\SH2A_FPU\portasm.src" 0 0 838 434 0 2 +"C:\E\Dev\FreeRTOS\WorkingCopy\Source\portable\Renesas\SH2A_FPU\portmacro.h" 88 88 838 434 0 4 +"C:\E\Dev\FreeRTOS\WorkingCopy\Source\tasks.c" 110 110 860 400 0 5 [LOADED_PROJECTS] "RTOSDemo" [END] diff --git a/Demo/SuperH_SH7216_Renesas/RTOSDemo/FreeRTOSConfig.h b/Demo/SuperH_SH7216_Renesas/RTOSDemo/FreeRTOSConfig.h index 9ef7ca73e..b94ab3590 100644 --- a/Demo/SuperH_SH7216_Renesas/RTOSDemo/FreeRTOSConfig.h +++ b/Demo/SuperH_SH7216_Renesas/RTOSDemo/FreeRTOSConfig.h @@ -79,7 +79,7 @@ #define configMAX_TASK_NAME_LEN ( 12 ) #define configUSE_TRACE_FACILITY 0 #define configUSE_16_BIT_TICKS 0 -#define configIDLE_SHOULD_YIELD 0 +#define configIDLE_SHOULD_YIELD 1 #define configUSE_CO_ROUTINES 0 #define configUSE_MUTEXES 1 #define configCHECK_FOR_STACK_OVERFLOW 0 @@ -102,12 +102,10 @@ to exclude the API function. */ #define INCLUDE_vTaskDelayUntil 1 #define INCLUDE_vTaskDelay 1 #define INCLUDE_uxTaskGetStackHighWaterMark 1 +#define INCLUDE_xTaskGetSchedulerState 1 #define configKERNEL_INTERRUPT_PRIORITY ( 1 ) #define configMAX_SYSCALL_INTERRUPT_PRIORITY ( 0xff ) -#define pvPortMallocAligned( x, puxStackBuffer ) ( ( puxStackBuffer == NULL ) ? ( pvPortMalloc( x ) ) : ( puxStackBuffer ) ) -#define vPortFreeAligned( x ) ( void ) x - #endif /* FREERTOS_CONFIG_H */ diff --git a/Demo/SuperH_SH7216_Renesas/RTOSDemo/RTOSDemo.nav b/Demo/SuperH_SH7216_Renesas/RTOSDemo/RTOSDemo.nav index 7f4fbf13b6b843fedbd4c9c2d5c979247322bc09..75035418d8106dbbec6304a84e2e608db11b2f8d 100644 GIT binary patch delta 2936 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" "0.0" +"{WK_00000001_CmdLine}RTOSDemoSessionSH7216_E10A-USB_SYSTEM__SH" "WINDOW" 59422 0 1 "0.23" 407 0 0 350 200 17 0 "32771|32772|32778|<>|32773|32774|<>|32820|<>|32801|32824" "0.0" "{WK_00000001_DISASSEMBLY}" "WINDOW" 0 0 0 "0.00" 0 -4 -23 892 659 9 0 "" "0.0" "{WK_00000001_EVENT}RTOSDemoSessionSH7216_E10A-USB_SYSTEM__SH" "WINDOW" 59422 0 0 "0.50" 292 0 0 350 200 2065 0 "32774|32775|32777|<>|32780|<>" "0.0" -"{WK_00000001_IO}RTOSDemoSessionSH7216_E10A-USB_SYSTEM__SH" "WINDOW" 59422 0 3 "0.31" 219 0 0 350 200 17 0 "32817|32826|32819|32820|32821" "0.0" +"{WK_00000001_IO}RTOSDemoSessionSH7216_E10A-USB_SYSTEM__SH" "WINDOW" 59422 0 3 "0.31" 407 0 0 350 200 17 0 "32817|32826|32819|32820|32821" "0.0" "{WK_00000001_MEMORY}RTOSDemoSessionSH7216_E10A-USB_SYSTEM__SH" "WINDOW" 59422 0 0 "0.60" 219 0 0 350 200 2065 0 "42202|42203|42204|42233|<>|42206|42205|42230|42229|42207|<>|42208|42209|42210|49076|42228|42227|<>|42231|42232|42234|42235|<>|42211|<>" "0.0" -"{WK_00000001_OUTPUT}" "WINDOW" 59422 0 2 "0.73" 219 560 340 350 200 18 0 "36756|36757|36758|36759|<>|36746|36747|<>|39531|<>|39500|39534|<>|36687" "0.0" +"{WK_00000001_OUTPUT}" "WINDOW" 59422 0 2 "0.73" 407 560 340 350 200 18 0 "36756|36757|36758|36759|<>|36746|36747|<>|39531|<>|39500|39534|<>|36687" "0.0" "{WK_00000001_REGISTERS}RTOSDemoSessionSH7216_E10A-USB_SYSTEM__SH" "WINDOW" 59421 0 0 "1.00" 265 0 0 350 200 18 0 "" "0.0" "{WK_00000001_STACKTRACE}RTOSDemoSessionSH7216_E10A-USB_SYSTEM__SH" "WINDOW" 59422 0 0 "0.50" 219 0 0 350 200 2065 0 "" "0.0" -"{WK_00000001_STATUS}RTOSDemoSessionSH7216_E10A-USB_SYSTEM__SH" "WINDOW" 59422 0 4 "0.50" 219 0 0 350 200 17 0 "" "0.0" -"{WK_00000001_WATCH}RTOSDemoSessionSH7216_E10A-USB_SYSTEM__SH" "WINDOW" 59422 0 0 "0.27" 219 0 0 350 200 18 0 "32781|32783|<>|32771|32829|32772|32827|32773|<>|32786|<>|32810|32811|32831" "0.0" +"{WK_00000001_STATUS}RTOSDemoSessionSH7216_E10A-USB_SYSTEM__SH" "WINDOW" 59422 0 4 "0.50" 407 0 0 350 200 17 0 "" "0.0" +"{WK_00000001_WATCH}RTOSDemoSessionSH7216_E10A-USB_SYSTEM__SH" "WINDOW" 59422 0 0 "0.27" 407 0 0 350 200 18 0 "32781|32783|<>|32771|32829|32772|32827|32773|<>|32786|<>|32810|32811|32831" "0.0" "{WK_00000002_WORKSPACE}" "WINDOW" 59420 0 0 "1.00" 340 560 340 350 200 18 0 "" "0.0" "{WK_TB00000001_STANDARD}" "TOOLBAR 0" 59419 0 2 "0.00" 0 0 0 0 0 18 0 "" "0.0" "{WK_TB00000002_EDITOR}" "TOOLBAR 0" 59419 0 0 "0.00" 0 0 0 0 0 18 0 "" "0.0" @@ -436,14 +437,15 @@ [WINDOW_POSITION_STATE_DATA_VD3] [WINDOW_POSITION_STATE_DATA_VD4] [WINDOW_Z_ORDER] -"C:\E\Dev\FreeRTOS\WorkingCopy\Source\queue.c" +"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\SuperH_SH7216_Renesas\RTOSDemo\regtest.src" +"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\recmutex.c" +"C:\E\Dev\FreeRTOS\WorkingCopy\Source\portable\MemMang\heap_2.c" +"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\SuperH_SH7216_Renesas\RTOSDemo\FreeRTOSConfig.h" "C:\E\Dev\FreeRTOS\WorkingCopy\Demo\SuperH_SH7216_Renesas\RTOSDemo\main.c" "C:\E\Dev\FreeRTOS\WorkingCopy\Source\tasks.c" "C:\E\Dev\FreeRTOS\WorkingCopy\Source\portable\Renesas\SH2A_FPU\portasm.src" -"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\SuperH_SH7216_Renesas\RTOSDemo\FreeRTOSConfig.h" -"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\PollQ.c" -"C:\E\Dev\FreeRTOS\WorkingCopy\Source\portable\Renesas\SH2A_FPU\port.c" -"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\SuperH_SH7216_Renesas\RTOSDemo\intprg.c" +"C:\E\Dev\FreeRTOS\WorkingCopy\Demo\Common\Minimal\death.c" +"C:\E\Dev\FreeRTOS\WorkingCopy\Source\portable\Renesas\SH2A_FPU\portmacro.h" [TARGET_NAME] "SH7216 E10A-USB SYSTEM (SH2A-FPU)" "" 0 [STATUSBAR_STATEINFO_VD1] diff --git a/Demo/SuperH_SH7216_Renesas/RTOSDemo/main.c b/Demo/SuperH_SH7216_Renesas/RTOSDemo/main.c index 37049b364..1a78b09b2 100644 --- a/Demo/SuperH_SH7216_Renesas/RTOSDemo/main.c +++ b/Demo/SuperH_SH7216_Renesas/RTOSDemo/main.c @@ -130,7 +130,7 @@ void main(void) /* The suicide tasks must be created last as they need to know how many tasks were running prior to their creation in order to ascertain whether or not the correct/expected number of tasks are running at any given time. */ -// vCreateSuicidalTasks( mainCREATOR_TASK_PRIORITY ); + vCreateSuicidalTasks( mainCREATOR_TASK_PRIORITY ); /* Start the tasks running. */ vTaskStartScheduler(); @@ -182,10 +182,10 @@ unsigned long ulLastRegTest1CycleCount = 0UL, ulLastRegTest2CycleCount = 0UL; { xCycleFrequency = mainERROR_CYCLE_TIME; } -// else if( xIsCreateTaskStillRunning() != pdTRUE ) -// { -// xCycleFrequency = mainERROR_CYCLE_TIME; -// } + else if( xIsCreateTaskStillRunning() != pdTRUE ) + { + xCycleFrequency = mainERROR_CYCLE_TIME; + } else if( xAreIntegerMathsTaskStillRunning() != pdTRUE ) { xCycleFrequency = mainERROR_CYCLE_TIME; -- 2.39.5