diff options
| author | hathach <[email protected]> | 2013-10-01 13:53:54 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2013-10-01 13:53:54 +0700 |
| commit | 640b0ec5467eadf153c4a09d53e0a38bae752685 (patch) | |
| tree | 1d589605ee186827ba6bd70958dd9286ca5ac535 /tinyusb/class | |
| parent | 7f4a3fc8294e733a9ba52d20fa16ca6662721126 (diff) | |
- move disconnection handle to enum task --> move tusbh_xxx_unmount is invoked in non-isr context
Diffstat (limited to 'tinyusb/class')
| -rw-r--r-- | tinyusb/class/cdc_host.c | 2 | ||||
| -rw-r--r-- | tinyusb/class/cdc_host.h | 4 | ||||
| -rw-r--r-- | tinyusb/class/hid_host.c | 4 | ||||
| -rw-r--r-- | tinyusb/class/hid_host.h | 4 | ||||
| -rw-r--r-- | tinyusb/class/msc_host.c | 2 | ||||
| -rw-r--r-- | tinyusb/class/msc_host.h | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/tinyusb/class/cdc_host.c b/tinyusb/class/cdc_host.c index 1fae8d66e..f54889489 100644 --- a/tinyusb/class/cdc_host.c +++ b/tinyusb/class/cdc_host.c @@ -266,7 +266,7 @@ void cdch_close(uint8_t dev_addr) memclr_(p_cdc, sizeof(cdch_data_t)); - tusbh_cdc_unmounted_isr(dev_addr); + tusbh_cdc_unmounted_cb(dev_addr); } diff --git a/tinyusb/class/cdc_host.h b/tinyusb/class/cdc_host.h index dfc1eba7b..f5add34d6 100644 --- a/tinyusb/class/cdc_host.h +++ b/tinyusb/class/cdc_host.h @@ -71,7 +71,7 @@ tusb_error_t tusbh_cdc_receive(uint8_t dev_addr, void * p_buffer, uint32_t lengt //------------- CDC Application Callback -------------// 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); @@ -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) -------------// 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); diff --git a/tinyusb/class/hid_host.c b/tinyusb/class/hid_host.c index b968c4454..0c7d4dc0a 100644 --- a/tinyusb/class/hid_host.c +++ b/tinyusb/class/hid_host.c @@ -282,7 +282,7 @@ void hidh_close(uint8_t dev_addr) if ( pipehandle_is_valid( keyboardh_data[dev_addr-1].pipe_hdl ) ) { 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 @@ -290,7 +290,7 @@ void hidh_close(uint8_t dev_addr) if( pipehandle_is_valid( mouseh_data[dev_addr-1].pipe_hdl ) ) { 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 diff --git a/tinyusb/class/hid_host.h b/tinyusb/class/hid_host.h index d0179a9bc..0c84bfbc3 100644 --- a/tinyusb/class/hid_host.h +++ b/tinyusb/class/hid_host.h @@ -66,7 +66,7 @@ tusb_error_t tusbh_hid_keyboard_get_report(uint8_t dev_addr, void * report) /*A //------------- Application Callback -------------// 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_unmounted_isr(uint8_t dev_addr); +void tusbh_hid_keyboard_unmounted_cb(uint8_t dev_addr); //--------------------------------------------------------------------+ // MOUSE Application API @@ -78,7 +78,7 @@ tusb_error_t tusbh_hid_mouse_get_report(uint8_t dev_addr, void* report) /*ATTR_ //------------- Application Callback -------------// 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_unmounted_isr(uint8_t dev_addr); +void tusbh_hid_mouse_unmounted_cb(uint8_t dev_addr); //--------------------------------------------------------------------+ // GENERIC Application API diff --git a/tinyusb/class/msc_host.c b/tinyusb/class/msc_host.c index 14c6bb5e4..df41a5998 100644 --- a/tinyusb/class/msc_host.c +++ b/tinyusb/class/msc_host.c @@ -427,7 +427,7 @@ void msch_close(uint8_t dev_addr) memclr_(&msch_data[dev_addr-1], sizeof(msch_interface_t)); osal_semaphore_reset(msch_sem_hdl); - tusbh_msc_unmounted_isr(dev_addr); // invoke Application Callback + tusbh_msc_unmounted_cb(dev_addr); // invoke Application Callback } //--------------------------------------------------------------------+ diff --git a/tinyusb/class/msc_host.h b/tinyusb/class/msc_host.h index 83409f859..4dbb3ef6c 100644 --- a/tinyusb/class/msc_host.h +++ b/tinyusb/class/msc_host.h @@ -80,7 +80,7 @@ tusb_error_t tusbh_msc_test_unit_ready(uint8_t dev_addr, uint8_t lun, msc_cmd_st //------------- Application Callback -------------// 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); |
