summaryrefslogtreecommitdiff
path: root/tinyusb/host
diff options
context:
space:
mode:
Diffstat (limited to 'tinyusb/host')
-rw-r--r--tinyusb/host/ehci/ehci.c2
-rw-r--r--tinyusb/host/hcd.h5
-rw-r--r--tinyusb/host/usbh.c6
-rw-r--r--tinyusb/host/usbh.h4
-rw-r--r--tinyusb/host/usbh_hcd.h2
5 files changed, 7 insertions, 12 deletions
diff --git a/tinyusb/host/ehci/ehci.c b/tinyusb/host/ehci/ehci.c
index e24548bc1..9d8bb16e7 100644
--- a/tinyusb/host/ehci/ehci.c
+++ b/tinyusb/host/ehci/ehci.c
@@ -224,7 +224,7 @@ void async_list_process_isr(ehci_qhd_t * const async_head, ehci_registers_t * co
pipe_hdl.xfer_type = TUSB_XFER_BULK;
pipe_hdl.index = qhd_get_index(p_qhd);
}
- usbh_isr( pipe_hdl, p_qhd->class_code); // call USBH call back
+ usbh_isr( pipe_hdl, p_qhd->class_code, BUS_EVENT_XFER_COMPLETE); // call USBH callback
}
p_qhd->p_qtd_list_head->used = 0; // free QTD
diff --git a/tinyusb/host/hcd.h b/tinyusb/host/hcd.h
index 129a4640f..98b5e5c5c 100644
--- a/tinyusb/host/hcd.h
+++ b/tinyusb/host/hcd.h
@@ -66,11 +66,6 @@ typedef struct {
uint8_t index;
} pipe_handle_t;
-typedef enum {
- BUS_XFER_COMPLETE,
- BUS_XFER_ERROR
-}usb_bus_event_t;
-
//--------------------------------------------------------------------+
// USBH-HCD API
//--------------------------------------------------------------------+
diff --git a/tinyusb/host/usbh.c b/tinyusb/host/usbh.c
index f56291290..544c1a467 100644
--- a/tinyusb/host/usbh.c
+++ b/tinyusb/host/usbh.c
@@ -61,7 +61,7 @@ void tusb_tick_tock(void)
#define ENUM_QUEUE_DEPTH 5
// TODO fix number of class driver
-static class_driver_t const usbh_class_drivers[TUSB_CLASS_MAX_CONSEC_NUMBER] =
+static host_class_driver_t const usbh_class_drivers[TUSB_CLASS_MAX_CONSEC_NUMBER] =
{
[TUSB_CLASS_HID] = {
.init = hidh_init,
@@ -179,14 +179,14 @@ pipe_status_t usbh_pipe_status_get(pipe_handle_t pipe_hdl)
// USBH-HCD ISR/Callback API
//--------------------------------------------------------------------+
// interrupt caused by a TD (with IOC=1) in pipe of class class_code
-void usbh_isr(pipe_handle_t pipe_hdl, uint8_t class_code)
+void usbh_isr(pipe_handle_t pipe_hdl, uint8_t class_code, tusb_bus_event_t event)
{
if (class_code == 0) // Control transfer
{
osal_semaphore_post( usbh_device_info_pool[ pipe_hdl.dev_addr ].sem_hdl );
}else if (usbh_class_drivers[class_code].isr)
{
- usbh_class_drivers[class_code].isr(pipe_hdl);
+ usbh_class_drivers[class_code].isr(pipe_hdl, event);
}else
{
ASSERT(false, (void) 0); // something wrong, no one claims the isr's source
diff --git a/tinyusb/host/usbh.h b/tinyusb/host/usbh.h
index 1dae917f6..901a0f056 100644
--- a/tinyusb/host/usbh.h
+++ b/tinyusb/host/usbh.h
@@ -106,9 +106,9 @@ typedef uint8_t tusbh_device_status_t;
typedef struct {
void (* const init) (void);
tusb_error_t (* const open_subtask)(uint8_t, uint8_t const *, uint16_t*);
- void (* const isr) (pipe_handle_t);
+ void (* const isr) (pipe_handle_t, tusb_bus_event_t);
void (* const close) (uint8_t);
-} class_driver_t;
+} host_class_driver_t;
//--------------------------------------------------------------------+
// INTERNAL OBJECT & FUNCTION DECLARATION
//--------------------------------------------------------------------+
diff --git a/tinyusb/host/usbh_hcd.h b/tinyusb/host/usbh_hcd.h
index bd0d09c55..d11b6e45f 100644
--- a/tinyusb/host/usbh_hcd.h
+++ b/tinyusb/host/usbh_hcd.h
@@ -101,7 +101,7 @@ typedef struct { // TODO internal structure, re-order members
extern usbh_device_info_t usbh_device_info_pool[TUSB_CFG_HOST_DEVICE_MAX+1]; // including zero-address
-void usbh_isr(pipe_handle_t pipe_hdl, uint8_t class_code);
+void usbh_isr(pipe_handle_t pipe_hdl, uint8_t class_code, tusb_bus_event_t event);
void usbh_device_plugged_isr(uint8_t hostid, tusb_speed_t speed);
void usbh_device_unplugged_isr(uint8_t hostid);