diff options
| author | hathach <[email protected]> | 2014-03-12 15:44:30 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2014-03-12 15:44:30 +0700 |
| commit | 2e9ab27e28bc08b508008933e651e17aa1a3ac64 (patch) | |
| tree | 53aef9c9e8e018dd63668b7833e5d1176af679be | |
| parent | 4efc5fecf7e774e678d56e9fc5efc965b2cf1d59 (diff) | |
seems like 43xx code requires an terminal (uart,SWO) connected to be able to run
| -rw-r--r-- | demos/device/device_os_none/device_os_none.ewp | 2 | ||||
| -rw-r--r-- | demos/device/device_os_none/device_os_none.uvopt | 35 | ||||
| -rw-r--r-- | demos/device/device_os_none/device_os_none.uvproj | 6 | ||||
| -rw-r--r-- | demos/device/src/tusb_config.h | 8 | ||||
| -rw-r--r-- | demos/host/host_os_none/host_os_none.uvopt | 24 |
5 files changed, 40 insertions, 35 deletions
diff --git a/demos/device/device_os_none/device_os_none.ewp b/demos/device/device_os_none/device_os_none.ewp index 1106d686f..cdc37c9db 100644 --- a/demos/device/device_os_none/device_os_none.ewp +++ b/demos/device/device_os_none/device_os_none.ewp @@ -1959,7 +1959,7 @@ </option>
<option>
<name>GenStdoutInterface</name>
- <state>0</state>
+ <state>1</state>
</option>
<option>
<name>GeneralMisraRules98</name>
diff --git a/demos/device/device_os_none/device_os_none.uvopt b/demos/device/device_os_none/device_os_none.uvopt index 3ed8e5a82..67589b0c8 100644 --- a/demos/device/device_os_none/device_os_none.uvopt +++ b/demos/device/device_os_none/device_os_none.uvopt @@ -348,7 +348,7 @@ <OPTFL> <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> - <IsCurrentTarget>1</IsCurrentTarget> + <IsCurrentTarget>0</IsCurrentTarget> </OPTFL> <CpuCode>8</CpuCode> <DllOpt> @@ -793,7 +793,7 @@ <OPTFL> <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> - <IsCurrentTarget>0</IsCurrentTarget> + <IsCurrentTarget>1</IsCurrentTarget> </OPTFL> <CpuCode>8</CpuCode> <Books> @@ -839,7 +839,7 @@ <sRfunc>1</sRfunc> <sRbox>1</sRbox> <tLdApp>1</tLdApp> - <tGomain>0</tGomain> + <tGomain>1</tGomain> <tRbreak>1</tRbreak> <tRwatch>1</tRwatch> <tRmem>1</tRmem> @@ -864,6 +864,11 @@ <TargetDriverDllRegistry> <SetRegEntry> <Number>0</Number> + <Key>DLGUARM</Key> + <Name></Name> + </SetRegEntry> + <SetRegEntry> + <Number>0</Number> <Key>DLGTARM</Key> <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)</Name> </SetRegEntry> @@ -875,7 +880,7 @@ <SetRegEntry> <Number>0</Number> <Key>JL2CM3</Key> - <Name>-U268003250 -O975 -S8 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO7 -FD10000000 -FC800 -FN0</Name> + <Name>-U268003250 -O975 -S8 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO19 -TC72000000 -TP21 -TDS800B -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO7 -FD10000000 -FC800 -FN0</Name> </SetRegEntry> </TargetDriverDllRegistry> <Breakpoint/> @@ -927,8 +932,8 @@ <Focus>0</Focus> <ColumnNumber>0</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>1</TopLine> - <CurrentLine>1</CurrentLine> + <TopLine>79</TopLine> + <CurrentLine>86</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\src\main.c</PathWithFileName> <FilenameWithoutPath>main.c</FilenameWithoutPath> @@ -939,7 +944,7 @@ <GroupNumber>1</GroupNumber> <FileNumber>2</FileNumber> <FileType>1</FileType> - <tvExp>1</tvExp> + <tvExp>0</tvExp> <Focus>0</Focus> <ColumnNumber>0</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> @@ -957,10 +962,10 @@ <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> - <ColumnNumber>0</ColumnNumber> + <ColumnNumber>23</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>0</TopLine> - <CurrentLine>0</CurrentLine> + <TopLine>127</TopLine> + <CurrentLine>128</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\src\keyboardd_app.c</PathWithFileName> <FilenameWithoutPath>keyboardd_app.c</FilenameWithoutPath> @@ -1383,8 +1388,8 @@ <Focus>0</Focus> <ColumnNumber>0</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>0</TopLine> - <CurrentLine>0</CurrentLine> + <TopLine>225</TopLine> + <CurrentLine>229</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\..\..\tinyusb\device\usbd.c</PathWithFileName> <FilenameWithoutPath>usbd.c</FilenameWithoutPath> @@ -2013,10 +2018,10 @@ <FileType>2</FileType> <tvExp>0</tvExp> <Focus>0</Focus> - <ColumnNumber>30</ColumnNumber> + <ColumnNumber>26</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>148</TopLine> - <CurrentLine>150</CurrentLine> + <TopLine>153</TopLine> + <CurrentLine>154</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\..\bsp\lpc43xx\startup_keil\startup_LPC43xx.s</PathWithFileName> <FilenameWithoutPath>startup_LPC43xx.s</FilenameWithoutPath> diff --git a/demos/device/device_os_none/device_os_none.uvproj b/demos/device/device_os_none/device_os_none.uvproj index 72e07d1a5..d36ccc3fe 100644 --- a/demos/device/device_os_none/device_os_none.uvproj +++ b/demos/device/device_os_none/device_os_none.uvproj @@ -4740,7 +4740,7 @@ <AfterMake> <RunUserProg1>0</RunUserProg1> <RunUserProg2>0</RunUserProg2> - <UserProg1Name>$K\ARM\BIN\ELFDWT.EXE !L BASEADDRESS(0x1A000000)</UserProg1Name> + <UserProg1Name></UserProg1Name> <UserProg2Name></UserProg2Name> <UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode> @@ -4795,7 +4795,7 @@ <Target> <UseTarget>1</UseTarget> <LoadApplicationAtStartup>1</LoadApplicationAtStartup> - <RunToMain>0</RunToMain> + <RunToMain>1</RunToMain> <RestoreBreakpoints>1</RestoreBreakpoints> <RestoreWatchpoints>1</RestoreWatchpoints> <RestoreMemoryDisplay>1</RestoreMemoryDisplay> @@ -4875,7 +4875,7 @@ <RvdsVP>2</RvdsVP> <hadIRAM2>1</hadIRAM2> <hadIROM2>0</hadIROM2> - <StupSel>0</StupSel> + <StupSel>8</StupSel> <useUlib>1</useUlib> <EndSel>0</EndSel> <uLtcg>0</uLtcg> diff --git a/demos/device/src/tusb_config.h b/demos/device/src/tusb_config.h index fc2d3b09a..4bba991bf 100644 --- a/demos/device/src/tusb_config.h +++ b/demos/device/src/tusb_config.h @@ -67,11 +67,11 @@ #define TUSB_CFG_DEVICE_FULLSPEED 1 // TODO refractor, remove
//------------- CLASS -------------//
-#define TUSB_CFG_DEVICE_HID_KEYBOARD 1
-#define TUSB_CFG_DEVICE_HID_MOUSE 1
+#define TUSB_CFG_DEVICE_HID_KEYBOARD 0
+#define TUSB_CFG_DEVICE_HID_MOUSE 0
#define TUSB_CFG_DEVICE_HID_GENERIC 0
-#define TUSB_CFG_DEVICE_MSC 0
-#define TUSB_CFG_DEVICE_CDC 1
+#define TUSB_CFG_DEVICE_MSC 1
+#define TUSB_CFG_DEVICE_CDC 0
//--------------------------------------------------------------------+
// COMMON CONFIGURATION
diff --git a/demos/host/host_os_none/host_os_none.uvopt b/demos/host/host_os_none/host_os_none.uvopt index 397e398f6..e37c21df2 100644 --- a/demos/host/host_os_none/host_os_none.uvopt +++ b/demos/host/host_os_none/host_os_none.uvopt @@ -856,7 +856,7 @@ <aLa>0</aLa> <aPa1>0</aPa1> <AscS4>0</AscS4> - <aSer4>0</aSer4> + <aSer4>1</aSer4> <StkLoc>0</StkLoc> <TrcWin>0</TrcWin> <newCpu>0</newCpu> @@ -884,8 +884,8 @@ <Focus>0</Focus> <ColumnNumber>0</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>111</TopLine> - <CurrentLine>112</CurrentLine> + <TopLine>151</TopLine> + <CurrentLine>158</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\src\main.c</PathWithFileName> <FilenameWithoutPath>main.c</FilenameWithoutPath> @@ -1428,7 +1428,7 @@ <Focus>0</Focus> <ColumnNumber>39</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>59</TopLine> + <TopLine>61</TopLine> <CurrentLine>63</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\..\..\vendor\fatfs\diskio.c</PathWithFileName> @@ -1442,9 +1442,9 @@ <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> - <ColumnNumber>11</ColumnNumber> + <ColumnNumber>15</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>2115</TopLine> + <TopLine>2117</TopLine> <CurrentLine>2122</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\..\..\vendor\fatfs\ff.c</PathWithFileName> @@ -1516,7 +1516,7 @@ <Focus>0</Focus> <ColumnNumber>17</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>84</TopLine> + <TopLine>86</TopLine> <CurrentLine>90</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\..\bsp\boards\printf_retarget.c</PathWithFileName> @@ -1544,7 +1544,7 @@ <GroupNumber>4</GroupNumber> <FileNumber>41</FileNumber> <FileType>1</FileType> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <Focus>0</Focus> <ColumnNumber>0</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> @@ -1650,10 +1650,10 @@ <FileType>2</FileType> <tvExp>0</tvExp> <Focus>0</Focus> - <ColumnNumber>13</ColumnNumber> + <ColumnNumber>20</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>171</TopLine> - <CurrentLine>174</CurrentLine> + <TopLine>147</TopLine> + <CurrentLine>159</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\..\bsp\lpc43xx\startup_keil\startup_LPC43xx.s</PathWithFileName> <FilenameWithoutPath>startup_LPC43xx.s</FilenameWithoutPath> @@ -1868,7 +1868,7 @@ <Focus>0</Focus> <ColumnNumber>0</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>141</TopLine> + <TopLine>143</TopLine> <CurrentLine>145</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\..\bsp\lpc175x_6x\startup_keil\startup_LPC17xx.s</PathWithFileName> |
