diff options
| author | hathach <[email protected]> | 2013-09-21 14:28:59 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2013-09-21 14:38:40 +0700 |
| commit | 57088638598ccd0ea185debb8ca0fc7cbb404587 (patch) | |
| tree | 500c081b52abe45535d7e0f64ff1e26673a6dc9e /tinyusb/class/hid_host.c | |
| parent | d15ba08fdc5c75aa061dc7dde10eff54f6dc607f (diff) | |
house keeping, clean up warnings
Diffstat (limited to 'tinyusb/class/hid_host.c')
| -rw-r--r-- | tinyusb/class/hid_host.c | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/tinyusb/class/hid_host.c b/tinyusb/class/hid_host.c index de44bb416..9018c6123 100644 --- a/tinyusb/class/hid_host.c +++ b/tinyusb/class/hid_host.c @@ -244,10 +244,7 @@ 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, &keyboardh_data[dev_addr-1]) ); - if ( tusbh_hid_keyboard_mounted_cb ) - { - tusbh_hid_keyboard_mounted_cb(dev_addr); - } + tusbh_hid_keyboard_mounted_cb(dev_addr); } else #endif @@ -255,10 +252,7 @@ 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, &mouseh_data[dev_addr-1]) ); - if (tusbh_hid_mouse_mounted_cb) - { - tusbh_hid_mouse_mounted_cb(dev_addr); - } + tusbh_hid_mouse_mounted_cb(dev_addr); } else #endif @@ -281,10 +275,7 @@ void hidh_isr(pipe_handle_t pipe_hdl, tusb_event_t event, uint32_t xferred_bytes if ( pipehandle_is_equal(pipe_hdl, keyboardh_data[pipe_hdl.dev_addr-1].pipe_hdl) ) { keyboardh_data[pipe_hdl.dev_addr-1].status = (event == TUSB_EVENT_XFER_COMPLETE) ? TUSB_INTERFACE_STATUS_COMPLETE : TUSB_INTERFACE_STATUS_ERROR; - if (tusbh_hid_keyboard_isr) - { - tusbh_hid_keyboard_isr(pipe_hdl.dev_addr, event); - } + tusbh_hid_keyboard_isr(pipe_hdl.dev_addr, event); return; } #endif @@ -293,11 +284,7 @@ void hidh_isr(pipe_handle_t pipe_hdl, tusb_event_t event, uint32_t xferred_bytes if ( pipehandle_is_equal(pipe_hdl, mouseh_data[pipe_hdl.dev_addr-1].pipe_hdl) ) { mouseh_data[pipe_hdl.dev_addr-1].status = (event == TUSB_EVENT_XFER_COMPLETE) ? TUSB_INTERFACE_STATUS_COMPLETE : TUSB_INTERFACE_STATUS_ERROR; - if (tusbh_hid_mouse_isr) - { - tusbh_hid_mouse_isr(pipe_hdl.dev_addr, event); - } - + tusbh_hid_mouse_isr(pipe_hdl.dev_addr, event); return; } #endif |