From: richardbarry Date: Fri, 28 Nov 2008 16:08:59 +0000 (+0000) Subject: Continued work in progress on new demo. X-Git-Tag: V5.1.2~105 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=732921c3f6010ed00445285750b0cbdbc5032b87;p=freertos Continued work in progress on new demo. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@591 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- diff --git a/Source/portable/IAR/AtmelSAM9XE/port.c b/Source/portable/IAR/AtmelSAM9XE/port.c index 0004c97b5..32eef0e76 100644 --- a/Source/portable/IAR/AtmelSAM9XE/port.c +++ b/Source/portable/IAR/AtmelSAM9XE/port.c @@ -91,6 +91,9 @@ /* Setup the PIT to generate the tick interrupts. */ static void prvSetupTimerInterrupt( void ); +/* The PIT interrupt handler - the RTOS tick. */ +static void vPortTickISR( void ); + /* ulCriticalNesting will get set to zero when the first task starts. It cannot be initialised to 0 as this will cause interrupts to be enabled during the kernel initialisation process. */ @@ -189,34 +192,27 @@ void vPortEndScheduler( void ) } /*-----------------------------------------------------------*/ -#if configUSE_PREEMPTION == 0 - - /* The cooperative scheduler requires a normal IRQ service routine to - simply increment the system tick. */ - static __arm __irq void vPortNonPreemptiveTick( void ); - static __arm __irq void vPortNonPreemptiveTick( void ) - { - unsigned portLONG ulDummy; - - /* Increment the tick count - which may wake some tasks but as the - preemptive scheduler is not being used any woken task is not given - processor time no matter what its priority. */ - vTaskIncrementTick(); - - /* Clear the PIT interrupt. */ - ulDummy = AT91C_BASE_PITC->PITC_PIVR; +static __arm void vPortTickISR( void ) +{ +volatile unsigned portLONG ulDummy; + + /* Increment the tick count - which may wake some tasks but as the + preemptive scheduler is not being used any woken task is not given + processor time no matter what its priority. */ + vTaskIncrementTick(); + + #if configUSE_PREEMPTION == 0 + vTaskSwitchContext(); + #endif - /* End the interrupt in the AIC. */ - AT91C_BASE_AIC->AIC_EOICR = ulDummy; - } - -#else - - /* Currently the IAR port requires the preemptive tick function to be - defined in an asm file. */ - -#endif - + /* Clear the PIT interrupt. */ + ulDummy = AT91C_BASE_PITC->PITC_PIVR; + + /* To remove compiler warning. */ + ( void ) ulDummy; + + /* The AIC is cleared in the asm wrapper, outside of this function. */ +} /*-----------------------------------------------------------*/ static void prvSetupTimerInterrupt( void ) @@ -228,14 +224,7 @@ const unsigned portLONG ulPeriodIn_uS = ( 1 / configTICK_RATE_HZ ) * port1SECOND /* Setup the PIT interrupt. */ AIC_DisableIT( AT91C_ID_SYS ); - - #if configUSE_PREEMPTION == 0 - AIC_ConfigureIT( AT91C_ID_SYS, AT91C_AIC_PRIOR_LOWEST, vPortNonPreemptiveTick ); - #else - extern void ( vPortPreemptiveTick )( void ); - AIC_ConfigureIT( AT91C_ID_SYS, AT91C_AIC_PRIOR_LOWEST, vPortPreemptiveTick ); - #endif - + AIC_ConfigureIT( AT91C_ID_SYS, AT91C_AIC_PRIOR_LOWEST, vPortTickISR ); AIC_EnableIT( AT91C_ID_SYS ); PIT_EnableIT(); diff --git a/Source/portable/IAR/AtmelSAM9XE/portasm.s79 b/Source/portable/IAR/AtmelSAM9XE/portasm.s79 index da118fb55..d5ac7ebad 100644 --- a/Source/portable/IAR/AtmelSAM9XE/portasm.s79 +++ b/Source/portable/IAR/AtmelSAM9XE/portasm.s79 @@ -2,10 +2,8 @@ CODE32 EXTERN vTaskSwitchContext - EXTERN vTaskIncrementTick PUBLIC vPortYieldProcessor - PUBLIC vPortPreemptiveTick PUBLIC vPortStartFirstTask #include "ISR_Support.h" @@ -31,28 +29,6 @@ vPortYieldProcessor: BX R0 portRESTORE_CONTEXT ; Restore the context of the selected task. -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -; Preemptive context switch function. This will only ever get installed if -; portUSE_PREEMPTION is set to 1 in portmacro.h. -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -vPortPreemptiveTick: - portSAVE_CONTEXT ; Save the context of the current task. - - LDR R0, =vTaskIncrementTick ; Increment the tick count - this may wake a task. - mov lr, pc - BX R0 - LDR R0, =vTaskSwitchContext ; Select the next task to execute. - mov lr, pc - BX R0 -#if 0 - LDR R14, =AT91C_BASE_PITC ; Clear the PIT interrupt - LDR R0, [R14, #PITC_PIVR ] - - LDR R14, =AT91C_BASE_AIC ; Mark the End of Interrupt on the AIC - STR R14, [R14, #AIC_EOICR] -#endif - portRESTORE_CONTEXT ; Restore the context of the selected task. - END