diff options
| author | hathach <[email protected]> | 2014-03-19 12:37:44 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2014-03-19 12:37:44 +0700 |
| commit | 69159076ae18253e551a17246c15b785a0e64114 (patch) | |
| tree | 7eeb9cece7cbc67e9039491b2b4d828cef23385b | |
| parent | a9e7181a56f5ad65dd4ad3634c2fc5fc74692f16 (diff) | |
rename keil group bsp lpcxxxx to lpcxxxx only
trying to get cmsis rtx work with host lpc43xx
| -rw-r--r-- | demos/host/host_cmsis_rtx/.cproject | 25 | ||||
| -rw-r--r-- | demos/host/host_cmsis_rtx/.project | 29 | ||||
| -rw-r--r-- | demos/host/host_cmsis_rtx/host_cmsis_rtx.uvopt | 258 | ||||
| -rw-r--r-- | demos/host/host_cmsis_rtx/host_cmsis_rtx.uvproj | 170 | ||||
| -rw-r--r-- | demos/host/host_freertos/host_freertos.uvopt | 26 | ||||
| -rw-r--r-- | demos/host/host_freertos/host_freertos.uvproj | 22 | ||||
| -rw-r--r-- | demos/host/host_os_none/host_os_none.uvopt | 8 | ||||
| -rw-r--r-- | demos/host/host_os_none/host_os_none.uvproj | 18 |
8 files changed, 344 insertions, 212 deletions
diff --git a/demos/host/host_cmsis_rtx/.cproject b/demos/host/host_cmsis_rtx/.cproject index 1ba3491c1..366af8823 100644 --- a/demos/host/host_cmsis_rtx/.cproject +++ b/demos/host/host_cmsis_rtx/.cproject @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+<?fileVersion 4.0.0?>
+
+<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
<storageModule moduleId="org.eclipse.cdt.core.settings">
<cconfiguration id="com.crt.advproject.config.exe.debug.1239969983">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.crt.advproject.config.exe.debug.1239969983" moduleId="org.eclipse.cdt.core.settings" name="Board NGX4330">
@@ -43,7 +45,7 @@ </option>
<option id="gnu.c.compiler.option.misc.other.898778785" name="Other flags" superClass="gnu.c.compiler.option.misc.other" value="-c -fmessage-length=0 -fno-builtin -ffunction-sections -fdata-sections" valueType="string"/>
<option id="gnu.c.compiler.option.include.paths.970795437" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
- <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/bsp/lpc43xx/CMSIS_LPC43xx_DriverLib/inc}""/>
+ <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/inc}""/>
<listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/freertos}""/>
<listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/freertos/freertos/Source/include}""/>
<listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/bsp}""/>
@@ -85,7 +87,7 @@ </toolChain>
</folderInfo>
<sourceEntries>
- <entry excluding="cmsis_rtos_rtx/SRC/IAR|bsp/boards/embedded_artists/oem_base_board|freertos/freertoslpc/FreeRTOS_lpc43xx_m0_Tick.c|freertos/freertos/Source/portable|bsp/boards/EA4357|NGX|bsp/lpc13uxx|bsp/lpc11uxx" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+ <entry excluding="mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/sdio.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_wwdt.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_timer.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_ssp.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_sdmmc.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_sdif.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_sct.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_rtc.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_rit.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_rgu.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_qei.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_pwr.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_nvic.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_mcpwm.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_lcd.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_i2s.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_gpdma.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_evrt.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_emc.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_dac.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_can.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_atimer.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_adc.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/LCDTerm.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/Font5x7.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/debug_frmwrk.c|cmsis_rtos_rtx/SRC|mcu/lpc175x_6x|mcu/lpc13uxx|mcu/lpc11uxx|cmsis_rtos_rtx/SRC/IAR|bsp/boards/embedded_artists/oem_base_board|freertos/freertoslpc/FreeRTOS_lpc43xx_m0_Tick.c|freertos/freertos/Source/portable|bsp/boards/EA4357|NGX|bsp/lpc13uxx|bsp/lpc11uxx" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
</sourceEntries>
</configuration>
</storageModule>
@@ -93,6 +95,7 @@ <storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+ <storageModule moduleId="scannerConfiguration"/>
</cconfiguration>
<cconfiguration id="com.crt.advproject.config.exe.debug.1239969983.636406670">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.crt.advproject.config.exe.debug.1239969983.636406670" moduleId="org.eclipse.cdt.core.settings" name="Board EA4357">
@@ -139,8 +142,9 @@ </option>
<option id="gnu.c.compiler.option.misc.other.740032111" name="Other flags" superClass="gnu.c.compiler.option.misc.other" value="-c -fmessage-length=0 -fno-builtin -ffunction-sections -fdata-sections" valueType="string"/>
<option id="gnu.c.compiler.option.include.paths.967143576" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
- <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/bsp/lpc43xx/CMSIS_LPC43xx_DriverLib/inc}""/>
- <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/bsp}""/>
+ <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/boards}""/>
+ <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/fatfs}""/>
+ <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/inc}""/>
<listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/cmsis_rtos_rtx/INC}""/>
<listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/tinyusb}""/>
<listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src}""/>
@@ -168,8 +172,12 @@ <listOptionValue builtIn="false" value="-Map="${BuildArtifactFileBaseName}.map""/>
<listOptionValue builtIn="false" value="--gc-sections"/>
</option>
- <option id="gnu.c.link.option.libs.1825587478" name="Libraries (-l)" superClass="gnu.c.link.option.libs"/>
- <option id="gnu.c.link.option.paths.916077707" name="Library search path (-L)" superClass="gnu.c.link.option.paths"/>
+ <option id="gnu.c.link.option.libs.1825587478" name="Libraries (-l)" superClass="gnu.c.link.option.libs" valueType="libs">
+ <listOptionValue builtIn="false" value="RTX_CM4"/>
+ </option>
+ <option id="gnu.c.link.option.paths.916077707" name="Library search path (-L)" superClass="gnu.c.link.option.paths" valueType="libPaths">
+ <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/cmsis_rtos_rtx/LIB/GCC}""/>
+ </option>
<option id="com.crt.advproject.link.gcc.hdrlib.1015545513" name="Use C library" superClass="com.crt.advproject.link.gcc.hdrlib" value="com.crt.advproject.gcc.link.hdrlib.codered.nohost" valueType="enumerated"/>
<option id="com.crt.advproject.link.fpu.834301167" name="Floating point" superClass="com.crt.advproject.link.fpu" value="com.crt.advproject.link.fpu.fpv4" valueType="enumerated"/>
<inputType id="cdt.managedbuild.tool.gnu.c.linker.input.388300407" superClass="cdt.managedbuild.tool.gnu.c.linker.input">
@@ -180,7 +188,7 @@ </toolChain>
</folderInfo>
<sourceEntries>
- <entry excluding="cmsis_rtos_rtx/SRC/IAR|freertos/freertoslpc/FreeRTOS_lpc43xx_m0_Tick.c|freertos/freertos/Source/portable|bsp/boards/EA4357|NGX|bsp/lpc13uxx|bsp/lpc11uxx" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+ <entry excluding="mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/sdio.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_wwdt.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_timer.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_ssp.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_sdmmc.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_sdif.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_sct.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_rtc.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_rit.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_rgu.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_qei.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_pwr.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_nvic.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_mcpwm.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_lcd.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_i2s.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_gpdma.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_evrt.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_emc.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_dac.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_can.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_atimer.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_adc.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/LCDTerm.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/Font5x7.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/debug_frmwrk.c|cmsis_rtos_rtx/SRC|mcu/lpc175x_6x|mcu/lpc13uxx|mcu/lpc11uxx|cmsis_rtos_rtx/SRC/IAR|freertos/freertoslpc/FreeRTOS_lpc43xx_m0_Tick.c|freertos/freertos/Source/portable|bsp/boards/EA4357|NGX|bsp/lpc13uxx|bsp/lpc11uxx" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
</sourceEntries>
</configuration>
</storageModule>
@@ -188,6 +196,7 @@ <storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+ <storageModule moduleId="scannerConfiguration"/>
</cconfiguration>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
diff --git a/demos/host/host_cmsis_rtx/.project b/demos/host/host_cmsis_rtx/.project index 253324af4..f44db2c36 100644 --- a/demos/host/host_cmsis_rtx/.project +++ b/demos/host/host_cmsis_rtx/.project @@ -81,9 +81,9 @@ </natures> <linkedResources> <link> - <name>bsp</name> + <name>boards</name> <type>2</type> - <locationURI>PARENT-2-PROJECT_LOC/bsp</locationURI> + <locationURI>PARENT-3-PROJECT_LOC/boards</locationURI> </link> <link> <name>cmsis_rtos_rtx</name> @@ -91,6 +91,16 @@ <locationURI>PARENT-3-PROJECT_LOC/vendor/cmsis_rtos_rtx</locationURI> </link> <link> + <name>fatfs</name> + <type>2</type> + <locationURI>PARENT-3-PROJECT_LOC/vendor/fatfs</locationURI> + </link> + <link> + <name>mcu</name> + <type>2</type> + <locationURI>PARENT-3-PROJECT_LOC/mcu</locationURI> + </link> + <link> <name>src</name> <type>2</type> <locationURI>PARENT-1-PROJECT_LOC/src</locationURI> @@ -103,12 +113,21 @@ </linkedResources> <filteredResources> <filter> - <id>1368600635222</id> - <name></name> + <id>1395203227346</id> + <name>mcu</name> + <type>26</type> + <matcher> + <id>org.eclipse.ui.ide.multiFilter</id> + <arguments>1.0-name-matches-false-false-iar</arguments> + </matcher> + </filter> + <filter> + <id>1395203227365</id> + <name>mcu</name> <type>26</type> <matcher> <id>org.eclipse.ui.ide.multiFilter</id> - <arguments>1.0-name-matches-false-false-startup_keil</arguments> + <arguments>1.0-name-matches-false-false-keil</arguments> </matcher> </filter> </filteredResources> diff --git a/demos/host/host_cmsis_rtx/host_cmsis_rtx.uvopt b/demos/host/host_cmsis_rtx/host_cmsis_rtx.uvopt index c4d0b83d7..477d33f02 100644 --- a/demos/host/host_cmsis_rtx/host_cmsis_rtx.uvopt +++ b/demos/host/host_cmsis_rtx/host_cmsis_rtx.uvopt @@ -135,7 +135,7 @@ <SetRegEntry> <Number>0</Number> <Key>DLGUARM</Key> - <Name>(106=-1,-1,-1,-1,0)(107=-1,-1,-1,-1,0)</Name> + <Name></Name> </SetRegEntry> <SetRegEntry> <Number>0</Number> @@ -407,10 +407,10 @@ <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> - <ColumnNumber>73</ColumnNumber> + <ColumnNumber>19</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>0</TopLine> - <CurrentLine>0</CurrentLine> + <TopLine>78</TopLine> + <CurrentLine>93</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\src\main.c</PathWithFileName> <FilenameWithoutPath>main.c</FilenameWithoutPath> @@ -489,73 +489,89 @@ <Focus>0</Focus> <ColumnNumber>0</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>0</TopLine> - <CurrentLine>0</CurrentLine> + <TopLine>137</TopLine> + <CurrentLine>145</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\src\msc_app.c</PathWithFileName> <FilenameWithoutPath>msc_app.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> + <File> + <GroupNumber>1</GroupNumber> + <FileNumber>7</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <Focus>0</Focus> + <ColumnNumber>0</ColumnNumber> + <tvExpOptDlg>0</tvExpOptDlg> + <TopLine>0</TopLine> + <CurrentLine>0</CurrentLine> + <bDave2>0</bDave2> + <PathWithFileName>..\src\cli.c</PathWithFileName> + <FilenameWithoutPath>cli.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> </Group> <Group> <GroupName>boards</GroupName> - <tvExp>1</tvExp> + <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> <File> <GroupNumber>2</GroupNumber> - <FileNumber>7</FileNumber> + <FileNumber>8</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> - <ColumnNumber>13</ColumnNumber> + <ColumnNumber>0</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>..\..\bsp\boards\board.c</PathWithFileName> + <PathWithFileName>..\..\..\boards\board.c</PathWithFileName> <FilenameWithoutPath>board.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> <File> <GroupNumber>2</GroupNumber> - <FileNumber>8</FileNumber> + <FileNumber>9</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> - <ColumnNumber>2</ColumnNumber> + <ColumnNumber>0</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>..\..\bsp\boards\printf_retarget.c</PathWithFileName> + <PathWithFileName>..\..\..\boards\printf_retarget.c</PathWithFileName> <FilenameWithoutPath>printf_retarget.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> <File> <GroupNumber>2</GroupNumber> - <FileNumber>9</FileNumber> + <FileNumber>10</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> - <ColumnNumber>61</ColumnNumber> + <ColumnNumber>0</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>..\..\bsp\boards\embedded_artists\oem_base_board\pca9532.c</PathWithFileName> + <PathWithFileName>..\..\..\boards\embedded_artists\oem_base_board\pca9532.c</PathWithFileName> <FilenameWithoutPath>pca9532.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> <File> <GroupNumber>2</GroupNumber> - <FileNumber>10</FileNumber> + <FileNumber>11</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> @@ -564,14 +580,14 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>..\..\bsp\boards\ngx\board_ngx4330.c</PathWithFileName> + <PathWithFileName>..\..\..\boards\ngx\board_ngx4330.c</PathWithFileName> <FilenameWithoutPath>board_ngx4330.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> <File> <GroupNumber>2</GroupNumber> - <FileNumber>11</FileNumber> + <FileNumber>12</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> @@ -580,14 +596,14 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>..\..\bsp\boards\microbuilder\board_lpc4357usb.c</PathWithFileName> + <PathWithFileName>..\..\..\boards\microbuilder\board_lpc4357usb.c</PathWithFileName> <FilenameWithoutPath>board_lpc4357usb.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> <File> <GroupNumber>2</GroupNumber> - <FileNumber>12</FileNumber> + <FileNumber>13</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> @@ -596,14 +612,14 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>..\..\bsp\boards\microbuilder\board_rf1ghznode.c</PathWithFileName> + <PathWithFileName>..\..\..\boards\microbuilder\board_rf1ghznode.c</PathWithFileName> <FilenameWithoutPath>board_rf1ghznode.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> <File> <GroupNumber>2</GroupNumber> - <FileNumber>13</FileNumber> + <FileNumber>14</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> @@ -612,14 +628,14 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>..\..\bsp\boards\lpcxpresso\board_lpcxpresso1769.c</PathWithFileName> + <PathWithFileName>..\..\..\boards\lpcxpresso\board_lpcxpresso1769.c</PathWithFileName> <FilenameWithoutPath>board_lpcxpresso1769.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> <File> <GroupNumber>2</GroupNumber> - <FileNumber>14</FileNumber> + <FileNumber>15</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> @@ -628,14 +644,14 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>..\..\bsp\boards\lpcxpresso\board_lpcxpresso1347.c</PathWithFileName> + <PathWithFileName>..\..\..\boards\lpcxpresso\board_lpcxpresso1347.c</PathWithFileName> <FilenameWithoutPath>board_lpcxpresso1347.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> <File> <GroupNumber>2</GroupNumber> - <FileNumber>15</FileNumber> + <FileNumber>16</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> @@ -644,14 +660,14 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>..\..\bsp\boards\keil\board_mcb4300.c</PathWithFileName> + <PathWithFileName>..\..\..\boards\keil\board_mcb4300.c</PathWithFileName> <FilenameWithoutPath>board_mcb4300.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> <File> <GroupNumber>2</GroupNumber> - <FileNumber>16</FileNumber> + <FileNumber>17</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> @@ -660,7 +676,7 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>..\..\bsp\boards\embedded_artists\ea4357\board_ea4357.c</PathWithFileName> + <PathWithFileName>..\..\..\boards\embedded_artists\ea4357\board_ea4357.c</PathWithFileName> <FilenameWithoutPath>board_ea4357.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> @@ -675,13 +691,13 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>3</GroupNumber> - <FileNumber>17</FileNumber> + <FileNumber>18</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> <ColumnNumber>30</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>36</TopLine> + <TopLine>38</TopLine> <CurrentLine>39</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\..\..\tinyusb\tusb.c</PathWithFileName> @@ -691,7 +707,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>18</FileNumber> + <FileNumber>19</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> @@ -707,7 +723,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>19</FileNumber> + <FileNumber>20</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> @@ -723,7 +739,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>20</FileNumber> + <FileNumber>21</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> @@ -739,14 +755,14 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>21</FileNumber> + <FileNumber>22</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> - <ColumnNumber>37</ColumnNumber> + <ColumnNumber>35</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>362</TopLine> - <CurrentLine>365</CurrentLine> + <TopLine>364</TopLine> + <CurrentLine>366</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\..\..\tinyusb\host\usbh.c</PathWithFileName> <FilenameWithoutPath>usbh.c</FilenameWithoutPath> @@ -755,7 +771,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>22</FileNumber> + <FileNumber>23</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> @@ -771,7 +787,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>23</FileNumber> + <FileNumber>24</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> @@ -787,7 +803,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>24</FileNumber> + <FileNumber>25</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> @@ -803,7 +819,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>25</FileNumber> + <FileNumber>26</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> @@ -819,7 +835,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>26</FileNumber> + <FileNumber>27</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> @@ -835,7 +851,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>27</FileNumber> + <FileNumber>28</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> @@ -844,14 +860,14 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>..\..\..\tinyusb\common\errors.c</PathWithFileName> - <FilenameWithoutPath>errors.c</FilenameWithoutPath> + <PathWithFileName>..\..\..\tinyusb\common\tusb_errors.c</PathWithFileName> + <FilenameWithoutPath>tusb_errors.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>28</FileNumber> + <FileNumber>29</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> @@ -867,7 +883,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>29</FileNumber> + <FileNumber>30</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> @@ -883,7 +899,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>30</FileNumber> + <FileNumber>31</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> @@ -899,7 +915,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>31</FileNumber> + <FileNumber>32</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> @@ -915,7 +931,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>32</FileNumber> + <FileNumber>33</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> @@ -932,14 +948,54 @@ </Group> <Group> - <GroupName>cmsis</GroupName> + <GroupName>cmsis-rtx</GroupName> <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> <File> <GroupNumber>4</GroupNumber> - <FileNumber>33</FileNumber> + <FileNumber>34</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <Focus>0</Focus> + <ColumnNumber>29</ColumnNumber> + <tvExpOptDlg>0</tvExpOptDlg> + <TopLine>217</TopLine> + <CurrentLine>225</CurrentLine> + <bDave2>0</bDave2> + <PathWithFileName>..\..\..\vendor\cmsis_rtos_rtx\RTX_Conf_CM.c</PathWithFileName> + <FilenameWithoutPath>RTX_Conf_CM.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>4</GroupNumber> + <FileNumber>35</FileNumber> + <FileType>4</FileType> + <tvExp>0</tvExp> + <Focus>0</Focus> + <ColumnNumber>0</ColumnNumber> + <tvExpOptDlg>0</tvExpOptDlg> + <TopLine>0</TopLine> + <CurrentLine>0</CurrentLine> + <bDave2>0</bDave2> + <PathWithFileName>..\..\..\vendor\cmsis_rtos_rtx\LIB\ARM\RTX_CM4.lib</PathWithFileName> + <FilenameWithoutPath>RTX_CM4.lib</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + </Group> + + <Group> + <GroupName>lpc43xx</GroupName> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <cbSel>0</cbSel> + <RteFlg>0</RteFlg> + <File> + <GroupNumber>5</GroupNumber> + <FileNumber>36</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> @@ -948,14 +1004,14 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_uart.c</PathWithFileName> + <PathWithFileName>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_uart.c</PathWithFileName> <FilenameWithoutPath>lpc43xx_uart.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> <File> - <GroupNumber>4</GroupNumber> - <FileNumber>34</FileNumber> + <GroupNumber>5</GroupNumber> + <FileNumber>37</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> @@ -964,14 +1020,14 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_scu.c</PathWithFileName> + <PathWithFileName>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_scu.c</PathWithFileName> <FilenameWithoutPath>lpc43xx_scu.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> <File> - <GroupNumber>4</GroupNumber> - <FileNumber>35</FileNumber> + <GroupNumber>5</GroupNumber> + <FileNumber>38</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> @@ -980,46 +1036,46 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_gpio.c</PathWithFileName> + <PathWithFileName>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_gpio.c</PathWithFileName> <FilenameWithoutPath>lpc43xx_gpio.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> <File> - <GroupNumber>4</GroupNumber> - <FileNumber>36</FileNumber> + <GroupNumber>5</GroupNumber> + <FileNumber>39</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> <ColumnNumber>0</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>403</TopLine> - <CurrentLine>406</CurrentLine> + <TopLine>0</TopLine> + <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_cgu.c</PathWithFileName> + <PathWithFileName>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_cgu.c</PathWithFileName> <FilenameWithoutPath>lpc43xx_cgu.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> <File> - <GroupNumber>4</GroupNumber> - <FileNumber>37</FileNumber> + <GroupNumber>5</GroupNumber> + <FileNumber>40</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> - <ColumnNumber>44</ColumnNumber> + <ColumnNumber>0</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>57</TopLine> - <CurrentLine>60</CurrentLine> + <TopLine>0</TopLine> + <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\system_LPC43xx.c</PathWithFileName> + <PathWithFileName>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\system_LPC43xx.c</PathWithFileName> <FilenameWithoutPath>system_LPC43xx.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> <File> - <GroupNumber>4</GroupNumber> - <FileNumber>38</FileNumber> + <GroupNumber>5</GroupNumber> + <FileNumber>41</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> @@ -1028,31 +1084,23 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_i2c.c</PathWithFileName> + <PathWithFileName>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_i2c.c</PathWithFileName> <FilenameWithoutPath>lpc43xx_i2c.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> - </Group> - - <Group> - <GroupName>startup</GroupName> - <tvExp>1</tvExp> - <tvExpOptDlg>0</tvExpOptDlg> - <cbSel>0</cbSel> - <RteFlg>0</RteFlg> <File> <GroupNumber>5</GroupNumber> - <FileNumber>39</FileNumber> + <FileNumber>42</FileNumber> <FileType>2</FileType> <tvExp>0</tvExp> <Focus>0</Focus> <ColumnNumber>0</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>148</TopLine> + <TopLine>144</TopLine> <CurrentLine>151</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>..\..\bsp\lpc43xx\startup_keil\startup_LPC43xx.s</PathWithFileName> + <PathWithFileName>..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s</PathWithFileName> <FilenameWithoutPath>startup_LPC43xx.s</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> @@ -1060,31 +1108,31 @@ </Group> <Group> - <GroupName>cmsis-rtx</GroupName> - <tvExp>1</tvExp> + <GroupName>fatfs</GroupName> + <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> <File> <GroupNumber>6</GroupNumber> - <FileNumber>40</FileNumber> + <FileNumber>43</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> <ColumnNumber>0</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>213</TopLine> - <CurrentLine>217</CurrentLine> + <TopLine>0</TopLine> + <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>..\..\..\vendor\cmsis_rtos_rtx\RTX_Conf_CM.c</PathWithFileName> - <FilenameWithoutPath>RTX_Conf_CM.c</FilenameWithoutPath> + <PathWithFileName>..\..\..\vendor\fatfs\ccsbcs.c</PathWithFileName> + <FilenameWithoutPath>ccsbcs.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>41</FileNumber> - <FileType>4</FileType> + <FileNumber>44</FileNumber> + <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> <ColumnNumber>0</ColumnNumber> @@ -1092,8 +1140,24 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>..\..\..\vendor\cmsis_rtos_rtx\LIB\ARM\RTX_CM4.lib</PathWithFileName> - <FilenameWithoutPath>RTX_CM4.lib</FilenameWithoutPath> + <PathWithFileName>..\..\..\vendor\fatfs\diskio.c</PathWithFileName> + <FilenameWithoutPath>diskio.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>6</GroupNumber> + <FileNumber>45</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <Focus>0</Focus> + <ColumnNumber>0</ColumnNumber> + <tvExpOptDlg>0</tvExpOptDlg> + <TopLine>0</TopLine> + <CurrentLine>0</CurrentLine> + <bDave2>0</bDave2> + <PathWithFileName>..\..\..\vendor\fatfs\ff.c</PathWithFileName> + <FilenameWithoutPath>ff.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> diff --git a/demos/host/host_cmsis_rtx/host_cmsis_rtx.uvproj b/demos/host/host_cmsis_rtx/host_cmsis_rtx.uvproj index b332e4094..b67411c45 100644 --- a/demos/host/host_cmsis_rtx/host_cmsis_rtx.uvproj +++ b/demos/host/host_cmsis_rtx/host_cmsis_rtx.uvproj @@ -347,10 +347,10 @@ <uThumb>0</uThumb> <uSurpInc>0</uSurpInc> <VariousControls> - <MiscControls>--gnu --c99 --diag_suppress=66 --no_inline</MiscControls> + <MiscControls>--gnu --c99</MiscControls> <Define>CORE_M4 TUSB_CFG_MCU=MCU_LPC43XX BOARD=BOARD_EA4357 TUSB_CFG_OS=TUSB_OS_CMSIS_RTX TUSB_CFG_OS_TASK_PRIO=osPriorityRealtime</Define> <Undefine></Undefine> - <IncludePath>..\src;..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\inc;..\..\bsp;..\..\..\tinyusb;..\..\..\vendor\cmsis_rtos_rtx\INC;..\host_cmsis_rtx</IncludePath> + <IncludePath>..\src;..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\inc;..\..\..\boards;..\..\..\tinyusb;..\..\..\vendor\cmsis_rtos_rtx\INC;..\..\..\vendor\fatfs</IncludePath> </VariousControls> </Cads> <Aads> @@ -421,6 +421,11 @@ <FileType>1</FileType> <FilePath>..\src\msc_app.c</FilePath> </File> + <File> + <FileName>cli.c</FileName> + <FileType>1</FileType> + <FilePath>..\src\cli.c</FilePath> + </File> </Files> </Group> <Group> @@ -429,52 +434,52 @@ <File> <FileName>board.c</FileName> <FileType>1</FileType> - <FilePath>..\..\bsp\boards\board.c</FilePath> + <FilePath>..\..\..\boards\board.c</FilePath> </File> <File> <FileName>printf_retarget.c</FileName> <FileType>1</FileType> - <FilePath>..\..\bsp\boards\printf_retarget.c</FilePath> + <FilePath>..\..\..\boards\printf_retarget.c</FilePath> </File> <File> <FileName>pca9532.c</FileName> <FileType>1</FileType> - <FilePath>..\..\bsp\boards\embedded_artists\oem_base_board\pca9532.c</FilePath> + <FilePath>..\..\..\boards\embedded_artists\oem_base_board\pca9532.c</FilePath> </File> <File> <FileName>board_ngx4330.c</FileName> <FileType>1</FileType> - <FilePath>..\..\bsp\boards\ngx\board_ngx4330.c</FilePath> + <FilePath>..\..\..\boards\ngx\board_ngx4330.c</FilePath> </File> <File> <FileName>board_lpc4357usb.c</FileName> <FileType>1</FileType> - <FilePath>..\..\bsp\boards\microbuilder\board_lpc4357usb.c</FilePath> + <FilePath>..\..\..\boards\microbuilder\board_lpc4357usb.c</FilePath> </File> <File> <FileName>board_rf1ghznode.c</FileName> <FileType>1</FileType> - <FilePath>..\..\bsp\boards\microbuilder\board_rf1ghznode.c</FilePath> + <FilePath>..\..\..\boards\microbuilder\board_rf1ghznode.c</FilePath> </File> <File> <FileName>board_lpcxpresso1769.c</FileName> <FileType>1</FileType> - <FilePath>..\..\bsp\boards\lpcxpresso\board_lpcxpresso1769.c</FilePath> + <FilePath>..\..\..\boards\lpcxpresso\board_lpcxpresso1769.c</FilePath> </File> <File> <FileName>board_lpcxpresso1347.c</FileName> <FileType>1</FileType> - <FilePath>..\..\bsp\boards\lpcxpresso\board_lpcxpresso1347.c</FilePath> + <FilePath>..\..\..\boards\lpcxpresso\board_lpcxpresso1347.c</FilePath> </File> <File> <FileName>board_mcb4300.c</FileName> <FileType>1</FileType> - <FilePath>..\..\bsp\boards\keil\board_mcb4300.c</FilePath> + <FilePath>..\..\..\boards\keil\board_mcb4300.c</FilePath> </File> <File> <FileName>board_ea4357.c</FileName> <FileType>1</FileType> - <FilePath>..\..\bsp\boards\embedded_artists\ea4357\board_ea4357.c</FilePath> + <FilePath>..\..\..\boards\embedded_artists\ea4357\board_ea4357.c</FilePath> </File> </Files> </Group> @@ -532,9 +537,9 @@ <FilePath>..\..\..\tinyusb\hal\hal_lpc175x_6x.c</FilePath> </File> <File> - <FileName>errors.c</FileName> + <FileName>tusb_errors.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\tinyusb\common\errors.c</FilePath> + <FilePath>..\..\..\tinyusb\common\tusb_errors.c</FilePath> </File> <File> <FileName>fifo.c</FileName> @@ -564,62 +569,77 @@ </Files> </Group> <Group> - <GroupName>cmsis</GroupName> + <GroupName>cmsis-rtx</GroupName> + <Files> + <File> + <FileName>RTX_Conf_CM.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\vendor\cmsis_rtos_rtx\RTX_Conf_CM.c</FilePath> + </File> + <File> + <FileName>RTX_CM4.lib</FileName> + <FileType>4</FileType> + <FilePath>..\..\..\vendor\cmsis_rtos_rtx\LIB\ARM\RTX_CM4.lib</FilePath> + </File> + </Files> + </Group> + <Group> + <GroupName>lpc43xx</GroupName> <Files> <File> <FileName>lpc43xx_uart.c</FileName> <FileType>1</FileType> - <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_uart.c</FilePath> + <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_uart.c</FilePath> </File> <File> <FileName>lpc43xx_scu.c</FileName> <FileType>1</FileType> - <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_scu.c</FilePath> + <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_scu.c</FilePath> </File> <File> <FileName>lpc43xx_gpio.c</FileName> <FileType>1</FileType> - <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_gpio.c</FilePath> + <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_gpio.c</FilePath> </File> <File> <FileName>lpc43xx_cgu.c</FileName> <FileType>1</FileType> - <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_cgu.c</FilePath> + <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_cgu.c</FilePath> </File> <File> <FileName>system_LPC43xx.c</FileName> <FileType>1</FileType> - <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\system_LPC43xx.c</FilePath> + <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\system_LPC43xx.c</FilePath> </File> <File> <FileName>lpc43xx_i2c.c</FileName> <FileType>1</FileType> - <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_i2c.c</FilePath> + <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_i2c.c</FilePath> </File> - </Files> - </Group> - <Group> - <GroupName>startup</GroupName> - <Files> <File> <FileName>startup_LPC43xx.s</FileName> <FileType>2</FileType> - <FilePath>..\..\bsp\lpc43xx\startup_keil\startup_LPC43xx.s</FilePath> + <FilePath>..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s</FilePath> </File> </Files> </Group> <Group> - <GroupName>cmsis-rtx</GroupName> + <GroupName>fatfs</GroupName> <Files> <File> - <FileName>RTX_Conf_CM.c</FileName> + <FileName>ccsbcs.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\vendor\cmsis_rtos_rtx\RTX_Conf_CM.c</FilePath> + <FilePath>..\..\..\vendor\fatfs\ccsbcs.c</FilePath> </File> <File> - <FileName>RTX_CM4.lib</FileName> - <FileType>4</FileType> - <FilePath>..\..\..\vendor\cmsis_rtos_rtx\LIB\ARM\RTX_CM4.lib</FilePath> + <FileName>diskio.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\vendor\fatfs\diskio.c</FilePath> + </File> + <File> + <FileName>ff.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\vendor\fatfs\ff.c</FilePath> </File> </Files> </Group> @@ -969,7 +989,7 @@ <MiscControls>--gnu --c99 --diag_suppress=66 --no_inline</MiscControls> <Define>CORE_M4 MCU=MCU_LPC43XX BOARD=BOARD_LPC4357USB TUSB_CFG_OS=TUSB_OS_CMSIS_RTX TUSB_CFG_OS_TASK_PRIO=osPriorityRealtime</Define> <Undefine></Undefine> - <IncludePath>..\src;..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\inc;..\..\bsp;..\..\..\tinyusb;..\..\..\vendor\cmsis_rtos_rtx\INC;..\host_cmsis_rtx</IncludePath> + <IncludePath>..\src;..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\inc;..\..\..\mcu;..\..\..\tinyusb;..\..\..\vendor\cmsis_rtos_rtx\INC;..\host_cmsis_rtx</IncludePath> </VariousControls> </Cads> <Aads> @@ -1040,6 +1060,11 @@ <FileType>1</FileType> <FilePath>..\src\msc_app.c</FilePath> </File> + <File> + <FileName>cli.c</FileName> + <FileType>1</FileType> + <FilePath>..\src\cli.c</FilePath> + </File> </Files> </Group> <Group> @@ -1048,17 +1073,17 @@ <File> <FileName>board.c</FileName> <FileType>1</FileType> - <FilePath>..\..\bsp\boards\board.c</FilePath> + <FilePath>..\..\..\boards\board.c</FilePath> </File> <File> <FileName>printf_retarget.c</FileName> <FileType>1</FileType> - <FilePath>..\..\bsp\boards\printf_retarget.c</FilePath> + <FilePath>..\..\..\boards\printf_retarget.c</FilePath> </File> <File> <FileName>pca9532.c</FileName> <FileType>1</FileType> - <FilePath>..\..\bsp\boards\embedded_artists\oem_base_board\pca9532.c</FilePath> + <FilePath>..\..\..\boards\embedded_artists\oem_base_board\pca9532.c</FilePath> <FileOption> <CommonProperty> <UseCPPCompiler>2</UseCPPCompiler> @@ -1103,37 +1128,37 @@ <File> <FileName>board_ngx4330.c</FileName> <FileType>1</FileType> - <FilePath>..\..\bsp\boards\ngx\board_ngx4330.c</FilePath> + <FilePath>..\..\..\boards\ngx\board_ngx4330.c</FilePath> </File> <File> <FileName>board_lpc4357usb.c</FileName> <FileType>1</FileType> - <FilePath>..\..\bsp\boards\microbuilder\board_lpc4357usb.c</FilePath> + <FilePath>..\..\..\boards\microbuilder\board_lpc4357usb.c</FilePath> </File> <File> <FileName>board_rf1ghznode.c</FileName> <FileType>1</FileType> - <FilePath>..\..\bsp\boards\microbuilder\board_rf1ghznode.c</FilePath> + <FilePath>..\..\..\boards\microbuilder\board_rf1ghznode.c</FilePath> </File> <File> <FileName>board_lpcxpresso1769.c</FileName> <FileType>1</FileType> - <FilePath>..\..\bsp\boards\lpcxpresso\board_lpcxpresso1769.c</FilePath> + <FilePath>..\..\..\boards\lpcxpresso\board_lpcxpresso1769.c</FilePath> </File> <File> <FileName>board_lpcxpresso1347.c</FileName> <FileType>1</FileType> - <FilePath>..\..\bsp\boards\lpcxpresso\board_lpcxpresso1347.c</FilePath> + <FilePath>..\..\..\boards\lpcxpresso\board_lpcxpresso1347.c</FilePath> </File> <File> <FileName>board_mcb4300.c</FileName> <FileType>1</FileType> - <FilePath>..\..\bsp\boards\keil\board_mcb4300.c</FilePath> + <FilePath>..\..\..\boards\keil\board_mcb4300.c</FilePath> </File> <File> <FileName>board_ea4357.c</FileName> <FileType>1</FileType> - <FilePath>..\..\bsp\boards\embedded_artists\ea4357\board_ea4357.c</FilePath> + <FilePath>..\..\..\boards\embedded_artists\ea4357\board_ea4357.c</FilePath> </File> </Files> </Group> @@ -1191,9 +1216,9 @@ <FilePath>..\..\..\tinyusb\hal\hal_lpc175x_6x.c</FilePath> </File> <File> - <FileName>errors.c</FileName> + <FileName>tusb_errors.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\tinyusb\common\errors.c</FilePath> + <FilePath>..\..\..\tinyusb\common\tusb_errors.c</FilePath> </File> <File> <FileName>fifo.c</FileName> @@ -1223,62 +1248,77 @@ </Files> </Group> <Group> - <GroupName>cmsis</GroupName> + <GroupName>cmsis-rtx</GroupName> + <Files> + <File> + <FileName>RTX_Conf_CM.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\vendor\cmsis_rtos_rtx\RTX_Conf_CM.c</FilePath> + </File> + <File> + <FileName>RTX_CM4.lib</FileName> + <FileType>4</FileType> + <FilePath>..\..\..\vendor\cmsis_rtos_rtx\LIB\ARM\RTX_CM4.lib</FilePath> + </File> + </Files> + </Group> + <Group> + <GroupName>lpc43xx</GroupName> <Files> <File> <FileName>lpc43xx_uart.c</FileName> <FileType>1</FileType> - <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_uart.c</FilePath> + <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_uart.c</FilePath> </File> <File> <FileName>lpc43xx_scu.c</FileName> <FileType>1</FileType> - <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_scu.c</FilePath> + <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_scu.c</FilePath> </File> <File> <FileName>lpc43xx_gpio.c</FileName> <FileType>1</FileType> - <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_gpio.c</FilePath> + <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_gpio.c</FilePath> </File> <File> <FileName>lpc43xx_cgu.c</FileName> <FileType>1</FileType> - <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_cgu.c</FilePath> + <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_cgu.c</FilePath> </File> <File> <FileName>system_LPC43xx.c</FileName> <FileType>1</FileType> - <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\system_LPC43xx.c</FilePath> + <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\system_LPC43xx.c</FilePath> </File> <File> <FileName>lpc43xx_i2c.c</FileName> <FileType>1</FileType> - <FilePath>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_i2c.c</FilePath> + <FilePath>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_i2c.c</FilePath> </File> - </Files> - </Group> - <Group> - <GroupName>startup</GroupName> - <Files> <File> <FileName>startup_LPC43xx.s</FileName> <FileType>2</FileType> - <FilePath>..\..\bsp\lpc43xx\startup_keil\startup_LPC43xx.s</FilePath> + <FilePath>..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s</FilePath> </File> </Files> </Group> <Group> - <GroupName>cmsis-rtx</GroupName> + <GroupName>fatfs</GroupName> <Files> <File> - <FileName>RTX_Conf_CM.c</FileName> + <FileName>ccsbcs.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\vendor\cmsis_rtos_rtx\RTX_Conf_CM.c</FilePath> + <FilePath>..\..\..\vendor\fatfs\ccsbcs.c</FilePath> </File> <File> - <FileName>RTX_CM4.lib</FileName> - <FileType>4</FileType> - <FilePath>..\..\..\vendor\cmsis_rtos_rtx\LIB\ARM\RTX_CM4.lib</FilePath> + <FileName>diskio.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\vendor\fatfs\diskio.c</FilePath> + </File> + <File> + <FileName>ff.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\vendor\fatfs\ff.c</FilePath> </File> </Files> </Group> diff --git a/demos/host/host_freertos/host_freertos.uvopt b/demos/host/host_freertos/host_freertos.uvopt index 84f0f8fc5..7f187062f 100644 --- a/demos/host/host_freertos/host_freertos.uvopt +++ b/demos/host/host_freertos/host_freertos.uvopt @@ -73,7 +73,7 @@ <OPTFL> <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> - <IsCurrentTarget>0</IsCurrentTarget> + <IsCurrentTarget>1</IsCurrentTarget> </OPTFL> <CpuCode>8</CpuCode> <DllOpt> @@ -555,7 +555,7 @@ <OPTFL> <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> - <IsCurrentTarget>1</IsCurrentTarget> + <IsCurrentTarget>0</IsCurrentTarget> </OPTFL> <CpuCode>8</CpuCode> <Books> @@ -989,8 +989,8 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>..\..\..\tinyusb\common\errors.c</PathWithFileName> - <FilenameWithoutPath>errors.c</FilenameWithoutPath> + <PathWithFileName>..\..\..\tinyusb\common\tusb_errors.c</PathWithFileName> + <FilenameWithoutPath>tusb_errors.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -1050,7 +1050,7 @@ <Focus>0</Focus> <ColumnNumber>31</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>221</TopLine> + <TopLine>224</TopLine> <CurrentLine>229</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\..\..\tinyusb\class\hid_host.c</PathWithFileName> @@ -1170,7 +1170,7 @@ <Focus>0</Focus> <ColumnNumber>5</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>45</TopLine> + <TopLine>48</TopLine> <CurrentLine>54</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\..\..\vendor\freertos\freertoslpc\FreeRTOSCommonHooks.c</PathWithFileName> @@ -1366,7 +1366,7 @@ <Group> <GroupName>boards</GroupName> - <tvExp>1</tvExp> + <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> @@ -1533,8 +1533,8 @@ </Group> <Group> - <GroupName>bsp lpc43xx</GroupName> - <tvExp>1</tvExp> + <GroupName>lpc43xx</GroupName> + <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> @@ -1626,8 +1626,8 @@ <Focus>0</Focus> <ColumnNumber>0</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>0</TopLine> - <CurrentLine>0</CurrentLine> + <TopLine>14</TopLine> + <CurrentLine>34</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\system_LPC43xx.c</PathWithFileName> <FilenameWithoutPath>system_LPC43xx.c</FilenameWithoutPath> @@ -1653,8 +1653,8 @@ </Group> <Group> - <GroupName>bsp lpc175x_6x</GroupName> - <tvExp>1</tvExp> + <GroupName>lpc175x_6x</GroupName> + <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> diff --git a/demos/host/host_freertos/host_freertos.uvproj b/demos/host/host_freertos/host_freertos.uvproj index ad1a3dd9a..223c1372b 100644 --- a/demos/host/host_freertos/host_freertos.uvproj +++ b/demos/host/host_freertos/host_freertos.uvproj @@ -347,7 +347,7 @@ <uThumb>0</uThumb> <uSurpInc>0</uSurpInc> <VariousControls> - <MiscControls>--gnu --c99 --diag_suppress=66</MiscControls> + <MiscControls>--gnu --c99</MiscControls> <Define>CORE_M4 TUSB_CFG_MCU=MCU_LPC43XX BOARD=BOARD_EA4357 TUSB_CFG_OS=TUSB_OS_FREERTOS TUSB_CFG_OS_TASK_PRIO=configMAX_PRIORITIES-5</Define> <Undefine></Undefine> <IncludePath>..\src;..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\inc;..\..\..\boards;..\..\..\tinyusb;..\..\..\vendor\freertos;..\..\..\vendor\freertos\freertos\Source\include;..\..\..\vendor\fatfs</IncludePath> @@ -704,7 +704,7 @@ </Files> </Group> <Group> - <GroupName>bsp lpc43xx</GroupName> + <GroupName>lpc43xx</GroupName> <Files> <File> <FileName>startup_LPC43xx.s</FileName> @@ -744,7 +744,7 @@ </Files> </Group> <Group> - <GroupName>bsp lpc175x_6x</GroupName> + <GroupName>lpc175x_6x</GroupName> <GroupOption> <CommonProperty> <UseCPPCompiler>0</UseCPPCompiler> @@ -1534,7 +1534,7 @@ </Files> </Group> <Group> - <GroupName>bsp lpc43xx</GroupName> + <GroupName>lpc43xx</GroupName> <Files> <File> <FileName>startup_LPC43xx.s</FileName> @@ -1574,7 +1574,7 @@ </Files> </Group> <Group> - <GroupName>bsp lpc175x_6x</GroupName> + <GroupName>lpc175x_6x</GroupName> <GroupOption> <CommonProperty> <UseCPPCompiler>0</UseCPPCompiler> @@ -2007,7 +2007,7 @@ <uThumb>0</uThumb> <uSurpInc>0</uSurpInc> <VariousControls> - <MiscControls>--gnu --c99 --diag_suppress=66</MiscControls> + <MiscControls>--gnu --c99</MiscControls> <Define>TUSB_CFG_MCU=MCU_LPC175X_6X BOARD=BOARD_LPCXPRESSO1769 TUSB_CFG_OS=TUSB_OS_FREERTOS TUSB_CFG_OS_TASK_PRIO=configMAX_PRIORITIES-5</Define> <Undefine></Undefine> <IncludePath>..\src;..\..\..\mcu\lpc175x_6x\CMSIS_CORE_LPC17xx\inc;..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\include;..\..\..\boards;..\..\..\tinyusb;..\..\..\vendor\freertos;..\..\..\vendor\freertos\freertos\Source\include;..\..\..\vendor\fatfs</IncludePath> @@ -2364,7 +2364,7 @@ </Files> </Group> <Group> - <GroupName>bsp lpc43xx</GroupName> + <GroupName>lpc43xx</GroupName> <GroupOption> <CommonProperty> <UseCPPCompiler>0</UseCPPCompiler> @@ -2460,7 +2460,7 @@ </Files> </Group> <Group> - <GroupName>bsp lpc175x_6x</GroupName> + <GroupName>lpc175x_6x</GroupName> <Files> <File> <FileName>system_LPC17xx.c</FileName> @@ -2837,7 +2837,7 @@ <uThumb>0</uThumb> <uSurpInc>0</uSurpInc> <VariousControls> - <MiscControls>--gnu --c99 --diag_suppress=66</MiscControls> + <MiscControls>--gnu --c99</MiscControls> <Define>CORE_M4 TUSB_CFG_MCU=MCU_LPC43XX BOARD=BOARD_NGX4330 TUSB_CFG_OS=TUSB_OS_FREERTOS TUSB_CFG_OS_TASK_PRIO=configMAX_PRIORITIES-5</Define> <Undefine></Undefine> <IncludePath>..\src;..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\inc;..\..\..\boards;..\..\..\tinyusb;..\..\..\vendor\freertos;..\..\..\vendor\freertos\freertos\Source\include;..\..\..\vendor\fatfs</IncludePath> @@ -3194,7 +3194,7 @@ </Files> </Group> <Group> - <GroupName>bsp lpc43xx</GroupName> + <GroupName>lpc43xx</GroupName> <Files> <File> <FileName>startup_LPC43xx.s</FileName> @@ -3234,7 +3234,7 @@ </Files> </Group> <Group> - <GroupName>bsp lpc175x_6x</GroupName> + <GroupName>lpc175x_6x</GroupName> <GroupOption> <CommonProperty> <UseCPPCompiler>0</UseCPPCompiler> diff --git a/demos/host/host_os_none/host_os_none.uvopt b/demos/host/host_os_none/host_os_none.uvopt index 439ae827a..9a7585cd2 100644 --- a/demos/host/host_os_none/host_os_none.uvopt +++ b/demos/host/host_os_none/host_os_none.uvopt @@ -1114,7 +1114,7 @@ <Focus>0</Focus> <ColumnNumber>0</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>33</TopLine> + <TopLine>34</TopLine> <CurrentLine>38</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\..\..\tinyusb\hal\hal_lpc175x_6x.c</PathWithFileName> @@ -1162,7 +1162,7 @@ <Focus>0</Focus> <ColumnNumber>0</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>16</TopLine> + <TopLine>17</TopLine> <CurrentLine>34</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\..\..\tinyusb\class\cdc_host.c</PathWithFileName> @@ -1306,7 +1306,7 @@ <Focus>0</Focus> <ColumnNumber>15</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>4</TopLine> + <TopLine>5</TopLine> <CurrentLine>10</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\..\..\tinyusb\host\ohci\ohci.c</PathWithFileName> @@ -1754,7 +1754,7 @@ <Focus>0</Focus> <ColumnNumber>35</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>75</TopLine> + <TopLine>76</TopLine> <CurrentLine>86</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_clkpwr.c</PathWithFileName> diff --git a/demos/host/host_os_none/host_os_none.uvproj b/demos/host/host_os_none/host_os_none.uvproj index ed0108296..30fbe00c2 100644 --- a/demos/host/host_os_none/host_os_none.uvproj +++ b/demos/host/host_os_none/host_os_none.uvproj @@ -639,7 +639,7 @@ </Files> </Group> <Group> - <GroupName>bsp lpc43xx</GroupName> + <GroupName>lpc43xx</GroupName> <Files> <File> <FileName>startup_LPC43xx.s</FileName> @@ -679,7 +679,7 @@ </Files> </Group> <Group> - <GroupName>bsp lpc175x_6x</GroupName> + <GroupName>lpc175x_6x</GroupName> <GroupOption> <CommonProperty> <UseCPPCompiler>0</UseCPPCompiler> @@ -1404,7 +1404,7 @@ </Files> </Group> <Group> - <GroupName>bsp lpc43xx</GroupName> + <GroupName>lpc43xx</GroupName> <Files> <File> <FileName>startup_LPC43xx.s</FileName> @@ -1444,7 +1444,7 @@ </Files> </Group> <Group> - <GroupName>bsp lpc175x_6x</GroupName> + <GroupName>lpc175x_6x</GroupName> <GroupOption> <CommonProperty> <UseCPPCompiler>0</UseCPPCompiler> @@ -2169,7 +2169,7 @@ </Files> </Group> <Group> - <GroupName>bsp lpc43xx</GroupName> + <GroupName>lpc43xx</GroupName> <GroupOption> <CommonProperty> <UseCPPCompiler>0</UseCPPCompiler> @@ -2265,7 +2265,7 @@ </Files> </Group> <Group> - <GroupName>bsp lpc175x_6x</GroupName> + <GroupName>lpc175x_6x</GroupName> <Files> <File> <FileName>system_LPC17xx.c</FileName> @@ -2642,7 +2642,7 @@ <uThumb>0</uThumb> <uSurpInc>0</uSurpInc> <VariousControls> - <MiscControls>--gnu --c99 --diag_suppress=66</MiscControls> + <MiscControls>--gnu --c99</MiscControls> <Define>CORE_M4 TUSB_CFG_MCU=MCU_LPC43XX BOARD=BOARD_NGX4330 TUSB_CFG_OS=TUSB_OS_NONE</Define> <Undefine></Undefine> <IncludePath>..\src;..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\inc;..\..\..\boards;..\..\..\tinyusb;..\..\..\vendor\fatfs</IncludePath> @@ -2934,7 +2934,7 @@ </Files> </Group> <Group> - <GroupName>bsp lpc43xx</GroupName> + <GroupName>lpc43xx</GroupName> <Files> <File> <FileName>startup_LPC43xx.s</FileName> @@ -2974,7 +2974,7 @@ </Files> </Group> <Group> - <GroupName>bsp lpc175x_6x</GroupName> + <GroupName>lpc175x_6x</GroupName> <GroupOption> <CommonProperty> <UseCPPCompiler>0</UseCPPCompiler> |