diff options
| author | hathach <[email protected]> | 2013-07-04 09:45:20 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2013-07-04 09:45:20 +0700 |
| commit | c5afb9d50f3aea59dfdf016a1ae33ab511249de7 (patch) | |
| tree | 7d6e61d3c023dddc7450a1b29eaa04f933aefad5 /tinyusb/class | |
| parent | 544b48183abea8c9cec94c93bc7080bd0e4cee8e (diff) | |
change class (hid/cdc) _mounted_isr to _mounted_cb
Diffstat (limited to 'tinyusb/class')
| -rw-r--r-- | tinyusb/class/cdc_host.c | 4 | ||||
| -rw-r--r-- | tinyusb/class/cdc_host.h | 2 | ||||
| -rw-r--r-- | tinyusb/class/hid_host.c | 8 | ||||
| -rw-r--r-- | tinyusb/class/hid_host.h | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/tinyusb/class/cdc_host.c b/tinyusb/class/cdc_host.c index e349f3b9f..3831fc243 100644 --- a/tinyusb/class/cdc_host.c +++ b/tinyusb/class/cdc_host.c @@ -194,9 +194,9 @@ tusb_error_t cdch_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con } // FIXME mounted class flag is not set yet - if (tusbh_cdc_mounted_isr) + if (tusbh_cdc_mounted_cb) { - tusbh_cdc_mounted_isr(dev_addr); + tusbh_cdc_mounted_cb(dev_addr); } return TUSB_ERROR_NONE; diff --git a/tinyusb/class/cdc_host.h b/tinyusb/class/cdc_host.h index fc21fcc25..ac8cf7acb 100644 --- a/tinyusb/class/cdc_host.h +++ b/tinyusb/class/cdc_host.h @@ -69,7 +69,7 @@ tusb_error_t tusbh_cdc_send(uint8_t dev_addr, void const * p_data, uint32_t leng tusb_error_t tusbh_cdc_receive(uint8_t dev_addr, void * p_buffer, uint32_t length, bool is_notify); //------------- Application Callback -------------// -void tusbh_cdc_mounted_isr(uint8_t dev_addr) ATTR_WEAK; +void tusbh_cdc_mounted_cb(uint8_t dev_addr) ATTR_WEAK; void tusbh_cdc_unmounted_isr(uint8_t dev_addr) ATTR_WEAK; void tusbh_cdc_isr(uint8_t dev_addr, tusb_event_t event) ATTR_WEAK; void tusbh_cdc_xfer_isr(uint8_t dev_addr, tusb_event_t event, cdc_pipeid_t pipe_id, uint32_t xferred_bytes) ATTR_WEAK; diff --git a/tinyusb/class/hid_host.c b/tinyusb/class/hid_host.c index 4b5a31f0c..be1e7f28d 100644 --- a/tinyusb/class/hid_host.c +++ b/tinyusb/class/hid_host.c @@ -257,9 +257,9 @@ tusb_error_t hidh_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con if ( HID_PROTOCOL_KEYBOARD == p_interface_desc->bInterfaceProtocol) { SUBTASK_ASSERT_STATUS ( hidh_interface_open(dev_addr, p_interface_desc->bInterfaceNumber, p_endpoint_desc, &keyboard_data[dev_addr-1]) ); - if ( tusbh_hid_keyboard_mounted_isr ) + if ( tusbh_hid_keyboard_mounted_cb ) { - tusbh_hid_keyboard_mounted_isr(dev_addr); + tusbh_hid_keyboard_mounted_cb(dev_addr); } } else #endif @@ -268,9 +268,9 @@ tusb_error_t hidh_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con if ( HID_PROTOCOL_MOUSE == p_interface_desc->bInterfaceProtocol) { SUBTASK_ASSERT_STATUS ( hidh_interface_open(dev_addr, p_interface_desc->bInterfaceNumber, p_endpoint_desc, &mouse_data[dev_addr-1]) ); - if (tusbh_hid_mouse_mounted_isr) + if (tusbh_hid_mouse_mounted_cb) { - tusbh_hid_mouse_mounted_isr(dev_addr); + tusbh_hid_mouse_mounted_cb(dev_addr); } } else #endif diff --git a/tinyusb/class/hid_host.h b/tinyusb/class/hid_host.h index 7d5876990..a61a66e70 100644 --- a/tinyusb/class/hid_host.h +++ b/tinyusb/class/hid_host.h @@ -64,7 +64,7 @@ tusb_error_t tusbh_hid_keyboard_get_report(uint8_t dev_addr, void * report) ATT tusb_interface_status_t tusbh_hid_keyboard_status(uint8_t dev_addr) ATTR_WARN_UNUSED_RESULT; //------------- Application Callback -------------// void tusbh_hid_keyboard_isr(uint8_t dev_addr, tusb_event_t event) ATTR_WEAK; -void tusbh_hid_keyboard_mounted_isr(uint8_t dev_addr) ATTR_WEAK; +void tusbh_hid_keyboard_mounted_cb(uint8_t dev_addr) ATTR_WEAK; void tusbh_hid_keyboard_unmounted_isr(uint8_t dev_addr) ATTR_WEAK; //--------------------------------------------------------------------+ @@ -75,7 +75,7 @@ tusb_error_t tusbh_hid_mouse_get_report(uint8_t dev_addr, void* report) ATTR_WA tusb_interface_status_t tusbh_hid_mouse_status(uint8_t dev_addr) ATTR_WARN_UNUSED_RESULT; //------------- Application Callback -------------// void tusbh_hid_mouse_isr(uint8_t dev_addr, tusb_event_t event) ATTR_WEAK; -void tusbh_hid_mouse_mounted_isr(uint8_t dev_addr) ATTR_WEAK; +void tusbh_hid_mouse_mounted_cb(uint8_t dev_addr) ATTR_WEAK; void tusbh_hid_mouse_unmounted_isr(uint8_t dev_addr) ATTR_WEAK; //--------------------------------------------------------------------+ |
