diff options
| -rw-r--r-- | core/usbh_core.c | 2 | ||||
| -rw-r--r-- | core/usbotg_core.c | 10 | ||||
| -rw-r--r-- | core/usbotg_core.h | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/core/usbh_core.c b/core/usbh_core.c index 4a5211f4..84e8dee5 100644 --- a/core/usbh_core.c +++ b/core/usbh_core.c @@ -1186,5 +1186,7 @@ int lsusb(int argc, char **argv) __WEAK uint8_t usbh_get_hport_active_config_index(struct usbh_hubport *hport) { + ARG_UNUSED(hport); + return 0; // Default to configuration index 0 }
\ No newline at end of file diff --git a/core/usbotg_core.c b/core/usbotg_core.c index afcd4d2f..80cf9708 100644 --- a/core/usbotg_core.c +++ b/core/usbotg_core.c @@ -31,14 +31,14 @@ static void usbotg_host_initialize(uint8_t busid) } if (g_usbotg_core[busid].usbd_initialized) { - g_usbotg_core[busid].usbd_initialized = false; usbd_deinitialize(busid); + g_usbotg_core[busid].usbd_initialized = false; } USB_LOG_INFO("Switch to HOST mode\r\n"); - usbh_initialize(busid, g_usbotg_core[busid].reg_base); g_usbotg_core[busid].usbh_initialized = true; + usbh_initialize(busid, g_usbotg_core[busid].reg_base); } static void usbotg_device_initialize(uint8_t busid) @@ -48,14 +48,14 @@ static void usbotg_device_initialize(uint8_t busid) } if (g_usbotg_core[busid].usbh_initialized) { - g_usbotg_core[busid].usbh_initialized = false; usbh_deinitialize(busid); + g_usbotg_core[busid].usbh_initialized = false; } USB_LOG_INFO("Switch to DEVICE mode\r\n"); - usbd_initialize(g_usbotg_core[busid].busid, g_usbotg_core[busid].reg_base, g_usbotg_core[busid].device_event_callback); g_usbotg_core[busid].usbd_initialized = true; + usbd_initialize(g_usbotg_core[busid].busid, g_usbotg_core[busid].reg_base, g_usbotg_core[busid].device_event_callback); } static void usbotg_rolechange_thread(void *argument) @@ -75,7 +75,7 @@ static void usbotg_rolechange_thread(void *argument) } } -int usbotg_initialize(uint8_t busid, uint32_t reg_base, usbd_event_handler_t device_event_callback, usbd_event_handler_t host_event_callback, uint8_t default_role); +int usbotg_initialize(uint8_t busid, uint32_t reg_base, usbd_event_handler_t device_event_callback, usbh_event_handler_t host_event_callback, uint8_t default_role) { char thread_name[32] = { 0 }; diff --git a/core/usbotg_core.h b/core/usbotg_core.h index 7f7208ac..7eadb878 100644 --- a/core/usbotg_core.h +++ b/core/usbotg_core.h @@ -14,7 +14,7 @@ extern "C" { #include "usbh_core.h" #include "usb_otg.h" -int usbotg_initialize(uint8_t busid, uint32_t reg_base, usbd_event_handler_t device_event_callback, usbd_event_handler_t host_event_callback, uint8_t default_role); +int usbotg_initialize(uint8_t busid, uint32_t reg_base, usbd_event_handler_t device_event_callback, usbh_event_handler_t host_event_callback, uint8_t default_role); int usbotg_deinitialize(uint8_t busid); /* called by user */ |