Work in progress on new port - correct the configuration of the timer interrupt.

pull/4/head
Richard Barry 16 years ago
parent c82aa9b224
commit adad8eab83

@ -78,7 +78,7 @@
/* Constants required to setup the PIT. */ /* Constants required to setup the PIT. */
#define port1MHz_IN_Hz ( 1000000ul ) #define port1MHz_IN_Hz ( 1000000ul )
#define port1SECOND_IN_uS ( 1000000ul ) #define port1SECOND_IN_uS ( 1000000.0 )
/* Constants required to handle critical sections. */ /* Constants required to handle critical sections. */
#define portNO_CRITICAL_NESTING ( ( unsigned portLONG ) 0 ) #define portNO_CRITICAL_NESTING ( ( unsigned portLONG ) 0 )
@ -210,7 +210,7 @@ volatile unsigned portLONG ulDummy;
processor time no matter what its priority. */ processor time no matter what its priority. */
vTaskIncrementTick(); vTaskIncrementTick();
#if configUSE_PREEMPTION == 0 #if configUSE_PREEMPTION == 1
vTaskSwitchContext(); vTaskSwitchContext();
#endif #endif
@ -226,7 +226,7 @@ volatile unsigned portLONG ulDummy;
static void prvSetupTimerInterrupt( void ) static void prvSetupTimerInterrupt( void )
{ {
const unsigned portLONG ulPeriodIn_uS = ( 1 / configTICK_RATE_HZ ) * port1SECOND_IN_uS; const unsigned portLONG ulPeriodIn_uS = ( 1.0 / ( double ) configTICK_RATE_HZ ) * port1SECOND_IN_uS;
/* Setup the PIT for the required frequency. */ /* Setup the PIT for the required frequency. */
PIT_Init( ulPeriodIn_uS, BOARD_MCK / port1MHz_IN_Hz ); PIT_Init( ulPeriodIn_uS, BOARD_MCK / port1MHz_IN_Hz );
@ -236,9 +236,6 @@ const unsigned portLONG ulPeriodIn_uS = ( 1 / configTICK_RATE_HZ ) * port1SECOND
AIC_ConfigureIT( AT91C_ID_SYS, AT91C_AIC_PRIOR_LOWEST, vPortTickISR ); AIC_ConfigureIT( AT91C_ID_SYS, AT91C_AIC_PRIOR_LOWEST, vPortTickISR );
AIC_EnableIT( AT91C_ID_SYS ); AIC_EnableIT( AT91C_ID_SYS );
PIT_EnableIT(); PIT_EnableIT();
/* Enable the PIT itself. */
PIT_Enable();
} }
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/

Loading…
Cancel
Save