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/host/usbh.c | |
| parent | 0b08dc7724a67f09be16fad3d6702ce0d7566f03 (diff) | |
rename pipe_status_t to tusb_interface_status_t
add tusbh_hid_keyboard_status & test code
Diffstat (limited to 'tinyusb/host/usbh.c')
| -rw-r--r-- | tinyusb/host/usbh.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tinyusb/host/usbh.c b/tinyusb/host/usbh.c index 7deb68bb3..08ab56880 100644 --- a/tinyusb/host/usbh.c +++ b/tinyusb/host/usbh.c @@ -148,13 +148,13 @@ tusb_error_t usbh_control_xfer_subtask(uint8_t dev_addr, tusb_std_request_t cons OSAL_SUBTASK_BEGIN - usbh_devices[dev_addr].control.pipe_status = PIPE_STATUS_BUSY; + usbh_devices[dev_addr].control.pipe_status = TUSB_INTERFACE_STATUS_BUSY; usbh_devices[dev_addr].control.request = *p_request; (void) hcd_pipe_control_xfer(dev_addr, &usbh_devices[dev_addr].control.request, data); osal_semaphore_wait(usbh_devices[dev_addr].control.sem_hdl, OSAL_TIMEOUT_NORMAL, &error); // careful of local variable without static // TODO make handler for this function general purpose - SUBTASK_ASSERT_STATUS_WITH_HANDLER(error || usbh_devices[dev_addr].control.pipe_status == PIPE_STATUS_ERROR, + SUBTASK_ASSERT_STATUS_WITH_HANDLER(error || usbh_devices[dev_addr].control.pipe_status == TUSB_INTERFACE_STATUS_ERROR, tusbh_device_mount_failed_cb(TUSB_ERROR_USBH_MOUNT_DEVICE_NOT_RESPOND, NULL) ); OSAL_SUBTASK_END @@ -178,9 +178,9 @@ static inline tusb_error_t usbh_pipe_control_close(uint8_t dev_addr) return TUSB_ERROR_NONE; } -pipe_status_t usbh_pipe_status_get(pipe_handle_t pipe_hdl) +tusb_interface_status_t usbh_pipe_status_get(pipe_handle_t pipe_hdl) { - return PIPE_STATUS_BUSY; + return TUSB_INTERFACE_STATUS_BUSY; } //--------------------------------------------------------------------+ @@ -191,7 +191,7 @@ void usbh_isr(pipe_handle_t pipe_hdl, uint8_t class_code, tusb_bus_event_t event { if (class_code == 0) // Control transfer { - usbh_devices[ pipe_hdl.dev_addr ].control.pipe_status = (event == BUS_EVENT_XFER_COMPLETE) ? PIPE_STATUS_COMPLETE : PIPE_STATUS_ERROR; + usbh_devices[ pipe_hdl.dev_addr ].control.pipe_status = (event == BUS_EVENT_XFER_COMPLETE) ? TUSB_INTERFACE_STATUS_COMPLETE : TUSB_INTERFACE_STATUS_ERROR; osal_semaphore_post( usbh_devices[ pipe_hdl.dev_addr ].control.sem_hdl ); }else if (usbh_class_drivers[class_code].isr) { |