From: richardbarry Date: Wed, 30 Jul 2008 09:39:03 +0000 (+0000) Subject: Add in the configMAX_SYSCALL_INTERRUPT_PRIORITY test tasks. X-Git-Tag: V5.0.3~3 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2eef5b15e7db359a080df377545f009d6680ac71;p=freertos Add in the configMAX_SYSCALL_INTERRUPT_PRIORITY test tasks. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@424 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- diff --git a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/RTOSDemo.Opt b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/RTOSDemo.Opt index 985175e9b..6a29b7a5c 100644 --- a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/RTOSDemo.Opt +++ b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/RTOSDemo.Opt @@ -11,16 +11,16 @@ DaveTm { 0,0,0,0,0,0,0,0 } Target (FreeRTOS_Demo), 0x0004 // Tools: 'ARM-ADS' -GRPOPT 1,(Demo_Source),0,0,0 +GRPOPT 1,(Demo_Source),1,0,0 GRPOPT 2,(Libraries),0,0,0 -GRPOPT 3,(RTOS_Source),0,0,0 +GRPOPT 3,(RTOS_Source),1,0,0 GRPOPT 4,(uIP_Source),0,0,0 OPTFFF 1,1,1,0,0,0,0,0,<..\Common\Minimal\BlockQ.c> OPTFFF 1,2,1,0,0,0,0,0,<..\Common\Minimal\blocktim.c> OPTFFF 1,3,1,0,0,0,0,0,<..\Common\Minimal\death.c> OPTFFF 1,4,1,0,0,0,0,0,<..\Common\Minimal\integer.c> -OPTFFF 1,5,1,2,0,1,1,0,<.\main.c> { 44,0,0,0,2,0,0,0,3,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,232,255,255,255,110,0,0,0,115,0,0,0,248,3,0,0,22,2,0,0 } +OPTFFF 1,5,1,0,0,216,228,0,<.\main.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,232,255,255,255,110,0,0,0,115,0,0,0,248,3,0,0,22,2,0,0 } OPTFFF 1,6,1,0,0,0,0,0,<.\ParTest\ParTest.c> OPTFFF 1,7,1,0,0,0,0,0,<..\Common\Minimal\PollQ.c> OPTFFF 1,8,1,0,0,0,0,0,<..\Common\Minimal\semtest.c> @@ -29,30 +29,33 @@ OPTFFF 1,10,1,0,0,0,0,0,<.\timertest.c> OPTFFF 1,11,5,922746880,0,0,0,0,<.\FreeRTOSConfig.h> OPTFFF 1,12,1,0,0,0,0,0,<..\Common\Minimal\GenQTest.c> OPTFFF 1,13,1,0,0,0,0,0,<..\Common\Minimal\QPeek.c> -OPTFFF 2,14,1,0,0,0,0,0,<.\rit128x96x4.c> -OPTFFF 2,15,1,0,0,0,0,0,<.\osram128x64x4.c> -OPTFFF 2,16,4,0,0,0,0,0,<..\Common\drivers\LuminaryMicro\Keil\driverlib.lib> -OPTFFF 2,17,1,0,0,0,0,0,<.\formike128x128x16.c> -OPTFFF 2,18,4,0,0,0,0,0,<..\Common\drivers\LuminaryMicro\Keil\grlib.lib> -OPTFFF 3,19,1,0,0,0,0,0,<..\..\Source\tasks.c> -OPTFFF 3,20,1,0,0,0,0,0,<..\..\Source\list.c> -OPTFFF 3,21,1,0,0,0,0,0,<..\..\Source\queue.c> -OPTFFF 3,22,1,402653184,0,0,0,0,<..\..\Source\portable\RVDS\ARM_CM3\port.c> -OPTFFF 3,23,1,0,0,0,0,0,<..\..\Source\portable\MemMang\heap_2.c> -OPTFFF 4,24,1,822083584,0,0,0,0,<.\webserver\uIP_Task.c> -OPTFFF 4,25,1,0,0,0,0,0,<.\webserver\emac.c> -OPTFFF 4,26,1,0,0,0,0,0,<.\webserver\httpd.c> -OPTFFF 4,27,1,0,0,0,0,0,<.\webserver\httpd-cgi.c> -OPTFFF 4,28,1,0,0,0,0,0,<.\webserver\httpd-fs.c> -OPTFFF 4,29,1,0,0,0,0,0,<.\webserver\http-strings.c> -OPTFFF 4,30,1,0,0,0,0,0,<..\Common\ethernet\uIP\uip-1.0\uip\uip_arp.c> -OPTFFF 4,31,1,0,0,0,0,0,<..\Common\ethernet\uIP\uip-1.0\uip\psock.c> -OPTFFF 4,32,1,0,0,0,0,0,<..\Common\ethernet\uIP\uip-1.0\uip\timer.c> -OPTFFF 4,33,1,0,0,0,0,0,<..\Common\ethernet\uIP\uip-1.0\uip\uip.c> +OPTFFF 1,14,1,721420288,0,83,83,0,<.\IntQueueTimer.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,232,255,255,255,44,0,0,0,46,0,0,0,171,3,0,0,193,1,0,0 } +OPTFFF 1,15,1,33554434,0,628,653,0,<..\Common\Minimal\IntQueue.c> { 44,0,0,0,2,0,0,0,3,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,232,255,255,255,66,0,0,0,69,0,0,0,193,3,0,0,216,1,0,0 } +OPTFFF 1,16,1,0,0,0,0,0,<..\Common\Minimal\recmutex.c> +OPTFFF 2,17,1,0,0,0,0,0,<.\rit128x96x4.c> +OPTFFF 2,18,1,0,0,0,0,0,<.\osram128x64x4.c> +OPTFFF 2,19,4,0,0,0,0,0,<..\Common\drivers\LuminaryMicro\Keil\driverlib.lib> +OPTFFF 2,20,1,0,0,0,0,0,<.\formike128x128x16.c> +OPTFFF 2,21,4,0,0,0,0,0,<..\Common\drivers\LuminaryMicro\Keil\grlib.lib> +OPTFFF 3,22,1,0,0,0,0,0,<..\..\Source\tasks.c> +OPTFFF 3,23,1,0,0,0,0,0,<..\..\Source\list.c> +OPTFFF 3,24,1,0,0,0,0,0,<..\..\Source\queue.c> +OPTFFF 3,25,1,0,0,122,122,0,<..\..\Source\portable\RVDS\ARM_CM3\port.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,232,255,255,255,22,0,0,0,23,0,0,0,173,4,0,0,170,1,0,0 } +OPTFFF 3,26,1,0,0,0,0,0,<..\..\Source\portable\MemMang\heap_2.c> +OPTFFF 4,27,1,822083584,0,0,0,0,<.\webserver\uIP_Task.c> +OPTFFF 4,28,1,0,0,0,0,0,<.\webserver\emac.c> +OPTFFF 4,29,1,0,0,0,0,0,<.\webserver\httpd.c> +OPTFFF 4,30,1,0,0,0,0,0,<.\webserver\httpd-cgi.c> +OPTFFF 4,31,1,0,0,0,0,0,<.\webserver\httpd-fs.c> +OPTFFF 4,32,1,0,0,0,0,0,<.\webserver\http-strings.c> +OPTFFF 4,33,1,0,0,0,0,0,<..\Common\ethernet\uIP\uip-1.0\uip\uip_arp.c> +OPTFFF 4,34,1,0,0,0,0,0,<..\Common\ethernet\uIP\uip-1.0\uip\psock.c> +OPTFFF 4,35,1,0,0,0,0,0,<..\Common\ethernet\uIP\uip-1.0\uip\timer.c> +OPTFFF 4,36,1,0,0,0,0,0,<..\Common\ethernet\uIP\uip-1.0\uip\uip.c> TARGOPT 1, (FreeRTOS_Demo) - ADSCLK=6000000 + ADSCLK=8000000 OPTTT 1,1,1,0 OPTHX 1,65535,0,0,0 OPTLX 79,66,8,<.\rvmdk\> @@ -61,10 +64,11 @@ TARGOPT 1, (FreeRTOS_Demo) OPTXL 1,1,1,1,1,1,1,0,0 OPTFL 1,0,1 OPTAX 255 - OPTBL 0,(Data Sheet) - OPTDL (SARMCM3.DLL)()(DLM.DLL)(-pLM3S2965)(SARMCM3.DLL)()(TLM.DLL)(-pLM3S2965) + OPTBL 0,(Data Sheet) + OPTDL (SARMCM3.DLL)()(DLM.DLL)(-pLM3S8962)(SARMCM3.DLL)()(TLM.DLL)(-pLM3S8962) OPTDBG 48126,4,()()()()()()()()()() (BIN\lmidk-agdi.dll)()()() - OPTKEY 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)(110=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(101=-1,-1,-1,-1,0)(102=-1,-1,-1,-1,0)(103=-1,-1,-1,-1,0)(104=-1,-1,-1,-1,0)(105=-1,-1,-1,-1,0)(106=-1,-1,-1,-1,0)(107=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(163=-1,-1,-1,-1,0)(164=-1,-1,-1,-1,0)(150=-1,-1,-1,-1,0)(151=-1,-1,-1,-1,0)(152=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)(1014=-1,-1,-1,-1,0)(1016=-1,-1,-1,-1,0)(136=-1,-1,-1,-1,0)) + OPTKEY 0,(UL2CM3)(-UU0101L5E -O14 -S0 -C0 -N00("ARM Cortex-M3") -D00(1BA00477) -L00(4) -FO7 -FD20000000 -FC800 -FN1 -FF0LM3S_256 -FS00 -FL040000) + OPTKEY 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)(110=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(101=-1,-1,-1,-1,0)(102=-1,-1,-1,-1,0)(103=-1,-1,-1,-1,0)(104=-1,-1,-1,-1,0)(105=-1,-1,-1,-1,0)(106=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(163=-1,-1,-1,-1,0)(164=-1,-1,-1,-1,0)(150=-1,-1,-1,-1,0)(151=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)(1014=-1,-1,-1,-1,0)(1016=-1,-1,-1,-1,0)(136=-1,-1,-1,-1,0)) OPTKEY 0,(ARMDBGFLAGS)() OPTKEY 0,(lmidk-agdi)(-B0 -O1792) OPTMM 1,2,(0) diff --git a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/RTOSDemo.Uv2 b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/RTOSDemo.Uv2 index d429c4e58..cbc6fdb79 100644 --- a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/RTOSDemo.Uv2 +++ b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/RTOSDemo.Uv2 @@ -21,6 +21,9 @@ File 1,1,<.\timertest.c> File 1,5,<.\FreeRTOSConfig.h> File 1,1,<..\Common\Minimal\GenQTest.c> File 1,1,<..\Common\Minimal\QPeek.c> +File 1,1,<.\IntQueueTimer.c> +File 1,1,<..\Common\Minimal\IntQueue.c> +File 1,1,<..\Common\Minimal\recmutex.c> File 2,1,<.\rit128x96x4.c> File 2,1,<.\osram128x64x4.c> File 2,4,<..\Common\drivers\LuminaryMicro\Keil\driverlib.lib> @@ -44,14 +47,14 @@ File 4,1,<..\Common\ethernet\uIP\uip-1.0\uip\uip.c> Options 1,0,0 // Target 'FreeRTOS_Demo' - Device (LM3S2965) + Device (LM3S8962) Vendor (Luminary Micro) - Cpu (IRAM(0x20000000-0x2000FFFF) IROM(0-0x3FFFF) CLOCK(6000000) CPUTYPE("Cortex-M3")) + Cpu (IRAM(0x20000000-0x2000FFFF) IROM(0-0x3FFFF) CLOCK(8000000) CPUTYPE("Cortex-M3")) FlashUt () StupF ("STARTUP\Luminary\Startup.s" ("Luminary Startup Code")) FlashDR (UL2CM3(-UU0101L5E -O14 -S0 -C0 -N00("ARM Cortex-M3") -D00(1BA00477) -L00(4) -FO7 -FD20000000 -FC800 -FN1 -FF0LM3S_256 -FS00 -FL040000)) - DevID (4322) - Rgf (LM3Sxxxx.H) + DevID (4285) + Rgf (LM3Sxxx.H) Mem () C () A () @@ -97,7 +100,7 @@ Options 1,0,0 // Target 'FreeRTOS_Demo' OCMADSXRAM { 0,0,0,0,0,0,0,0,0 } OCR_RVCT { 1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,4,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,0,0,1,0,0,0,0,0,0,0,0,0,0 } RV_STAVEC () - ADSCCFLG { 17,32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } + ADSCCFLG { 5,32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } ADSCMISC (--diag_suppress 191,550,513,167,177,144) ADSCDEFN (RVDS_ARMCM3_LM3S102, "PACK_STRUCT_END=","ALIGN_STRUCT_END=") ADSCUDEF () @@ -125,11 +128,11 @@ Options 1,0,0 // Target 'FreeRTOS_Demo' ADSLDMC (--entry Reset_Handler) ADSLDIF () ADSLDDW () - OPTDL (SARMCM3.DLL)()(DLM.DLL)(-pLM3S2965)(SARMCM3.DLL)()(TLM.DLL)(-pLM3S2965) + OPTDL (SARMCM3.DLL)()(DLM.DLL)(-pLM3S8962)(SARMCM3.DLL)()(TLM.DLL)(-pLM3S8962) OPTDBG 48126,4,()()()()()()()()()() (BIN\lmidk-agdi.dll)()()() - FLASH1 { 1,0,0,0,1,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0 } + FLASH1 { 1,0,0,0,1,0,0,0,3,16,0,0,0,0,0,0,0,0,0,0 } FLASH2 (BIN\lmidk-agdi.dll) - FLASH3 () + FLASH3 ("" ()) FLASH4 () EndOpt diff --git a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/settings/RTOSDemo.dni b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/settings/RTOSDemo.dni index 462defc70..922866af0 100644 --- a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/settings/RTOSDemo.dni +++ b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/settings/RTOSDemo.dni @@ -15,6 +15,11 @@ UseTrigger=1 TriggerName=main LimitSize=0 ByteLimit=50 +[Disassemble mode] +mode=1 +[Breakpoints] +Bp0=_ "STD_CODE" "{C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\Common\Minimal\IntQueue.c}.363.2@1" 1 0 0 0 "" 0 "" +Count=1 [Log file] LoggingEnabled=_ 0 LogFile=_ "" @@ -22,7 +27,3 @@ Category=_ 0 [TermIOLog] LoggingEnabled=_ 0 LogFile=_ "" -[Disassemble mode] -mode=1 -[Breakpoints] -Count=0 diff --git a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/settings/RTOSDemo.wsdt b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/settings/RTOSDemo.wsdt index 83d84be75..cdf36be82 100644 --- a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/settings/RTOSDemo.wsdt +++ b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/settings/RTOSDemo.wsdt @@ -17,7 +17,7 @@ 4826882619100726867 - + TabID-18883-22024 @@ -25,24 +25,24 @@ Workspace - RTOSDemo + RTOSDemoRTOSDemo/Demo filesRTOSDemo/Scheduler files - 0TabID-29040-7360Find in FilesFind-in-FilesTabID-19024-10413BuildBuild1 + 0TabID-29040-7360Find in FilesFind-in-FilesTabID-19024-10413BuildBuildTabID-19202-19100Debug LogDebug-Log1 - TextEditorC:\E\Dev\FreeRTOS\WorkingCopy2\Demo\CORTEX_LM3Sxxxx_IAR_Keil\main.c01938396839600100000010000001 + TextEditorC:\E\Dev\FreeRTOS\WorkingCopy2\Demo\CORTEX_LM3Sxxxx_IAR_Keil\main.c04401685616856TextEditorC:\E\Dev\FreeRTOS\WorkingCopy2\Source\portable\IAR\ARM_CM3\portasm.s09839993999TextEditorC:\E\Dev\FreeRTOS\WorkingCopy2\Demo\CORTEX_LM3Sxxxx_IAR_Keil\IntQueueTimer.c02700TextEditorC:\E\Dev\FreeRTOS\WorkingCopy2\Demo\Common\Minimal\IntQueue.c032715684156843TextEditorC:\E\Dev\FreeRTOS\WorkingCopy2\Demo\CORTEX_LM3Sxxxx_IAR_Keil\FreeRTOSConfig.h061000100000010000001 - iaridepm.enu1-2-2613315-2-2200200142857203666226429626273-2-23251402-2-214043271002857332994142857203666 + iaridepm.enu1-2-2760315-2-2200200119048203666188690775967-2-21781682-2-216841801002381183299119048203666 diff --git a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/startup_rvmdk.S b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/startup_rvmdk.S index 39ad11bd6..b7077b164 100644 --- a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/startup_rvmdk.S +++ b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/startup_rvmdk.S @@ -126,7 +126,8 @@ __Vectors DCD IntDefaultHandler ; Timer 0B DCD IntDefaultHandler ; Timer 1A DCD IntDefaultHandler ; Timer 1B - DCD IntDefaultHandler ; Timer 2A + EXTERN vT2InterruptHandler + DCD vT2InterruptHandler ; Timer 2A DCD IntDefaultHandler ; Timer 2B DCD IntDefaultHandler ; Comp 0 DCD IntDefaultHandler ; Comp 1 @@ -138,7 +139,8 @@ __Vectors DCD IntDefaultHandler ; GPIO Port H DCD IntDefaultHandler ; UART2 Rx and Tx DCD IntDefaultHandler ; SSI1 Rx and Tx - DCD IntDefaultHandler ; Timer 3 subtimer A + EXTERN vT3InterruptHandler + DCD vT3InterruptHandler ; Timer 3 subtimer A DCD IntDefaultHandler ; Timer 3 subtimer B DCD IntDefaultHandler ; I2C1 Master and Slave DCD IntDefaultHandler ; Quadrature Encoder 1