Minor updates.

pull/4/head
Richard Barry 16 years ago
parent f374044a1c
commit ea30213367

@ -49,6 +49,9 @@
#include "FreeRTOS.h" #include "FreeRTOS.h"
#include "partest.h" #include "partest.h"
#include "led.h"
#define partstNUM_LEDS ( 4 )
/*----------------------------------------------------------- /*-----------------------------------------------------------
* Simple parallel port IO routines for the LED's. * Simple parallel port IO routines for the LED's.
@ -56,19 +59,37 @@
void vParTestInitialise( void ) void vParTestInitialise( void )
{ {
LED_Configure( 0 ); unsigned long ul;
LED_Configure( 1 );
for( ul = 0; ul < partstNUM_LEDS; ul++ )
{
LED_Configure( ul );
}
} }
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
void vParTestSetLED( unsigned portBASE_TYPE uxLED, signed portBASE_TYPE xValue ) void vParTestSetLED( unsigned portBASE_TYPE uxLED, signed portBASE_TYPE xValue )
{ {
if( uxLED < partstNUM_LEDS )
{
if( xValue == 0 )
{
LED_Clear( uxLED );
}
else
{
LED_Set( uxLED );
}
}
} }
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
void vParTestToggleLED( unsigned portBASE_TYPE uxLED ) void vParTestToggleLED( unsigned portBASE_TYPE uxLED )
{ {
LED_Toggle(1); if( uxLED < partstNUM_LEDS )
{
LED_Toggle( uxLED );
}
} }

File diff suppressed because it is too large Load Diff

@ -4728,7 +4728,7 @@
<option> <option>
<name>Variant</name> <name>Variant</name>
<version>8</version> <version>8</version>
<state>0</state> <state>11</state>
</option> </option>
<option> <option>
<name>GEndianMode</name> <name>GEndianMode</name>
@ -4750,7 +4750,7 @@
</option> </option>
<option> <option>
<name>Output description</name> <name>Output description</name>
<state>No specifier a, A, no specifier n, no float nor long long, no flags.</state> <state>No specifier a, A, no specifier n, no float nor long long.</state>
</option> </option>
<option> <option>
<name>GOutputBinary</name> <name>GOutputBinary</name>
@ -4789,7 +4789,7 @@
</option> </option>
<option> <option>
<name>OGLastSavedByProductVersion</name> <name>OGLastSavedByProductVersion</name>
<state>5.10.0.213</state> <state>5.20.0.50986</state>
</option> </option>
<option> <option>
<name>GeneralEnableMisra</name> <name>GeneralEnableMisra</name>
@ -4877,7 +4877,7 @@
</option> </option>
<option> <option>
<name>CCDiagSuppress</name> <name>CCDiagSuppress</name>
<state>Pe826,Pe1375</state> <state>Pa082</state>
</option> </option>
<option> <option>
<name>CCDiagRemark</name> <name>CCDiagRemark</name>
@ -4974,6 +4974,7 @@
<state>$PROJ_DIR$\..\..\Common\drivers\Atmel\at91lib\boards\at91sam9xe-ek</state> <state>$PROJ_DIR$\..\..\Common\drivers\Atmel\at91lib\boards\at91sam9xe-ek</state>
<state>$PROJ_DIR$\..\..\Common\drivers\Atmel\at91lib\peripherals</state> <state>$PROJ_DIR$\..\..\Common\drivers\Atmel\at91lib\peripherals</state>
<state>$PROJ_DIR$\..\..\Common\drivers\Atmel\at91lib\components</state> <state>$PROJ_DIR$\..\..\Common\drivers\Atmel\at91lib\components</state>
<state>$PROJ_DIR$\..\..\Common\drivers\Atmel\at91lib\utility</state>
<state>$PROJ_DIR$\..\..\Common\drivers\Atmel\at91lib\usb</state> <state>$PROJ_DIR$\..\..\Common\drivers\Atmel\at91lib\usb</state>
<state>$PROJ_DIR$\..\..\..\Source\include</state> <state>$PROJ_DIR$\..\..\..\Source\include</state>
<state>$PROJ_DIR$\..</state> <state>$PROJ_DIR$\..</state>

@ -22,7 +22,7 @@
@REM but they are listed at the end of this file for reference. @REM but they are listed at the end of this file for reference.
"C:\Devtools\IAR Systems\Embedded Workbench 5.0\common\bin\cspybat" "C:\Devtools\IAR Systems\Embedded Workbench 5.0\ARM\bin\armproc.dll" "C:\Devtools\IAR Systems\Embedded Workbench 5.0\ARM\bin\armjlink.dll" %1 --plugin "C:\Devtools\IAR Systems\Embedded Workbench 5.0\ARM\bin\<libsupport_plugin>" --macro "C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_IAR\ewp\..\..\..\resources\at91sam9xe-ek-flash.mac" --backend -B "--endian=little" "--cpu=ARM926EJ-S" "--fpu=None" "-p" "C:\Devtools\IAR Systems\Embedded Workbench 5.0\ARM\CONFIG\debugger\Atmel\ioAT91SAM9XE256.ddf" "--semihosting" "--device=AT91SAM9XE256" "-d" "jlink" "--drv_communication=USB0" "--jlink_speed=adaptive" "--drv_catch_exceptions=0x000" "C:\Devtools\IAR Systems\Embedded Workbench 5.0\common\bin\cspybat" "C:\Devtools\IAR Systems\Embedded Workbench 5.0\ARM\bin\armproc.dll" "C:\Devtools\IAR Systems\Embedded Workbench 5.0\ARM\bin\armjlink.dll" %1 --plugin "C:\Devtools\IAR Systems\Embedded Workbench 5.0\ARM\bin\<libsupport_plugin>" --macro "C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_IAR\ewp\..\..\..\resources\at91sam9xe-ek-flash.mac" --backend -B "--endian=little" "--cpu=ARM926EJ-S" "--fpu=None" "-p" "C:\Devtools\IAR Systems\Embedded Workbench 5.0\ARM\CONFIG\debugger\Atmel\ioAT91SAM9XE512.ddf" "--drv_verify_download" "--semihosting" "--device=AT91SAM9XE512" "-d" "jlink" "--drv_communication=USB0" "--jlink_speed=auto" "--jlink_initial_speed=32" "--drv_catch_exceptions=0x000" "--jlink_reset_strategy=50,0"
@REM Loaded plugins: @REM Loaded plugins:

@ -1,5 +1,214 @@
<?xml version="1.0" encoding="iso-8859-1"?> <?xml version="1.0" encoding="iso-8859-1"?>
<Project/> <Project>
<Desktop>
<Static>
<Debug-Log/>
<Build>
<ColumnWidth0>20</ColumnWidth0>
<ColumnWidth1>1216</ColumnWidth1>
<ColumnWidth2>324</ColumnWidth2>
<ColumnWidth3>81</ColumnWidth3>
</Build>
<Workspace>
<ColumnWidths>
<Column0>124</Column0>
<Column1>27</Column1>
<Column2>27</Column2>
<Column3>27</Column3>
</ColumnWidths>
</Workspace>
<Disassembly>
<MixedMode>1</MixedMode>
<CodeCovShow>0</CodeCovShow>
</Disassembly>
</Static>
<Windows>
<Wnd3>
<Tabs>
<Tab>
<Identity>TabID-27883-8575</Identity>
<TabName>Debug Log</TabName>
<Factory>Debug-Log</Factory>
<Session/>
</Tab>
<Tab>
<Identity>TabID-24747-8634</Identity>
<TabName>Build</TabName>
<Factory>Build</Factory>
<Session/>
</Tab>
</Tabs>
<SelectedTab>0</SelectedTab>
</Wnd3>
<Wnd4>
<Tabs>
<Tab>
<Identity>TabID-5864-8578</Identity>
<TabName>Workspace</TabName>
<Factory>Workspace</Factory>
<Session>
<NodeDict>
<ExpandedNode>at91sam9xe-ek</ExpandedNode>
</NodeDict>
</Session>
</Tab>
</Tabs>
<SelectedTab>0</SelectedTab>
</Wnd4>
<Wnd5>
<Tabs>
<Tab>
<Identity>TabID-16612-8582</Identity>
<TabName>Disassembly</TabName>
<Factory>Disassembly</Factory>
<Session/>
</Tab>
</Tabs>
<SelectedTab>0</SelectedTab>
</Wnd5>
</Windows>
<Editor>
<Pane>
<Tab>
<Factory>TextEditor</Factory>
<Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\boards\at91sam9xe-ek\board_cstartup_iar.s</Filename>
<XPos>0</XPos>
<YPos>125</YPos>
<SelStart>4609</SelStart>
<SelEnd>4609</SelEnd>
</Tab>
<Tab>
<Factory>TextEditor</Factory>
<Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\AtmelSAM9XE\port.c</Filename>
<XPos>0</XPos>
<YPos>178</YPos>
<SelStart>7138</SelStart>
<SelEnd>7138</SelEnd>
</Tab>
<Tab>
<Factory>TextEditor</Factory>
<Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\AtmelSAM9XE\portasm.s79</Filename>
<XPos>0</XPos>
<YPos>17</YPos>
<SelStart>1072</SelStart>
<SelEnd>1072</SelEnd>
</Tab>
<Tab>
<Factory>TextEditor</Factory>
<Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_IAR\ParTest\ParTest.c</Filename>
<XPos>0</XPos>
<YPos>58</YPos>
<SelStart>2678</SelStart>
<SelEnd>2701</SelEnd>
</Tab>
<ActiveTab>3</ActiveTab>
<Tab>
<Factory>TextEditor</Factory>
<Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\utility\led.c</Filename>
<XPos>0</XPos>
<YPos>92</YPos>
<SelStart>2663</SelStart>
<SelEnd>2663</SelEnd>
</Tab>
</Pane>
<ActivePane>0</ActivePane>
<Sizes>
<Pane>
<X>1000000</X>
<Y>1000000</Y>
</Pane>
</Sizes>
<SplitMode>1</SplitMode>
</Editor>
<Positions>
<Top>
<Row0>
<Sizes>
<Toolbar-00aa9b70>
<key>iaridepm.enu1</key>
</Toolbar-00aa9b70>
</Sizes>
</Row0>
<Row1>
<Sizes>
<Toolbar-044a32e0>
<key>debuggergui.enu1</key>
</Toolbar-044a32e0>
</Sizes>
</Row1>
</Top>
<Left>
<Row0>
<Sizes>
<Wnd4>
<Rect>
<Top>-2</Top>
<Left>-2</Left>
<Bottom>716</Bottom>
<Right>198</Right>
<x>-2</x>
<y>-2</y>
<xscreen>200</xscreen>
<yscreen>200</yscreen>
<sizeHorzCX>119048</sizeHorzCX>
<sizeHorzCY>203666</sizeHorzCY>
<sizeVertCX>119048</sizeVertCX>
<sizeVertCY>731161</sizeVertCY>
</Rect>
</Wnd4>
</Sizes>
</Row0>
</Left>
<Right>
<Row0>
<Sizes>
<Wnd5>
<Rect>
<Top>-2</Top>
<Left>-2</Left>
<Bottom>716</Bottom>
<Right>198</Right>
<x>-2</x>
<y>-2</y>
<xscreen>200</xscreen>
<yscreen>200</yscreen>
<sizeHorzCX>119048</sizeHorzCX>
<sizeHorzCY>203666</sizeHorzCY>
<sizeVertCX>119048</sizeVertCX>
<sizeVertCY>731161</sizeVertCY>
</Rect>
</Wnd5>
</Sizes>
</Row0>
</Right>
<Bottom>
<Row0>
<Sizes>
<Wnd3>
<Rect>
<Top>-2</Top>
<Left>-2</Left>
<Bottom>198</Bottom>
<Right>1682</Right>
<x>-2</x>
<y>-2</y>
<xscreen>1684</xscreen>
<yscreen>200</yscreen>
<sizeHorzCX>1002381</sizeHorzCX>
<sizeHorzCY>203666</sizeHorzCY>
<sizeVertCX>119048</sizeVertCX>
<sizeVertCY>203666</sizeVertCY>
</Rect>
</Wnd3>
</Sizes>
</Row0>
</Bottom>
<Float>
<Sizes/>
</Float>
</Positions>
</Desktop>
</Project>

@ -2,6 +2,28 @@
WatchCond=_ 0 WatchCond=_ 0
Watch0=_ 0 "" 0 "" 0 "" 0 "" 0 0 0 0 Watch0=_ 0 "" 0 "" 0 "" 0 "" 0 0 0 0
Watch1=_ 0 "" 0 "" 0 "" 0 "" 0 0 0 0 Watch1=_ 0 "" 0 "" 0 "" 0 "" 0 0 0 0
[DisAssemblyWindow]
NumStates=_ 1
State 1=_ 1
[CodeCoverage]
Enabled=_ 0
[StackPlugin]
Enabled=1
OverflowWarningsEnabled=1
WarningThreshold=90
SpWarningsEnabled=1
WarnHow=0
UseTrigger=1
TriggerName=main
LimitSize=0
ByteLimit=50
[Log file]
LoggingEnabled=_ 0
LogFile=_ ""
Category=_ 0
[TermIOLog]
LoggingEnabled=_ 0
LogFile=_ ""
[Disassemble mode] [Disassemble mode]
mode=0 mode=0
[Breakpoints] [Breakpoints]

@ -96,6 +96,10 @@ int main()
prvSetupHardware(); prvSetupHardware();
/* Start the standard demo tasks. */ /* Start the standard demo tasks. */
vStartLEDFlashTasks( mainLED_TASK_PRIORITY );
/* These tasks to be added once the simple flasher is running.
vStartIntegerMathTasks( tskIDLE_PRIORITY ); vStartIntegerMathTasks( tskIDLE_PRIORITY );
vStartLEDFlashTasks( mainLED_TASK_PRIORITY ); vStartLEDFlashTasks( mainLED_TASK_PRIORITY );
vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY ); vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY );
@ -108,9 +112,9 @@ int main()
vStartQueuePeekTasks(); vStartQueuePeekTasks();
vStartRecursiveMutexTasks(); vStartRecursiveMutexTasks();
/* The death demo tasks must be started last as the sanity checks performed The death demo tasks must be started last as the sanity checks performed
require knowledge of the number of other tasks in the system. */ require knowledge of the number of other tasks in the system.
vCreateSuicidalTasks( mainCREATOR_TASK_PRIORITY ); vCreateSuicidalTasks( mainCREATOR_TASK_PRIORITY ); */
/* Start the scheduler. From this point on the execution will be under /* Start the scheduler. From this point on the execution will be under
the control of the kernel. */ the control of the kernel. */
@ -125,7 +129,7 @@ int main()
static void prvCheckTask( void * pvParameters ) static void prvCheckTask( void * pvParameters )
{ {
portTickType xNextWakeTime, xPeriod = mainNO_ERROR_PERIOD; portTickType xNextWakeTime, xPeriod = mainNO_ERROR_PERIOD;
static volatile ulErrorCode = 0UL; static volatile unsigned portLONG ulErrorCode = 0UL;
/* Initialise xNextWakeTime prior to its first use. From this point on /* Initialise xNextWakeTime prior to its first use. From this point on
the value of the variable is handled automatically by the kernel. */ the value of the variable is handled automatically by the kernel. */

@ -3,7 +3,7 @@
<Workspace> <Workspace>
<ConfigDictionary> <ConfigDictionary>
<CurrentConfigs><Project>at91sam9xe-ek/at91sam9xe256_flash</Project></CurrentConfigs></ConfigDictionary> <CurrentConfigs><Project>at91sam9xe-ek/at91sam9xe512_flash</Project></CurrentConfigs></ConfigDictionary>
<Desktop> <Desktop>
<Static> <Static>
<Workspace> <Workspace>
@ -12,7 +12,7 @@
<Column0>330</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths> <Column0>258</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>
</Workspace> </Workspace>
<Build> <Build>
@ -20,11 +20,11 @@
<ColumnWidth0>20</ColumnWidth0><ColumnWidth1>1216</ColumnWidth1><ColumnWidth2>324</ColumnWidth2><ColumnWidth3>81</ColumnWidth3></Build> <ColumnWidth0>20</ColumnWidth0><ColumnWidth1>1216</ColumnWidth1><ColumnWidth2>324</ColumnWidth2><ColumnWidth3>81</ColumnWidth3></Build>
</Static> <Debug-Log/><TerminalIO/></Static>
<Windows> <Windows>
<Wnd2> <Wnd0>
<Tabs> <Tabs>
<Tab> <Tab>
<Identity>TabID-26777-6465</Identity> <Identity>TabID-26777-6465</Identity>
@ -36,7 +36,7 @@
</Tab> </Tab>
</Tabs> </Tabs>
<SelectedTab>0</SelectedTab></Wnd2><Wnd3> <SelectedTab>0</SelectedTab></Wnd0><Wnd1>
<Tabs> <Tabs>
<Tab> <Tab>
<Identity>TabID-25209-6494</Identity> <Identity>TabID-25209-6494</Identity>
@ -44,22 +44,22 @@
<Factory>Build</Factory> <Factory>Build</Factory>
<Session/> <Session/>
</Tab> </Tab>
</Tabs> <Tab><Identity>TabID-21317-8493</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab></Tabs>
<SelectedTab>0</SelectedTab></Wnd3></Windows> <SelectedTab>0</SelectedTab></Wnd1></Windows>
<Editor> <Editor>
<Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\boards\at91sam9xe-ek\board_cstartup_iar.s</Filename><XPos>0</XPos><YPos>125</YPos><SelStart>4609</SelStart><SelEnd>4609</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\AtmelSAM9XE\port.c</Filename><XPos>0</XPos><YPos>178</YPos><SelStart>7138</SelStart><SelEnd>7138</SelEnd></Tab><ActiveTab>1</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\AtmelSAM9XE\portasm.s79</Filename><XPos>0</XPos><YPos>17</YPos><SelStart>1072</SelStart><SelEnd>1072</SelEnd></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor> <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_IAR\main.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd></Tab><ActiveTab>0</ActiveTab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
<Positions> <Positions>
<Top><Row0><Sizes><Toolbar-00aa98f0><key>iaridepm.enu1</key></Toolbar-00aa98f0></Sizes></Row0></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>740</Bottom><Right>404</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>119048</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>241667</sizeVertCX><sizeVertCY>755601</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>198</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>200</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>119048</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions> <Top><Row0><Sizes><Toolbar-00aa9b88><key>iaridepm.enu1</key></Toolbar-00aa9b88></Sizes></Row0></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>592</Bottom><Right>332</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>142857</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>238571</sizeVertCX><sizeVertCY>604888</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>346</Bottom><Right>1402</Right><x>-2</x><y>-2</y><xscreen>1404</xscreen><yscreen>348</yscreen><sizeHorzCX>1002857</sizeHorzCX><sizeHorzCY>354379</sizeHorzCY><sizeVertCX>142857</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
</Desktop> </Desktop>
</Workspace> </Workspace>

Loading…
Cancel
Save