diff options
| author | hathach <[email protected]> | 2013-10-02 11:01:28 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2013-10-02 11:01:28 +0700 |
| commit | 5c8389b9ae88d04b7d45330ad8b79ce0352b547b (patch) | |
| tree | 94276b23b23d3c314824cf5eaec4f6174bf2bd6c | |
| parent | ef83b8e10a1afd85fd935d5656f363927f3cd4bb (diff) | |
update freertos project
temp hack to fix problem with no TD on status endpoint of hub in case of error
| -rw-r--r-- | demos/host/host_freertos/.cproject | 1 | ||||
| -rw-r--r-- | demos/host/host_freertos/.project | 5 | ||||
| -rw-r--r-- | demos/host/host_freertos/host_freertos.uvopt | 80 | ||||
| -rw-r--r-- | demos/host/host_freertos/host_freertos.uvproj | 44 | ||||
| -rw-r--r-- | demos/host/host_os_none/host_os_none.uvopt | 88 | ||||
| -rw-r--r-- | tinyusb/host/usbh.c | 9 |
6 files changed, 150 insertions, 77 deletions
diff --git a/demos/host/host_freertos/.cproject b/demos/host/host_freertos/.cproject index f8c6f1158..9df394ac8 100644 --- a/demos/host/host_freertos/.cproject +++ b/demos/host/host_freertos/.cproject @@ -708,6 +708,7 @@ <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}/fatfs}""/> <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/lwip/lwip/src/include}""/> <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/lwip/lwip/src/include/ipv4}""/> <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/lwip/lpclwip}""/> diff --git a/demos/host/host_freertos/.project b/demos/host/host_freertos/.project index 1381e7fcd..447500588 100644 --- a/demos/host/host_freertos/.project +++ b/demos/host/host_freertos/.project @@ -86,6 +86,11 @@ <locationURI>PARENT-2-PROJECT_LOC/bsp</locationURI> </link> <link> + <name>fatfs</name> + <type>2</type> + <locationURI>PARENT-3-PROJECT_LOC/vendor/fatfs</locationURI> + </link> + <link> <name>freertos</name> <type>2</type> <locationURI>PARENT-3-PROJECT_LOC/vendor/freertos</locationURI> diff --git a/demos/host/host_freertos/host_freertos.uvopt b/demos/host/host_freertos/host_freertos.uvopt index b337afc73..9aedc7528 100644 --- a/demos/host/host_freertos/host_freertos.uvopt +++ b/demos/host/host_freertos/host_freertos.uvopt @@ -319,7 +319,7 @@ <Group> <GroupName>app</GroupName> - <tvExp>1</tvExp> + <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> @@ -331,7 +331,7 @@ <Focus>0</Focus> <ColumnNumber>0</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>98</TopLine> + <TopLine>99</TopLine> <CurrentLine>102</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\src\main.c</PathWithFileName> @@ -377,10 +377,10 @@ <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> - <ColumnNumber>0</ColumnNumber> + <ColumnNumber>7</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>44</TopLine> - <CurrentLine>73</CurrentLine> + <TopLine>68</TopLine> + <CurrentLine>74</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\src\mouse_app.c</PathWithFileName> <FilenameWithoutPath>mouse_app.c</FilenameWithoutPath> @@ -423,7 +423,7 @@ <Group> <GroupName>boards</GroupName> - <tvExp>1</tvExp> + <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> @@ -591,7 +591,7 @@ <Group> <GroupName>tinyusb</GroupName> - <tvExp>1</tvExp> + <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> @@ -843,7 +843,7 @@ <Focus>0</Focus> <ColumnNumber>0</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>104</TopLine> + <TopLine>105</TopLine> <CurrentLine>110</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\..\..\tinyusb\class\msc_host.c</PathWithFileName> @@ -865,9 +865,9 @@ <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> - <ColumnNumber>53</ColumnNumber> + <ColumnNumber>54</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>350</TopLine> + <TopLine>351</TopLine> <CurrentLine>355</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_uart.c</PathWithFileName> @@ -983,7 +983,7 @@ <Group> <GroupName>freertos</GroupName> - <tvExp>1</tvExp> + <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> @@ -1107,7 +1107,7 @@ <Focus>0</Focus> <ColumnNumber>27</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>24</TopLine> + <TopLine>25</TopLine> <CurrentLine>29</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\..\..\vendor\freertos\freertos\Source\portable\RVDS\ARM_CM4F\port.c</PathWithFileName> @@ -1117,4 +1117,60 @@ </File> </Group> + <Group> + <GroupName>fatfs</GroupName> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <cbSel>0</cbSel> + <RteFlg>0</RteFlg> + <File> + <GroupNumber>7</GroupNumber> + <FileNumber>48</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\ccsbcs.c</PathWithFileName> + <FilenameWithoutPath>ccsbcs.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>7</GroupNumber> + <FileNumber>49</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <Focus>0</Focus> + <ColumnNumber>5</ColumnNumber> + <tvExpOptDlg>0</tvExpOptDlg> + <TopLine>51</TopLine> + <CurrentLine>62</CurrentLine> + <bDave2>0</bDave2> + <PathWithFileName>..\..\..\vendor\fatfs\diskio.c</PathWithFileName> + <FilenameWithoutPath>diskio.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>7</GroupNumber> + <FileNumber>50</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <Focus>0</Focus> + <ColumnNumber>14</ColumnNumber> + <tvExpOptDlg>0</tvExpOptDlg> + <TopLine>1698</TopLine> + <CurrentLine>1710</CurrentLine> + <bDave2>0</bDave2> + <PathWithFileName>..\..\..\vendor\fatfs\ff.c</PathWithFileName> + <FilenameWithoutPath>ff.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + </Group> + </ProjectOpt> diff --git a/demos/host/host_freertos/host_freertos.uvproj b/demos/host/host_freertos/host_freertos.uvproj index ea93dd531..100b86810 100644 --- a/demos/host/host_freertos/host_freertos.uvproj +++ b/demos/host/host_freertos/host_freertos.uvproj @@ -44,7 +44,7 @@ <InvalidFlash>1</InvalidFlash> </TargetStatus> <OutputDirectory>.\UV4Build\</OutputDirectory> - <OutputName>host_os_none</OutputName> + <OutputName>host_freertos</OutputName> <CreateExecutable>1</CreateExecutable> <CreateLib>0</CreateLib> <CreateHexFile>0</CreateHexFile> @@ -350,7 +350,7 @@ <MiscControls>--gnu --c99 --diag_suppress=66</MiscControls> <Define>CORE_M4 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;..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\inc;..\..\bsp;..\..\..\tinyusb;..\..\..\vendor\freertos;..\..\..\vendor\freertos\freertos\Source\include;..\host_freertos</IncludePath> + <IncludePath>..\src;..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\inc;..\..\bsp;..\..\..\tinyusb;..\..\..\vendor\freertos;..\..\..\vendor\freertos\freertos\Source\include;..\host_freertos;..\..\..\vendor\fatfs</IncludePath> </VariousControls> </Cads> <Aads> @@ -653,6 +653,26 @@ </File> </Files> </Group> + <Group> + <GroupName>fatfs</GroupName> + <Files> + <File> + <FileName>ccsbcs.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\vendor\fatfs\ccsbcs.c</FilePath> + </File> + <File> + <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> </Groups> </Target> <Target> @@ -1342,6 +1362,26 @@ </File> </Files> </Group> + <Group> + <GroupName>fatfs</GroupName> + <Files> + <File> + <FileName>ccsbcs.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\vendor\fatfs\ccsbcs.c</FilePath> + </File> + <File> + <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> </Groups> </Target> </Targets> diff --git a/demos/host/host_os_none/host_os_none.uvopt b/demos/host/host_os_none/host_os_none.uvopt index f7edae87d..8b223e2aa 100644 --- a/demos/host/host_os_none/host_os_none.uvopt +++ b/demos/host/host_os_none/host_os_none.uvopt @@ -134,11 +134,6 @@ <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> @@ -162,7 +157,7 @@ <Bp> <Number>0</Number> <Type>0</Type> - <LineNumber>316</LineNumber> + <LineNumber>405</LineNumber> <EnabledFlag>1</EnabledFlag> <Address>0</Address> <ByteObject>0</ByteObject> @@ -175,22 +170,6 @@ <ExecCommand></ExecCommand> <Expression></Expression> </Bp> - <Bp> - <Number>1</Number> - <Type>0</Type> - <LineNumber>116</LineNumber> - <EnabledFlag>1</EnabledFlag> - <Address>0</Address> - <ByteObject>0</ByteObject> - <HtxType>0</HtxType> - <ManyObjects>0</ManyObjects> - <SizeOfObject>0</SizeOfObject> - <BreakByAccess>0</BreakByAccess> - <BreakIfRCount>0</BreakIfRCount> - <Filename>C:\Users\hathach\Dropbox\tinyusb\workspace\tinyusb\demos\host\src\msc_app.c</Filename> - <ExecCommand></ExecCommand> - <Expression></Expression> - </Bp> </Breakpoint> <WatchWindow1> <Ww> @@ -223,6 +202,11 @@ <WinNumber>1</WinNumber> <ItemText>disk_state</ItemText> </Ww> + <Ww> + <count>6</count> + <WinNumber>1</WinNumber> + <ItemText>**path</ItemText> + </Ww> </WatchWindow1> <MemoryWindow1> <Mm> @@ -407,7 +391,7 @@ <Bp> <Number>0</Number> <Type>0</Type> - <LineNumber>316</LineNumber> + <LineNumber>405</LineNumber> <EnabledFlag>1</EnabledFlag> <Address>0</Address> <ByteObject>0</ByteObject> @@ -420,22 +404,6 @@ <ExecCommand></ExecCommand> <Expression></Expression> </Bp> - <Bp> - <Number>1</Number> - <Type>0</Type> - <LineNumber>116</LineNumber> - <EnabledFlag>1</EnabledFlag> - <Address>0</Address> - <ByteObject>0</ByteObject> - <HtxType>0</HtxType> - <ManyObjects>0</ManyObjects> - <SizeOfObject>0</SizeOfObject> - <BreakByAccess>0</BreakByAccess> - <BreakIfRCount>0</BreakIfRCount> - <Filename>C:\Users\hathach\Dropbox\tinyusb\workspace\tinyusb\demos\host\src\msc_app.c</Filename> - <ExecCommand></ExecCommand> - <Expression></Expression> - </Bp> </Breakpoint> <WatchWindow1> <Ww> @@ -480,7 +448,7 @@ <Group> <GroupName>app</GroupName> - <tvExp>1</tvExp> + <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> @@ -492,7 +460,7 @@ <Focus>0</Focus> <ColumnNumber>25</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>154</TopLine> + <TopLine>155</TopLine> <CurrentLine>160</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\src\main.c</PathWithFileName> @@ -586,10 +554,10 @@ <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> - <ColumnNumber>0</ColumnNumber> + <ColumnNumber>35</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>1</TopLine> - <CurrentLine>1</CurrentLine> + <TopLine>399</TopLine> + <CurrentLine>405</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\src\cli.c</PathWithFileName> <FilenameWithoutPath>cli.c</FilenameWithoutPath> @@ -600,7 +568,7 @@ <Group> <GroupName>boards</GroupName> - <tvExp>1</tvExp> + <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> @@ -642,10 +610,10 @@ <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> - <ColumnNumber>44</ColumnNumber> + <ColumnNumber>1</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> <TopLine>95</TopLine> - <CurrentLine>106</CurrentLine> + <CurrentLine>132</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\..\bsp\boards\printf_retarget.c</PathWithFileName> <FilenameWithoutPath>printf_retarget.c</FilenameWithoutPath> @@ -768,7 +736,7 @@ <Group> <GroupName>tinyusb</GroupName> - <tvExp>1</tvExp> + <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> @@ -842,10 +810,10 @@ <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> - <ColumnNumber>21</ColumnNumber> + <ColumnNumber>0</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>3</TopLine> - <CurrentLine>8</CurrentLine> + <TopLine>356</TopLine> + <CurrentLine>362</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\..\..\tinyusb\host\usbh.c</PathWithFileName> <FilenameWithoutPath>usbh.c</FilenameWithoutPath> @@ -1092,7 +1060,7 @@ <Focus>0</Focus> <ColumnNumber>3</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>575</TopLine> + <TopLine>576</TopLine> <CurrentLine>580</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_cgu.c</PathWithFileName> @@ -1146,10 +1114,10 @@ <FileType>2</FileType> <tvExp>0</tvExp> <Focus>0</Focus> - <ColumnNumber>35</ColumnNumber> + <ColumnNumber>19</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>145</TopLine> - <CurrentLine>153</CurrentLine> + <TopLine>146</TopLine> + <CurrentLine>152</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\..\bsp\lpc43xx\startup_keil\startup_LPC43xx.s</PathWithFileName> <FilenameWithoutPath>startup_LPC43xx.s</FilenameWithoutPath> @@ -1160,7 +1128,7 @@ <Group> <GroupName>fatfs</GroupName> - <tvExp>1</tvExp> + <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> @@ -1172,7 +1140,7 @@ <Focus>0</Focus> <ColumnNumber>23</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>108</TopLine> + <TopLine>109</TopLine> <CurrentLine>113</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\..\..\vendor\fatfs\diskio.c</PathWithFileName> @@ -1186,10 +1154,10 @@ <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> - <ColumnNumber>0</ColumnNumber> + <ColumnNumber>12</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>2785</TopLine> - <CurrentLine>2795</CurrentLine> + <TopLine>91</TopLine> + <CurrentLine>97</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\..\..\vendor\fatfs\ff.c</PathWithFileName> <FilenameWithoutPath>ff.c</FilenameWithoutPath> diff --git a/tinyusb/host/usbh.c b/tinyusb/host/usbh.c index dcb4e73a8..f36c279a4 100644 --- a/tinyusb/host/usbh.c +++ b/tinyusb/host/usbh.c @@ -391,7 +391,8 @@ tusb_error_t enumeration_body_subtask(void) 4, enum_data_buffer ), error ); - SUBTASK_ASSERT_STATUS( error ); +// SUBTASK_ASSERT_STATUS( error ); + SUBTASK_ASSERT_STATUS_WITH_HANDLER(error, hub_status_pipe_queue( usbh_devices[0].hub_addr) ); // TODO hub refractor // Acknowledge Port Connection Change OSAL_SUBTASK_INVOKED_AND_WAIT( hub_port_clear_feature_subtask(usbh_devices[0].hub_addr, usbh_devices[0].hub_port, HUB_FEATURE_PORT_CONNECTION_CHANGE), error ); @@ -408,7 +409,8 @@ tusb_error_t enumeration_body_subtask(void) else { // Connection Event OSAL_SUBTASK_INVOKED_AND_WAIT ( hub_port_reset_subtask(usbh_devices[0].hub_addr, usbh_devices[0].hub_port), error ); - SUBTASK_ASSERT_STATUS( error ); +// SUBTASK_ASSERT_STATUS( error ); + SUBTASK_ASSERT_STATUS_WITH_HANDLER(error, hub_status_pipe_queue( usbh_devices[0].hub_addr) ); // TODO hub refractor usbh_devices[0].speed = hub_port_get_speed(); @@ -427,15 +429,16 @@ tusb_error_t enumeration_body_subtask(void) 8, enum_data_buffer ), error ); - SUBTASK_ASSERT_STATUS(error); // TODO some slow device is observed to fail the very fist controller xfer, can try more times //------------- Reset device again before Set Address -------------// if (usbh_devices[0].hub_addr == 0) { // connected directly to roothub + SUBTASK_ASSERT_STATUS(error); // TODO some slow device is observed to fail the very fist controller xfer, can try more times hcd_port_reset( usbh_devices[0].core_id ); // reset port after 8 byte descriptor // osal_task_delay(50); // TODO reset is recommended to last 50 ms (NXP EHCI passes this) }else { // connected via a hub + SUBTASK_ASSERT_STATUS_WITH_HANDLER(error, hub_status_pipe_queue( usbh_devices[0].hub_addr) ); // TODO hub refractor OSAL_SUBTASK_INVOKED_AND_WAIT ( hub_port_reset_subtask(usbh_devices[0].hub_addr, usbh_devices[0].hub_port), error ); if ( TUSB_ERROR_NONE == error ) |
