diff options
| author | hathach <[email protected]> | 2013-03-26 16:39:25 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2013-03-26 16:39:25 +0700 |
| commit | ac905a8d09598067c53ff32835a2d70797d970be (patch) | |
| tree | 2ea02bce7ac3f4174dc99f4a22e56abb1c109595 /tinyusb/class | |
| parent | 0b08dc7724a67f09be16fad3d6702ce0d7566f03 (diff) | |
rename pipe_status_t to tusb_interface_status_t
add tusbh_hid_keyboard_status & test code
Diffstat (limited to 'tinyusb/class')
| -rw-r--r-- | tinyusb/class/hid_host.c | 9 | ||||
| -rw-r--r-- | tinyusb/class/hid_host.h | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/tinyusb/class/hid_host.c b/tinyusb/class/hid_host.c index 723fd64f1..bd63aa99d 100644 --- a/tinyusb/class/hid_host.c +++ b/tinyusb/class/hid_host.c @@ -95,12 +95,21 @@ tusb_error_t tusbh_hid_keyboard_get_report(uint8_t dev_addr, uint8_t instance_nu hidh_keyboard_info_t *p_keyboard = get_kbd_data(dev_addr); + ASSERT(TUSB_INTERFACE_STATUS_BUSY != p_keyboard->status, TUSB_ERROR_INTERFACE_IS_BUSY); + // TODO abstract to use hidh service ASSERT_STATUS( hcd_pipe_xfer(p_keyboard->pipe_hdl, (uint8_t*) report, p_keyboard->report_size, true) ) ; + p_keyboard->status = TUSB_INTERFACE_STATUS_BUSY; + return TUSB_ERROR_NONE; } +tusb_interface_status_t tusbh_hid_keyboard_status(uint8_t dev_addr, uint8_t instance_num) +{ + return tusbh_device_get_state(dev_addr) ? keyboard_data[dev_addr-1].status : TUSB_INTERFACE_STATUS_INVALID_PARA; +} + void hidh_keyboard_close(uint8_t dev_addr) { pipe_handle_t pipe_hdl = keyboard_data[dev_addr-1].pipe_hdl; diff --git a/tinyusb/class/hid_host.h b/tinyusb/class/hid_host.h index 482c3213d..1846bf674 100644 --- a/tinyusb/class/hid_host.h +++ b/tinyusb/class/hid_host.h @@ -65,11 +65,12 @@ typedef struct { pipe_handle_t pipe_hdl; uint16_t report_size; + volatile tusb_interface_status_t status; }hidh_keyboard_info_t; bool tusbh_hid_keyboard_is_supported(uint8_t dev_addr) ATTR_PURE ATTR_WARN_UNUSED_RESULT; tusb_error_t tusbh_hid_keyboard_get_report(uint8_t dev_addr, uint8_t instance_num, tusb_keyboard_report_t * const report) ATTR_WARN_UNUSED_RESULT; -pipe_status_t tusbh_hid_keyboard_status(uint8_t dev_addr, uint8_t instance_num) ATTR_WARN_UNUSED_RESULT; +tusb_interface_status_t tusbh_hid_keyboard_status(uint8_t dev_addr, uint8_t instance_num) ATTR_WARN_UNUSED_RESULT; //--------------------------------------------------------------------+ // MOUSE Public API |