kingkevin
/
esp32-s2_dfu
1
0
Fork 0
Code Issues Releases Activity

- move disconnection handle to enum task --> move tusbh_xxx_unmount is invoked in non-isr context

This commit is contained in:
hathach 2013-10-01 13:53:54 +07:00
parent 7f4a3fc829
commit 640b0ec546
17 changed files with 87 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
demos/host/host_os_none/host_os_none.uvopt
View File

@ -460,7 +460,7 @@
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>25</ColumnNumber> <ColumnNumber>25</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>151</TopLine> <TopLine>152</TopLine>
<CurrentLine>160</CurrentLine> <CurrentLine>160</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\src\main.c</PathWithFileName> <PathWithFileName>..\src\main.c</PathWithFileName>
@ -492,7 +492,7 @@
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>0</ColumnNumber> <ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>127</TopLine> <TopLine>128</TopLine>
<CurrentLine>135</CurrentLine> <CurrentLine>135</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\src\keyboard_app.c</PathWithFileName> <PathWithFileName>..\src\keyboard_app.c</PathWithFileName>
@ -524,7 +524,7 @@
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>1</ColumnNumber> <ColumnNumber>1</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>53</TopLine> <TopLine>66</TopLine>
<CurrentLine>86</CurrentLine> <CurrentLine>86</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\src\rndis_app.c</PathWithFileName> <PathWithFileName>..\src\rndis_app.c</PathWithFileName>
@ -556,7 +556,7 @@
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>33</ColumnNumber> <ColumnNumber>33</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>73</TopLine> <TopLine>74</TopLine>
<CurrentLine>77</CurrentLine> <CurrentLine>77</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\src\cli.c</PathWithFileName> <PathWithFileName>..\src\cli.c</PathWithFileName>
@ -612,7 +612,7 @@
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>44</ColumnNumber> <ColumnNumber>44</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>82</TopLine> <TopLine>95</TopLine>
<CurrentLine>106</CurrentLine> <CurrentLine>106</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\..\bsp\boards\printf_retarget.c</PathWithFileName> <PathWithFileName>..\..\bsp\boards\printf_retarget.c</PathWithFileName>
@ -794,10 +794,10 @@
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>24</ColumnNumber> <ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>1</TopLine> <TopLine>1</TopLine>
<CurrentLine>11</CurrentLine> <CurrentLine>1</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\..\..\tinyusb\host\hub.c</PathWithFileName> <PathWithFileName>..\..\..\tinyusb\host\hub.c</PathWithFileName>
<FilenameWithoutPath>hub.c</FilenameWithoutPath> <FilenameWithoutPath>hub.c</FilenameWithoutPath>
@ -810,10 +810,10 @@
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>0</ColumnNumber> <ColumnNumber>19</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>1</TopLine> <TopLine>1</TopLine>
<CurrentLine>1</CurrentLine> <CurrentLine>18</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\..\..\tinyusb\host\usbh.c</PathWithFileName> <PathWithFileName>..\..\..\tinyusb\host\usbh.c</PathWithFileName>
<FilenameWithoutPath>usbh.c</FilenameWithoutPath> <FilenameWithoutPath>usbh.c</FilenameWithoutPath>
@ -826,10 +826,10 @@
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>56</ColumnNumber> <ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>562</TopLine> <TopLine>1</TopLine>
<CurrentLine>578</CurrentLine> <CurrentLine>1</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\..\..\tinyusb\host\ehci\ehci.c</PathWithFileName> <PathWithFileName>..\..\..\tinyusb\host\ehci\ehci.c</PathWithFileName>
<FilenameWithoutPath>ehci.c</FilenameWithoutPath> <FilenameWithoutPath>ehci.c</FilenameWithoutPath>
@ -988,7 +988,7 @@
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>0</ColumnNumber> <ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>240</TopLine> <TopLine>241</TopLine>
<CurrentLine>249</CurrentLine> <CurrentLine>249</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\..\..\tinyusb\class\msc_host.c</PathWithFileName> <PathWithFileName>..\..\..\tinyusb\class\msc_host.c</PathWithFileName>
@ -1060,7 +1060,7 @@
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>3</ColumnNumber> <ColumnNumber>3</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>572</TopLine> <TopLine>573</TopLine>
<CurrentLine>580</CurrentLine> <CurrentLine>580</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_cgu.c</PathWithFileName> <PathWithFileName>..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_cgu.c</PathWithFileName>
@ -1116,7 +1116,7 @@
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>0</ColumnNumber> <ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>145</TopLine> <TopLine>146</TopLine>
<CurrentLine>151</CurrentLine> <CurrentLine>151</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\..\bsp\lpc43xx\startup_keil\startup_LPC43xx.s</PathWithFileName> <PathWithFileName>..\..\bsp\lpc43xx\startup_keil\startup_LPC43xx.s</PathWithFileName>
@ -1138,9 +1138,9 @@
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>51</ColumnNumber> <ColumnNumber>52</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>111</TopLine> <TopLine>107</TopLine>
<CurrentLine>108</CurrentLine> <CurrentLine>108</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\..\..\vendor\fatfs\diskio.c</PathWithFileName> <PathWithFileName>..\..\..\vendor\fatfs\diskio.c</PathWithFileName>

5
demos/host/src/cdc_serial_app.c
View File

@ -62,15 +62,16 @@ void tusbh_cdc_mounted_cb(uint8_t dev_addr)
{ {
// application set-up // application set-up
printf("a CDC device is mounted\n"); printf("\na CDC device is mounted\n");
osal_queue_flush(queue_hdl); osal_queue_flush(queue_hdl);
tusbh_cdc_receive(dev_addr, buffer_in, sizeof(buffer_in), true); // first report tusbh_cdc_receive(dev_addr, buffer_in, sizeof(buffer_in), true); // first report
} }
void tusbh_cdc_unmounted_isr(uint8_t dev_addr) void tusbh_cdc_unmounted_cb(uint8_t dev_addr)
{ {
// application tear-down // application tear-down
printf("\na CDC device is unmounted\n");
} }
void tusbh_cdc_xfer_isr(uint8_t dev_addr, tusb_event_t event, cdc_pipeid_t pipe_id, uint32_t xferred_bytes) void tusbh_cdc_xfer_isr(uint8_t dev_addr, tusb_event_t event, cdc_pipeid_t pipe_id, uint32_t xferred_bytes)

5
demos/host/src/keyboard_app.c
View File

@ -71,15 +71,16 @@ void tusbh_hid_keyboard_mounted_cb(uint8_t dev_addr)
{ {
// application set-up // application set-up
printf("a keyboard device is mounted\n"); puts("\na Keyboard device is mounted");
osal_queue_flush(queue_kbd_hdl); osal_queue_flush(queue_kbd_hdl);
tusbh_hid_keyboard_get_report(dev_addr, (uint8_t*) &usb_keyboard_report); // first report tusbh_hid_keyboard_get_report(dev_addr, (uint8_t*) &usb_keyboard_report); // first report
} }
void tusbh_hid_keyboard_unmounted_isr(uint8_t dev_addr) void tusbh_hid_keyboard_unmounted_cb(uint8_t dev_addr)
{ {
// application tear-down // application tear-down
puts("\na Keyboard device is unmounted");
} }
void tusbh_hid_keyboard_isr(uint8_t dev_addr, tusb_event_t event) void tusbh_hid_keyboard_isr(uint8_t dev_addr, tusb_event_t event)

5
demos/host/src/mouse_app.c
View File

@ -71,15 +71,16 @@ void tusbh_hid_mouse_mounted_cb(uint8_t dev_addr)
{ {
// application set-up // application set-up
printf("a mouse device is mounted\n"); puts("\na Mouse device is mounted");
osal_queue_flush(queue_mouse_hdl); osal_queue_flush(queue_mouse_hdl);
(void) tusbh_hid_mouse_get_report(dev_addr, (uint8_t*) &usb_mouse_report); // first report (void) tusbh_hid_mouse_get_report(dev_addr, (uint8_t*) &usb_mouse_report); // first report
} }
void tusbh_hid_mouse_unmounted_isr(uint8_t dev_addr) void tusbh_hid_mouse_unmounted_cb(uint8_t dev_addr)
{ {
// application tear-down // application tear-down
puts("\na Mouse device is unmounted\n");
} }
void tusbh_hid_mouse_isr(uint8_t dev_addr, tusb_event_t event) void tusbh_hid_mouse_isr(uint8_t dev_addr, tusb_event_t event)

6
demos/host/src/msc_app.c
View File

@ -65,7 +65,7 @@ static FATFS fatfs[TUSB_CFG_HOST_DEVICE_MAX] TUSB_CFG_ATTR_USBRAM;
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
void tusbh_msc_mounted_cb(uint8_t dev_addr) void tusbh_msc_mounted_cb(uint8_t dev_addr)
{ {
printf("an msc device is mounted\n"); puts("\na MassStorage device is mounted");
//------------- Disk Information -------------// //------------- Disk Information -------------//
// SCSI VendorID[8] & ProductID[16] from Inquiry Command // SCSI VendorID[8] & ProductID[16] from Inquiry Command
@ -110,11 +110,11 @@ void tusbh_msc_mounted_cb(uint8_t dev_addr)
} }
} }
void tusbh_msc_unmounted_isr(uint8_t dev_addr) void tusbh_msc_unmounted_cb(uint8_t dev_addr)
{ {
// unmount disk // unmount disk
disk_state[dev_addr-1] = STA_NOINIT; disk_state[dev_addr-1] = STA_NOINIT;
puts("--"); puts("\na MassStorage device is unmounted");
} }
void tusbh_msc_isr(uint8_t dev_addr, tusb_event_t event, uint32_t xferred_bytes) void tusbh_msc_isr(uint8_t dev_addr, tusb_event_t event, uint32_t xferred_bytes)

5
demos/host/src/rndis_app.c
View File

@ -51,7 +51,7 @@ void tusbh_cdc_rndis_mounted_cb(uint8_t dev_addr)
{ // application set-up { // application set-up
uint8_t mac_address[6]; uint8_t mac_address[6];
printf("a RNDIS device is mounted\n"); printf("\nan RNDIS device is mounted\n");
tusbh_cdc_rndis_get_mac_addr(dev_addr, mac_address); tusbh_cdc_rndis_get_mac_addr(dev_addr, mac_address);
printf("MAC Address "); printf("MAC Address ");
@ -59,9 +59,10 @@ void tusbh_cdc_rndis_mounted_cb(uint8_t dev_addr)
printf("\n"); printf("\n");
} }
void tusbh_cdc_rndis_unmounted_isr(uint8_t dev_addr) void tusbh_cdc_rndis_unmounted_cb(uint8_t dev_addr)
{ {
// application tear-down // application tear-down
printf("\nan RNDIS device is unmounted\n");
} }
void rndis_app_init(void) void rndis_app_init(void)

6
tests/lpc18xx_43xx/test/host/usbh/test_usbh.c
View File

@ -149,7 +149,7 @@ void test_usbh_device_unplugged_isr_device_not_previously_mounted(void)
usbh_devices[dev_addr].hub_addr = 0; usbh_devices[dev_addr].hub_addr = 0;
usbh_devices[dev_addr].hub_port = 0; usbh_devices[dev_addr].hub_port = 0;
usbh_device_unplugged_isr(0); usbh_hcd_rhport_unplugged_isr(0);
} }
void test_usbh_device_unplugged_isr(void) void test_usbh_device_unplugged_isr(void)
@ -166,7 +166,7 @@ void test_usbh_device_unplugged_isr(void)
hcd_pipe_control_close_ExpectAndReturn(dev_addr, TUSB_ERROR_NONE); hcd_pipe_control_close_ExpectAndReturn(dev_addr, TUSB_ERROR_NONE);
//------------- Code Under Test -------------// //------------- Code Under Test -------------//
usbh_device_unplugged_isr(0); usbh_hcd_rhport_unplugged_isr(0);
TEST_ASSERT_EQUAL(TUSB_DEVICE_STATE_REMOVING, usbh_devices[dev_addr].state); TEST_ASSERT_EQUAL(TUSB_DEVICE_STATE_REMOVING, usbh_devices[dev_addr].state);
} }
@ -188,7 +188,7 @@ void test_usbh_device_unplugged_multple_class(void)
hcd_pipe_control_close_ExpectAndReturn(dev_addr, TUSB_ERROR_NONE); hcd_pipe_control_close_ExpectAndReturn(dev_addr, TUSB_ERROR_NONE);
//------------- Code Under Test -------------// //------------- Code Under Test -------------//
usbh_device_unplugged_isr(0); usbh_hcd_rhport_unplugged_isr(0);
TEST_ASSERT_EQUAL(TUSB_DEVICE_STATE_REMOVING, usbh_devices[dev_addr].state); TEST_ASSERT_EQUAL(TUSB_DEVICE_STATE_REMOVING, usbh_devices[dev_addr].state);

2
tinyusb/class/cdc_host.c
View File

@ -266,7 +266,7 @@ void cdch_close(uint8_t dev_addr)
memclr_(p_cdc, sizeof(cdch_data_t)); memclr_(p_cdc, sizeof(cdch_data_t));
tusbh_cdc_unmounted_isr(dev_addr); tusbh_cdc_unmounted_cb(dev_addr);
} }

4
tinyusb/class/cdc_host.h
View File

@ -71,7 +71,7 @@ tusb_error_t tusbh_cdc_receive(uint8_t dev_addr, void * p_buffer, uint32_t lengt
//------------- CDC Application Callback -------------// //------------- CDC Application Callback -------------//
void tusbh_cdc_mounted_cb(uint8_t dev_addr); void tusbh_cdc_mounted_cb(uint8_t dev_addr);
void tusbh_cdc_unmounted_isr(uint8_t dev_addr); void tusbh_cdc_unmounted_cb(uint8_t dev_addr);
void tusbh_cdc_xfer_isr(uint8_t dev_addr, tusb_event_t event, cdc_pipeid_t pipe_id, uint32_t xferred_bytes); void tusbh_cdc_xfer_isr(uint8_t dev_addr, tusb_event_t event, cdc_pipeid_t pipe_id, uint32_t xferred_bytes);
@ -84,7 +84,7 @@ tusb_error_t tusbh_cdc_rndis_get_mac_addr(uint8_t dev_addr, uint8_t mac_address[
//------------- RNDIS Application Callback (overshadow CDC callbacks) -------------// //------------- RNDIS Application Callback (overshadow CDC callbacks) -------------//
void tusbh_cdc_rndis_mounted_cb(uint8_t dev_addr); void tusbh_cdc_rndis_mounted_cb(uint8_t dev_addr);
void tusbh_cdc_rndis_unmounted_isr(uint8_t dev_addr); void tusbh_cdc_rndis_unmounted_cb(uint8_t dev_addr);
void tusbh_cdc_rndis_xfer_isr(uint8_t dev_addr, tusb_event_t event, cdc_pipeid_t pipe_id, uint32_t xferred_bytes); void tusbh_cdc_rndis_xfer_isr(uint8_t dev_addr, tusb_event_t event, cdc_pipeid_t pipe_id, uint32_t xferred_bytes);

4
tinyusb/class/hid_host.c
View File

@ -282,7 +282,7 @@ void hidh_close(uint8_t dev_addr)
if ( pipehandle_is_valid( keyboardh_data[dev_addr-1].pipe_hdl ) ) if ( pipehandle_is_valid( keyboardh_data[dev_addr-1].pipe_hdl ) )
{ {
hidh_interface_close(dev_addr, &keyboardh_data[dev_addr-1]); hidh_interface_close(dev_addr, &keyboardh_data[dev_addr-1]);
tusbh_hid_keyboard_unmounted_isr(dev_addr); tusbh_hid_keyboard_unmounted_cb(dev_addr);
} }
#endif #endif
@ -290,7 +290,7 @@ void hidh_close(uint8_t dev_addr)
if( pipehandle_is_valid( mouseh_data[dev_addr-1].pipe_hdl ) ) if( pipehandle_is_valid( mouseh_data[dev_addr-1].pipe_hdl ) )
{ {
hidh_interface_close(dev_addr, &mouseh_data[dev_addr-1]); hidh_interface_close(dev_addr, &mouseh_data[dev_addr-1]);
tusbh_hid_mouse_unmounted_isr( dev_addr ); tusbh_hid_mouse_unmounted_cb( dev_addr );
} }
#endif #endif

4
tinyusb/class/hid_host.h
View File

@ -66,7 +66,7 @@ tusb_error_t tusbh_hid_keyboard_get_report(uint8_t dev_addr, void * report) /*A
//------------- Application Callback -------------// //------------- Application Callback -------------//
void tusbh_hid_keyboard_isr(uint8_t dev_addr, tusb_event_t event); void tusbh_hid_keyboard_isr(uint8_t dev_addr, tusb_event_t event);
void tusbh_hid_keyboard_mounted_cb(uint8_t dev_addr); void tusbh_hid_keyboard_mounted_cb(uint8_t dev_addr);
void tusbh_hid_keyboard_unmounted_isr(uint8_t dev_addr); void tusbh_hid_keyboard_unmounted_cb(uint8_t dev_addr);
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
// MOUSE Application API // MOUSE Application API
@ -78,7 +78,7 @@ tusb_error_t tusbh_hid_mouse_get_report(uint8_t dev_addr, void* report) /*ATTR_
//------------- Application Callback -------------// //------------- Application Callback -------------//
void tusbh_hid_mouse_isr(uint8_t dev_addr, tusb_event_t event); void tusbh_hid_mouse_isr(uint8_t dev_addr, tusb_event_t event);
void tusbh_hid_mouse_mounted_cb(uint8_t dev_addr); void tusbh_hid_mouse_mounted_cb(uint8_t dev_addr);
void tusbh_hid_mouse_unmounted_isr(uint8_t dev_addr); void tusbh_hid_mouse_unmounted_cb(uint8_t dev_addr);
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
// GENERIC Application API // GENERIC Application API

2
tinyusb/class/msc_host.c
View File

@ -427,7 +427,7 @@ void msch_close(uint8_t dev_addr)
memclr_(&msch_data[dev_addr-1], sizeof(msch_interface_t)); memclr_(&msch_data[dev_addr-1], sizeof(msch_interface_t));
osal_semaphore_reset(msch_sem_hdl); osal_semaphore_reset(msch_sem_hdl);
tusbh_msc_unmounted_isr(dev_addr); // invoke Application Callback tusbh_msc_unmounted_cb(dev_addr); // invoke Application Callback
} }
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+

2
tinyusb/class/msc_host.h
View File

@ -80,7 +80,7 @@ tusb_error_t tusbh_msc_test_unit_ready(uint8_t dev_addr, uint8_t lun, msc_cmd_st
//------------- Application Callback -------------// //------------- Application Callback -------------//
void tusbh_msc_mounted_cb(uint8_t dev_addr); void tusbh_msc_mounted_cb(uint8_t dev_addr);
void tusbh_msc_unmounted_isr(uint8_t dev_addr); void tusbh_msc_unmounted_cb(uint8_t dev_addr);
void tusbh_msc_isr(uint8_t dev_addr, tusb_event_t event, uint32_t xferred_bytes); void tusbh_msc_isr(uint8_t dev_addr, tusb_event_t event, uint32_t xferred_bytes);

4
tinyusb/host/ehci/ehci.c
View File

@ -564,11 +564,11 @@ static void port_connect_status_change_isr(uint8_t hostid)
// NOTE There is an sequence plug->unplug->…..-> plug if device is powering with pre-plugged device // NOTE There is an sequence plug->unplug->…..-> plug if device is powering with pre-plugged device
if (regs->portsc_bit.current_connect_status) if (regs->portsc_bit.current_connect_status)
{ {
usbh_device_plugged_isr(hostid, 0, 0); usbh_hcd_rhport_plugged_isr(hostid, 0, 0);
}else // device unplugged }else // device unplugged
{ {
usbh_hcd_rhport_unplugged_isr(hostid); usbh_hcd_rhport_unplugged_isr(hostid);
regs->usb_cmd_bit.advacne_async = 1; // Async doorbell check EHCI 4.8.2 for operational details // regs->usb_cmd_bit.advacne_async = 1; // Async doorbell check EHCI 4.8.2 for operational details
} }
} }

2
tinyusb/host/hub.c
View File

@ -210,7 +210,7 @@ void hub_isr(pipe_handle_t pipe_hdl, tusb_event_t event, uint32_t xferred_bytes)
if ( BIT_TEST_(p_hub->status_change, port) ) if ( BIT_TEST_(p_hub->status_change, port) )
{ {
// TODO HUB connection/disconnection will be determined in enum task --> connect change // TODO HUB connection/disconnection will be determined in enum task --> connect change
usbh_device_plugged_isr(usbh_devices[pipe_hdl.dev_addr].core_id, pipe_hdl.dev_addr, port); usbh_hcd_rhport_plugged_isr(usbh_devices[pipe_hdl.dev_addr].core_id, pipe_hdl.dev_addr, port);
} }
} }

60
tinyusb/host/usbh.c
View File

@ -273,16 +273,21 @@ void usbh_xfer_isr(pipe_handle_t pipe_hdl, uint8_t class_code, tusb_event_t even
} }
} }
void usbh_device_plugged_isr(uint8_t hostid, uint8_t hub_addr, uint8_t hub_port) void usbh_hcd_rhport_plugged_isr(uint8_t hostid, uint8_t hub_addr, uint8_t hub_port)
{ {
osal_queue_send(enum_queue_hdl, osal_queue_send(enum_queue_hdl,
&(usbh_enumerate_t){ .core_id = hostid, .hub_addr = hub_addr, .hub_port = hub_port} ); &(usbh_enumerate_t){
.core_id = hostid,
.hub_addr = hub_addr,
.hub_port = hub_port}
);
} }
// a device unplugged on hostid, hub_addr, hub_port // a device unplugged on hostid, hub_addr, hub_port
// return true if found and unmounted device, false if cannot find // return true if found and unmounted device, false if cannot find
bool usbh_device_unplugged(uint8_t hostid, uint8_t hub_addr, uint8_t hub_port) void usbh_device_unplugged(uint8_t hostid, uint8_t hub_addr, uint8_t hub_port)
{ {
bool is_found = false;
//------------- find the all devices (star-network) under port that is unplugged -------------// //------------- find the all devices (star-network) under port that is unplugged -------------//
for (uint8_t dev_addr = 0; dev_addr <= TUSB_CFG_HOST_DEVICE_MAX; dev_addr ++) for (uint8_t dev_addr = 0; dev_addr <= TUSB_CFG_HOST_DEVICE_MAX; dev_addr ++)
{ {
@ -306,15 +311,24 @@ bool usbh_device_unplugged(uint8_t hostid, uint8_t hub_addr, uint8_t hub_port)
// HCD must set this device's state to TUSB_DEVICE_STATE_UNPLUG when done // HCD must set this device's state to TUSB_DEVICE_STATE_UNPLUG when done
usbh_devices[dev_addr].state = TUSB_DEVICE_STATE_REMOVING; usbh_devices[dev_addr].state = TUSB_DEVICE_STATE_REMOVING;
usbh_devices[dev_addr].flag_supported_class = 0; usbh_devices[dev_addr].flag_supported_class = 0;
is_found = true;
} }
} }
return true; if (is_found) hcd_hub_advance_asyn(usbh_devices[0].core_id); // TODO hack
} }
void usbh_hcd_rhport_unplugged_isr(uint8_t hostid) void usbh_hcd_rhport_unplugged_isr(uint8_t hostid)
{ {
(void) usbh_device_unplugged(hostid, 0, 0); osal_queue_send(enum_queue_hdl,
&(usbh_enumerate_t)
{
.core_id = hostid,
.hub_addr = 0,
.hub_port = 0
} );
} }
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
@ -353,8 +367,23 @@ tusb_error_t enumeration_body_subtask(void)
usbh_devices[0].hub_port = enum_entry.hub_port; usbh_devices[0].hub_port = enum_entry.hub_port;
usbh_devices[0].state = TUSB_DEVICE_STATE_UNPLUG; usbh_devices[0].state = TUSB_DEVICE_STATE_UNPLUG;
if ( usbh_devices[0].hub_addr != 0) // connected/disconnected via hub if ( usbh_devices[0].hub_addr == 0)
{ { // connected/disconnected directly with roothub
if( hcd_port_connect_status(usbh_devices[0].core_id) )
{ // connection event
osal_task_delay(200); // wait for device is stable
hcd_port_reset( usbh_devices[0].core_id ); // port must be reset to have correct speed operation
// osal_task_delay(50); // TODO reset is recommended to last 50 ms (NXP EHCI passes this)
usbh_devices[0].speed = hcd_port_speed_get( usbh_devices[0].core_id );
}
else
{ // disconnection event
usbh_device_unplugged(usbh_devices[0].core_id, 0, 0);
SUBTASK_EXIT(TUSB_ERROR_NONE); // restart task
}
}
else
{ // connected/disconnected via hub
//------------- Get Port Status -------------// //------------- Get Port Status -------------//
OSAL_SUBTASK_INVOKED_AND_WAIT( OSAL_SUBTASK_INVOKED_AND_WAIT(
usbh_control_xfer_subtask( usbh_devices[0].hub_addr, bm_request_type(TUSB_DIR_DEV_TO_HOST, TUSB_REQUEST_TYPE_CLASS, TUSB_REQUEST_RECIPIENT_OTHER), usbh_control_xfer_subtask( usbh_devices[0].hub_addr, bm_request_type(TUSB_DIR_DEV_TO_HOST, TUSB_REQUEST_TYPE_CLASS, TUSB_REQUEST_RECIPIENT_OTHER),
@ -370,17 +399,14 @@ tusb_error_t enumeration_body_subtask(void)
if ( ! ((hub_port_status_response_t *) enum_data_buffer)->status_change.connect_status ) SUBTASK_EXIT(TUSB_ERROR_NONE); // only handle connection change if ( ! ((hub_port_status_response_t *) enum_data_buffer)->status_change.connect_status ) SUBTASK_EXIT(TUSB_ERROR_NONE); // only handle connection change
if ( ! ((hub_port_status_response_t *) enum_data_buffer)->status_current.connect_status ) if ( ! ((hub_port_status_response_t *) enum_data_buffer)->status_current.connect_status )
{ // Device is disconnected via Hub { // Disconnection event
if ( usbh_device_unplugged(usbh_devices[0].core_id, usbh_devices[0].hub_addr, usbh_devices[0].hub_port) ) usbh_device_unplugged(usbh_devices[0].core_id, usbh_devices[0].hub_addr, usbh_devices[0].hub_port);
{
hcd_hub_advance_asyn(usbh_devices[0].core_id); // TODO hack
}
(void) hub_status_pipe_queue( usbh_devices[0].hub_addr ); // done with hub, waiting for next data on status pipe (void) hub_status_pipe_queue( usbh_devices[0].hub_addr ); // done with hub, waiting for next data on status pipe
SUBTASK_EXIT(TUSB_ERROR_NONE); // restart task SUBTASK_EXIT(TUSB_ERROR_NONE); // restart task
} }
else else
{ // Device is connected via Hub { // Connection Event
OSAL_SUBTASK_INVOKED_AND_WAIT ( hub_port_reset_subtask(usbh_devices[0].hub_addr, usbh_devices[0].hub_port), error ); 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 );
@ -390,14 +416,6 @@ tusb_error_t enumeration_body_subtask(void)
OSAL_SUBTASK_INVOKED_AND_WAIT( hub_port_clear_feature_subtask(usbh_devices[0].hub_addr, usbh_devices[0].hub_port, HUB_FEATURE_PORT_RESET_CHANGE), error ); OSAL_SUBTASK_INVOKED_AND_WAIT( hub_port_clear_feature_subtask(usbh_devices[0].hub_addr, usbh_devices[0].hub_port, HUB_FEATURE_PORT_RESET_CHANGE), error );
} }
} }
else
{
SUBTASK_ASSERT( hcd_port_connect_status(usbh_devices[0].core_id) ); // ensure device is still plugged
osal_task_delay(200); // wait for device is stable
hcd_port_reset( usbh_devices[0].core_id ); // port must be reset to have correct speed operation
// osal_task_delay(50); // TODO reset is recommended to last 50 ms (NXP EHCI passes this)
usbh_devices[0].speed = hcd_port_speed_get( usbh_devices[0].core_id );
}
SUBTASK_ASSERT_STATUS( usbh_pipe_control_open(0, 8) ); SUBTASK_ASSERT_STATUS( usbh_pipe_control_open(0, 8) );
usbh_devices[0].state = TUSB_DEVICE_STATE_ADDRESSED; usbh_devices[0].state = TUSB_DEVICE_STATE_ADDRESSED;

2
tinyusb/host/usbh_hcd.h
View File

@ -115,7 +115,7 @@ extern usbh_device_info_t usbh_devices[TUSB_CFG_HOST_DEVICE_MAX+1]; // including
// callback from HCD ISR // callback from HCD ISR
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
void usbh_xfer_isr(pipe_handle_t pipe_hdl, uint8_t class_code, tusb_event_t event, uint32_t xferred_bytes); void usbh_xfer_isr(pipe_handle_t pipe_hdl, uint8_t class_code, tusb_event_t event, uint32_t xferred_bytes);
void usbh_device_plugged_isr(uint8_t hostid, uint8_t hub_addr, uint8_t hub_port); void usbh_hcd_rhport_plugged_isr(uint8_t hostid, uint8_t hub_addr, uint8_t hub_port);
void usbh_hcd_rhport_unplugged_isr(uint8_t hostid); void usbh_hcd_rhport_unplugged_isr(uint8_t hostid);
#ifdef __cplusplus #ifdef __cplusplus