diff options
34 files changed, 262 insertions, 1048 deletions
diff --git a/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/RTOSDemo.ewd b/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/RTOSDemo.ewd index 3ef1570c0..d7d011355 100644 --- a/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/RTOSDemo.ewd +++ b/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/RTOSDemo.ewd @@ -29,7 +29,7 @@ </option>
<option>
<name>CRunToEnable</name>
- <state>0</state>
+ <state>1</state>
</option>
<option>
<name>CRunToName</name>
@@ -53,7 +53,7 @@ </option>
<option>
<name>DDFFile</name>
- <state>$TOOLKIT_DIR$\config\debugger\ior5f571ml.ddf</state>
+ <state>$TOOLKIT_DIR$\config\debugger\ior5f51138.ddf</state>
</option>
<option>
<name>DebuggerUseExtraOptions</name>
@@ -162,7 +162,7 @@ </option>
<option>
<name>OCDownloadVerifyAll</name>
- <state>0</state>
+ <state>1</state>
</option>
<option>
<name>OCDownloadAttach</name>
diff --git a/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/settings/RTOSDemo.Debug.cspy.bat b/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/settings/RTOSDemo.Debug.cspy.bat index 000a07c7c..e6dd98ebe 100644 --- a/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/settings/RTOSDemo.Debug.cspy.bat +++ b/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/settings/RTOSDemo.Debug.cspy.bat @@ -25,7 +25,7 @@ if not "%1" == "" goto debugFile @echo on
-"C:\DevTools\IAR Systems\Embedded Workbench 7.2\common\bin\cspybat" -f "C:\E\Dev\FreeRTOS\WorkingCopy\FreeRTOS\Demo\RX113-RSK_GCC_e2studio_IAR\settings\RTOSDemo.Debug.general.xcl" --backend -f "C:\E\Dev\FreeRTOS\WorkingCopy\FreeRTOS\Demo\RX113-RSK_GCC_e2studio_IAR\settings\RTOSDemo.Debug.driver.xcl"
+"C:\DevTools\IAR Systems\Embedded Workbench 7.2\common\bin\cspybat" -f "C:\E\Dev\FreeRTOS\WorkingCopy\FreeRTOS\Demo\RX100_RX113-RSK_GCC_e2studio_IAR\settings\RTOSDemo.Debug.general.xcl" --backend -f "C:\E\Dev\FreeRTOS\WorkingCopy\FreeRTOS\Demo\RX100_RX113-RSK_GCC_e2studio_IAR\settings\RTOSDemo.Debug.driver.xcl"
@echo off
goto end
@@ -34,7 +34,7 @@ goto end @echo on
-"C:\DevTools\IAR Systems\Embedded Workbench 7.2\common\bin\cspybat" -f "C:\E\Dev\FreeRTOS\WorkingCopy\FreeRTOS\Demo\RX113-RSK_GCC_e2studio_IAR\settings\RTOSDemo.Debug.general.xcl" "--debug_file=%1" --backend -f "C:\E\Dev\FreeRTOS\WorkingCopy\FreeRTOS\Demo\RX113-RSK_GCC_e2studio_IAR\settings\RTOSDemo.Debug.driver.xcl"
+"C:\DevTools\IAR Systems\Embedded Workbench 7.2\common\bin\cspybat" -f "C:\E\Dev\FreeRTOS\WorkingCopy\FreeRTOS\Demo\RX100_RX113-RSK_GCC_e2studio_IAR\settings\RTOSDemo.Debug.general.xcl" "--debug_file=%1" --backend -f "C:\E\Dev\FreeRTOS\WorkingCopy\FreeRTOS\Demo\RX100_RX113-RSK_GCC_e2studio_IAR\settings\RTOSDemo.Debug.driver.xcl"
@echo off
:end
\ No newline at end of file diff --git a/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/settings/RTOSDemo.Debug.driver.xcl b/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/settings/RTOSDemo.Debug.driver.xcl index 048724e75..8b7032c5e 100644 --- a/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/settings/RTOSDemo.Debug.driver.xcl +++ b/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/settings/RTOSDemo.Debug.driver.xcl @@ -34,6 +34,10 @@ "USB"
+"--verify_download"
+
+"all"
+
diff --git a/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/settings/RTOSDemo.Debug.general.xcl b/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/settings/RTOSDemo.Debug.general.xcl index 0d8b5cdf6..0a800c53e 100644 --- a/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/settings/RTOSDemo.Debug.general.xcl +++ b/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/settings/RTOSDemo.Debug.general.xcl @@ -2,7 +2,7 @@ "C:\DevTools\IAR Systems\Embedded Workbench 7.2\rx\bin\rxe1e20.dll"
-"C:\E\Dev\FreeRTOS\WorkingCopy\FreeRTOS\Demo\RX113-RSK_GCC_e2studio_IAR\Debug\Exe\RTOSDemo.out"
+"C:\E\Dev\FreeRTOS\WorkingCopy\FreeRTOS\Demo\RX100_RX113-RSK_GCC_e2studio_IAR\Debug\Exe\RTOSDemo.out"
--plugin "C:\DevTools\IAR Systems\Embedded Workbench 7.2\rx\bin\rxbat.dll"
diff --git a/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/settings/RTOSDemo.dbgdt b/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/settings/RTOSDemo.dbgdt index 4f7e51010..4e6e47d94 100644 --- a/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/settings/RTOSDemo.dbgdt +++ b/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/settings/RTOSDemo.dbgdt @@ -4,9 +4,9 @@ <Desktop>
<Static>
<Debug-Log>
- <ColumnWidth0>20</ColumnWidth0>
- <ColumnWidth1>1622</ColumnWidth1>
- </Debug-Log>
+
+
+ <ColumnWidth0>20</ColumnWidth0><ColumnWidth1>1622</ColumnWidth1></Debug-Log>
<Build>
<ColumnWidth0>20</ColumnWidth0>
<ColumnWidth1>1216</ColumnWidth1>
@@ -15,31 +15,31 @@ </Build>
<Workspace>
<ColumnWidths>
- <Column0>255</Column0>
- <Column1>27</Column1>
- <Column2>27</Column2>
- <Column3>27</Column3>
- </ColumnWidths>
+
+
+
+
+ <Column0>255</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>
</Workspace>
<Disassembly>
<col-names>
- <item>Disassembly</item>
- <item>_I0</item>
- </col-names>
+
+
+ <item>Disassembly</item><item>_I0</item></col-names>
<col-widths>
- <item>500</item>
- <item>20</item>
- </col-widths>
+
+
+ <item>500</item><item>20</item></col-widths>
<DisasmHistory/>
<PreferedWindows>
- <Position>2</Position>
- <ScreenPosX>0</ScreenPosX>
- <ScreenPosY>0</ScreenPosY>
- <Windows/>
- </PreferedWindows>
- <ShowCodeCoverage>1</ShowCodeCoverage>
- <ShowInstrProfiling>1</ShowInstrProfiling>
- </Disassembly>
+
+
+
+
+ <Position>2</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows>
+
+
+ <ShowCodeCoverage>1</ShowCodeCoverage><ShowInstrProfiling>1</ShowInstrProfiling></Disassembly>
<Register>
<PreferedWindows>
<Position>2</Position>
@@ -50,7 +50,9 @@ </Register>
</Static>
<Windows>
- <Wnd1>
+
+
+ <Wnd2>
<Tabs>
<Tab>
<Identity>TabID-6594-3339</Identity>
@@ -65,179 +67,33 @@ <Session/>
</Tab>
</Tabs>
- <SelectedTab>0</SelectedTab>
- </Wnd1>
- <Wnd4>
+
+ <SelectedTab>0</SelectedTab></Wnd2><Wnd3>
<Tabs>
<Tab>
<Identity>TabID-17343-3342</Identity>
<TabName>Workspace</TabName>
<Factory>Workspace</Factory>
<Session>
- <NodeDict>
- <ExpandedNode>RTOSDemo</ExpandedNode>
- </NodeDict>
- </Session>
+
+ <NodeDict><ExpandedNode>RTOSDemo</ExpandedNode></NodeDict></Session>
</Tab>
</Tabs>
- <SelectedTab>0</SelectedTab>
- </Wnd4>
- </Windows>
+
+ <SelectedTab>0</SelectedTab></Wnd3></Windows>
<Editor>
- <Pane>
- <Tab>
- <Factory>TextEditor</Factory>
- <Filename>$WS_DIR$\src\main.c</Filename>
- <XPos>0</XPos>
- <YPos>0</YPos>
- <SelStart>0</SelStart>
- <SelEnd>0</SelEnd>
- <XPos2>0</XPos2>
- <YPos2>66</YPos2>
- <SelStart2>5312</SelStart2>
- <SelEnd2>5312</SelEnd2>
- </Tab>
- <Tab>
- <Factory>TextEditor</Factory>
- <Filename>$WS_DIR$\src\Full_Demo\RegTest_IAR.s</Filename>
- <XPos>0</XPos>
- <YPos>0</YPos>
- <SelStart>0</SelStart>
- <SelEnd>0</SelEnd>
- <XPos2>0</XPos2>
- <YPos2>144</YPos2>
- <SelStart2>5881</SelStart2>
- <SelEnd2>5881</SelEnd2>
- </Tab>
- <Tab>
- <Factory>TextEditor</Factory>
- <Filename>$WS_DIR$\..\Common\Minimal\flop.c</Filename>
- <XPos>0</XPos>
- <YPos>0</YPos>
- <SelStart>0</SelStart>
- <SelEnd>0</SelEnd>
- <XPos2>0</XPos2>
- <YPos2>126</YPos2>
- <SelStart2>6956</SelStart2>
- <SelEnd2>6956</SelEnd2>
- </Tab>
- <Tab>
- <Factory>TextEditor</Factory>
- <Filename>$WS_DIR$\..\Common\Minimal\TimerDemo.c</Filename>
- <XPos>0</XPos>
- <YPos>0</YPos>
- <SelStart>0</SelStart>
- <SelEnd>0</SelEnd>
- <XPos2>0</XPos2>
- <YPos2>242</YPos2>
- <SelStart2>12612</SelStart2>
- <SelEnd2>12612</SelEnd2>
- </Tab>
- <Tab>
- <Factory>TextEditor</Factory>
- <Filename>$WS_DIR$\..\Common\Minimal\IntQueue.c</Filename>
- <XPos>0</XPos>
- <YPos>0</YPos>
- <SelStart>0</SelStart>
- <SelEnd>0</SelEnd>
- <XPos2>0</XPos2>
- <YPos2>381</YPos2>
- <SelStart2>0</SelStart2>
- <SelEnd2>0</SelEnd2>
- </Tab>
- <Tab>
- <Factory>TextEditor</Factory>
- <Filename>$WS_DIR$\src\Full_Demo\IntQueueTimer.c</Filename>
- <XPos>0</XPos>
- <YPos>0</YPos>
- <SelStart>0</SelStart>
- <SelEnd>0</SelEnd>
- <XPos2>0</XPos2>
- <YPos2>154</YPos2>
- <SelStart2>7349</SelStart2>
- <SelEnd2>7349</SelEnd2>
- </Tab>
- <ActiveTab>5</ActiveTab>
- </Pane>
- <ActivePane>0</ActivePane>
- <Sizes>
- <Pane>
- <X>1000000</X>
- <Y>1000000</Y>
- </Pane>
- </Sizes>
- <SplitMode>1</SplitMode>
- </Editor>
+
+
+
+
+ <Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\src\main.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>111</YPos2><SelStart2>6264</SelStart2><SelEnd2>6264</SelEnd2></Tab><ActiveTab>0</ActiveTab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
<Positions>
- <Top>
- <Row0>
- <Sizes>
- <Toolbar-026E7B08>
- <key>iaridepm.enu1</key>
- </Toolbar-026E7B08>
- </Sizes>
- </Row0>
- <Row1>
- <Sizes>
- <Toolbar-1DFB9BD8>
- <key>debuggergui.enu1</key>
- </Toolbar-1DFB9BD8>
- </Sizes>
- </Row1>
- </Top>
- <Left>
- <Row0>
- <Sizes>
- <Wnd4>
- <Rect>
- <Top>-2</Top>
- <Left>-2</Left>
- <Bottom>718</Bottom>
- <Right>329</Right>
- <x>-2</x>
- <y>-2</y>
- <xscreen>200</xscreen>
- <yscreen>200</yscreen>
- <sizeHorzCX>119048</sizeHorzCX>
- <sizeHorzCY>203252</sizeHorzCY>
- <sizeVertCX>197024</sizeVertCX>
- <sizeVertCY>731707</sizeVertCY>
- </Rect>
- </Wnd4>
- </Sizes>
- </Row0>
- </Left>
- <Right>
- <Row0>
- <Sizes/>
- </Row0>
- </Right>
- <Bottom>
- <Row0>
- <Sizes>
- <Wnd1>
- <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>203252</sizeHorzCY>
- <sizeVertCX>119048</sizeVertCX>
- <sizeVertCY>203252</sizeVertCY>
- </Rect>
- </Wnd1>
- </Sizes>
- </Row0>
- </Bottom>
- <Float>
- <Sizes/>
- </Float>
- </Positions>
+
+
+
+
+
+ <Top><Row0><Sizes><Toolbar-00C882C0><key>iaridepm.enu1</key></Toolbar-00C882C0></Sizes></Row0><Row1><Sizes><Toolbar-1542CDB8><key>debuggergui.enu1</key></Toolbar-1542CDB8></Sizes></Row1><Row2><Sizes/></Row2></Top><Left><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>718</Bottom><Right>329</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>119048</sizeHorzCX><sizeHorzCY>203252</sizeHorzCY><sizeVertCX>197024</sizeVertCX><sizeVertCY>731707</sizeVertCY></Rect></Wnd3></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd2><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>203252</sizeHorzCY><sizeVertCX>119048</sizeVertCX><sizeVertCY>203252</sizeVertCY></Rect></Wnd2></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
</Desktop>
</Project>
diff --git a/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/settings/RTOSDemo.dni b/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/settings/RTOSDemo.dni index faba72123..c2fb28813 100644 --- a/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/settings/RTOSDemo.dni +++ b/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/settings/RTOSDemo.dni @@ -1,5 +1,5 @@ [DebugChecksum]
-Checksum=-126027898
+Checksum=-948946463
[CodeCoverage]
Enabled=_ 0
[Stack]
@@ -48,126 +48,126 @@ PerfCondition=0,0 PerfDisplayTime=0,0
PerfOnlyOnce=0,0
PerfUse64Bit=0
-ChipName=R5F571ML
+ChipName=R5F51138
PinMode=0
RegMode=0
Endian=0
ExtMemBlockNum=55
-ExtMemEndian_000=0
-ExtMemCondAccess_000=0
-ExtMemEndian_001=0
-ExtMemCondAccess_001=0
-ExtMemEndian_002=0
-ExtMemCondAccess_002=0
-ExtMemEndian_003=0
-ExtMemCondAccess_003=0
-ExtMemEndian_004=0
-ExtMemCondAccess_004=0
-ExtMemEndian_005=0
-ExtMemCondAccess_005=0
-ExtMemEndian_006=0
-ExtMemCondAccess_006=0
-ExtMemEndian_007=0
-ExtMemCondAccess_007=0
-ExtMemEndian_008=0
-ExtMemCondAccess_008=0
-ExtMemEndian_009=0
-ExtMemCondAccess_009=0
-ExtMemEndian_010=0
-ExtMemCondAccess_010=0
-ExtMemEndian_011=0
-ExtMemCondAccess_011=0
-ExtMemEndian_012=0
-ExtMemCondAccess_012=0
-ExtMemEndian_013=0
-ExtMemCondAccess_013=0
-ExtMemEndian_014=0
-ExtMemCondAccess_014=0
-ExtMemEndian_015=0
-ExtMemCondAccess_015=0
-ExtMemEndian_016=0
-ExtMemCondAccess_016=0
-ExtMemEndian_017=0
-ExtMemCondAccess_017=0
-ExtMemEndian_018=0
-ExtMemCondAccess_018=0
-ExtMemEndian_019=0
-ExtMemCondAccess_019=0
-ExtMemEndian_020=0
-ExtMemCondAccess_020=0
-ExtMemEndian_021=0
-ExtMemCondAccess_021=0
-ExtMemEndian_022=0
-ExtMemCondAccess_022=0
-ExtMemEndian_023=0
-ExtMemCondAccess_023=0
-ExtMemEndian_024=0
-ExtMemCondAccess_024=0
-ExtMemEndian_025=0
-ExtMemCondAccess_025=0
-ExtMemEndian_026=0
-ExtMemCondAccess_026=0
-ExtMemEndian_027=0
-ExtMemCondAccess_027=0
-ExtMemEndian_028=0
-ExtMemCondAccess_028=0
-ExtMemEndian_029=0
-ExtMemCondAccess_029=0
-ExtMemEndian_030=0
-ExtMemCondAccess_030=0
-ExtMemEndian_031=0
-ExtMemCondAccess_031=0
-ExtMemEndian_032=0
-ExtMemCondAccess_032=0
-ExtMemEndian_033=0
-ExtMemCondAccess_033=0
-ExtMemEndian_034=0
-ExtMemCondAccess_034=0
-ExtMemEndian_035=0
-ExtMemCondAccess_035=0
-ExtMemEndian_036=0
-ExtMemCondAccess_036=0
-ExtMemEndian_037=0
-ExtMemCondAccess_037=0
-ExtMemEndian_038=0
-ExtMemCondAccess_038=0
-ExtMemEndian_039=0
-ExtMemCondAccess_039=0
-ExtMemEndian_040=0
-ExtMemCondAccess_040=0
-ExtMemEndian_041=0
-ExtMemCondAccess_041=0
-ExtMemEndian_042=0
-ExtMemCondAccess_042=0
-ExtMemEndian_043=0
-ExtMemCondAccess_043=0
-ExtMemEndian_044=0
-ExtMemCondAccess_044=0
-ExtMemEndian_045=0
-ExtMemCondAccess_045=0
-ExtMemEndian_046=0
-ExtMemCondAccess_046=0
-ExtMemEndian_047=0
-ExtMemCondAccess_047=0
-ExtMemEndian_048=0
-ExtMemCondAccess_048=0
-ExtMemEndian_049=0
-ExtMemCondAccess_049=0
-ExtMemEndian_050=0
-ExtMemCondAccess_050=0
-ExtMemEndian_051=0
-ExtMemCondAccess_051=0
-ExtMemEndian_052=0
-ExtMemCondAccess_052=0
-ExtMemEndian_053=0
-ExtMemCondAccess_053=0
-ExtMemEndian_054=0
-ExtMemCondAccess_054=0
-InputClock=25.000000
-ICLK=240.000000
-AllowClkSrcChange=0
+ExtMemEndian_000=0
+ExtMemCondAccess_000=0
+ExtMemEndian_001=0
+ExtMemCondAccess_001=0
+ExtMemEndian_002=0
+ExtMemCondAccess_002=0
+ExtMemEndian_003=0
+ExtMemCondAccess_003=0
+ExtMemEndian_004=0
+ExtMemCondAccess_004=0
+ExtMemEndian_005=0
+ExtMemCondAccess_005=0
+ExtMemEndian_006=0
+ExtMemCondAccess_006=0
+ExtMemEndian_007=0
+ExtMemCondAccess_007=0
+ExtMemEndian_008=0
+ExtMemCondAccess_008=0
+ExtMemEndian_009=0
+ExtMemCondAccess_009=0
+ExtMemEndian_010=0
+ExtMemCondAccess_010=0
+ExtMemEndian_011=0
+ExtMemCondAccess_011=0
+ExtMemEndian_012=0
+ExtMemCondAccess_012=0
+ExtMemEndian_013=0
+ExtMemCondAccess_013=0
+ExtMemEndian_014=0
+ExtMemCondAccess_014=0
+ExtMemEndian_015=0
+ExtMemCondAccess_015=0
+ExtMemEndian_016=0
+ExtMemCondAccess_016=0
+ExtMemEndian_017=0
+ExtMemCondAccess_017=0
+ExtMemEndian_018=0
+ExtMemCondAccess_018=0
+ExtMemEndian_019=0
+ExtMemCondAccess_019=0
+ExtMemEndian_020=0
+ExtMemCondAccess_020=0
+ExtMemEndian_021=0
+ExtMemCondAccess_021=0
+ExtMemEndian_022=0
+ExtMemCondAccess_022=0
+ExtMemEndian_023=0
+ExtMemCondAccess_023=0
+ExtMemEndian_024=0
+ExtMemCondAccess_024=0
+ExtMemEndian_025=0
+ExtMemCondAccess_025=0
+ExtMemEndian_026=0
+ExtMemCondAccess_026=0
+ExtMemEndian_027=0
+ExtMemCondAccess_027=0
+ExtMemEndian_028=0
+ExtMemCondAccess_028=0
+ExtMemEndian_029=0
+ExtMemCondAccess_029=0
+ExtMemEndian_030=0
+ExtMemCondAccess_030=0
+ExtMemEndian_031=0
+ExtMemCondAccess_031=0
+ExtMemEndian_032=0
+ExtMemCondAccess_032=0
+ExtMemEndian_033=0
+ExtMemCondAccess_033=0
+ExtMemEndian_034=0
+ExtMemCondAccess_034=0
+ExtMemEndian_035=0
+ExtMemCondAccess_035=0
+ExtMemEndian_036=0
+ExtMemCondAccess_036=0
+ExtMemEndian_037=0
+ExtMemCondAccess_037=0
+ExtMemEndian_038=0
+ExtMemCondAccess_038=0
+ExtMemEndian_039=0
+ExtMemCondAccess_039=0
+ExtMemEndian_040=0
+ExtMemCondAccess_040=0
+ExtMemEndian_041=0
+ExtMemCondAccess_041=0
+ExtMemEndian_042=0
+ExtMemCondAccess_042=0
+ExtMemEndian_043=0
+ExtMemCondAccess_043=0
+ExtMemEndian_044=0
+ExtMemCondAccess_044=0
+ExtMemEndian_045=0
+ExtMemCondAccess_045=0
+ExtMemEndian_046=0
+ExtMemCondAccess_046=0
+ExtMemEndian_047=0
+ExtMemCondAccess_047=0
+ExtMemEndian_048=0
+ExtMemCondAccess_048=0
+ExtMemEndian_049=0
+ExtMemCondAccess_049=0
+ExtMemEndian_050=0
+ExtMemCondAccess_050=0
+ExtMemEndian_051=0
+ExtMemCondAccess_051=0
+ExtMemEndian_052=0
+ExtMemCondAccess_052=0
+ExtMemEndian_053=0
+ExtMemCondAccess_053=0
+ExtMemEndian_054=0
+ExtMemCondAccess_054=0
+InputClock=16.000000
+ICLK=32.000000
+AllowClkSrcChange=1
WorkRamStart=4096
-ComunicationSelect=0
+ComunicationSelect=1
UseExtal=1
JtagClock=10
FINE=2000000
@@ -189,7 +189,7 @@ UseExtFlashFile_3=0 ExtFlashFile_3=
EraseExtFlashBeforeDownload_3=0
NeedInitExtMem=0
-NeedInit=0
+NeedInit=1
[CallStackLog]
Enabled=0
[CallStackStripe]
@@ -220,16 +220,16 @@ UnspecRange=1 ActionState=1
[Simulator]
Freq=98000000
-[DataSample]
-LogEnabled=0
-GraphEnabled=0
-ShowTimeLog=1
[DriverProfiling]
Enabled=0
Mode=1
Graph=0
Symbiont=0
Exclusions=
+[DataSample]
+LogEnabled=0
+GraphEnabled=0
+ShowTimeLog=1
[Log file]
LoggingEnabled=_ 0
LogFile=_ ""
diff --git a/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/settings/RTOSDemo.wsdt b/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/settings/RTOSDemo.wsdt index 26fa889f3..d9c95c34c 100644 --- a/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/settings/RTOSDemo.wsdt +++ b/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/settings/RTOSDemo.wsdt @@ -12,7 +12,7 @@ - <Column0>310</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>
+ <Column0>326</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>
</Workspace>
<Build>
@@ -22,14 +22,14 @@ <ColumnWidth0>20</ColumnWidth0><ColumnWidth1>1216</ColumnWidth1><ColumnWidth2>324</ColumnWidth2><ColumnWidth3>81</ColumnWidth3></Build>
<TerminalIO/>
<Debug-Log>
- <ColumnWidth0>20</ColumnWidth0>
- <ColumnWidth1>1622</ColumnWidth1>
- </Debug-Log>
+
+
+ <ColumnWidth0>20</ColumnWidth0><ColumnWidth1>1622</ColumnWidth1></Debug-Log>
</Static>
<Windows>
- <Wnd0>
+ <Wnd2>
<Tabs>
<Tab>
<Identity>TabID-13537-752</Identity>
@@ -37,11 +37,11 @@ <Factory>Workspace</Factory>
<Session>
- <NodeDict><ExpandedNode>RTOSDemo</ExpandedNode><ExpandedNode>RTOSDemo/Blinky_Demo</ExpandedNode><ExpandedNode>RTOSDemo/FreeRTOS_Source</ExpandedNode><ExpandedNode>RTOSDemo/FreeRTOS_Source/portable</ExpandedNode><ExpandedNode>RTOSDemo/Full_Demo</ExpandedNode><ExpandedNode>RTOSDemo/Full_Demo/Standard_Demo_Tasks</ExpandedNode><ExpandedNode>RTOSDemo/cg_src</ExpandedNode></NodeDict></Session>
+ <NodeDict><ExpandedNode>RTOSDemo</ExpandedNode><ExpandedNode>RTOSDemo/Blinky_Demo</ExpandedNode></NodeDict></Session>
</Tab>
</Tabs>
- <SelectedTab>0</SelectedTab></Wnd0><Wnd1>
+ <SelectedTab>0</SelectedTab></Wnd2><Wnd3>
<Tabs>
<Tab>
<Identity>TabID-29660-3316</Identity>
@@ -57,20 +57,20 @@ </Tab>
</Tabs>
- <SelectedTab>0</SelectedTab></Wnd1></Windows>
+ <SelectedTab>0</SelectedTab></Wnd3></Windows>
<Editor>
- <Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\src\main.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>83</YPos2><SelStart2>5106</SelStart2><SelEnd2>5106</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\Source\tasks.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>1296</YPos2><SelStart2>49343</SelStart2><SelEnd2>49343</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\Common\Minimal\IntQueue.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>335</YPos2><SelStart2>16740</SelStart2><SelEnd2>16740</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\Source\portable\IAR\RX100\port.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>0</YPos2><SelStart2>0</SelStart2><SelEnd2>0</SelEnd2></Tab><ActiveTab>3</ActiveTab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
+ <Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\src\main.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>111</YPos2><SelStart2>6264</SelStart2><SelEnd2>6264</SelEnd2></Tab><ActiveTab>0</ActiveTab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
<Positions>
- <Top><Row0><Sizes><Toolbar-012083D8><key>iaridepm.enu1</key></Toolbar-012083D8></Sizes></Row0></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>627</Bottom><Right>400</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>119048</sizeHorzCX><sizeHorzCY>203252</sizeHorzCY><sizeVertCX>239286</sizeVertCX><sizeVertCY>639228</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>313</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>315</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>320122</sizeHorzCY><sizeVertCX>119048</sizeVertCX><sizeVertCY>203252</sizeVertCY></Rect></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
+ <Top><Row0><Sizes><Toolbar-00C882C0><key>iaridepm.enu1</key></Toolbar-00C882C0></Sizes></Row0></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>627</Bottom><Right>400</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>119048</sizeHorzCX><sizeHorzCY>203252</sizeHorzCY><sizeVertCX>239286</sizeVertCX><sizeVertCY>639228</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>313</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>315</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>320122</sizeHorzCY><sizeVertCX>119048</sizeVertCX><sizeVertCY>203252</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
</Desktop>
</Workspace>
diff --git a/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/settings/RTOSDemo.wspos b/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/settings/RTOSDemo.wspos index ecdc2c482..c13f71d80 100644 --- a/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/settings/RTOSDemo.wspos +++ b/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/settings/RTOSDemo.wspos @@ -1,2 +1,2 @@ [MainWindow]
-WindowPlacement=_ 519 0 1619 872 3
+WindowPlacement=_ 367 9 1633 963 3
diff --git a/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/src/Full_Demo/RegTest_IAR.s b/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/src/Full_Demo/RegTest_IAR.s index b5e790f4d..2c8abccb6 100644 --- a/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/src/Full_Demo/RegTest_IAR.s +++ b/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/src/Full_Demo/RegTest_IAR.s @@ -70,8 +70,8 @@ PUBLIC _vRegTest1Implementation
PUBLIC _vRegTest2Implementation
- EXTERN _ulRegTest1CycleCount
- EXTERN _ulRegTest2CycleCount
+ EXTERN _ulRegTest1LoopCounter
+ EXTERN _ulRegTest2LoopCounter
RSEG CODE:CODE(4)
@@ -107,7 +107,7 @@ _vRegTest1Implementation: /* Increment the loop counter to show this task is still getting CPU
time. */
- MOV.L #_ulRegTest1CycleCount, R14
+ MOV.L #_ulRegTest1LoopCounter, R14
MOV.L [ R14 ], R15
ADD #1, R15
MOV.L R15, [ R14 ]
@@ -206,7 +206,7 @@ _vRegTest2Implementation: /* Increment the loop counter to show this task is still getting CPU
time. */
- MOV.L #_ulRegTest2CycleCount, R14
+ MOV.L #_ulRegTest2LoopCounter, R14
MOV.L [ R14 ], R15
ADD #1, R15
MOV.L R15, [ R14 ]
diff --git a/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/src/cg_src/r_cg_macrodriver.h b/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/src/cg_src/r_cg_macrodriver.h index 0de90f97e..2c36af592 100644 --- a/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/src/cg_src/r_cg_macrodriver.h +++ b/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/src/cg_src/r_cg_macrodriver.h @@ -30,8 +30,13 @@ /***********************************************************************************************************************
Includes
***********************************************************************************************************************/
-#include "../iodefine.h"
-//_RB_#include <machine.h>
+#ifdef __ICCRX__
+ #include <iorx113.h>
+#endif
+
+#ifdef __GNUC__
+ #include "../iodefine.h"
+#endif
/***********************************************************************************************************************
Macro definitions (Register bit)
diff --git a/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/src/main.c b/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/src/main.c index 9c0497643..d71b2f84c 100644 --- a/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/src/main.c +++ b/FreeRTOS/Demo/RX100_RX113-RSK_GCC_e2studio_IAR/src/main.c @@ -149,12 +149,6 @@ int main( void ) static void prvSetupHardware( void )
{
- /* Set up SCI1 receive buffer */
- R_SCI1_Serial_Receive((uint8_t *) &g_rx_char, 1);
-
- /* Enable SCI1 operations */
- R_SCI1_Start();
-
LED0 = LED_OFF;
LED1 = LED_OFF;
LED2 = LED_OFF;
diff --git a/FreeRTOS/Demo/RX100_RX113-RSK_Renesas_e2studio/.cproject b/FreeRTOS/Demo/RX100_RX113-RSK_Renesas_e2studio/.cproject index 325ef5b13..60f4655ea 100644 --- a/FreeRTOS/Demo/RX100_RX113-RSK_Renesas_e2studio/.cproject +++ b/FreeRTOS/Demo/RX100_RX113-RSK_Renesas_e2studio/.cproject @@ -135,6 +135,16 @@ <inputType id="%Base.Compiler.Shc.C.Input1.Id.803597369" name="C++ Input" superClass="%Base.Compiler.Shc.C.Input1.Id"/>
</tool>
</fileInfo>
+ <folderInfo id="com.renesas.cdt.rxc.hardwaredebug.win32.configuration.Id.941970450.497502634" name="/" resourcePath="src/FreeRTOS_Source">
+ <toolChain id="com.renesas.cdt.rxc.hardwaredebug.win32.toolChain.Id.45016972" name="Renesas RXC Toolchain" superClass="com.renesas.cdt.rxc.hardwaredebug.win32.toolChain.Id" unusedChildren="">
+ <tool id="com.renesas.cdt.rxc.hardwaredebug.win32.tool.compiler.Id.1830726910" name="Compiler" superClass="com.renesas.cdt.rxc.hardwaredebug.win32.tool.compiler.Id.741766106"/>
+ <tool id="com.renesas.cdt.rxc.hardwaredebug.win32.tool.assembler.Id.252059482" name="Assembler" superClass="com.renesas.cdt.rxc.hardwaredebug.win32.tool.assembler.Id.1503720976"/>
+ <tool id="com.renesas.cdt.rxc.hardwaredebug.win32.tool.linker.Id.270734961" name="Linker" superClass="com.renesas.cdt.rxc.hardwaredebug.win32.tool.linker.Id.1635879936"/>
+ <tool id="%com.renesas.cdt.rxc.hardwaredebug.win32.tool.libgen.Id.345810510" name="Standard Library" superClass="%com.renesas.cdt.rxc.hardwaredebug.win32.tool.libgen.Id.763608360"/>
+ <tool id="com.renesas.cdt.rxc.hardwaredebug.win32.tool.convertor.Id.2001992067" name="Converter" superClass="com.renesas.cdt.rxc.hardwaredebug.win32.tool.convertor.Id.345873254"/>
+ <tool id="com.renesas.cdt.rxc.release.win32.tool.config.Id.1243141782" name="RTOS Configurator" superClass="com.renesas.cdt.rxc.release.win32.tool.config.Id.1131737081"/>
+ </toolChain>
+ </folderInfo>
<folderInfo id="com.renesas.cdt.rxc.hardwaredebug.win32.configuration.Id.941970450.1671746385" name="/" resourcePath="src/FreeRTOS_Source/portable/MemMang">
<toolChain id="com.renesas.cdt.rxc.hardwaredebug.win32.toolChain.Id.197179432" name="Renesas RXC Toolchain" superClass="com.renesas.cdt.rxc.hardwaredebug.win32.toolChain.Id" unusedChildren="">
<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE" id="com.renesas.cdt.rxc.hardwaredebug.win32.targetPlatform.Id" isAbstract="false" osList="win32" superClass="com.renesas.cdt.rxc.hardwaredebug.win32.targetPlatform.Id"/>
diff --git a/FreeRTOS/Demo/RX100_RX113-RSK_Renesas_e2studio/.project b/FreeRTOS/Demo/RX100_RX113-RSK_Renesas_e2studio/.project index 648ae6b1f..b1a6edbb3 100644 --- a/FreeRTOS/Demo/RX100_RX113-RSK_Renesas_e2studio/.project +++ b/FreeRTOS/Demo/RX100_RX113-RSK_Renesas_e2studio/.project @@ -43,7 +43,7 @@ </linkedResources>
<filteredResources>
<filter>
- <id>1442828545389</id>
+ <id>1443895064622</id>
<name>src/FreeRTOS_Source</name>
<type>6</type>
<matcher>
@@ -52,6 +52,15 @@ </matcher>
</filter>
<filter>
+ <id>1443895064632</id>
+ <name>src/FreeRTOS_Source</name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-name-matches-false-false-utils</arguments>
+ </matcher>
+ </filter>
+ <filter>
<id>1442828574901</id>
<name>src/FreeRTOS_Source/portable</name>
<type>9</type>
diff --git a/FreeRTOS/Demo/RX100_RX113-RSK_Renesas_e2studio/RTOSDemo HardwareDebug.launch b/FreeRTOS/Demo/RX100_RX113-RSK_Renesas_e2studio/RTOSDemo HardwareDebug.launch index e78951892..89dfc4457 100644 --- a/FreeRTOS/Demo/RX100_RX113-RSK_Renesas_e2studio/RTOSDemo HardwareDebug.launch +++ b/FreeRTOS/Demo/RX100_RX113-RSK_Renesas_e2studio/RTOSDemo HardwareDebug.launch @@ -62,7 +62,7 @@ <intAttribute key="org.eclipse.cdt.debug.gdbjtag.core.delay" value="3"/>
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doHalt" value="false"/>
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doReset" value="false"/>
-<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.imageFileName" value="C:\E\Dev\FreeRTOS\WorkingCopy\FreeRTOS\Demo\RX113-RSK_Renesas_e2studio\HardwareDebug\RTOSDemo.x"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.imageFileName" value="C:\E\Dev\FreeRTOS\WorkingCopy\FreeRTOS\Demo\RX100_RX113-RSK_Renesas_e2studio\HardwareDebug\RTOSDemo.x"/>
<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.imageOffset" value="0"/>
<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.initCommands" value=""/>
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.loadImage" value="true"/>
@@ -73,7 +73,7 @@ <booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setResume" value="true"/>
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setStopAt" value="true"/>
<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.stopAt" value="main"/>
-<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.symbolsFileName" value="C:\E\Dev\FreeRTOS\WorkingCopy\FreeRTOS\Demo\RX113-RSK_Renesas_e2studio\HardwareDebug\RTOSDemo.x"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.symbolsFileName" value="C:\E\Dev\FreeRTOS\WorkingCopy\FreeRTOS\Demo\RX100_RX113-RSK_Renesas_e2studio\HardwareDebug\RTOSDemo.x"/>
<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.symbolsOffset" value="0"/>
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useFileForImage" value="false"/>
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useFileForSymbols" value="false"/>
diff --git a/FreeRTOS/Demo/RX100_RX113-RSK_Renesas_e2studio/RTOSDemo Release.launch b/FreeRTOS/Demo/RX100_RX113-RSK_Renesas_e2studio/RTOSDemo Release.launch deleted file mode 100644 index 7364a96f6..000000000 --- a/FreeRTOS/Demo/RX100_RX113-RSK_Renesas_e2studio/RTOSDemo Release.launch +++ /dev/null @@ -1,114 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="com.renesas.cdt.launch.dsf.gdbremote.launchConfigurationType">
-<intAttribute key="com.renesas.cdt.core.admPortNumber" value="61236"/>
-<stringAttribute key="com.renesas.cdt.core.initCommands" value=""/>
-<stringAttribute key="com.renesas.cdt.core.ipAddress" value="localhost"/>
-<stringAttribute key="com.renesas.cdt.core.jtagDevice" value="E1"/>
-<stringAttribute key="com.renesas.cdt.core.jtagDeviceId" value="com.renesas.hardwaredebug.rx.e1"/>
-<stringAttribute key="com.renesas.cdt.core.optionInitCommands" value=""/>
-<intAttribute key="com.renesas.cdt.core.portNumber" value="61234"/>
-<stringAttribute key="com.renesas.cdt.core.runCommands" value=""/>
-<stringAttribute key="com.renesas.cdt.core.serverParam" value="-g E1 -l 0 -t R5F51138 -p 61234 -d 61236 -uClockSrcHoco= 0 -uInputClock= 16.0000 -uAllowClockSourceInternal= 1 -uUseFine= 1 -uFineBaudRate= 2.00 -w 1 -z 0 -uRegisterSetting= 0 -uModePin= 0 -uDebugMode= 0 -uExecuteProgram= 0 -uIdCode= FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -b -n 0 -uWorkRamAddress= 0 -uProgReWriteIRom= 0 -uProgReWriteDFlash= 0 -uhookWorkRamAddr= 0x1000 -uhookWorkRamSize= 0x230"/>
-<booleanAttribute key="com.renesas.cdt.core.startServer" value="true"/>
-<stringAttribute key="com.renesas.cdt.core.targetDevice" value="R5F51138"/>
-<booleanAttribute key="com.renesas.cdt.core.useRemoteTarget" value="true"/>
-<booleanAttribute key="com.renesas.cdt.core.verboseMode" value="false"/>
-<stringAttribute key="com.renesas.cdt.debug.ioview.dsf.registerSelection" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <selectedRegisterList ioFilePath="C:\Renesas\e2_studio\internal\IoFiles\RX\RX113.sfrx"/> "/>
-<stringAttribute key="com.renesas.cdt.launch.dsf.IO_MAP" value="${eclipse_home}..\internal\IoFiles\RX\RX113.sfrx"/>
-<booleanAttribute key="com.renesas.cdt.launch.dsf.USE_DEFAULT_IO_MAP" value="true"/>
-<listAttribute key="com.renesas.cdt.launch.dsf.downloadImages">
-<listEntry value="|true|true|true|0|true|No core"/>
-</listAttribute>
-<booleanAttribute key="com.renesas.cdt.launch.dsf.downloadImagesUpgradedV30" value="true"/>
-<stringAttribute key="com.renesas.cdt.launch.dsf.launchSeqType" value="com.renesas.cdt.launch.dsf.launchSequence.e2GdbServer"/>
-<stringAttribute key="com.renesas.cdt.launch.dsf.serverPath" value="${eclipse_home}../DebugComp/e2-server-gdb.exe"/>
-<booleanAttribute key="com.renesas.hardwaredebug.e1.allow.clock.source.internal" value="true"/>
-<intAttribute key="com.renesas.hardwaredebug.e1.clock_source" value="0"/>
-<stringAttribute key="com.renesas.hardwaredebug.e1.connection.mode" value="0"/>
-<booleanAttribute key="com.renesas.hardwaredebug.e1.e1_pwr" value="true"/>
-<booleanAttribute key="com.renesas.hardwaredebug.e1.enable.hot.plug" value="false"/>
-<booleanAttribute key="com.renesas.hardwaredebug.e1.enable_external_flash" value="false"/>
-<booleanAttribute key="com.renesas.hardwaredebug.e1.execute.program" value="false"/>
-<listAttribute key="com.renesas.hardwaredebug.e1.ext_flash_definitions"/>
-<stringAttribute key="com.renesas.hardwaredebug.e1.ext_flash_registers" value="2.1,0,"/>
-<stringAttribute key="com.renesas.hardwaredebug.e1.external_memory" value=""/>
-<stringAttribute key="com.renesas.hardwaredebug.e1.fine.baud.rate" value="2.00"/>
-<stringAttribute key="com.renesas.hardwaredebug.e1.flash_overwrite_blocks" value=""/>
-<stringAttribute key="com.renesas.hardwaredebug.e1.hook_Stop_func" value="0x0"/>
-<booleanAttribute key="com.renesas.hardwaredebug.e1.hook_enable_Stop" value="false"/>
-<booleanAttribute key="com.renesas.hardwaredebug.e1.hook_enable_start" value="false"/>
-<stringAttribute key="com.renesas.hardwaredebug.e1.hook_start_func" value="0x0"/>
-<intAttribute key="com.renesas.hardwaredebug.e1.hook_work_ram_Addr" value="4096"/>
-<intAttribute key="com.renesas.hardwaredebug.e1.hook_work_ram_Size" value="560"/>
-<booleanAttribute key="com.renesas.hardwaredebug.e1.hw_break" value="true"/>
-<stringAttribute key="com.renesas.hardwaredebug.e1.id_code" value="FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"/>
-<stringAttribute key="com.renesas.hardwaredebug.e1.inputclock" value="16.0000"/>
-<stringAttribute key="com.renesas.hardwaredebug.e1.jtag.clock.freq" value="16.5"/>
-<stringAttribute key="com.renesas.hardwaredebug.e1.jtag.or.fine" value="1"/>
-<booleanAttribute key="com.renesas.hardwaredebug.e1.le" value="true"/>
-<stringAttribute key="com.renesas.hardwaredebug.e1.mode" value="0"/>
-<stringAttribute key="com.renesas.hardwaredebug.e1.mode_pin" value="0"/>
-<booleanAttribute key="com.renesas.hardwaredebug.e1.prog_rewrite_dflash" value="false"/>
-<booleanAttribute key="com.renesas.hardwaredebug.e1.prog_rewrite_irom" value="false"/>
-<stringAttribute key="com.renesas.hardwaredebug.e1.serial_number" value=""/>
-<stringAttribute key="com.renesas.hardwaredebug.e1.supply.voltage" value="3.3V"/>
-<intAttribute key="com.renesas.hardwaredebug.e1.timer_clock" value="0"/>
-<intAttribute key="com.renesas.hardwaredebug.e1.work_ram_start" value="0"/>
-<stringAttribute key="com.renesas.hardwaredebug.e1rl78.communication.method" value="0"/>
-<booleanAttribute key="com.renesas.hardwaredebug.e1rl78.e1_pwr" value="true"/>
-<booleanAttribute key="com.renesas.hardwaredebug.e1rl78.eraseFlash" value="true"/>
-<booleanAttribute key="com.renesas.hardwaredebug.e1rl78.hw_break" value="true"/>
-<booleanAttribute key="com.renesas.hardwaredebug.e1rl78.le" value="true"/>
-<stringAttribute key="com.renesas.hardwaredebug.e1rl78.main.clock.freq" value="0"/>
-<booleanAttribute key="com.renesas.hardwaredebug.e1rl78.mask.internal.reset.signal" value="false"/>
-<booleanAttribute key="com.renesas.hardwaredebug.e1rl78.mask.target.reset.signal" value="false"/>
-<stringAttribute key="com.renesas.hardwaredebug.e1rl78.monitor.clock" value="1"/>
-<booleanAttribute key="com.renesas.hardwaredebug.e1rl78.permit.flash.programming" value="true"/>
-<stringAttribute key="com.renesas.hardwaredebug.e1rl78.security.id" value="00000000000000000000"/>
-<booleanAttribute key="com.renesas.hardwaredebug.e1rl78.stopSerialEmu" value="false"/>
-<booleanAttribute key="com.renesas.hardwaredebug.e1rl78.stopTimerEmu" value="false"/>
-<stringAttribute key="com.renesas.hardwaredebug.e1rl78.sub.clock.freq" value="0"/>
-<stringAttribute key="com.renesas.hardwaredebug.e1rl78.supply.voltage" value="0"/>
-<booleanAttribute key="com.renesas.hardwaredebug.e1rl78.traceEnable" value="false"/>
-<booleanAttribute key="com.renesas.hardwaredebug.e1rl78.use.wide.voltage.mode" value="true"/>
-<booleanAttribute key="com.renesas.hardwaredebug.e1rl78.verify.on.writing.to.memory" value="true"/>
-<intAttribute key="org.eclipse.cdt.debug.gdbjtag.core.delay" value="3"/>
-<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doHalt" value="false"/>
-<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doReset" value="false"/>
-<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.imageFileName" value="C:\Users\TallyM\Documents\RSK\RX113 RSK\Samples\DevArea\RTOSDemo\Release\RTOSDemo.abs"/>
-<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.imageOffset" value="0"/>
-<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.initCommands" value=""/>
-<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.loadImage" value="true"/>
-<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.loadSymbols" value="true"/>
-<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.pcRegister" value=""/>
-<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.runCommands" value=""/>
-<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setPcRegister" value="false"/>
-<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setResume" value="false"/>
-<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setStopAt" value="true"/>
-<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.stopAt" value="main"/>
-<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.symbolsFileName" value="C:\Users\TallyM\Documents\RSK\RX113 RSK\Samples\DevArea\RTOSDemo\Release\RTOSDemo.abs"/>
-<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.symbolsOffset" value="0"/>
-<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useFileForImage" value="false"/>
-<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useFileForSymbols" value="false"/>
-<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useProjBinaryForImage" value="true"/>
-<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useProjBinaryForSymbols" value="true"/>
-<stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="${eclipse_home}../DebugComp/rx-elf-gdb"/>
-<booleanAttribute key="org.eclipse.cdt.dsf.gdb.NON_STOP" value="true"/>
-<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
-<stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
-<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="remote"/>
-<booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
-<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="Release/RTOSDemo.abs"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="RTOSDemo"/>
-<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value=""/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/RTOSDemo"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <memoryBlockExpressionList context="reserved-for-future-use"/> "/>
-<stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
-</launchConfiguration>
diff --git a/FreeRTOS/Demo/RX200_RX231-RSK_GCC_e2studio_IAR/.cproject b/FreeRTOS/Demo/RX200_RX231-RSK_GCC_e2studio_IAR/.cproject index 905cdc923..28bfc18da 100644 --- a/FreeRTOS/Demo/RX200_RX231-RSK_GCC_e2studio_IAR/.cproject +++ b/FreeRTOS/Demo/RX200_RX231-RSK_GCC_e2studio_IAR/.cproject @@ -95,6 +95,8 @@ <tool id="com.renesas.cdt.rx.hardwaredebug.win32.tool.compiler.Id.2031381723" name="Compiler" superClass="com.renesas.cdt.rx.hardwaredebug.win32.tool.compiler.Id.615534793">
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.renesas.cdt.core.Compiler.option.includeFileDir.1451226901" name="Include file directories" superClass="com.renesas.cdt.core.Compiler.option.includeFileDir" valueType="includePath">
<listOptionValue builtIn="false" value=""${TCINSTALL}/rx-elf/optlibinc""/>
+ <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/Full_Demo/Standard_Demo_Tasks/include}""/>
+ <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/Full_Demo}""/>
<listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/Renesas_Code}""/>
<listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/FreeRTOS_Source/portable/GCC/RX600v2}""/>
<listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/FreeRTOS_Source/include}""/>
@@ -112,15 +114,6 @@ <tool id="com.renesas.cdt.rx.hardwaredebug.win32.tool.objcopy.Id.1347399210" name="Objcopy" superClass="com.renesas.cdt.rx.hardwaredebug.win32.tool.objcopy.Id.1452181060"/>
</toolChain>
</folderInfo>
- <folderInfo id="%com.renesas.cdt.rx.hardwaredebug.win32.configuration.Id.420935881.1765395967" name="/" resourcePath="src/Full_Demo/Standard_Demo_Tasks">
- <toolChain id="%com.renesas.cdt.rx.hardwaredebug.win32.toolChain.Id.860907086" name="KPIT GNURX-ELF Toolchain" superClass="%com.renesas.cdt.rx.hardwaredebug.win32.toolChain.Id" unusedChildren="">
- <tool id="com.renesas.cdt.rx.hardwaredebug.win32.tool.libgen.Id.1761528883" name="Library Generator" superClass="com.renesas.cdt.rx.hardwaredebug.win32.tool.libgen.Id.1189270647"/>
- <tool id="com.renesas.cdt.rx.hardwaredebug.win32.tool.compiler.Id.2005862425" name="Compiler" superClass="com.renesas.cdt.rx.hardwaredebug.win32.tool.compiler.Id.2031381723"/>
- <tool id="com.renesas.cdt.rx.hardwaredebug.win32.tool.assembler.Id.465381763" name="Assembler" superClass="com.renesas.cdt.rx.hardwaredebug.win32.tool.assembler.Id.36211313"/>
- <tool id="com.renesas.cdt.rx.hardwaredebug.win32.tool.linker.Id.1591044267" name="Linker" superClass="com.renesas.cdt.rx.hardwaredebug.win32.tool.linker.Id.1533267670"/>
- <tool id="com.renesas.cdt.rx.hardwaredebug.win32.tool.objcopy.Id.1497476526" name="Objcopy" superClass="com.renesas.cdt.rx.hardwaredebug.win32.tool.objcopy.Id.1347399210"/>
- </toolChain>
- </folderInfo>
<sourceEntries>
<entry excluding="cg_src/r_cg_tmr.c|cg_src/r_cg_tmr_user.c|cg_src/r_cg_interrupt_handlers.h|cg_src/r_cg_main.c|cg_src/r_cg_tmr.h|cg_src/r_cg_vector_table.c|Renesas_Code/reset_program.asm|Renesas_Code/hardware_setup.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
</sourceEntries>
diff --git a/FreeRTOS/Demo/RX200_RX231-RSK_GCC_e2studio_IAR/.project b/FreeRTOS/Demo/RX200_RX231-RSK_GCC_e2studio_IAR/.project index e6ee496da..b0c8106dc 100644 --- a/FreeRTOS/Demo/RX200_RX231-RSK_GCC_e2studio_IAR/.project +++ b/FreeRTOS/Demo/RX200_RX231-RSK_GCC_e2studio_IAR/.project @@ -43,7 +43,7 @@ </linkedResources>
<filteredResources>
<filter>
- <id>1443109912507</id>
+ <id>1443178487642</id>
<name></name>
<type>6</type>
<matcher>
@@ -52,7 +52,7 @@ </matcher>
</filter>
<filter>
- <id>1443109912517</id>
+ <id>1443178487652</id>
<name></name>
<type>6</type>
<matcher>
@@ -61,7 +61,7 @@ </matcher>
</filter>
<filter>
- <id>1443109912517</id>
+ <id>1443178487652</id>
<name></name>
<type>6</type>
<matcher>
@@ -70,7 +70,7 @@ </matcher>
</filter>
<filter>
- <id>1443109912527</id>
+ <id>1443178487662</id>
<name></name>
<type>6</type>
<matcher>
@@ -79,7 +79,7 @@ </matcher>
</filter>
<filter>
- <id>1443109912537</id>
+ <id>1443178487662</id>
<name></name>
<type>6</type>
<matcher>
@@ -88,7 +88,7 @@ </matcher>
</filter>
<filter>
- <id>1443109912537</id>
+ <id>1443178487672</id>
<name></name>
<type>10</type>
<matcher>
@@ -97,6 +97,15 @@ </matcher>
</filter>
<filter>
+ <id>1443178487672</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-name-matches-false-false-settings</arguments>
+ </matcher>
+ </filter>
+ <filter>
<id>1443169247928</id>
<name>src</name>
<type>6</type>
diff --git a/FreeRTOS/Demo/RX200_RX231-RSK_GCC_e2studio_IAR/.settings/language.settings.xml b/FreeRTOS/Demo/RX200_RX231-RSK_GCC_e2studio_IAR/.settings/language.settings.xml index 0413bf5d5..2939c37b0 100644 --- a/FreeRTOS/Demo/RX200_RX231-RSK_GCC_e2studio_IAR/.settings/language.settings.xml +++ b/FreeRTOS/Demo/RX200_RX231-RSK_GCC_e2studio_IAR/.settings/language.settings.xml @@ -3,7 +3,7 @@ <configuration id="%com.renesas.cdt.rx.hardwaredebug.win32.configuration.Id.420935881" name="HardwareDebug">
<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
- <provider class="com.renesas.cdt.common.build.spec.RXGCCBuiltinSpecsDetector" console="false" env-hash="-1183767966702391901" id="RXGCCBuiltinSpecsDetector" keep-relative-paths="false" name="Renesas GCCBuildinCompilerSettings" options-hash="1410121582" parameter="rx-elf-gcc -E -P -v -dD ${INPUTS}" prefer-non-shared="true">
+ <provider class="com.renesas.cdt.common.build.spec.RXGCCBuiltinSpecsDetector" console="false" env-hash="-1162106695519804221" id="RXGCCBuiltinSpecsDetector" keep-relative-paths="false" name="Renesas GCCBuildinCompilerSettings" options-hash="1410121582" parameter="rx-elf-gcc -E -P -v -dD ${INPUTS}" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
diff --git a/FreeRTOS/Demo/RX200_RX231-RSK_GCC_e2studio_IAR/main.c b/FreeRTOS/Demo/RX200_RX231-RSK_GCC_e2studio_IAR/main.c deleted file mode 100644 index 56ce5a2c9..000000000 --- a/FreeRTOS/Demo/RX200_RX231-RSK_GCC_e2studio_IAR/main.c +++ /dev/null @@ -1,5 +0,0 @@ -
-int main( void )
-{
- return 0;
-}
diff --git a/FreeRTOS/Demo/RX200_RX231-RSK_GCC_e2studio_IAR/src/cg_src/r_cg_main.c b/FreeRTOS/Demo/RX200_RX231-RSK_GCC_e2studio_IAR/src/cg_src/r_cg_main.c deleted file mode 100644 index 4807a41f7..000000000 --- a/FreeRTOS/Demo/RX200_RX231-RSK_GCC_e2studio_IAR/src/cg_src/r_cg_main.c +++ /dev/null @@ -1,90 +0,0 @@ -/***********************************************************************************************************************
-* DISCLAIMER
-* This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products.
-* No other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all
-* applicable laws, including copyright laws.
-* THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIESREGARDING THIS SOFTWARE, WHETHER EXPRESS, IMPLIED
-* OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-* NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED.TO THE MAXIMUM EXTENT PERMITTED NOT PROHIBITED BY
-* LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES SHALL BE LIABLE FOR ANY DIRECT,
-* INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS SOFTWARE, EVEN IF RENESAS OR
-* ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-* Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability
-* of this software. By using this software, you agree to the additional terms and conditions found by accessing the
-* following link:
-* http://www.renesas.com/disclaimer
-*
-* Copyright (C) 2015 Renesas Electronics Corporation. All rights reserved.
-***********************************************************************************************************************/
-
-/***********************************************************************************************************************
-* File Name : r_cg_main.c
-* Version : Code Generator for RX231 V1.00.00.03 [10 Jul 2015]
-* Device(s) : R5F52318AxFP
-* Tool-Chain : GCCRX
-* Description : This file implements main function.
-* Creation Date: 23/09/2015
-***********************************************************************************************************************/
-
-/***********************************************************************************************************************
-Pragma directive
-***********************************************************************************************************************/
-/* Start user code for pragma. Do not edit comment generated here */
-/* End user code. Do not edit comment generated here */
-
-/***********************************************************************************************************************
-Includes
-***********************************************************************************************************************/
-#include "r_cg_macrodriver.h"
-#include "r_cg_cgc.h"
-/* Start user code for include. Do not edit comment generated here */
-/* End user code. Do not edit comment generated here */
-#include "r_cg_userdefine.h"
-
-/***********************************************************************************************************************
-Global variables and functions
-***********************************************************************************************************************/
-/* Start user code for global. Do not edit comment generated here */
-/* End user code. Do not edit comment generated here */
-
-
-void R_MAIN_UserInit(void);
-/***********************************************************************************************************************
-* Function Name: main
-* Description : This function implements main function.
-* Arguments : None
-* Return Value : None
-***********************************************************************************************************************/
-void main(void)
-{
- R_MAIN_UserInit();
- /* Start user code. Do not edit comment generated here */
- while (1U)
- {
- ;
- }
- /* End user code. Do not edit comment generated here */
-}
-/***********************************************************************************************************************
-* Function Name: R_MAIN_UserInit
-* Description : This function adds user code before implementing main function.
-* Arguments : None
-* Return Value : None
-***********************************************************************************************************************/
-void R_MAIN_UserInit(void)
-{
- /* Start user code. Do not edit comment generated here */
- uint16_t protect_dummy = (uint16_t)(SYSTEM.PRCR.WORD & 0x000FU);
-
- /* Disable protect bit */
- SYSTEM.PRCR.WORD = 0xA50FU;
-
- SYSTEM.VBATTCR.BYTE = 0x81U;
-
- /* Restore the previous state of the protect register */
- SYSTEM.PRCR.WORD = (uint16_t)(0xA500U | protect_dummy);
- /* End user code. Do not edit comment generated here */
-}
-
-/* Start user code for adding. Do not edit comment generated here */
-/* End user code. Do not edit comment generated here */
diff --git a/FreeRTOS/Demo/RX200_RX231-RSK_GCC_e2studio_IAR/src/cg_src/r_cg_vector_table.c b/FreeRTOS/Demo/RX200_RX231-RSK_GCC_e2studio_IAR/src/cg_src/r_cg_vector_table.c deleted file mode 100644 index 0218fd306..000000000 --- a/FreeRTOS/Demo/RX200_RX231-RSK_GCC_e2studio_IAR/src/cg_src/r_cg_vector_table.c +++ /dev/null @@ -1,467 +0,0 @@ -/***********************************************************************************************************************
-* DISCLAIMER
-* This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products.
-* No other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all
-* applicable laws, including copyright laws.
-* THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIESREGARDING THIS SOFTWARE, WHETHER EXPRESS, IMPLIED
-* OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-* NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED.TO THE MAXIMUM EXTENT PERMITTED NOT PROHIBITED BY
-* LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES SHALL BE LIABLE FOR ANY DIRECT,
-* INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS SOFTWARE, EVEN IF RENESAS OR
-* ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-* Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability
-* of this software. By using this software, you agree to the additional terms and conditions found by accessing the
-* following link:
-* http://www.renesas.com/disclaimer
-*
-* Copyright (C) 2015 Renesas Electronics Corporation. All rights reserved.
-***********************************************************************************************************************/
-
-/***********************************************************************************************************************
-* File Name : r_cg_vector_table.c
-* Version : Code Generator for RX231 V1.00.00.03 [10 Jul 2015]
-* Device(s) : R5F52318AxFP
-* Tool-Chain : GCCRX
-* Description : This file implements interrupt vector.
-* Creation Date: 23/09/2015
-***********************************************************************************************************************/
-
-/***********************************************************************************************************************
-Pragma directive
-***********************************************************************************************************************/
-/* Start user code for pragma. Do not edit comment generated here */
-/* End user code. Do not edit comment generated here */
-
-/***********************************************************************************************************************
-Includes
-***********************************************************************************************************************/
-#include "r_cg_macrodriver.h"
-#include "r_cg_userdefine.h"
-
-/***********************************************************************************************************************
-Global variables and functions
-***********************************************************************************************************************/
-typedef void (*fp) (void);
-extern void PowerON_Reset (void);
-extern void stack (void);
-
-#define OFS0_VAL 0xFFFFFFFFUL
-#define OFS1_VAL 0xFFFFFFFFUL
-#define EXVECT_SECT __attribute__ ((section (".exvectors")))
-
-const void *ExceptVectors[] EXVECT_SECT = {
-/* Start user code for adding. Do not edit comment generated here */
- /* 0xffffff80 MDE register */
-#ifdef __RX_BIG_ENDIAN__
- /* Big endian */
- (fp)0xfffffff8,
-#else
- /* Little endian */
- (fp)0xffffffff,
-#endif
- /* 0xffffff84 Reserved */
- r_reserved_exception,
- /* 0xffffff88 OFS1 register */
- (fp) OFS1_VAL,
- /* 0xffffff8c OFS0 register */
- (fp) OFS0_VAL,
- /* 0xffffff90 Reserved */
- r_reserved_exception,
- /* 0xffffff94 Reserved */
- r_reserved_exception,
- /* 0xffffff98 Reserved */
- r_reserved_exception,
- /* 0xffffff9c Reserved */
- r_reserved_exception,
- /* 0xffffffa0 ID */
- (fp)0xffffffff,
- /* 0xffffffa4 ID */
- (fp)0xffffffff,
- /* 0xffffffa8 ID */
- (fp)0xffffffff,
- /* 0xffffffac ID */
- (fp)0xffffffff,
- /* 0xffffffb0 Reserved */
- r_reserved_exception,
- /* 0xffffffb4 Reserved */
- r_reserved_exception,
- /* 0xffffffb8 Reserved */
- r_reserved_exception,
- /* 0xffffffbc Reserved */
- r_reserved_exception,
- /* 0xffffffc0 Reserved */
- r_reserved_exception,
- /* 0xffffffc4 Reserved */
- r_reserved_exception,
- /* 0xffffffc8 Reserved */
- r_reserved_exception,
- /* 0xffffffcc Reserved */
- r_reserved_exception,
- /* 0xffffffd0 Exception(Supervisor Instruction) */
- r_privileged_exception,
- /* 0xffffffd4 Exception(Access Instruction) */
- r_access_exception,
- /* 0xffffffd8 Reserved */
- r_undefined_exception,
- /* 0xffffffdc Exception(Undefined Instruction) */
- r_undefined_exception,
- /* 0xffffffe0 Reserved */
- r_undefined_exception,
- /* 0xffffffe4 Exception(Floating Point) */
- r_floatingpoint_exception,
- /* 0xffffffe8 Reserved */
- r_undefined_exception,
- /* 0xffffffec Reserved */
- r_undefined_exception,
- /* 0xfffffff0 Reserved */
- r_undefined_exception,
- /* 0xfffffff4 Reserved */
- r_undefined_exception,
- /* 0xfffffff8 NMI */
- r_nmi_exception
-/* End user code. Do not edit comment generated here */
-};
-
-#define FVECT_SECT __attribute__ ((section (".fvectors")))
-const void *HardwareVectors[] FVECT_SECT = {
- /* 0xfffffffc RESET */
- /* <<VECTOR DATA START (POWER ON RESET)>> */
- /* Power On Reset PC */
- PowerON_Reset
- /* <<VECTOR DATA END (POWER ON RESET)>> */
-};
-
-#define RVECT_SECT __attribute__ ((section (".rvectors")))
-
-const fp RelocatableVectors[] RVECT_SECT = {
- /* 0x0000 Reserved */
- (fp)r_reserved_exception,
- /* 0x0004 Reserved */
- (fp)r_reserved_exception,
- /* 0x0008 Reserved */
- (fp)r_reserved_exception,
- /* 0x000C Reserved */
- (fp)r_reserved_exception,
- /* 0x0010 Reserved */
- (fp)r_reserved_exception,
- /* 0x0014 Reserved */
- (fp)r_reserved_exception,
- /* 0x0018 Reserved */
- (fp)r_reserved_exception,
- /* 0x001C Reserved */
- (fp)r_reserved_exception,
- /* 0x0020 Reserved */
- (fp)r_reserved_exception,
- /* 0x0024 Reserved */
- (fp)r_reserved_exception,
- /* 0x0028 Reserved */
- (fp)r_reserved_exception,
- /* 0x002C Reserved */
- (fp)r_reserved_exception,
- /* 0x0030 Reserved */
- (fp)r_reserved_exception,
- /* 0x0034 Reserved */
- (fp)r_reserved_exception,
- /* 0x0038 Reserved */
- (fp)r_reserved_exception,
- /* 0x003C Reserved */
- (fp)r_reserved_exception,
- /* 0x0040 BSC BUSERR */
- (fp)r_undefined_exception,
- /* 0x0044 Reserved */
- (fp)r_reserved_exception,
- /* 0x0048 Reserved */
- (fp)r_undefined_exception,
- /* 0x004C Reserved */
- (fp)r_reserved_exception,
- /* 0x0050 Reserved */
- (fp)r_reserved_exception,
- /* 0x0054 Reserved */
- (fp)r_undefined_exception,
- /* 0x0058 Reserved */
- (fp)r_reserved_exception,
- /* 0x005C Reserved */
- (fp)r_undefined_exception,
- /* 0x0060 Reserved */
- (fp)r_reserved_exception,
- /* 0x0064 Reserved */
- (fp)r_reserved_exception,
- /* 0x0068 ICU SWINT2 */
- (fp)r_undefined_exception,
- /* 0x006C ICU SWINT */
- (fp)r_undefined_exception,
- /* 0x0070 CMT0 */
- (fp)r_undefined_exception,
- /* 0x0074 CMT1 */
- (fp)r_undefined_exception,
- /* 0x0078 CMTW0 */
- (fp)r_undefined_exception,
- /* 0x007C CMTW1 */
- (fp)r_undefined_exception,
- /* 0x0080 USBA D0FIFO2 */
- (fp)r_undefined_exception,
- /* 0x0084 USBA D1FIFO2 */
- (fp)r_undefined_exception,
- /* 0x0088 USB0 D0FIFO0 */
- (fp)r_undefined_exception,
- /* 0x008C USB0 D0FIFO0 */
- (fp)r_undefined_exception,
- /* 0x0090 Reserved */
- (fp)r_reserved_exception,
- /* 0x0094 Reserved */
- (fp)r_reserved_exception,
- /* 0x0098 RSPI0 SPRI0 */
- (fp)r_undefined_exception,
- /* 0x009C RSPI0 SPTI0 */
- (fp)r_undefined_exception,
- /* 0x00A0 RSPI1 SPRI1 */
- (fp)r_undefined_exception,
- /* 0x00A4 RSPI1 SPTI1 */
- (fp)r_undefined_exception,
- /* 0x00A8 QSPI SPRI */
- (fp)r_undefined_exception,
- /* 0x00AC QSPI SPTI */
- (fp)r_undefined_exception,
- /* 0x00B0 SDHI SBFAI */
- (fp)r_undefined_exception,
- /* 0x00B4 MMC MBFAI */
- (fp)r_undefined_exception,
- /* 0x00B8 SSI0 SSITX0 */
- (fp)r_undefined_exception,
- /* 0x00BC SSI0 SSIRX0 */
- (fp)r_undefined_exception,
- /* 0x00C0 SSI1 SSIRTI1 */
- (fp)r_undefined_exception,
- /* 0x00C4 Reserved */
- (fp)r_reserved_exception,
- /* 0x00C8 SRC IDEI */
- (fp)r_undefined_exception,
- /* 0x00CC SRC ODFI */
- (fp)r_undefined_exception,
- /* 0x00E0 Reserved */
- (fp)r_reserved_exception,
- /* 0x00E4 Reserved */
- (fp)r_reserved_exception,
- /* 0x00E8 SCI0 RXI0 */
- (fp)r_undefined_exception,
- /* 0x00EC SCI0 TXI0 */
- (fp)r_undefined_exception,
- /* 0x00F0 SCI1 RXI1 */
- (fp)r_undefined_exception,
- /* 0x00F4 SCI1 TXI1 */
- (fp)r_undefined_exception,
- /* 0x00F8 SCI2 RXI2 */
- (fp)r_undefined_exception,
- /* 0x00FC SCI2 TXI2 */
- (fp)r_undefined_exception,
- /* 0x0100 ICU IRQ0 */
- (fp)r_undefined_exception,
- /* 0x0104 ICU IRQ1 */
- (fp)r_undefined_exception,
- /* 0x0108 ICU IRQ2 */
- (fp)r_undefined_exception,
- /* 0x010C ICU IRQ3 */
- (fp)r_undefined_exception,
- /* 0x0110 ICU IRQ4 */
- (fp)r_undefined_exception,
- /* 0x0114 ICU IRQ5 */
- (fp)r_undefined_exception,
- /* 0x0118 ICU IRQ6 */
- (fp)r_undefined_exception,
- /* 0x011C ICU IRQ7 */
- (fp)r_undefined_exception,
- /* 0x0120 ICU IRQ8 */
- (fp)r_undefined_exception,
- /* 0x0124 ICU IRQ9 */
- (fp)r_undefined_exception,
- /* 0x0128 ICU IRQ10 */
- (fp)r_undefined_exception,
- /* 0x012C ICU IRQ11 */
- (fp)r_undefined_exception,
- /* 0x0130 ICU IRQ12 */
- (fp)r_undefined_exception,
- /* 0x0134 ICU IRQ13 */
- (fp)r_undefined_exception,
- /* 0x0138 ICU IRQ14 */
- (fp)r_undefined_exception,
- /* 0x013C ICU IRQ15 */
- (fp)r_undefined_exception,
- /* 0x0140 SCI3 RXI3 */
- (fp)r_undefined_exception,
- /* 0x0144 SCI3 TXI3 */
- (fp)r_undefined_exception,
- /* 0x0148 SCI4 RXI4 */
- (fp)r_undefined_exception,
- /* 0x014C SCI4 TXI4 */
- (fp)r_undefined_exception,
- /* 0x0150 SCI5 RXI5 */
- (fp)r_undefined_exception,
- /* 0x0154 SCI5 TXI5 */
- (fp)r_undefined_exception,
- /* 0x0158 SCI6 RXI6 */
- (fp)r_undefined_exception,
- /* 0x015C SCI6 TXI6 */
- (fp)r_undefined_exception,
- /* 0x0160 LVD LVD1 */
- (fp)r_undefined_exception,
- /* 0x0164 LVD LVD2 */
- (fp)r_undefined_exception,
- /* 0x0168 USB0 USBR0 */
- (fp)r_undefined_exception,
- /* 0x016C Reserved */
- (fp)r_reserved_exception,
- /* 0x0170 RTC ALM */
- (fp)r_undefined_exception,
- /* 0x0174 RTC PRD */
- (fp)r_undefined_exception,
- /* 0x0178 USBA USBHSR */
- (fp)r_undefined_exception,
- /* 0x0184 PDC PCDFI */
- (fp)r_undefined_exception,
- /* 0x0188 SCI7 RXI7 */
- (fp)r_undefined_exception,
- /* 0x018C SCI7 TXI7 */
- (fp)r_undefined_exception,
- /* 0x0190 SCIFA8 RXIF8 */
- (fp)r_undefined_exception,
- /* 0x0194 SCIF8 TXIF8 */
- (fp)r_undefined_exception,
- /* 0x0198 SCIF9 RXIF9 */
- (fp)r_undefined_exception,
- /* 0x019C SCIF9 TXIF9 */
- (fp)r_undefined_exception,
- /* 0x01A0 SCIF10 RXIF10 */
- (fp)r_undefined_exception,
- /* 0x01A4 SCIF10 TXIF10 */
- (fp)r_undefined_exception,
- /* 0x01A8 ICU GROUP_BE0 */
- (fp)r_undefined_exception,
- /* 0x01AC Reserved */
- (fp)r_reserved_exception,
- /* 0x01B0 Reserved */
- (fp)r_reserved_exception,
- /* 0x01B4 Reserved */
- (fp)r_reserved_exception,
- /* 0x01B8 ICU GROUP_BL0 */
- (fp)r_undefined_exception,
- /* 0x01BC ICU GROUP_BL1 */
- (fp)r_undefined_exception,
- /* 0x01C0 ICU GROUP_AL0 */
- (fp)r_undefined_exception,
- /* 0x01C4 ICU GROUP_AL1 */
- (fp)r_undefined_exception,
- /* 0x01C8 SCIF11 RXIF11 */
- (fp)r_undefined_exception,
- /* 0x01CC SCIF11 TXIF11 */
- (fp)r_undefined_exception,
- /* 0x01D0 SCI12 RXI12 */
- (fp)r_undefined_exception,
- /* 0x01D4 SCI12 TXI12 */
- (fp)r_undefined_exception,
- /* 0x01D8 Reserved */
- (fp)r_reserved_exception,
- /* 0x01DC Reserved */
- (fp)r_reserved_exception,
- /* 0x01F4 OST OST */
- (fp)r_undefined_exception,
- /* 0x01F8 EXDMAC EXDMAC0I */
- (fp)r_undefined_exception,
- /* 0x01FC EXDMAC EXDMAC1I */
- (fp)r_undefined_exception,
- /* 0x0318 DMAC DMAC0I */
- (fp)r_undefined_exception,
- /* 0x031C DMAC DMAC1I */
- (fp)r_undefined_exception,
- /* 0x0320 DMAC DMAC2I */
- (fp)r_undefined_exception,
- /* 0x0324 DMAC DMAC3I */
- (fp)r_undefined_exception,
- /* 0x03D8 RIIC0 EEI0 */
- (fp)r_undefined_exception,
- /* 0x03DC RIIC0 RXI0 */
- (fp)r_undefined_exception,
- /* 0x03E0 RIIC0 TXI0 */
- (fp)r_undefined_exception,
- /* 0x03E4 RIIC0 TEI0 */
- (fp)r_undefined_exception,
-
-};
-
-/***********************************************************************************************************************
-* Function Name: r_undefined_exception
-* Description : None
-* Arguments : None
-* Return Value : None
-***********************************************************************************************************************/
-void r_undefined_exception(void)
-{
- /* Start user code. Do not edit comment generated here */
- /* End user code. Do not edit comment generated here */
-}
-/***********************************************************************************************************************
-* Function Name: r_reserved_exception
-* Description : None
-* Arguments : None
-* Return Value : None
-***********************************************************************************************************************/
-void r_reserved_exception(void)
-{
- /* Start user code. Do not edit comment generated here */
- /* End user code. Do not edit comment generated here */
-}
-/***********************************************************************************************************************
-* Function Name: r_nmi_exception
-* Description : None
-* Arguments : None
-* Return Value : None
-***********************************************************************************************************************/
-void r_nmi_exception(void)
-{
- /* Start user code. Do not edit comment generated here */
- /* End user code. Do not edit comment generated here */
-}
-/***********************************************************************************************************************
-* Function Name: r_brk_exception
-* Description : None
-* Arguments : None
-* Return Value : None
-***********************************************************************************************************************/
-void r_brk_exception(void)
-{
- /* Start user code. Do not edit comment generated here */
- /* End user code. Do not edit comment generated here */
-}
-/***********************************************************************************************************************
-* Function Name: r_privileged_exception
-* Description : None
-* Arguments : None
-* Return Value : None
-***********************************************************************************************************************/
-void r_privileged_exception(void)
-{
- /* Start user code. Do not edit comment generated here */
- /* End user code. Do not edit comment generated here */
-}
-/***********************************************************************************************************************
-* Function Name: r_access_exception
-* Description : None
-* Arguments : None
-* Return Value : None
-***********************************************************************************************************************/
-void r_access_exception(void)
-{
- /* Start user code. Do not edit comment generated here */
- /* End user code. Do not edit comment generated here */
-}
-/***********************************************************************************************************************
-* Function Name: r_floatingpoint_exception
-* Description : None
-* Arguments : None
-* Return Value : None
-***********************************************************************************************************************/
-void r_floatingpoint_exception(void)
-{
- /* Start user code. Do not edit comment generated here */
- /* End user code. Do not edit comment generated here */
-}
-
diff --git a/FreeRTOS/Demo/Xilinx_FreeRTOS_BSP/repo/bsp/freertos822_xilinx_v1_0/src/Source/portable/GCC/ARM_CA9/portZynq7000.c b/FreeRTOS/Demo/Xilinx_FreeRTOS_BSP/repo/bsp/freertos822_xilinx_v1_0/src/Source/portable/GCC/ARM_CA9/portZynq7000.c index 86734bfb5..30a52d7cb 100644 --- a/FreeRTOS/Demo/Xilinx_FreeRTOS_BSP/repo/bsp/freertos822_xilinx_v1_0/src/Source/portable/GCC/ARM_CA9/portZynq7000.c +++ b/FreeRTOS/Demo/Xilinx_FreeRTOS_BSP/repo/bsp/freertos822_xilinx_v1_0/src/Source/portable/GCC/ARM_CA9/portZynq7000.c @@ -101,6 +101,11 @@ projects. */ void FreeRTOS_ApplicationIRQHandler( uint32_t ulICCIAR );
void vApplicationIRQHandler( uint32_t ulICCIAR ) __attribute__ ( ( weak, alias ("FreeRTOS_ApplicationIRQHandler") ) );
+/* The function that sets up the tick is declared week to allow it to be
+overridden by the application. */
+void FreeRTOS_SetupTickInterrupt( void ) __attribute__ ( ( weak ) );
+void FreeRTOS_ClearTickInterrupt( void ) __attribute__ ( ( weak ) );
+
/*-----------------------------------------------------------*/
void FreeRTOS_SetupTickInterrupt( void )
diff --git a/FreeRTOS/Source/portable/GCC/ARM_CA9/port.c b/FreeRTOS/Source/portable/GCC/ARM_CA9/port.c index c57b0ce92..37b201221 100644 --- a/FreeRTOS/Source/portable/GCC/ARM_CA9/port.c +++ b/FreeRTOS/Source/portable/GCC/ARM_CA9/port.c @@ -181,7 +181,7 @@ the CPU itself before modifying certain hardware registers. */ #define portBIT_0_SET ( ( uint8_t ) 0x01 )
/* Let the user override the pre-loading of the initial LR with the address of
-prvTaskExitError() in case is messes up unwinding of the stack in the
+prvTaskExitError() in case it messes up unwinding of the stack in the
debugger. */
#ifdef configTASK_RETURN_ADDRESS
#define portTASK_RETURN_ADDRESS configTASK_RETURN_ADDRESS
diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM0/port.c b/FreeRTOS/Source/portable/GCC/ARM_CM0/port.c index 3946bada5..0b07b0e9a 100644 --- a/FreeRTOS/Source/portable/GCC/ARM_CM0/port.c +++ b/FreeRTOS/Source/portable/GCC/ARM_CM0/port.c @@ -92,7 +92,7 @@ #define portINITIAL_XPSR ( 0x01000000 )
/* Let the user override the pre-loading of the initial LR with the address of
-prvTaskExitError() in case is messes up unwinding of the stack in the
+prvTaskExitError() in case it messes up unwinding of the stack in the
debugger. */
#ifdef configTASK_RETURN_ADDRESS
#define portTASK_RETURN_ADDRESS configTASK_RETURN_ADDRESS
diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM3/port.c b/FreeRTOS/Source/portable/GCC/ARM_CM3/port.c index 28f58898e..b32d38c11 100644 --- a/FreeRTOS/Source/portable/GCC/ARM_CM3/port.c +++ b/FreeRTOS/Source/portable/GCC/ARM_CM3/port.c @@ -132,7 +132,7 @@ calculations. */ #define portMISSED_COUNTS_FACTOR ( 45UL )
/* Let the user override the pre-loading of the initial LR with the address of
-prvTaskExitError() in case is messes up unwinding of the stack in the
+prvTaskExitError() in case it messes up unwinding of the stack in the
debugger. */
#ifdef configTASK_RETURN_ADDRESS
#define portTASK_RETURN_ADDRESS configTASK_RETURN_ADDRESS
diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM4F/port.c b/FreeRTOS/Source/portable/GCC/ARM_CM4F/port.c index b99fdfb35..a7ed5d6a5 100644 --- a/FreeRTOS/Source/portable/GCC/ARM_CM4F/port.c +++ b/FreeRTOS/Source/portable/GCC/ARM_CM4F/port.c @@ -140,7 +140,7 @@ calculations. */ #define portMISSED_COUNTS_FACTOR ( 45UL )
/* Let the user override the pre-loading of the initial LR with the address of
-prvTaskExitError() in case is messes up unwinding of the stack in the
+prvTaskExitError() in case it messes up unwinding of the stack in the
debugger. */
#ifdef configTASK_RETURN_ADDRESS
#define portTASK_RETURN_ADDRESS configTASK_RETURN_ADDRESS
diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM7/r0p1/port.c b/FreeRTOS/Source/portable/GCC/ARM_CM7/r0p1/port.c index 328539039..9a70b68f4 100644 --- a/FreeRTOS/Source/portable/GCC/ARM_CM7/r0p1/port.c +++ b/FreeRTOS/Source/portable/GCC/ARM_CM7/r0p1/port.c @@ -134,7 +134,7 @@ calculations. */ #define portMISSED_COUNTS_FACTOR ( 45UL )
/* Let the user override the pre-loading of the initial LR with the address of
-prvTaskExitError() in case is messes up unwinding of the stack in the
+prvTaskExitError() in case it messes up unwinding of the stack in the
debugger. */
#ifdef configTASK_RETURN_ADDRESS
#define portTASK_RETURN_ADDRESS configTASK_RETURN_ADDRESS
diff --git a/FreeRTOS/Source/portable/GCC/ARM_CRx_No_GIC/port.c b/FreeRTOS/Source/portable/GCC/ARM_CRx_No_GIC/port.c index 70a91900b..09675cb9f 100644 --- a/FreeRTOS/Source/portable/GCC/ARM_CRx_No_GIC/port.c +++ b/FreeRTOS/Source/portable/GCC/ARM_CRx_No_GIC/port.c @@ -113,7 +113,7 @@ mode. */ #define portAPSR_USER_MODE ( 0x10 )
/* Let the user override the pre-loading of the initial LR with the address of
-prvTaskExitError() in case is messes up unwinding of the stack in the
+prvTaskExitError() in case it messes up unwinding of the stack in the
debugger. */
#ifdef configTASK_RETURN_ADDRESS
#define portTASK_RETURN_ADDRESS configTASK_RETURN_ADDRESS
diff --git a/FreeRTOS/Source/portable/IAR/ARM_CRx_No_GIC/port.c b/FreeRTOS/Source/portable/IAR/ARM_CRx_No_GIC/port.c index 31d920b9e..912301b12 100644 --- a/FreeRTOS/Source/portable/IAR/ARM_CRx_No_GIC/port.c +++ b/FreeRTOS/Source/portable/IAR/ARM_CRx_No_GIC/port.c @@ -113,7 +113,7 @@ mode. */ #define portAPSR_USER_MODE ( 0x10 )
/* Let the user override the pre-loading of the initial LR with the address of
-prvTaskExitError() in case is messes up unwinding of the stack in the
+prvTaskExitError() in case it messes up unwinding of the stack in the
debugger. */
#ifdef configTASK_RETURN_ADDRESS
#define portTASK_RETURN_ADDRESS configTASK_RETURN_ADDRESS
diff --git a/FreeRTOS/Source/portable/IAR/RX100/portmacro.h b/FreeRTOS/Source/portable/IAR/RX100/portmacro.h index 50efc54ff..6e16ae59a 100644 --- a/FreeRTOS/Source/portable/IAR/RX100/portmacro.h +++ b/FreeRTOS/Source/portable/IAR/RX100/portmacro.h @@ -124,13 +124,13 @@ typedef unsigned long UBaseType_t; #define portTICK_PERIOD_MS ( ( TickType_t ) 1000 / configTICK_RATE_HZ )
#define portNOP() __no_operation()
-#define portYIELD() \
- __asm volatile \
- ( \
- "MOV.L #0x872E0, R15 \n\t" \
- "MOV.B #1, [R15] \n\t" \
- "MOV.L [R15], R15 \n\t" \
- ::: "R15" \
+#define portYIELD() \
+ __asm volatile \
+ ( \
+ "MOV.L #0x872E0, R15 \n" \
+ "MOV.B #1, [R15] \n" \
+ "MOV.L [R15], R15 \n" \
+ ::: "R15" \
)
#define portYIELD_FROM_ISR( x ) if( ( x ) != pdFALSE ) { portYIELD(); }
diff --git a/FreeRTOS/Source/portable/MPLAB/PIC32MX/port.c b/FreeRTOS/Source/portable/MPLAB/PIC32MX/port.c index 7665b903f..b24e85953 100644 --- a/FreeRTOS/Source/portable/MPLAB/PIC32MX/port.c +++ b/FreeRTOS/Source/portable/MPLAB/PIC32MX/port.c @@ -122,7 +122,7 @@ override this behaviour by: #endif
/* Let the user override the pre-loading of the initial RA with the address of
-prvTaskExitError() in case is messes up unwinding of the stack in the
+prvTaskExitError() in case it messes up unwinding of the stack in the
debugger - in which case configTASK_RETURN_ADDRESS can be defined as 0 (NULL). */
#ifdef configTASK_RETURN_ADDRESS
#define portTASK_RETURN_ADDRESS configTASK_RETURN_ADDRESS
diff --git a/FreeRTOS/Source/portable/MPLAB/PIC32MZ/port.c b/FreeRTOS/Source/portable/MPLAB/PIC32MZ/port.c index 3b4659251..db1686731 100644 --- a/FreeRTOS/Source/portable/MPLAB/PIC32MZ/port.c +++ b/FreeRTOS/Source/portable/MPLAB/PIC32MZ/port.c @@ -129,7 +129,7 @@ override this behaviour by: #endif
/* Let the user override the pre-loading of the initial RA with the address of
-prvTaskExitError() in case is messes up unwinding of the stack in the
+prvTaskExitError() in case it messes up unwinding of the stack in the
debugger - in which case configTASK_RETURN_ADDRESS can be defined as 0 (NULL). */
#ifdef configTASK_RETURN_ADDRESS
#define portTASK_RETURN_ADDRESS configTASK_RETURN_ADDRESS
diff --git a/FreeRTOS/Source/portable/Tasking/ARM_CM4F/port.c b/FreeRTOS/Source/portable/Tasking/ARM_CM4F/port.c index 6f252f817..c59f95933 100644 --- a/FreeRTOS/Source/portable/Tasking/ARM_CM4F/port.c +++ b/FreeRTOS/Source/portable/Tasking/ARM_CM4F/port.c @@ -97,7 +97,7 @@ #define portINITIAL_EXEC_RETURN ( 0xfffffffd )
/* Let the user override the pre-loading of the initial LR with the address of
-prvTaskExitError() in case is messes up unwinding of the stack in the
+prvTaskExitError() in case it messes up unwinding of the stack in the
debugger. */
#ifdef configTASK_RETURN_ADDRESS
#define portTASK_RETURN_ADDRESS configTASK_RETURN_ADDRESS
diff --git a/FreeRTOS/Source/timers.c b/FreeRTOS/Source/timers.c index 5d1ad084a..9ede09f61 100644 --- a/FreeRTOS/Source/timers.c +++ b/FreeRTOS/Source/timers.c @@ -318,6 +318,8 @@ BaseType_t xTimerGenericCommand( TimerHandle_t xTimer, const BaseType_t xCommand BaseType_t xReturn = pdFAIL;
DaemonTaskMessage_t xMessage;
+ configASSERT( xTimer );
+
/* Send a message to the timer service task to perform a particular action
on a particular timer definition. */
if( xTimerQueue != NULL )
@@ -371,6 +373,7 @@ const char * pcTimerGetTimerName( TimerHandle_t xTimer ) {
Timer_t *pxTimer = ( Timer_t * ) xTimer;
+ configASSERT( xTimer );
return pxTimer->pcTimerName;
}
/*-----------------------------------------------------------*/
@@ -810,6 +813,8 @@ BaseType_t xTimerIsTimerActive( TimerHandle_t xTimer ) BaseType_t xTimerIsInActiveList;
Timer_t *pxTimer = ( Timer_t * ) xTimer;
+ configASSERT( xTimer );
+
/* Is the timer in the list of active timers? */
taskENTER_CRITICAL();
{
|