summaryrefslogtreecommitdiff
path: root/tinyusb
diff options
context:
space:
mode:
Diffstat (limited to 'tinyusb')
-rw-r--r--tinyusb/core/tusb_types.h4
-rw-r--r--tinyusb/host/ehci/ehci.c35
-rw-r--r--tinyusb/host/usbh.c19
3 files changed, 46 insertions, 12 deletions
diff --git a/tinyusb/core/tusb_types.h b/tinyusb/core/tusb_types.h
index aff92aebb..f0797bfdc 100644
--- a/tinyusb/core/tusb_types.h
+++ b/tinyusb/core/tusb_types.h
@@ -154,7 +154,7 @@ enum {
#define TUSB_DESC_CONFIG_POWER_MA(x) ((x)/2)
/// Device State
-enum tusb_device_state_{
+typedef enum {
TUSB_DEVICE_STATE_UNPLUG = 0 ,
TUSB_DEVICE_STATE_ADDRESSED ,
@@ -162,7 +162,7 @@ enum tusb_device_state_{
TUSB_DEVICE_STATE_REMOVING ,
TUSB_DEVICE_STATE_SAFE_REMOVE ,
-};
+}tusb_device_state_t;
typedef enum {
BUS_EVENT_XFER_COMPLETE,
diff --git a/tinyusb/host/ehci/ehci.c b/tinyusb/host/ehci/ehci.c
index 9d8bb16e7..c8d524b7b 100644
--- a/tinyusb/host/ehci/ehci.c
+++ b/tinyusb/host/ehci/ehci.c
@@ -135,7 +135,7 @@ void hcd_port_reset(uint8_t hostid)
#ifndef _TEST_
// NXP specific, port reset will automatically be 0 when reset sequence complete
- while( regs->portsc_bit.port_reset || !regs->portsc_bit.port_enable){}
+ while( regs->portsc_bit.port_reset || !regs->portsc_bit.port_enable){} // FIXME trapped here once
#endif
}
@@ -205,7 +205,7 @@ void port_connect_status_change_isr(uint8_t hostid)
}
-void async_list_process_isr(ehci_qhd_t * const async_head, ehci_registers_t * const regs)
+void async_list_process_isr(ehci_qhd_t * const async_head)
{
ehci_qhd_t *p_qhd = async_head;
do
@@ -235,6 +235,33 @@ void async_list_process_isr(ehci_qhd_t * const async_head, ehci_registers_t * co
}while(p_qhd != async_head); // async list traversal, stop if loop around
}
+void xfer_error_isr(uint8_t hostid)
+{
+ //------------- async list -------------//
+ ehci_qhd_t * const async_head = get_async_head(hostid);
+ ehci_qhd_t *p_qhd = async_head;
+ do
+ {
+ // current qhd has error in transaction
+ if (p_qhd->qtd_overlay.buffer_err || p_qhd->qtd_overlay.babble_err || p_qhd->qtd_overlay.xact_err ||
+ //p_qhd->qtd_overlay.non_hs_period_missed_uframe || p_qhd->qtd_overlay.pingstate_err TODO split transaction error
+ (p_qhd->device_address != 0 && p_qhd->qtd_overlay.halted) ) // addr0 cannot be protocol STALL
+ {
+ pipe_handle_t pipe_hdl = { .dev_addr = p_qhd->device_address };
+ if (p_qhd->endpoint_number) // if not Control, can only be Bulk
+ {
+ pipe_hdl.xfer_type = TUSB_XFER_BULK;
+ pipe_hdl.index = qhd_get_index(p_qhd);
+ }
+ usbh_isr( pipe_hdl, p_qhd->class_code, BUS_EVENT_XFER_ERROR); // call USBH callback
+ }
+
+ p_qhd = (ehci_qhd_t*) align32(p_qhd->next.address);
+ }while(p_qhd != async_head); // async list traversal, stop if loop around
+
+ //------------- TODO period list -------------//
+}
+
//------------- Host Controller Driver's Interrupt Handler -------------//
void hcd_isr(uint8_t hostid)
{
@@ -249,14 +276,14 @@ void hcd_isr(uint8_t hostid)
if (int_status & EHCI_INT_MASK_ERROR)
{
// TODO handle Queue Head halted
- // TODO invoke some error callback if not async head
hal_debugger_breakpoint();
+ xfer_error_isr(hostid);
}
//------------- some QTD/SITD/ITD with IOC set is completed -------------//
if (int_status & EHCI_INT_MASK_NXP_ASYNC)
{
- async_list_process_isr(get_async_head(hostid), regs);
+ async_list_process_isr(get_async_head(hostid));
}
if (int_status & EHCI_INT_MASK_NXP_PERIODIC)
diff --git a/tinyusb/host/usbh.c b/tinyusb/host/usbh.c
index 544c1a467..46776cabe 100644
--- a/tinyusb/host/usbh.c
+++ b/tinyusb/host/usbh.c
@@ -203,25 +203,29 @@ void usbh_device_plugged_isr(uint8_t hostid, tusb_speed_t speed)
void usbh_device_unplugged_isr(uint8_t hostid)
{
//------------- find the device address that is unplugged -------------//
- uint8_t dev_addr=1;
+ uint8_t dev_addr = 0;
while ( dev_addr <= TUSB_CFG_HOST_DEVICE_MAX &&
!(usbh_device_info_pool[dev_addr].core_id == hostid &&
usbh_device_info_pool[dev_addr].hub_addr == 0 &&
usbh_device_info_pool[dev_addr].hub_port == 0 &&
- usbh_device_info_pool[dev_addr].state != TUSB_DEVICE_STATE_UNPLUG
+ usbh_device_info_pool[dev_addr].state != TUSB_DEVICE_STATE_UNPLUG
)
)
{
dev_addr++;
}
+ // TODO close addr0 pipe (when get 8-byte desc, set addr failed)
ASSERT(dev_addr <= TUSB_CFG_HOST_DEVICE_MAX, (void) 0 );
- // if device unplugged is not a hub TODO handle hub unplugged
- for (uint8_t class_code = 1; class_code < TUSB_CLASS_MAX_CONSEC_NUMBER; class_code++)
+ if (dev_addr > 0) // device can still be unplugged when not set new address
{
- if (usbh_class_drivers[class_code].close)
- usbh_class_drivers[class_code].close(dev_addr);
+ // if device unplugged is not a hub TODO handle hub unplugged
+ for (uint8_t class_code = 1; class_code < TUSB_CLASS_MAX_CONSEC_NUMBER; class_code++)
+ {
+ if (usbh_class_drivers[class_code].close)
+ usbh_class_drivers[class_code].close(dev_addr);
+ }
}
usbh_pipe_control_close(dev_addr);
@@ -256,6 +260,7 @@ OSAL_TASK_DECLARE(usbh_enumeration_task)
usbh_device_info_pool[0].speed = enum_entry.speed;
TASK_ASSERT_STATUS( usbh_pipe_control_open(0, 8) );
+ usbh_device_info_pool[0].state = TUSB_DEVICE_STATE_ADDRESSED;
//------------- Get first 8 bytes of device descriptor to get Control Endpoint Size -------------//
OSAL_SUBTASK_INVOKED_AND_WAIT(
@@ -295,7 +300,9 @@ OSAL_TASK_DECLARE(usbh_enumeration_task)
usbh_device_info_pool[new_addr].hub_port = usbh_device_info_pool[0].hub_port;
usbh_device_info_pool[new_addr].speed = usbh_device_info_pool[0].speed;
usbh_device_info_pool[new_addr].state = TUSB_DEVICE_STATE_ADDRESSED;
+
usbh_pipe_control_close(0);
+ usbh_device_info_pool[0].state = TUSB_DEVICE_STATE_UNPLUG;
// hcd_port_reset( usbh_device_info_pool[new_addr].core_id ); TODO verified
generated by cgit v1.3.1 (git 2.54.0) at 2026-08-18 10:31:18 +0000