From 4568c80e155841120bae66bd5a20385f59720e49 Mon Sep 17 00:00:00 2001 From: richardbarry Date: Mon, 9 Sep 2013 16:21:46 +0000 Subject: [PATCH] Finalise XMC4000 Keil demos. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2030 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- .../FreeRTOSConfig.h | 41 +++++------ .../RTOSDemo.uvopt | 71 ++++++++++--------- .../RTOSDemo.uvproj | 14 ++-- .../RegTest.c | 1 - .../CORTEX_M4F_Infineon_XMC4000_Keil/main.c | 2 +- .../startup_XMC4200.s | 4 +- .../startup_XMC4400.s | 4 +- .../startup_XMC4500.s | 2 +- 8 files changed, 72 insertions(+), 67 deletions(-) diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/FreeRTOSConfig.h index e1e30d39c..56610ae71 100644 --- a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/FreeRTOSConfig.h @@ -82,26 +82,27 @@ #include extern uint32_t SystemCoreClock; -#define configUSE_PREEMPTION 1 -#define configUSE_IDLE_HOOK 0 -#define configUSE_TICK_HOOK 0 -#define configCPU_CLOCK_HZ ( SystemCoreClock ) -#define configTICK_RATE_HZ ( ( portTickType ) 1000 ) -#define configMAX_PRIORITIES ( ( unsigned portBASE_TYPE ) 5 ) -#define configMINIMAL_STACK_SIZE ( ( unsigned short ) 130 ) -#define configTOTAL_HEAP_SIZE ( ( size_t ) ( 22800 ) ) -#define configMAX_TASK_NAME_LEN ( 10 ) -#define configUSE_TRACE_FACILITY 1 -#define configUSE_16_BIT_TICKS 0 -#define configIDLE_SHOULD_YIELD 1 -#define configUSE_MUTEXES 1 -#define configQUEUE_REGISTRY_SIZE 8 -#define configCHECK_FOR_STACK_OVERFLOW 2 -#define configUSE_RECURSIVE_MUTEXES 1 -#define configUSE_MALLOC_FAILED_HOOK 1 -#define configUSE_APPLICATION_TASK_TAG 0 -#define configUSE_COUNTING_SEMAPHORES 1 -#define configGENERATE_RUN_TIME_STATS 0 +#define configUSE_PREEMPTION 1 +#define configUSE_PORT_OPTIMISED_TASK_SELECTION 1 +#define configUSE_IDLE_HOOK 0 +#define configUSE_TICK_HOOK 0 +#define configCPU_CLOCK_HZ ( SystemCoreClock ) +#define configTICK_RATE_HZ ( ( portTickType ) 1000 ) +#define configMAX_PRIORITIES ( 5 ) +#define configMINIMAL_STACK_SIZE ( ( unsigned short ) 130 ) +#define configTOTAL_HEAP_SIZE ( ( size_t ) ( 22800 ) ) +#define configMAX_TASK_NAME_LEN ( 10 ) +#define configUSE_TRACE_FACILITY 1 +#define configUSE_16_BIT_TICKS 0 +#define configIDLE_SHOULD_YIELD 1 +#define configUSE_MUTEXES 1 +#define configQUEUE_REGISTRY_SIZE 8 +#define configCHECK_FOR_STACK_OVERFLOW 2 +#define configUSE_RECURSIVE_MUTEXES 1 +#define configUSE_MALLOC_FAILED_HOOK 1 +#define configUSE_APPLICATION_TASK_TAG 0 +#define configUSE_COUNTING_SEMAPHORES 1 +#define configGENERATE_RUN_TIME_STATS 0 /* Co-routine definitions. */ #define configUSE_CO_ROUTINES 0 diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/RTOSDemo.uvopt b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/RTOSDemo.uvopt index c03a8bbea..4ff8d7ba5 100644 --- a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/RTOSDemo.uvopt +++ b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/RTOSDemo.uvopt @@ -73,7 +73,7 @@ 1 0 - 0 + 1 255 @@ -128,7 +128,7 @@ 0 0 0 - 1 + 7 @@ -139,9 +139,14 @@ - BIN\UL2CM3.DLL + Segger\JL2CM3.dll + + 0 + JL2CM3 + -U59101789 -O78 -S0 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO7 -FD20000000 -FC800 -FN1 -FF0XMC4500_1024 -FS0C000000 -FL0100000 + 0 DLGDARM @@ -160,7 +165,7 @@ 0 DLGUARM - (105=-1,-1,-1,-1,0) + / 0 @@ -481,7 +486,7 @@ 1 0 - 1 + 0 255 @@ -563,7 +568,7 @@ 0 DLGTARM - (1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0) + (1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=230,785,596,1007,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0) 0 @@ -573,7 +578,7 @@ 0 DLGUARM - / + 0 @@ -630,7 +635,7 @@ Startup - 0 + 1 0 0 0 @@ -640,10 +645,10 @@ 2 0 0 - 61 + 0 0 - 0 - 0 + 277 + 289 0 .\startup_XMC4500.s startup_XMC4500.s @@ -674,7 +679,7 @@ 0 0 0 - 279 + 276 288 0 .\startup_XMC4200.s @@ -704,7 +709,7 @@ 1 0 0 - 20 + 7 0 0 0 @@ -722,8 +727,8 @@ 0 0 0 - 0 - 0 + 276 + 288 0 .\startup_XMC4400.s startup_XMC4400.s @@ -744,10 +749,10 @@ 1 0 0 - 4 + 45 0 - 113 - 140 + 64 + 97 0 .\main.c main.c @@ -760,10 +765,10 @@ 5 0 0 - 34 + 0 0 - 143 - 187 + 64 + 87 0 .\FreeRTOSConfig.h FreeRTOSConfig.h @@ -778,8 +783,8 @@ 0 0 0 - 367 - 418 + 165 + 173 0 .\RegTest.c RegTest.c @@ -792,10 +797,10 @@ 1 0 0 - 16 + 0 0 - 241 - 274 + 67 + 1 0 .\main_full.c main_full.c @@ -808,10 +813,10 @@ 1 0 0 - 0 + 16 0 - 123 - 141 + 64 + 10 0 .\main_blinky.c main_blinky.c @@ -898,8 +903,8 @@ 0 0 0 - 0 - 0 + 383 + 384 0 ..\..\Source\portable\RVDS\ARM_CM4F\port.c port.c @@ -954,8 +959,8 @@ 0 0 0 - 195 - 203 + 241 + 258 0 ..\Common\Minimal\sp_flop.c sp_flop.c diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/RTOSDemo.uvproj b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/RTOSDemo.uvproj index a9854674f..acef88bb3 100644 --- a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/RTOSDemo.uvproj +++ b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/RTOSDemo.uvproj @@ -139,7 +139,7 @@ 0 0 - 1 + 7 @@ -153,7 +153,7 @@ - BIN\UL2CM3.DLL + Segger\JL2CM3.dll @@ -167,7 +167,7 @@ 1 BIN\UL2CM3.DLL - + "" () @@ -351,7 +351,7 @@ --cpu Cortex-M4.fp --no_allow_fpreg_for_nonfpdata rvkdm PART_XMC4500 - ..\CORTEX_M4F_Infineon_XMC4500_Keil;..\..\Source\include;..\..\Source\portable\RVDS\ARM_CM4F;..\Common\include + ..\CORTEX_M4F_Infineon_XMC4000_Keil;..\..\Source\include;..\..\Source\portable\RVDS\ARM_CM4F;..\Common\include @@ -1026,7 +1026,7 @@ --cpu Cortex-M4.fp --no_allow_fpreg_for_nonfpdata rvkdm PART_XMC4400 - ..\CORTEX_M4F_Infineon_XMC4500_Keil;..\..\Source\include;..\..\Source\portable\RVDS\ARM_CM4F;..\Common\include + ..\CORTEX_M4F_Infineon_XMC4000_Keil;..\..\Source\include;..\..\Source\portable\RVDS\ARM_CM4F;..\Common\include @@ -1685,7 +1685,7 @@ 1 - 1 + 0 0 0 0 @@ -1701,7 +1701,7 @@ --cpu Cortex-M4.fp --no_allow_fpreg_for_nonfpdata rvkdm PART_XMC4200 - ..\CORTEX_M4F_Infineon_XMC4500_Keil;..\..\Source\include;..\..\Source\portable\RVDS\ARM_CM4F;..\Common\include + ..\CORTEX_M4F_Infineon_XMC4500_Keil;..\..\Source\include;..\..\Source\portable\RVDS\ARM_CM4F;..\Common\include;. diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/RegTest.c b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/RegTest.c index 2c42e38f1..7b4ee9baa 100644 --- a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/RegTest.c +++ b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/RegTest.c @@ -435,7 +435,6 @@ reg2_error_loop /* If this line is hit then there was an error in a core register value. This loop ensures the loop counter variable stops incrementing. */ b reg2_error_loop - nop } /*-----------------------------------------------------------*/ diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/main.c b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/main.c index 768a44d96..c030aee31 100644 --- a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/main.c +++ b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/main.c @@ -94,7 +94,7 @@ /* Set mainCREATE_SIMPLE_BLINKY_DEMO_ONLY to one to run the simple blinky demo, or 0 to run the more comprehensive test and demo application. */ -#define mainCREATE_SIMPLE_BLINKY_DEMO_ONLY 0 +#define mainCREATE_SIMPLE_BLINKY_DEMO_ONLY 1 /*-----------------------------------------------------------*/ diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/startup_XMC4200.s b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/startup_XMC4200.s index a246e4302..f6775f064 100644 --- a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/startup_XMC4200.s +++ b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/startup_XMC4200.s @@ -149,11 +149,11 @@ __Vectors DCD 0 ; Reserved DCD 0 ; Reserved DCD 0 ; Reserved - DCD SVC_Handler ; SVCall Handler + ExcpVector SVC_Handler ; SVCall Handler ExcpVector DebugMon_Handler ; Debug Monitor Handler DCD 0 ; Reserved DCD PendSV_Handler ; PendSV Handler - DCD SysTick_Handler ; SysTick Handler + ExcpVector SysTick_Handler ; SysTick Handler ; Interrupt Handlers for Service Requests (SR) from XMC4200 Peripherals ExcpVector SCU_0_IRQHandler ; Handler name for SR SCU_0 diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/startup_XMC4400.s b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/startup_XMC4400.s index cebede580..c58654dc3 100644 --- a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/startup_XMC4400.s +++ b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/startup_XMC4400.s @@ -149,11 +149,11 @@ __Vectors DCD 0 ; Reserved DCD 0 ; Reserved DCD 0 ; Reserved - DCD SVC_Handler ; SVCall Handler + ExcpVector SVC_Handler ; SVCall Handler ExcpVector DebugMon_Handler ; Debug Monitor Handler DCD 0 ; Reserved DCD PendSV_Handler ; PendSV Handler - DCD SysTick_Handler ; SysTick Handler + ExcpVector SysTick_Handler ; SysTick Handler ; Interrupt Handlers for Service Requests (SR) from XMC4400 Peripherals ExcpVector SCU_0_IRQHandler ; Handler name for SR SCU_0 diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/startup_XMC4500.s b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/startup_XMC4500.s index 1f2422253..501be0cf7 100644 --- a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/startup_XMC4500.s +++ b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_Keil/startup_XMC4500.s @@ -153,7 +153,7 @@ __Vectors DCD SVC_Handler ; SVCall Handler ExcpVector DebugMon_Handler ; Debug Monitor Handler DCD 0 ; Reserved - DCD PendSV_Handler ; PendSV Handler + DCD PendSV_Handler ; PendSV Handler DCD SysTick_Handler ; SysTick Handler ; Interrupt Handlers for Service Requests (SR) from XMC4500 Peripherals -- 2.39.2