Finalise XMC4000 Keil demos.

pull/4/head
Richard Barry 12 years ago
parent db1a5f1553
commit 1e248417bc

@ -82,6 +82,11 @@
#include <stdint.h> #include <stdint.h>
extern uint32_t SystemCoreClock; extern uint32_t SystemCoreClock;
/* The following definition allows the startup files that ship with the IDE
to be used without modification when the chip used includes the PMU CM001
errata. */
#define WORKAROUND_PMU_CM001 1
#define configUSE_PREEMPTION 1 #define configUSE_PREEMPTION 1
#define configUSE_PORT_OPTIMISED_TASK_SELECTION 1 #define configUSE_PORT_OPTIMISED_TASK_SELECTION 1
#define configUSE_IDLE_HOOK 0 #define configUSE_IDLE_HOOK 0
@ -154,9 +159,13 @@ header file. */
#define configASSERT( x ) if( ( x ) == 0 ) { taskDISABLE_INTERRUPTS(); for( ;; ); } #define configASSERT( x ) if( ( x ) == 0 ) { taskDISABLE_INTERRUPTS(); for( ;; ); }
/* Definitions that map the FreeRTOS port interrupt handlers to their CMSIS /* Definitions that map the FreeRTOS port interrupt handlers to their CMSIS
standard names. */ standard names. WORKAROUND_PMU_CM001 is defined at the top of this file. */
#define vPortSVCHandler SVC_Handler #if WORKAROUND_PMU_CM001 == 1
#define xPortPendSVHandler PendSV_Handler_Veneer
#else
#define xPortPendSVHandler PendSV_Handler #define xPortPendSVHandler PendSV_Handler
#endif
#define vPortSVCHandler SVC_Handler
#define xPortSysTickHandler SysTick_Handler #define xPortSysTickHandler SysTick_Handler

@ -165,7 +165,7 @@
<SetRegEntry> <SetRegEntry>
<Number>0</Number> <Number>0</Number>
<Key>DLGUARM</Key> <Key>DLGUARM</Key>
<Name>/</Name> <Name></Name>
</SetRegEntry> </SetRegEntry>
<SetRegEntry> <SetRegEntry>
<Number>0</Number> <Number>0</Number>
@ -372,7 +372,7 @@
<SetRegEntry> <SetRegEntry>
<Number>0</Number> <Number>0</Number>
<Key>DLGUARM</Key> <Key>DLGUARM</Key>
<Name>/</Name> <Name></Name>
</SetRegEntry> </SetRegEntry>
<SetRegEntry> <SetRegEntry>
<Number>0</Number> <Number>0</Number>
@ -389,8 +389,8 @@
<MemoryWindow1> <MemoryWindow1>
<Mm> <Mm>
<WinNumber>1</WinNumber> <WinNumber>1</WinNumber>
<SubType>5</SubType> <SubType>2</SubType>
<ItemText>0x0C000000</ItemText> <ItemText>0x20005f90</ItemText>
</Mm> </Mm>
</MemoryWindow1> </MemoryWindow1>
<Tracepoint> <Tracepoint>
@ -424,12 +424,6 @@
</DebugFlag> </DebugFlag>
<LintExecutable></LintExecutable> <LintExecutable></LintExecutable>
<LintConfigFile></LintConfigFile> <LintConfigFile></LintConfigFile>
<SystemViewers>
<Entry>
<Name>System Viewer\PORT2</Name>
<WinId>35905</WinId>
</Entry>
</SystemViewers>
</TargetOption> </TargetOption>
</Target> </Target>
@ -578,7 +572,7 @@
<SetRegEntry> <SetRegEntry>
<Number>0</Number> <Number>0</Number>
<Key>DLGUARM</Key> <Key>DLGUARM</Key>
<Name></Name> <Name>/</Name>
</SetRegEntry> </SetRegEntry>
<SetRegEntry> <SetRegEntry>
<Number>0</Number> <Number>0</Number>
@ -751,7 +745,7 @@
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>45</ColumnNumber> <ColumnNumber>45</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>64</TopLine> <TopLine>63</TopLine>
<CurrentLine>97</CurrentLine> <CurrentLine>97</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>.\main.c</PathWithFileName> <PathWithFileName>.\main.c</PathWithFileName>
@ -767,8 +761,8 @@
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>0</ColumnNumber> <ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>64</TopLine> <TopLine>1</TopLine>
<CurrentLine>87</CurrentLine> <CurrentLine>1</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>.\FreeRTOSConfig.h</PathWithFileName> <PathWithFileName>.\FreeRTOSConfig.h</PathWithFileName>
<FilenameWithoutPath>FreeRTOSConfig.h</FilenameWithoutPath> <FilenameWithoutPath>FreeRTOSConfig.h</FilenameWithoutPath>
@ -783,8 +777,8 @@
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>0</ColumnNumber> <ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>165</TopLine> <TopLine>0</TopLine>
<CurrentLine>173</CurrentLine> <CurrentLine>0</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>.\RegTest.c</PathWithFileName> <PathWithFileName>.\RegTest.c</PathWithFileName>
<FilenameWithoutPath>RegTest.c</FilenameWithoutPath> <FilenameWithoutPath>RegTest.c</FilenameWithoutPath>
@ -799,8 +793,8 @@
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>0</ColumnNumber> <ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>67</TopLine> <TopLine>0</TopLine>
<CurrentLine>1</CurrentLine> <CurrentLine>0</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>.\main_full.c</PathWithFileName> <PathWithFileName>.\main_full.c</PathWithFileName>
<FilenameWithoutPath>main_full.c</FilenameWithoutPath> <FilenameWithoutPath>main_full.c</FilenameWithoutPath>
@ -813,10 +807,10 @@
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>16</ColumnNumber> <ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>64</TopLine> <TopLine>0</TopLine>
<CurrentLine>10</CurrentLine> <CurrentLine>0</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>.\main_blinky.c</PathWithFileName> <PathWithFileName>.\main_blinky.c</PathWithFileName>
<FilenameWithoutPath>main_blinky.c</FilenameWithoutPath> <FilenameWithoutPath>main_blinky.c</FilenameWithoutPath>
@ -827,7 +821,7 @@
<Group> <Group>
<GroupName>FreeRTOS_Source</GroupName> <GroupName>FreeRTOS_Source</GroupName>
<tvExp>0</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
@ -871,8 +865,8 @@
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>0</ColumnNumber> <ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>0</TopLine> <TopLine>552</TopLine>
<CurrentLine>0</CurrentLine> <CurrentLine>560</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\..\Source\queue.c</PathWithFileName> <PathWithFileName>..\..\Source\queue.c</PathWithFileName>
<FilenameWithoutPath>queue.c</FilenameWithoutPath> <FilenameWithoutPath>queue.c</FilenameWithoutPath>
@ -903,8 +897,8 @@
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>0</ColumnNumber> <ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>383</TopLine> <TopLine>420</TopLine>
<CurrentLine>384</CurrentLine> <CurrentLine>428</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\..\Source\portable\RVDS\ARM_CM4F\port.c</PathWithFileName> <PathWithFileName>..\..\Source\portable\RVDS\ARM_CM4F\port.c</PathWithFileName>
<FilenameWithoutPath>port.c</FilenameWithoutPath> <FilenameWithoutPath>port.c</FilenameWithoutPath>
@ -959,8 +953,8 @@
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>0</ColumnNumber> <ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>241</TopLine> <TopLine>254</TopLine>
<CurrentLine>258</CurrentLine> <CurrentLine>262</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\Common\Minimal\sp_flop.c</PathWithFileName> <PathWithFileName>..\Common\Minimal\sp_flop.c</PathWithFileName>
<FilenameWithoutPath>sp_flop.c</FilenameWithoutPath> <FilenameWithoutPath>sp_flop.c</FilenameWithoutPath>

@ -1010,7 +1010,7 @@
</ArmAdsMisc> </ArmAdsMisc>
<Cads> <Cads>
<interw>1</interw> <interw>1</interw>
<Optim>1</Optim> <Optim>2</Optim>
<oTime>0</oTime> <oTime>0</oTime>
<SplitLS>0</SplitLS> <SplitLS>0</SplitLS>
<OneElfS>0</OneElfS> <OneElfS>0</OneElfS>

@ -152,7 +152,7 @@ __Vectors
ExcpVector SVC_Handler ; SVCall Handler ExcpVector SVC_Handler ; SVCall Handler
ExcpVector DebugMon_Handler ; Debug Monitor Handler ExcpVector DebugMon_Handler ; Debug Monitor Handler
DCD 0 ; Reserved DCD 0 ; Reserved
DCD PendSV_Handler ; PendSV Handler ExcpVector PendSV_Handler ; PendSV Handler
ExcpVector SysTick_Handler ; SysTick Handler ExcpVector SysTick_Handler ; SysTick Handler
; Interrupt Handlers for Service Requests (SR) from XMC4200 Peripherals ; Interrupt Handlers for Service Requests (SR) from XMC4200 Peripherals

@ -152,7 +152,7 @@ __Vectors
ExcpVector SVC_Handler ; SVCall Handler ExcpVector SVC_Handler ; SVCall Handler
ExcpVector DebugMon_Handler ; Debug Monitor Handler ExcpVector DebugMon_Handler ; Debug Monitor Handler
DCD 0 ; Reserved DCD 0 ; Reserved
DCD PendSV_Handler ; PendSV Handler ExcpVector PendSV_Handler ; PendSV Handler
ExcpVector SysTick_Handler ; SysTick Handler ExcpVector SysTick_Handler ; SysTick Handler
; Interrupt Handlers for Service Requests (SR) from XMC4400 Peripherals ; Interrupt Handlers for Service Requests (SR) from XMC4400 Peripherals

@ -150,11 +150,11 @@ __Vectors
DCD 0 ; Reserved DCD 0 ; Reserved
DCD 0 ; Reserved DCD 0 ; Reserved
DCD 0 ; Reserved DCD 0 ; Reserved
DCD SVC_Handler ; SVCall Handler ExcpVector SVC_Handler ; SVCall Handler
ExcpVector DebugMon_Handler ; Debug Monitor Handler ExcpVector DebugMon_Handler ; Debug Monitor Handler
DCD 0 ; Reserved DCD 0 ; Reserved
DCD PendSV_Handler ; PendSV Handler ExcpVector PendSV_Handler ; PendSV Handler
DCD SysTick_Handler ; SysTick Handler ExcpVector SysTick_Handler ; SysTick Handler
; Interrupt Handlers for Service Requests (SR) from XMC4500 Peripherals ; Interrupt Handlers for Service Requests (SR) from XMC4500 Peripherals
ExcpVector SCU_0_IRQHandler ; Handler name for SR SCU_0 ExcpVector SCU_0_IRQHandler ; Handler name for SR SCU_0

Loading…
Cancel
Save