diff options
| author | hathach <[email protected]> | 2013-03-24 15:50:49 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2013-03-24 15:50:49 +0700 |
| commit | ce6398038635a55094d66eacdadaaa4d5b895625 (patch) | |
| tree | f4fda4969233df988cd0442426908a7f5b228e73 /tinyusb/class | |
| parent | 9c5ffa99328e1885cf75bedd2bfbcb30960a81dc (diff) | |
clean up:
- refractor tusb_handle_device_t device_hdl to uint8_t dev_addr
add keyboard_app.c/h
Diffstat (limited to 'tinyusb/class')
| -rw-r--r-- | tinyusb/class/hid_host.c | 12 | ||||
| -rw-r--r-- | tinyusb/class/hid_host.h | 5 |
2 files changed, 9 insertions, 8 deletions
diff --git a/tinyusb/class/hid_host.c b/tinyusb/class/hid_host.c index c46125b95..320957759 100644 --- a/tinyusb/class/hid_host.c +++ b/tinyusb/class/hid_host.c @@ -61,15 +61,15 @@ STATIC_ class_hid_keyboard_info_t keyboard_info_pool[TUSB_CFG_HOST_DEVICE_MAX]; //--------------------------------------------------------------------+ // PUBLIC API (Parameter Verification is required) //--------------------------------------------------------------------+ -tusb_error_t tusbh_hid_keyboard_get(tusb_handle_device_t const device_hdl, uint8_t instance_num, tusb_keyboard_report_t * const report) +tusb_error_t tusbh_hid_keyboard_get(uint8_t const dev_addr, uint8_t instance_num, tusb_keyboard_report_t * const report) { keyboard_interface_t *p_kbd; - ASSERT_INT(TUSB_DEVICE_STATE_CONFIGURED, tusbh_device_status_get(device_hdl), TUSB_ERROR_DEVICE_NOT_READY); + ASSERT_INT(TUSB_DEVICE_STATE_CONFIGURED, tusbh_device_status_get(dev_addr), TUSB_ERROR_DEVICE_NOT_READY); ASSERT_PTR(report, TUSB_ERROR_INVALID_PARA); ASSERT(instance_num < TUSB_CFG_HOST_HID_KEYBOARD_NO_INSTANCES_PER_DEVICE, TUSB_ERROR_INVALID_PARA); - p_kbd = &keyboard_info_pool[device_hdl].instance[instance_num]; + p_kbd = &keyboard_info_pool[dev_addr].instance[instance_num]; ASSERT(0 != p_kbd->pipe_in.dev_addr, TUSB_ERROR_CLASS_DEVICE_DONT_SUPPORT); @@ -80,11 +80,11 @@ tusb_error_t tusbh_hid_keyboard_get(tusb_handle_device_t const device_hdl, uint8 return TUSB_ERROR_NONE; } -uint8_t tusbh_hid_keyboard_no_instances(tusb_handle_device_t const device_hdl) +uint8_t tusbh_hid_keyboard_no_instances(uint8_t const dev_addr) { - ASSERT_INT(TUSB_DEVICE_STATE_CONFIGURED, tusbh_device_status_get(device_hdl), 0); + ASSERT_INT(TUSB_DEVICE_STATE_CONFIGURED, tusbh_device_status_get(dev_addr), 0); - return keyboard_info_pool[device_hdl].instance_count; + return keyboard_info_pool[dev_addr].instance_count; } //--------------------------------------------------------------------+ diff --git a/tinyusb/class/hid_host.h b/tinyusb/class/hid_host.h index c0cb81702..669e962d6 100644 --- a/tinyusb/class/hid_host.h +++ b/tinyusb/class/hid_host.h @@ -62,8 +62,9 @@ //--------------------------------------------------------------------+ // APPLICATION API //--------------------------------------------------------------------+ -uint8_t tusbh_hid_keyboard_no_instances(tusb_handle_device_t const device_hdl) ATTR_WARN_UNUSED_RESULT; -tusb_error_t tusbh_hid_keyboard_get(tusb_handle_device_t const handle, uint8_t instance_num, tusb_keyboard_report_t * const report) ATTR_WARN_UNUSED_RESULT; +uint8_t tusbh_hid_keyboard_no_instances(uint8_t const dev_addr) ATTR_WARN_UNUSED_RESULT; +tusb_error_t tusbh_hid_keyboard_get(uint8_t const handle, uint8_t const instance_num, tusb_keyboard_report_t * const report) ATTR_WARN_UNUSED_RESULT; +pipe_status_t tusbh_hid_keyboard_pipe_status(uint8_t const handle, uint8_t const instance_num); //--------------------------------------------------------------------+ // INTERNAL API |
