github-forks
/
FreeRTOS-Kernel
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updated the sleep function to ensure it left interrupts disabled when returning.

Browse Source
pull/4/head
Richard Barry 12 years ago
parent 2cf9f1ac8c
commit af623460a6
5 changed files with 135 additions and 132 deletions
Show Stats Download Patch File Download Diff File

228
FreeRTOS/Demo/CORTEX_M4_ATSAM4L_Atmel_Studio/FreeRTOS_Demo.cproj
Unescape Escape View File

@ -132,14 +132,14 @@
<com_atmel_avrdbg_tool_samice>
<ToolType>com.atmel.avrdbg.tool.samice</ToolType>
<ToolName>J-Link-OB-SAM3U128</ToolName>
<ToolNumber>000480008423</ToolNumber>
<ToolNumber>000480008435</ToolNumber>
<KeepTimersRunning>true</KeepTimersRunning>
<OverrideVtor>false</OverrideVtor>
<OverrideVtorValue>
</OverrideVtorValue>
<Channel>
<host>127.0.0.1</host>
<port>4788</port>
<port>1882</port>
<ssl>False</ssl>
</Channel>
<ToolOptions>
@ -273,118 +273,118 @@
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<ToolchainSettings>
<ArmGcc>
<armgcc.common.general.symbols>__ATSAM4LC4C__</armgcc.common.general.symbols>
<armgcc.common.outputfiles.hex>True</armgcc.common.outputfiles.hex>
<armgcc.common.outputfiles.lss>True</armgcc.common.outputfiles.lss>
<armgcc.common.outputfiles.eep>True</armgcc.common.outputfiles.eep>
<armgcc.common.outputfiles.bin>True</armgcc.common.outputfiles.bin>
<armgcc.common.outputfiles.srec>True</armgcc.common.outputfiles.srec>
<armgcc.compiler.symbols.DefSymbols>
<ListValues>
<Value>BOARD=SAM4L_EK</Value>
<Value>ARM_MATH_CM4=true</Value>
<Value>__SAM4LC4C__</Value>
</ListValues>
</armgcc.compiler.symbols.DefSymbols>
<armgcc.compiler.directories.DefaultIncludePath>False</armgcc.compiler.directories.DefaultIncludePath>
<armgcc.compiler.directories.IncludePaths>
<ListValues>
<Value>../src/asf/sam/utils/preprocessor</Value>
<Value>../src/asf/sam/drivers/lcdca/example/sam4lc4c_sam4l_ek</Value>
<Value>../src/asf/sam/utils/cmsis/sam4l/include</Value>
<Value>../src/asf/common/services/sleepmgr</Value>
<Value>../src/asf/sam/utils</Value>
<Value>../src/asf/common/boards</Value>
<Value>../src/asf/sam/drivers/flashcalw</Value>
<Value>../src/asf/sam/boards</Value>
<Value>../src/asf/common/services/clock</Value>
<Value>../src/asf/sam/drivers/bpm</Value>
<Value>../src/asf/thirdparty/CMSIS/Include</Value>
<Value>../src/asf/sam/boards/sam4l_ek</Value>
<Value>../src/asf/sam/utils/header_files</Value>
<Value>../src/asf/common/services/ioport</Value>
<Value>../src/asf/sam/utils/cmsis/sam4l/source/templates</Value>
<Value>../src/asf/common/utils</Value>
<Value>../src/asf/thirdparty/CMSIS/Lib/GCC</Value>
<Value>../src</Value>
<Value>../src/config</Value>
<Value>../src/asf/sam/drivers/ast</Value>
<Value>../../../Source/include</Value>
<Value>../../../Source/portable/GCC/ARM_CM3</Value>
<Value>../../Common/include</Value>
</ListValues>
</armgcc.compiler.directories.IncludePaths>
<armgcc.compiler.optimization.OtherFlags>-fdata-sections</armgcc.compiler.optimization.OtherFlags>
<armgcc.compiler.optimization.PrepareFunctionsForGarbageCollection>True</armgcc.compiler.optimization.PrepareFunctionsForGarbageCollection>
<armgcc.compiler.optimization.DebugLevel>Maximum (-g3)</armgcc.compiler.optimization.DebugLevel>
<armgcc.compiler.warnings.AllWarnings>True</armgcc.compiler.warnings.AllWarnings>
<armgcc.compiler.miscellaneous.OtherFlags>-std=gnu99 -Wmissing-field-initializers</armgcc.compiler.miscellaneous.OtherFlags>
<armgcc.linker.libraries.Libraries>
<ListValues>
<Value>arm_cortexM4l_math</Value>
<Value>m</Value>
</ListValues>
</armgcc.linker.libraries.Libraries>
<armgcc.linker.libraries.LibrarySearchPaths>
<ListValues>
<Value>../cmsis/linkerScripts</Value>
<Value>../src/asf/thirdparty/CMSIS/Lib/GCC</Value>
</ListValues>
</armgcc.linker.libraries.LibrarySearchPaths>
<armgcc.linker.optimization.GarbageCollectUnusedSections>True</armgcc.linker.optimization.GarbageCollectUnusedSections>
<armgcc.linker.miscellaneous.LinkerFlags>-T../src/asf/sam/utils/linker_scripts/sam4l/sam4l4/gcc/flash.ld -Wl,--cref -Wl,--entry=Reset_Handler -mthumb</armgcc.linker.miscellaneous.LinkerFlags>
<armgcc.assembler.general.IncludePaths>
<ListValues>
<Value>../src/asf/sam/utils/preprocessor</Value>
<Value>../src/asf/sam/drivers/lcdca/example/sam4lc4c_sam4l_ek</Value>
<Value>../src/asf/sam/utils/cmsis/sam4l/include</Value>
<Value>../src/asf/common/services/sleepmgr</Value>
<Value>../src/asf/sam/utils</Value>
<Value>../src/asf/common/boards</Value>
<Value>../src/asf/sam/drivers/flashcalw</Value>
<Value>../src/asf/sam/boards</Value>
<Value>../src/asf/common/services/clock</Value>
<Value>../src/asf/sam/drivers/bpm</Value>
<Value>../src/asf/thirdparty/CMSIS/Include</Value>
<Value>../src/asf/sam/boards/sam4l_ek</Value>
<Value>../src/asf/sam/utils/header_files</Value>
<Value>../src/asf/common/services/ioport</Value>
<Value>../src/asf/sam/utils/cmsis/sam4l/source/templates</Value>
<Value>../src/asf/common/utils</Value>
<Value>../src/asf/thirdparty/CMSIS/Lib/GCC</Value>
<Value>../src</Value>
<Value>../src/config</Value>
<Value>../src/asf/sam/drivers/ast</Value>
</ListValues>
</armgcc.assembler.general.IncludePaths>
<armgcc.assembler.debugging.DebugLevel>Default (-g)</armgcc.assembler.debugging.DebugLevel>
<armgcc.preprocessingassembler.general.AssemblerFlags>-DARM_MATH_CM4=true -DBOARD=SAM4L_EK -D__ATSAM4LC4C__</armgcc.preprocessingassembler.general.AssemblerFlags>
<armgcc.preprocessingassembler.general.IncludePaths>
<ListValues>
<Value>../src/asf/sam/utils/preprocessor</Value>
<Value>../src/asf/sam/drivers/lcdca/example/sam4lc4c_sam4l_ek</Value>
<Value>../src/asf/sam/utils/cmsis/sam4l/include</Value>
<Value>../src/asf/common/services/sleepmgr</Value>
<Value>../src/asf/sam/utils</Value>
<Value>../src/asf/common/boards</Value>
<Value>../src/asf/sam/drivers/flashcalw</Value>
<Value>../src/asf/sam/boards</Value>
<Value>../src/asf/common/services/clock</Value>
<Value>../src/asf/sam/drivers/bpm</Value>
<Value>../src/asf/thirdparty/CMSIS/Include</Value>
<Value>../src/asf/sam/boards/sam4l_ek</Value>
<Value>../src/asf/sam/utils/header_files</Value>
<Value>../src/asf/common/services/ioport</Value>
<Value>../src/asf/sam/utils/cmsis/sam4l/source/templates</Value>
<Value>../src/asf/common/utils</Value>
<Value>../src/asf/thirdparty/CMSIS/Lib/GCC</Value>
<Value>../src</Value>
<Value>../src/config</Value>
<Value>../src/asf/sam/drivers/ast</Value>
</ListValues>
</armgcc.preprocessingassembler.general.IncludePaths>
<armgcc.preprocessingassembler.debugging.DebugLevel>Default (-Wa,-g)</armgcc.preprocessingassembler.debugging.DebugLevel>
</ArmGcc>
<armgcc.common.general.symbols>__ATSAM4LC4C__</armgcc.common.general.symbols>
<armgcc.common.outputfiles.hex>True</armgcc.common.outputfiles.hex>
<armgcc.common.outputfiles.lss>True</armgcc.common.outputfiles.lss>
<armgcc.common.outputfiles.eep>True</armgcc.common.outputfiles.eep>
<armgcc.common.outputfiles.bin>True</armgcc.common.outputfiles.bin>
<armgcc.common.outputfiles.srec>True</armgcc.common.outputfiles.srec>
<armgcc.compiler.symbols.DefSymbols>
<ListValues>
<Value>BOARD=SAM4L_EK</Value>
<Value>ARM_MATH_CM4=true</Value>
<Value>__SAM4LC4C__</Value>
</ListValues>
</armgcc.compiler.symbols.DefSymbols>
<armgcc.compiler.directories.DefaultIncludePath>False</armgcc.compiler.directories.DefaultIncludePath>
<armgcc.compiler.directories.IncludePaths>
<ListValues>
<Value>../src/asf/sam/utils/preprocessor</Value>
<Value>../src/asf/sam/drivers/lcdca/example/sam4lc4c_sam4l_ek</Value>
<Value>../src/asf/sam/utils/cmsis/sam4l/include</Value>
<Value>../src/asf/common/services/sleepmgr</Value>
<Value>../src/asf/sam/utils</Value>
<Value>../src/asf/common/boards</Value>
<Value>../src/asf/sam/drivers/flashcalw</Value>
<Value>../src/asf/sam/boards</Value>
<Value>../src/asf/common/services/clock</Value>
<Value>../src/asf/sam/drivers/bpm</Value>
<Value>../src/asf/thirdparty/CMSIS/Include</Value>
<Value>../src/asf/sam/boards/sam4l_ek</Value>
<Value>../src/asf/sam/utils/header_files</Value>
<Value>../src/asf/common/services/ioport</Value>
<Value>../src/asf/sam/utils/cmsis/sam4l/source/templates</Value>
<Value>../src/asf/common/utils</Value>
<Value>../src/asf/thirdparty/CMSIS/Lib/GCC</Value>
<Value>../src</Value>
<Value>../src/config</Value>
<Value>../src/asf/sam/drivers/ast</Value>
<Value>../../../Source/include</Value>
<Value>../../../Source/portable/GCC/ARM_CM3</Value>
<Value>../../Common/include</Value>
</ListValues>
</armgcc.compiler.directories.IncludePaths>
<armgcc.compiler.optimization.OtherFlags>-fdata-sections</armgcc.compiler.optimization.OtherFlags>
<armgcc.compiler.optimization.PrepareFunctionsForGarbageCollection>True</armgcc.compiler.optimization.PrepareFunctionsForGarbageCollection>
<armgcc.compiler.optimization.DebugLevel>Maximum (-g3)</armgcc.compiler.optimization.DebugLevel>
<armgcc.compiler.warnings.AllWarnings>True</armgcc.compiler.warnings.AllWarnings>
<armgcc.compiler.miscellaneous.OtherFlags>-std=gnu99 -Wmissing-field-initializers</armgcc.compiler.miscellaneous.OtherFlags>
<armgcc.linker.libraries.Libraries>
<ListValues>
<Value>arm_cortexM4l_math</Value>
<Value>m</Value>
</ListValues>
</armgcc.linker.libraries.Libraries>
<armgcc.linker.libraries.LibrarySearchPaths>
<ListValues>
<Value>../cmsis/linkerScripts</Value>
<Value>../src/asf/thirdparty/CMSIS/Lib/GCC</Value>
</ListValues>
</armgcc.linker.libraries.LibrarySearchPaths>
<armgcc.linker.optimization.GarbageCollectUnusedSections>True</armgcc.linker.optimization.GarbageCollectUnusedSections>
<armgcc.linker.miscellaneous.LinkerFlags>-T../src/asf/sam/utils/linker_scripts/sam4l/sam4l4/gcc/flash.ld -Wl,--cref -Wl,--entry=Reset_Handler -mthumb</armgcc.linker.miscellaneous.LinkerFlags>
<armgcc.assembler.general.IncludePaths>
<ListValues>
<Value>../src/asf/sam/utils/preprocessor</Value>
<Value>../src/asf/sam/drivers/lcdca/example/sam4lc4c_sam4l_ek</Value>
<Value>../src/asf/sam/utils/cmsis/sam4l/include</Value>
<Value>../src/asf/common/services/sleepmgr</Value>
<Value>../src/asf/sam/utils</Value>
<Value>../src/asf/common/boards</Value>
<Value>../src/asf/sam/drivers/flashcalw</Value>
<Value>../src/asf/sam/boards</Value>
<Value>../src/asf/common/services/clock</Value>
<Value>../src/asf/sam/drivers/bpm</Value>
<Value>../src/asf/thirdparty/CMSIS/Include</Value>
<Value>../src/asf/sam/boards/sam4l_ek</Value>
<Value>../src/asf/sam/utils/header_files</Value>
<Value>../src/asf/common/services/ioport</Value>
<Value>../src/asf/sam/utils/cmsis/sam4l/source/templates</Value>
<Value>../src/asf/common/utils</Value>
<Value>../src/asf/thirdparty/CMSIS/Lib/GCC</Value>
<Value>../src</Value>
<Value>../src/config</Value>
<Value>../src/asf/sam/drivers/ast</Value>
</ListValues>
</armgcc.assembler.general.IncludePaths>
<armgcc.assembler.debugging.DebugLevel>Default (-g)</armgcc.assembler.debugging.DebugLevel>
<armgcc.preprocessingassembler.general.AssemblerFlags>-DARM_MATH_CM4=true -DBOARD=SAM4L_EK -D__ATSAM4LC4C__</armgcc.preprocessingassembler.general.AssemblerFlags>
<armgcc.preprocessingassembler.general.IncludePaths>
<ListValues>
<Value>../src/asf/sam/utils/preprocessor</Value>
<Value>../src/asf/sam/drivers/lcdca/example/sam4lc4c_sam4l_ek</Value>
<Value>../src/asf/sam/utils/cmsis/sam4l/include</Value>
<Value>../src/asf/common/services/sleepmgr</Value>
<Value>../src/asf/sam/utils</Value>
<Value>../src/asf/common/boards</Value>
<Value>../src/asf/sam/drivers/flashcalw</Value>
<Value>../src/asf/sam/boards</Value>
<Value>../src/asf/common/services/clock</Value>
<Value>../src/asf/sam/drivers/bpm</Value>
<Value>../src/asf/thirdparty/CMSIS/Include</Value>
<Value>../src/asf/sam/boards/sam4l_ek</Value>
<Value>../src/asf/sam/utils/header_files</Value>
<Value>../src/asf/common/services/ioport</Value>
<Value>../src/asf/sam/utils/cmsis/sam4l/source/templates</Value>
<Value>../src/asf/common/utils</Value>
<Value>../src/asf/thirdparty/CMSIS/Lib/GCC</Value>
<Value>../src</Value>
<Value>../src/config</Value>
<Value>../src/asf/sam/drivers/ast</Value>
</ListValues>
</armgcc.preprocessingassembler.general.IncludePaths>
<armgcc.preprocessingassembler.debugging.DebugLevel>Default (-Wa,-g)</armgcc.preprocessingassembler.debugging.DebugLevel>
</ArmGcc>
</ToolchainSettings>
</PropertyGroup>
<ItemGroup>

12
FreeRTOS/Demo/CORTEX_M4_ATSAM4L_Atmel_Studio/src/SAM4L_low_power_tick_management.c
Unescape Escape View File

@ -263,6 +263,7 @@ void vPortSuppressTicksAndSleep( portTickType xExpectedIdleTime )
uint32_t ulAlarmValue, ulCompleteTickPeriods;
eSleepModeStatus eSleepAction;
portTickType xModifiableIdleTime;
enum sleepmgr_mode xSleepMode;
/* THIS FUNCTION IS CALLED WITH THE SCHEDULER SUSPENDED. */
@ -332,8 +333,14 @@ portTickType xModifiableIdleTime;
instruction. */
if( xModifiableIdleTime > 0 )
{
/* Sleep until something happens. */
sleepmgr_enter_sleep();
/* Find the deepest allowable sleep mode. */
xSleepMode = sleepmgr_get_sleep_mode();
if( xSleepMode != SLEEPMGR_ACTIVE )
{
/* Sleep until something happens. */
bpm_sleep( BPM, xSleepMode );
}
}
/* Allow the application to define some post sleep processing. */
@ -347,7 +354,6 @@ portTickType xModifiableIdleTime;
/* Re-enable interrupts - see comments above the cpsid instruction()
above. */
#warning The sleep manager will have re-enabled interrupts already, does this matter?
__asm volatile( "cpsie i" );
if( ulTickFlag != pdFALSE )

4
FreeRTOS/Demo/CORTEX_M4_ATSAM4L_Atmel_Studio/src/asf/sam/drivers/bpm/bpm.c
Unescape Escape View File

@ -294,5 +294,7 @@ void bpm_sleep(Bpm *bpm, uint32_t sleep_mode)
* Please note that we should probably use something like
* cpu_leave_critical(), using set_pri_mask(0)
*/
cpu_irq_enable();
/* In this demo interrupts are managed by the FreeRTOS kernel and must not
be altered here so the following line has been removed _RB_
cpu_irq_enable(); */
}

4
FreeRTOS/Demo/CORTEX_M4_ATSAM4L_Atmel_Studio/src/asf/sam/drivers/bpm/sleep.h
Unescape Escape View File

@ -127,7 +127,9 @@ static inline void bpm_sleep(Bpm *bpm, uint32_t sleep_mode)
* Please note that we should probably use something like
* cpu_leave_critical(), using set_pri_mask(0)
*/
cpu_irq_enable();
/* In this demo interrupts are managed by the FreeRTOS kernel and must not
be altered here so the following line has been removed _RB_
cpu_irq_enable(); */
}

19
FreeRTOS/Demo/CORTEX_M4_ATSAM4L_Atmel_Studio/src/config/FreeRTOSConfig.h
Unescape Escape View File

@ -140,19 +140,6 @@ to exclude the API function. */
#define INCLUDE_vTaskDelayUntil 1
#define INCLUDE_vTaskDelay 1
/* FreeRTOS+CLI definitions. */
/* Dimensions a buffer into which command outputs can be written. The buffer
can be declared in the CLI code itself, to allow multiple command consoles to
share the same buffer. For example, an application may allow access to the
command interpreter by UART and by Ethernet. Sharing a buffer is done purely
to save RAM. Note, however, that the command console itself is not re-entrant,
so only one command interpreter interface can be used at any one time. For
that reason, no attempt at providing mutual exclusion to the buffer is
attempted. */
#define configCOMMAND_INT_MAX_OUTPUT_SIZE 400
/* Cortex-M specific definitions. */
#ifdef __NVIC_PRIO_BITS
@ -192,5 +179,11 @@ void vPostSleepProcessing( unsigned long xExpectedIdleTime );
#define configPRE_SLEEP_PROCESSING( xExpectedIdleTime ) vPreSleepProcessing( xExpectedIdleTime );
#define configPOST_SLEEP_PROCESSING( xExpectedIdleTime ) vPostSleepProcessing( xExpectedIdleTime );
/* Definitions that map the FreeRTOS port interrupt handlers to their CMSIS
standard names. */
#define vPortSVCHandler SVC_Handler
#define xPortPendSVHandler PendSV_Handler
#define xPortSysTickHandler SysTick_Handler
#endif /* FREERTOS_CONFIG_H */

Write Preview
Loading…
Cancel
Save