len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-08-19 09:38:32 -04:00
Code Issues Projects Releases Packages Wiki Activity

Update to V4.5.0 files and directory structure.

Browse source
This commit is contained in:
Richard Barry 2007-09-17 10:07:48 +00:00
parent 1362bebfdc
commit 98a9959a44
758 changed files with 53177 additions and 3139 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/portable/BCC/16BitDOS/Flsh186/port.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/BCC/16BitDOS/Flsh186/prtmacro.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/BCC/16BitDOS/PC/port.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/BCC/16BitDOS/PC/prtmacro.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/BCC/16BitDOS/common/portasm.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/BCC/16BitDOS/common/portcomn.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/CodeWarrior/HCS12/port.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/CodeWarrior/HCS12/portmacro.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/GCC/ARM7_AT91FR40008/port.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/GCC/ARM7_AT91FR40008/portISR.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/GCC/ARM7_AT91FR40008/portmacro.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/GCC/ARM7_AT91SAM7S/port.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/GCC/ARM7_AT91SAM7S/portISR.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/GCC/ARM7_AT91SAM7S/portmacro.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/GCC/ARM7_LPC2000/port.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/GCC/ARM7_LPC2000/portISR.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/GCC/ARM7_LPC2000/portmacro.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

6
Source/portable/GCC/ARM7_LPC23xx/port.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.
@ -98,7 +98,7 @@ portSTACK_TYPE *pxOriginalTOS;
*pxTopOfStack = ( portSTACK_TYPE ) pxCode + portINSTRUCTION_SIZE;
pxTopOfStack--;
*pxTopOfStack = ( portSTACK_TYPE ) 0xaaaaaaaa; /* R14 */
*pxTopOfStack = ( portSTACK_TYPE ) 0x00000000; /* R14 */
pxTopOfStack--;
*pxTopOfStack = ( portSTACK_TYPE ) pxOriginalTOS; /* Stack used when task starts goes in R13. */
pxTopOfStack--;
@ -223,7 +223,7 @@ unsigned portLONG ulCompareMatch;
}
#endif
VICVectPriority4 = 1;
VICVectCntl4 = 1;
/* Start the timer - interrupts are disabled when this function is called
so it is okay to do this here. */

7
Source/portable/GCC/ARM7_LPC23xx/portISR.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.
@ -108,9 +108,6 @@ void vPortYieldProcessor( void )
void vNonPreemptiveTick( void ) __attribute__ ((interrupt ("IRQ")));
void vNonPreemptiveTick( void )
{
FIO2SET |= (1<<0);
vTaskIncrementTick();
T0IR = 2;
VICVectAddr = portCLEAR_VIC_INTERRUPT;
@ -133,7 +130,7 @@ void vPortYieldProcessor( void )
/* Ready for the next interrupt. */
T0IR = 2;
VICAddress = portCLEAR_VIC_INTERRUPT;
VICVectAddr = portCLEAR_VIC_INTERRUPT;
/* Restore the context of the new task. */
portRESTORE_CONTEXT();

2
Source/portable/GCC/ARM7_LPC23xx/portmacro.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

85
Source/portable/GCC/ARM_CM3/port.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.
@ -38,6 +38,11 @@
+ Reduced the code used to setup the initial stack frame.
+ The kernel no longer has to install or handle the fault interrupt.
Change from V4.4.0:
+ Introduced usage of configKERNEL_INTERRUPT_PRIORITY macro to set the
interrupt priority used by the kernel.
*/
@ -49,23 +54,32 @@
#include "FreeRTOS.h"
#include "task.h"
/* For backward compatibility, ensure configKERNEL_INTERRUPT_PRIORITY is
defined. The value should also ensure backward compatibility.
FreeRTOS.org versions prior to V4.4.0 did not include this definition. */
#ifndef configKERNEL_INTERRUPT_PRIORITY
#define configKERNEL_INTERRUPT_PRIORITY 255
#endif
/* Constants required to manipulate the NVIC. */
#define portNVIC_SYSTICK_CTRL ( ( volatile unsigned portLONG *) 0xe000e010 )
#define portNVIC_SYSTICK_LOAD ( ( volatile unsigned portLONG *) 0xe000e014 )
#define portNVIC_INT_CTRL ( ( volatile unsigned portLONG *) 0xe000ed04 )
#define portNVIC_SYSPRI2 ( ( volatile unsigned portLONG *) 0xe000ed20 )
#define portNVIC_SYSPRI1 ( ( volatile unsigned portLONG *) 0xe000ed1c )
#define portNVIC_SYSTICK_CLK 0x00000004
#define portNVIC_SYSTICK_INT 0x00000002
#define portNVIC_SYSTICK_ENABLE 0x00000001
#define portNVIC_PENDSVSET 0x10000000
#define portNVIC_PENDSV_PRI 0x00ff0000
#define portNVIC_SVCALL_PRI 0xff000000
#define portNVIC_SYSTICK_PRI 0xff000000
#define portNVIC_PENDSV_PRI ( ( ( unsigned portLONG ) configKERNEL_INTERRUPT_PRIORITY ) << 16 )
#define portNVIC_SYSTICK_PRI ( ( ( unsigned portLONG ) configKERNEL_INTERRUPT_PRIORITY ) << 24 )
/* Constants required to set up the initial stack. */
#define portINITIAL_XPSR ( 0x01000000 )
/* The priority used by the kernel is assigned to a variable to make access
from inline assembler easier. */
const unsigned portLONG ulKernelPriority = configKERNEL_INTERRUPT_PRIORITY;
/* Each task maintains its own interrupt status in the critical nesting
variable. */
unsigned portBASE_TYPE uxCriticalNesting = 0xaaaaaaaa;
@ -100,7 +114,7 @@ portSTACK_TYPE *pxPortInitialiseStack( portSTACK_TYPE *pxTopOfStack, pdTASK_CODE
pxTopOfStack--;
*pxTopOfStack = ( portSTACK_TYPE ) pxCode; /* PC */
pxTopOfStack--;
*pxTopOfStack = 0xfffffffd; /* LR */
*pxTopOfStack = 0; /* LR */
pxTopOfStack -= 5; /* R12, R3, R2 and R1. */
*pxTopOfStack = ( portSTACK_TYPE ) pvParameters; /* R0 */
pxTopOfStack -= 9; /* R11, R10, R9, R8, R7, R6, R5 and R4. */
@ -129,7 +143,7 @@ void prvSetMSP( unsigned long ulValue )
*/
portBASE_TYPE xPortStartScheduler( void )
{
/* Make PendSV, CallSV and SysTick the lowest priority interrupts. */
/* Make PendSV, CallSV and SysTick the same priroity as the kernel. */
*(portNVIC_SYSPRI2) |= portNVIC_PENDSV_PRI;
*(portNVIC_SYSPRI2) |= portNVIC_SYSTICK_PRI;
@ -193,33 +207,26 @@ void xPortPendSVHandler( void )
" mrs r0, psp \n"
" cbz r0, no_save \n"
" \n" /* Save the context into the TCB. */
" sub r0, #0x20 \n"
" stm r0, {r4-r11} \n"
" nop \n"
" stmdb r0!, {r4-r11} \n"
" sub r0, #0x04 \n"
" ldr r1, uxCriticalNestingConst \n"
" ldr r2, pxCurrentTCBConst \n"
" ldr r1, [r1] \n"
" stm r0, {r1} \n"
" ldr r1, pxCurrentTCBConst \n"
" ldr r1, [r1] \n"
" str r0, [r1] \n"
" ldr r2, [r2] \n"
" str r1, [r0] \n"
" str r0, [r2] \n"
" \n"
"no_save:\n"
" ldr r0, vTaskSwitchContextConst \n" /* Find the task to execute. */
" push {r14} \n"
" cpsid i \n"
" blx r0 \n"
" cpsie i \n"
" bl vPortSwitchContext \n"
" pop {r14} \n"
" \n" /* Restore the context. */
" ldr r1, pxCurrentTCBConst \n"
" ldr r1, [r1] \n"
" ldr r0, [r1] \n"
" ldm r0, {r1, r4-r11} \n"
" nop \n"
" ldmia r0!, {r1, r4-r11} \n"
" ldr r2, uxCriticalNestingConst \n"
" str r1, [r2] \n"
" add r0, #0x24 \n"
" msr psp, r0 \n"
" orr r14, #0xd \n"
" \n" /* Exit with interrupts in the state required by the task. */
@ -227,11 +234,12 @@ void xPortPendSVHandler( void )
" bx r14 \n"
" \n"
"sv_disable_interrupts: \n"
" cpsid i \n"
" ldr r1, =ulKernelPriority \n"
" ldr r1, [r1] \n"
" msr basepri, r1 \n"
" bx r14 \n"
" \n"
" .align 2 \n"
"vTaskSwitchContextConst: .word vTaskSwitchContext \n"
"pxCurrentTCBConst: .word pxCurrentTCB \n"
"uxCriticalNestingConst: .word uxCriticalNesting \n"
);
@ -246,11 +254,8 @@ void xPortSysTickHandler( void )
/* Call the scheduler tick function. */
__asm volatile
(
" ldr r0, vTaskIncrementTickConst \n"
" push {r14} \n"
" cpsid i \n"
" blx r0 \n"
" cpsie i \n"
" bl vPortIncrementTick \n"
" pop {r14}"
);
@ -259,8 +264,7 @@ void xPortSysTickHandler( void )
__asm volatile
(
" push {r14} \n"
" ldr r0, vPortYieldFromISRConst2 \n"
" blx r0 \n"
" bl vPortYieldFromISR \n"
" pop {r14}"
);
#endif
@ -277,12 +281,12 @@ void xPortSysTickHandler( void )
__asm volatile
(
"tick_disable_interrupts: \n"
" cpsid i \n"
" ldr r1, =ulKernelPriority \n"
" ldr r1, [r1] \n"
" msr basepri, r1 \n"
" bx r14 \n"
" \n"
" .align 2 \n"
"vPortYieldFromISRConst2: .word vPortYieldFromISR\n"
"vTaskIncrementTickConst: .word vTaskIncrementTick\n"
"uxCriticalNestingConst2: .word uxCriticalNesting"
);
}
@ -298,5 +302,22 @@ void prvSetupTimerInterrupt( void )
*(portNVIC_SYSTICK_LOAD) = configCPU_CLOCK_HZ / configTICK_RATE_HZ;
*(portNVIC_SYSTICK_CTRL) = portNVIC_SYSTICK_CLK | portNVIC_SYSTICK_INT | portNVIC_SYSTICK_ENABLE;
}
/*-----------------------------------------------------------*/
void vPortSwitchContext( void )
{
vPortSetInterruptMask();
vTaskSwitchContext();
vPortClearInterruptMask();
}
/*-----------------------------------------------------------*/
void vPortIncrementTick( void )
{
vPortSetInterruptMask();
vTaskIncrementTick();
vPortClearInterruptMask();
}
/*-----------------------------------------------------------*/

37
Source/portable/GCC/ARM_CM3/portmacro.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.
@ -33,6 +33,12 @@
***************************************************************************
*/
/*
Change from V4.4.0:
+ Introduced usage of configKERNEL_INTERRUPT_PRIORITY macro to set the
interrupt priority used by the kernel.
*/
#ifndef PORTMACRO_H
#define PORTMACRO_H
@ -83,12 +89,35 @@ extern void vPortYieldFromISR( void );
/* Critical section management. */
extern void vPortEnableInterrupts( void );
#define vPortSetInterruptMask() \
__asm volatile \
( \
" push { r0 } \n" \
" ldr r0, =ulKernelPriority \n" \
" ldr r0, [r0] \n" \
" msr basepri, r0 \n" \
" pop { r0 } " \
)
/*-----------------------------------------------------------*/
#define vPortClearInterruptMask() \
__asm volatile \
( \
" push { r0 } \n" \
" mov r0, #0 \n" \
" msr basepri, r0 \n" \
" pop { r0 } " \
)
/*-----------------------------------------------------------*/
extern void vPortEnterCritical( void );
extern void vPortExitCritical( void );
#define portDISABLE_INTERRUPTS() __asm volatile( "cpsid i" )
#define portENABLE_INTERRUPTS() __asm volatile( "cpsie i" )
#define portDISABLE_INTERRUPTS() vPortSetInterruptMask();
#define portENABLE_INTERRUPTS() vPortClearInterruptMask();
#define portENTER_CRITICAL() vPortEnterCritical()
#define portEXIT_CRITICAL() vPortExitCritical()
/*-----------------------------------------------------------*/

2
Source/portable/GCC/ATMega323/port.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/GCC/ATMega323/portmacro.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

17
Source/portable/GCC/AVR32_UC3/port.c
View file

@ -13,7 +13,7 @@
*****************************************************************************/
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.
@ -75,6 +75,8 @@ volatile unsigned portLONG ulCriticalNesting = 9999UL;
#if( configTICK_USE_TC==0 )
static void prvScheduleNextTick( void );
#else
static void prvClearTcInt( void );
#endif
/* Setup the timer to generate the tick interrupts. */
@ -203,7 +205,7 @@ __attribute__((__naked__)) static void vTick( void )
#if( configTICK_USE_TC==1 )
/* Clear the interrupt flag. */
AVR32_TC.channel[configTICK_TC_CHANNEL].sr;
prvClearTcInt();
#else
/* Schedule the COUNT&COMPARE match interrupt in (configCPU_CLOCK_HZ/configTICK_RATE_HZ)
clock cycles from now. */
@ -234,7 +236,7 @@ __attribute__((__naked__)) void SCALLYield( void )
different optimisation levels. The interrupt flags can therefore not always
be saved to the stack. Instead the critical section nesting level is stored
in a variable, which is then saved as part of the stack context. */
void vPortEnterCritical( void )
__attribute__((__noinline__)) void vPortEnterCritical( void )
{
/* Disable interrupts */
portDISABLE_INTERRUPTS();
@ -246,7 +248,7 @@ void vPortEnterCritical( void )
}
/*-----------------------------------------------------------*/
void vPortExitCritical( void )
__attribute__((__noinline__)) void vPortExitCritical( void )
{
if(ulCriticalNesting > portNO_CRITICAL_NESTING)
{
@ -334,7 +336,7 @@ clock cycles from now. */
Set_system_register(AVR32_COMPARE, lCycles);
}
static void prvScheduleNextTick(void)
__attribute__((__noinline__)) static void prvScheduleNextTick(void)
{
unsigned long lCycles, lCount;
@ -353,6 +355,11 @@ clock cycles from now. */
}
Set_system_register(AVR32_COMPARE, lCycles);
}
#else
__attribute__((__noinline__)) static void prvClearTcInt(void)
{
AVR32_TC.channel[configTICK_TC_CHANNEL].sr;
}
#endif
/*-----------------------------------------------------------*/

2
Source/portable/GCC/AVR32_UC3/portmacro.h
View file

@ -13,7 +13,7 @@
*****************************************************************************/
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/GCC/H8S2329/port.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/GCC/H8S2329/portmacro.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/GCC/HCS12/port.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/GCC/HCS12/portmacro.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/GCC/MSP430F449/port.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/GCC/MSP430F449/portmacro.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/GCC/MicroBlaze/port.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/GCC/MicroBlaze/portmacro.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/GCC/STR75x/port.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/GCC/STR75x/portISR.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/GCC/STR75x/portmacro.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

4
Source/portable/IAR/ARM_CM3/port.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.
@ -65,7 +65,7 @@
#define portINITIAL_XPSR ( 0x01000000 )
/* For backward compatibility, ensure configKERNEL_INTERRUPT_PRIORITY is
defined. The value zero should also ensure backward compatibility.
defined. The value 255 should also ensure backward compatibility.
FreeRTOS.org versions prior to V4.3.0 did not include this definition. */
#ifndef configKERNEL_INTERRUPT_PRIORITY
#define configKERNEL_INTERRUPT_PRIORITY 255

71
Source/portable/IAR/ARM_CM3/portasm.s
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.
@ -42,8 +42,8 @@
#include <FreeRTOSConfig.h>
/* For backward compatibility, ensure configKERNEL_INTERRUPT_PRIORITY is
defined. The value zero should also ensure backward compatibility.
/* For backward compatibility, ensure configKERNEL_INTERRUPT_PRIORITY is
defined. The value zero should also ensure backward compatibility.
FreeRTOS.org versions prior to V4.3.0 did not include this definition. */
#ifndef configKERNEL_INTERRUPT_PRIORITY
#define configKERNEL_INTERRUPT_PRIORITY 0
@ -79,60 +79,53 @@ vSetMSP
/*-----------------------------------------------------------*/
xPortPendSVHandler:
mrs r0, psp
cbz r0, no_save
/* Save the context into the TCB. */
sub r0, r0, #0x20
stm r0, {r4-r11}
nop
sub r0, r0, #0x04
mrs r0, psp
cbz r0, no_save
/* Save the context into the TCB. */
stmdb r0!, {r4-r11}
sub r0, r0, #0x04
ldr r1, =uxCriticalNesting
ldr r1, [r1]
str R1, [r0, #0x00]
ldr r1, =pxCurrentTCB
ldr r1, [r1]
str r0, [r1]
ldr r2, =pxCurrentTCB
ldr r1, [r1]
ldr r2, [r2]
str r1, [r0]
str r0, [r2]
no_save:
ldr r0, =vPortSwitchContext
push {r14}
blx r0
pop {r14}
/* Restore the context. */
push {r14}
bl vPortSwitchContext
pop {r14}
/* Restore the context. */
ldr r1, =pxCurrentTCB
ldr r1, [r1]
ldr r0, [r1]
ldm r0, {r1, r4-r11}
nop
ldr r1, [r1]
ldr r0, [r1]
ldmia r0!, {r1, r4-r11}
ldr r2, =uxCriticalNesting
str r1, [r2]
add r0, r0, #0x24
msr psp, r0
orr r14, r14, #0xd
/* Exit with interrupts in the state required by the task. */
cbnz r1, sv_disable_interrupts
bx r14
sv_disable_interrupts:
str r1, [r2]
msr psp, r0
orr r14, r14, #0xd
/* Exit with interrupts in the state required by the task. */
cbnz r1, sv_disable_interrupts
bx r14
sv_disable_interrupts:
mov r1, #configKERNEL_INTERRUPT_PRIORITY
msr basepri, R1
bx r14
bx r14
/*-----------------------------------------------------------*/
xPortSysTickHandler:
/* Call the scheduler tick function. */
ldr r0, =vPortIncrementTick
push {r14}
blx r0
bl vPortIncrementTick
pop {r14}
/* If using preemption, also force a context switch. */
#if configUSE_PREEMPTION == 1
push {r14}
ldr r0, =vPortYieldFromISR
blx r0
bl vPortYieldFromISR
pop {r14}
#endif

3
Source/portable/IAR/ARM_CM3/portmacro.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.
@ -90,7 +90,6 @@ extern void vPortYieldFromISR( void );
/* Critical section management. */
extern void vPortEnableInterrupts( void );
extern void vPortEnterCritical( void );
extern void vPortExitCritical( void );
extern void vPortSetInterruptMask( void );

2
Source/portable/IAR/ATMega323/port.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/IAR/ATMega323/portmacro.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/IAR/ATMega323/portmacro.s90
View file

@ -1,4 +1,4 @@
; FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
; FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
;
; This file is part of the FreeRTOS.org distribution.
;

42
Source/portable/IAR/AVR32_UC3/exception.s82
View file

@ -70,107 +70,107 @@ _evba:
ORG 0x000
// Unrecoverable Exception.
_handle_Unrecoverable_Exception:
rjmp _handle_Unrecoverable_Exception
rjmp $
ORG 0x004
// TLB Multiple Hit: UNUSED IN AVR32UC.
_handle_TLB_Multiple_Hit:
rjmp _handle_TLB_Multiple_Hit
rjmp $
ORG 0x008
// Bus Error Data Fetch.
_handle_Bus_Error_Data_Fetch:
rjmp _handle_Bus_Error_Data_Fetch
rjmp $
ORG 0x00C
// Bus Error Instruction Fetch.
_handle_Bus_Error_Instruction_Fetch:
rjmp _handle_Bus_Error_Instruction_Fetch
rjmp $
ORG 0x010
// NMI.
_handle_NMI:
rjmp _handle_NMI
rjmp $
ORG 0x014
// Instruction Address.
_handle_Instruction_Address:
rjmp _handle_Instruction_Address
rjmp $
ORG 0x018
// ITLB Protection.
_handle_ITLB_Protection:
rjmp _handle_ITLB_Protection
rjmp $
ORG 0x01C
// Breakpoint.
_handle_Breakpoint:
rjmp _handle_Breakpoint
rjmp $
ORG 0x020
// Illegal Opcode.
_handle_Illegal_Opcode:
rjmp _handle_Illegal_Opcode
rjmp $
ORG 0x024
// Unimplemented Instruction.
_handle_Unimplemented_Instruction:
rjmp _handle_Unimplemented_Instruction
rjmp $
ORG 0x028
// Privilege Violation.
_handle_Privilege_Violation:
rjmp _handle_Privilege_Violation
rjmp $
ORG 0x02C
// Floating-Point: UNUSED IN AVR32UC.
_handle_Floating_Point:
rjmp _handle_Floating_Point
rjmp $
ORG 0x030
// Coprocessor Absent: UNUSED IN AVR32UC.
_handle_Coprocessor_Absent:
rjmp _handle_Coprocessor_Absent
rjmp $
ORG 0x034
// Data Address (Read).
_handle_Data_Address_Read:
rjmp _handle_Data_Address_Read
rjmp $
ORG 0x038
// Data Address (Write).
_handle_Data_Address_Write:
rjmp _handle_Data_Address_Write
rjmp $
ORG 0x03C
// DTLB Protection (Read).
_handle_DTLB_Protection_Read:
rjmp _handle_DTLB_Protection_Read
rjmp $
ORG 0x040
// DTLB Protection (Write).
_handle_DTLB_Protection_Write:
rjmp _handle_DTLB_Protection_Write
rjmp $
ORG 0x044
// DTLB Modified: UNUSED IN AVR32UC.
_handle_DTLB_Modified:
rjmp _handle_DTLB_Modified
rjmp $
ORG 0x050
// ITLB Miss: UNUSED IN AVR32UC.
_handle_ITLB_Miss:
rjmp _handle_ITLB_Miss
rjmp $
ORG 0x060
// DTLB Miss (Read): UNUSED IN AVR32UC.
_handle_DTLB_Miss_Read:
rjmp _handle_DTLB_Miss_Read
rjmp $
ORG 0x070
// DTLB Miss (Write): UNUSED IN AVR32UC.
_handle_DTLB_Miss_Write:
rjmp _handle_DTLB_Miss_Write
rjmp $
ORG 0x100
// Supervisor Call.

15
Source/portable/IAR/AVR32_UC3/port.c
View file

@ -13,7 +13,7 @@
*****************************************************************************/
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.
@ -76,6 +76,8 @@ volatile unsigned portLONG ulCriticalNesting = 9999UL;
#if( configTICK_USE_TC==0 )
static void prvScheduleNextTick( void );
#else
static void prvClearTcInt( void );
#endif
/* Setup the timer to generate the tick interrupts. */
@ -169,7 +171,7 @@ static void vTick( void )
#if( configTICK_USE_TC==1 )
/* Clear the interrupt flag. */
AVR32_TC.channel[configTICK_TC_CHANNEL].sr;
prvClearTcInt();
#else
/* Schedule the COUNT&COMPARE match interrupt in (configCPU_CLOCK_HZ/configTICK_RATE_HZ)
clock cycles from now. */
@ -201,6 +203,7 @@ void SCALLYield( void )
different optimisation levels. The interrupt flags can therefore not always
be saved to the stack. Instead the critical section nesting level is stored
in a variable, which is then saved as part of the stack context. */
#pragma optimize = no_inline
void vPortEnterCritical( void )
{
/* Disable interrupts */
@ -213,6 +216,7 @@ void vPortEnterCritical( void )
}
/*-----------------------------------------------------------*/
#pragma optimize = no_inline
void vPortExitCritical( void )
{
if(ulCriticalNesting > portNO_CRITICAL_NESTING)
@ -301,6 +305,7 @@ clock cycles from now. */
Set_system_register(AVR32_COMPARE, lCycles);
}
#pragma optimize = no_inline
static void prvScheduleNextTick(void)
{
unsigned long lCycles, lCount;
@ -320,6 +325,12 @@ clock cycles from now. */
}
Set_system_register(AVR32_COMPARE, lCycles);
}
#else
#pragma optimize = no_inline
static void prvClearTcInt(void)
{
AVR32_TC.channel[configTICK_TC_CHANNEL].sr;
}
#endif
/*-----------------------------------------------------------*/

2
Source/portable/IAR/AVR32_UC3/portmacro.h
View file

@ -13,7 +13,7 @@
*****************************************************************************/
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/IAR/AtmelSAM7S64/port.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/IAR/AtmelSAM7S64/portmacro.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/IAR/LPC2000/port.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/IAR/LPC2000/portmacro.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/IAR/STR71x/port.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/IAR/STR71x/portmacro.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/IAR/STR75x/ISR_Support.h
View file

@ -1,4 +1,4 @@
; FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
; FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
;
; This file is part of the FreeRTOS.org distribution.
;

2
Source/portable/IAR/STR75x/port.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/IAR/STR75x/portasm.s79
View file

@ -1,4 +1,4 @@
; FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
; FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
;
; This file is part of the FreeRTOS.org distribution.
;

2
Source/portable/IAR/STR75x/portmacro.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/IAR/STR91x/ISR_Support.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS distribution.

285
Source/portable/IAR/STR91x/port.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS distribution.
@ -34,7 +34,7 @@
*/
/*-----------------------------------------------------------
* Implementation of functions defined in portable.h for the ST STR91x ARM7
* Implementation of functions defined in portable.h for the ST STR91x ARM9
* port.
*----------------------------------------------------------*/
@ -43,22 +43,54 @@
/* Standard includes. */
#include <stdlib.h>
#include <assert.h>
/* Scheduler includes. */
#include "FreeRTOS.h"
#include "task.h"
#ifndef configUSE_WATCHDOG_TICK
#error configUSE_WATCHDOG_TICK must be set to either 1 or 0 in FreeRTOSConfig.h to use either the Watchdog or timer 2 to generate the tick interrupt respectively.
#endif
/* Constants required to setup the initial stack. */
#ifndef _RUN_TASK_IN_ARM_MODE_
#define portINITIAL_SPSR ( ( portSTACK_TYPE ) 0x3f ) /* System mode, THUMB mode, interrupts enabled. */
#else
#define portINITIAL_SPSR ( ( portSTACK_TYPE ) 0x1f ) /* System mode, ARM mode, interrupts enabled. */
#endif
#define portINSTRUCTION_SIZE ( ( portSTACK_TYPE ) 4 )
/* Constants required to handle critical sections. */
#define portNO_CRITICAL_NESTING ( ( unsigned portLONG ) 0 )
#ifndef abs
#define abs(x) ((x)>0 ? (x) : -(x))
#endif
/**
* Toggle a led using the following algorithm:
* if ( GPIO_ReadBit(GPIO9, GPIO_Pin_2) )
* {
* GPIO_WriteBit( GPIO9, GPIO_Pin_2, Bit_RESET );
* }
* else
* {
* GPIO_WriteBit( GPIO9, GPIO_Pin_2, Bit_RESET );
* }
*
*/
#define TOGGLE_LED(port,pin) \
if ( ((((port)->DR[(pin)<<2])) & (pin)) != Bit_RESET ) \
{ \
(port)->DR[(pin) <<2] = 0x00; \
} \
else \
{ \
(port)->DR[(pin) <<2] = (pin); \
}
/*-----------------------------------------------------------*/
@ -73,12 +105,16 @@ unsigned portLONG ulCriticalNesting = ( unsigned portLONG ) 9999;
/* Tick interrupt routines for cooperative and preemptive operation
respectively. The preemptive version is not defined as __irq as it is called
from an asm wrapper function. */
__arm __irq void vPortNonPreemptiveTick( void );
void WDG_IRQHandler( void );
/* VIC interrupt default handler. */
static void prvDefaultHandler( void );
#if configUSE_WATCHDOG_TICK == 0
/* Used to update the OCR timer register */
static u16 s_nPulseLength;
#endif
/*-----------------------------------------------------------*/
/*
@ -174,90 +210,189 @@ void vPortEndScheduler( void )
/* This function is called from an asm wrapper, so does not require the __irq
keyword. */
void WDG_IRQHandler( void )
{
/* Increment the tick counter. */
vTaskIncrementTick();
#if configUSE_WATCHDOG_TICK == 1
#if configUSE_PREEMPTION == 1
/* The new tick value might unblock a task. Ensure the highest task that
is ready to execute is the task that will execute when the tick ISR
exits. */
vTaskSwitchContext();
#endif
/* Clear the interrupt in the watchdog. */
WDG->SR &= ~0x0001;
}
/*-----------------------------------------------------------*/
#ifndef abs
#define abs(x) ((x)>0 ? (x) : -(x))
#endif
static void prvFindFactors(u32 n, u16 *a, u32 *b)
{
/* This function is copied from the ST STR7 library and is
copyright STMicroelectronics. Reproduced with permission. */
u32 b0;
u16 a0;
long err, err_min=n;
*a = a0 = ((n-1)/65536ul) + 1;
*b = b0 = n / *a;
for (; *a <= 256; (*a)++)
static void prvFindFactors(u32 n, u16 *a, u32 *b)
{
*b = n / *a;
err = (long)*a * (long)*b - (long)n;
if (abs(err) > (*a / 2))
/* This function is copied from the ST STR7 library and is
copyright STMicroelectronics. Reproduced with permission. */
u32 b0;
u16 a0;
long err, err_min=n;
*a = a0 = ((n-1)/65536ul) + 1;
*b = b0 = n / *a;
for (; *a <= 256; (*a)++)
{
(*b)++;
*b = n / *a;
err = (long)*a * (long)*b - (long)n;
if (abs(err) > (*a / 2))
{
(*b)++;
err = (long)*a * (long)*b - (long)n;
}
if (abs(err) < abs(err_min))
{
err_min = err;
a0 = *a;
b0 = *b;
if (err == 0) break;
}
}
if (abs(err) < abs(err_min))
*a = a0;
*b = b0;
}
/*-----------------------------------------------------------*/
static void prvSetupTimerInterrupt( void )
{
WDG_InitTypeDef xWdg;
unsigned portSHORT a;
unsigned portLONG n = configCPU_PERIPH_HZ / configTICK_RATE_HZ, b;
/* Configure the watchdog as a free running timer that generates a
periodic interrupt. */
SCU_APBPeriphClockConfig( __WDG, ENABLE );
WDG_DeInit();
WDG_StructInit(&xWdg);
prvFindFactors( n, &a, &b );
xWdg.WDG_Prescaler = a - 1;
xWdg.WDG_Preload = b - 1;
WDG_Init( &xWdg );
WDG_ITConfig(ENABLE);
/* Configure the VIC for the WDG interrupt. */
VIC_Config( WDG_ITLine, VIC_IRQ, 10 );
VIC_ITCmd( WDG_ITLine, ENABLE );
/* Install the default handlers for both VIC's. */
VIC0->DVAR = ( unsigned portLONG ) prvDefaultHandler;
VIC1->DVAR = ( unsigned portLONG ) prvDefaultHandler;
WDG_Cmd(ENABLE);
}
/*-----------------------------------------------------------*/
void WDG_IRQHandler( void )
{
{
err_min = err;
a0 = *a;
b0 = *b;
if (err == 0) break;
/* Increment the tick counter. */
vTaskIncrementTick();
#if configUSE_PREEMPTION == 1
{
/* The new tick value might unblock a task. Ensure the highest task that
is ready to execute is the task that will execute when the tick ISR
exits. */
vTaskSwitchContext();
}
#endif /* configUSE_PREEMPTION. */
/* Clear the interrupt in the watchdog. */
WDG->SR &= ~0x0001;
}
}
*a = a0;
*b = b0;
}
/*-----------------------------------------------------------*/
#else
static void prvSetupTimerInterrupt( void )
{
WDG_InitTypeDef xWdg;
unsigned portSHORT a;
unsigned portLONG n = configCPU_PERIPH_HZ / configTICK_RATE_HZ, b;
static void prvFindFactors(u32 n, u8 *a, u16 *b)
{
/* This function is copied from the ST STR7 library and is
copyright STMicroelectronics. Reproduced with permission. */
u16 b0;
u8 a0;
long err, err_min=n;
*a = a0 = ((n-1)/256) + 1;
*b = b0 = n / *a;
for (; *a <= 256; (*a)++)
{
*b = n / *a;
err = (long)*a * (long)*b - (long)n;
if (abs(err) > (*a / 2))
{
(*b)++;
err = (long)*a * (long)*b - (long)n;
}
if (abs(err) < abs(err_min))
{
err_min = err;
a0 = *a;
b0 = *b;
if (err == 0) break;
}
}
*a = a0;
*b = b0;
}
/*-----------------------------------------------------------*/
/* Configure the watchdog as a free running timer that generates a
periodic interrupt. */
static void prvSetupTimerInterrupt( void )
{
unsigned portCHAR a;
unsigned portSHORT b;
unsigned portLONG n = configCPU_PERIPH_HZ / configTICK_RATE_HZ;
TIM_InitTypeDef timer;
SCU_APBPeriphClockConfig( __TIM23, ENABLE );
TIM_DeInit(TIM2);
TIM_StructInit(&timer);
prvFindFactors( n, &a, &b );
timer.TIM_Mode = TIM_OCM_CHANNEL_1;
timer.TIM_OC1_Modes = TIM_TIMING;
timer.TIM_Clock_Source = TIM_CLK_APB;
timer.TIM_Clock_Edge = TIM_CLK_EDGE_RISING;
timer.TIM_Prescaler = a-1;
timer.TIM_Pulse_Level_1 = TIM_HIGH;
timer.TIM_Pulse_Length_1 = s_nPulseLength = b-1;
TIM_Init (TIM2, &timer);
TIM_ITConfig(TIM2, TIM_IT_OC1, ENABLE);
/* Configure the VIC for the WDG interrupt. */
VIC_Config( TIM2_ITLine, VIC_IRQ, 10 );
VIC_ITCmd( TIM2_ITLine, ENABLE );
/* Install the default handlers for both VIC's. */
VIC0->DVAR = ( unsigned portLONG ) prvDefaultHandler;
VIC1->DVAR = ( unsigned portLONG ) prvDefaultHandler;
TIM_CounterCmd(TIM2, TIM_CLEAR);
TIM_CounterCmd(TIM2, TIM_START);
}
/*-----------------------------------------------------------*/
SCU_APBPeriphClockConfig( __WDG, ENABLE );
WDG_DeInit();
WDG_StructInit(&xWdg);
prvFindFactors( n, &a, &b );
xWdg.WDG_Prescaler = a - 1;
xWdg.WDG_Preload = b - 1;
WDG_Init( &xWdg );
WDG_ITConfig(ENABLE);
/* Configure the VIC for the WDG interrupt. */
VIC_Config( WDG_ITLine, VIC_IRQ, 10 );
VIC_ITCmd( WDG_ITLine, ENABLE );
/* Install the default handlers for both VIC's. */
VIC0->DVAR = ( unsigned portLONG ) prvDefaultHandler;
VIC1->DVAR = ( unsigned portLONG ) prvDefaultHandler;
WDG_Cmd(ENABLE);
}
void TIM2_IRQHandler( void )
{
/* Reset the timer counter to avioid overflow. */
TIM2->OC1R += s_nPulseLength;
/* Increment the tick counter. */
vTaskIncrementTick();
#if configUSE_PREEMPTION == 1
{
/* The new tick value might unblock a task. Ensure the highest task that
is ready to execute is the task that will execute when the tick ISR
exits. */
vTaskSwitchContext();
}
#endif
/* Clear the interrupt in the watchdog. */
TIM2->SR &= ~TIM_FLAG_OC1;
}
#endif /* USE_WATCHDOG_TICK */
/*-----------------------------------------------------------*/

2
Source/portable/IAR/STR91x/portasm.s79
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS distribution.

2
Source/portable/IAR/STR91x/portmacro.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS distribution.

2
Source/portable/Keil/ARM7/port.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/Keil/ARM7/portISR.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/Keil/ARM7/portmacro.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/MPLAB/PIC18F/port.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/MPLAB/PIC18F/portmacro.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/MPLAB/PIC24_dsPIC/port.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/MPLAB/PIC24_dsPIC/portmacro.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/MemMang/heap_1.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/MemMang/heap_2.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/MemMang/heap_3.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/Paradigm/Tern_EE/large_untested/port.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/Paradigm/Tern_EE/large_untested/portasm.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/Paradigm/Tern_EE/large_untested/portmacro.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/Paradigm/Tern_EE/small/port.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/Paradigm/Tern_EE/small/portasm.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/Paradigm/Tern_EE/small/portmacro.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

33
Source/portable/RVDS/ARM_CM3/port.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.
@ -211,27 +211,25 @@ __asm void xPortPendSVHandler( void )
PRESERVE8
/* Start first task if the stack has not yet been setup. */
mrs r0, psp
cbz r0, no_save
mrs r0, psp
cbz r0, no_save
/* Save the context into the TCB. */
sub r0, #0x20
stm r0, {r4-r11}
sub r0, #0x04
stmdb r0!, {r4-r11}
sub r0, r0, #0x04
ldr r1, =uxCriticalNesting
ldr r1, [r1]
stm r0, {r1}
ldr r1, =pxCurrentTCB
ldr r1, [r1]
str r0, [r1]
ldr r2, =pxCurrentTCB
ldr r1, [r1]
ldr r2, [r2]
str r1, [r0]
str r0, [r2]
no_save;
/* Find the task to execute. */
ldr r0, =vTaskSwitchContext
push {r14}
cpsid i
blx r0
bl vTaskSwitchContext
cpsie i
pop {r14}
@ -239,11 +237,10 @@ no_save;
ldr r1, =pxCurrentTCB
ldr r1, [r1];
ldr r0, [r1];
ldm r0, {r1, r4-r11}
ldmia r0!, {r1, r4-r11}
ldr r2, =uxCriticalNesting
str r1, [r2]
ldr r2, [r2]
add r0, #0x24
msr psp, r0
orr r14, #0xd
@ -264,10 +261,9 @@ __asm void xPortSysTickHandler( void )
PRESERVE8
/* Call the scheduler tick function. */
ldr r0, =vTaskIncrementTick
push {r14}
cpsid i
blx r0
bl vTaskIncrementTick
cpsie i
pop {r14}
@ -275,8 +271,7 @@ __asm void xPortSysTickHandler( void )
#if configUSE_PREEMPTION == 1
extern vPortYieldFromISR
push {r14}
ldr r0, =vPortYieldFromISR
blx r0
bl vPortYieldFromISR
pop {r14}
#endif

2
Source/portable/RVDS/ARM_CM3/portmacro.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/Rowley/MSP430F449/Port1/port.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/Rowley/MSP430F449/Port1/portmacro.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/Rowley/MSP430F449/Port2/port.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/Rowley/MSP430F449/Port2/portmacro.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/Rowley/MSP430F449/port.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/Rowley/MSP430F449/portmacro.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/SDCC/Cygnal/port.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/SDCC/Cygnal/portmacro.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/WizC/PIC18/Drivers/Tick/Tick.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/WizC/PIC18/Drivers/Tick/isrTick.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/WizC/PIC18/addFreeRTOS.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/WizC/PIC18/port.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/WizC/PIC18/portmacro.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/oWatcom/16BitDOS/Flsh186/port.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/oWatcom/16BitDOS/Flsh186/portmacro.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/oWatcom/16BitDOS/PC/port.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/oWatcom/16BitDOS/PC/portmacro.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/oWatcom/16BitDOS/common/portasm.h
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.

2
Source/portable/oWatcom/16BitDOS/common/portcomn.c
View file

@ -1,5 +1,5 @@
/*
FreeRTOS.org V4.4.0 - Copyright (C) 2003-2007 Richard Barry.
FreeRTOS.org V4.5.0 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.