diff options
| author | sakumisu <[email protected]> | 2022-06-16 22:17:18 +0800 |
|---|---|---|
| committer | sakumisu <[email protected]> | 2022-06-16 22:17:18 +0800 |
| commit | 7c4809412b352af7bb35ab3b4471f5467019be83 (patch) | |
| tree | 30f1f26c4f645ee09244ee871f479262c847680c | |
| parent | 977264d78c4a36a58f131a81103caf5335c5034a (diff) | |
event use if not else
| -rw-r--r-- | core/usbh_core.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/core/usbh_core.c b/core/usbh_core.c index bdf68659..411ee2a6 100644 --- a/core/usbh_core.c +++ b/core/usbh_core.c @@ -698,7 +698,8 @@ static int usbh_portchange_wait(struct usbh_hubport **hport) return 0; } } - } else if (recved_event & USBH_EVENT_DISCONNECTED) { + } + if (recved_event & USBH_EVENT_DISCONNECTED) { if (!usbh_get_port_connect_status(port)) { if (connport->connected) { connport->connected = false; @@ -876,7 +877,7 @@ int lsusb(int argc, char **argv) for (uint8_t i = 0; i < usbh_core_cfg.rhport[port - 1].hport.config.config_desc.bNumInterfaces; i++) { if (usbh_core_cfg.rhport[port - 1].hport.config.intf[i].class_driver->driver_name) { USB_LOG_RAW(" |__Port %u,Port addr:0x%02x,If %u,ClassDriver=%s\r\n", usbh_core_cfg.rhport[port - 1].hport.port, usbh_core_cfg.rhport[port - 1].hport.dev_addr, - i, usbh_core_cfg.rhport[port - 1].hport.config.intf[i].class_driver->driver_name); + i, usbh_core_cfg.rhport[port - 1].hport.config.intf[i].class_driver->driver_name); } } } @@ -893,7 +894,7 @@ int lsusb(int argc, char **argv) for (uint8_t i = 0; i < hub_class->child[port - 1].config.config_desc.bNumInterfaces; i++) { if (hub_class->child[port - 1].config.intf[i].class_driver->driver_name) { USB_LOG_RAW(" |__Port %u,Port addr:0x%02x,If %u,ClassDriver=%s\r\n", hub_class->child[port - 1].port, hub_class->child[port - 1].dev_addr, - i, hub_class->child[port - 1].config.intf[i].class_driver->driver_name); + i, hub_class->child[port - 1].config.intf[i].class_driver->driver_name); } } } @@ -904,7 +905,7 @@ int lsusb(int argc, char **argv) for (port = USBH_HUB_PORT_START_INDEX; port <= CONFIG_USBHOST_RHPORTS; port++) { if (usbh_core_cfg.rhport[port - 1].hport.connected) { USB_LOG_RAW("Hub %02u,Port %u,Port addr:0x%02x,VID:PID 0x%04x:0x%04x\r\n", USBH_ROOT_HUB_INDEX, usbh_core_cfg.rhport[port - 1].hport.port, usbh_core_cfg.rhport[port - 1].hport.dev_addr, - usbh_core_cfg.rhport[port - 1].hport.device_desc.idVendor, usbh_core_cfg.rhport[port - 1].hport.device_desc.idProduct); + usbh_core_cfg.rhport[port - 1].hport.device_desc.idVendor, usbh_core_cfg.rhport[port - 1].hport.device_desc.idProduct); usbh_print_hubport_info(&usbh_core_cfg.rhport[port - 1].hport); } } @@ -916,7 +917,7 @@ int lsusb(int argc, char **argv) for (port = USBH_HUB_PORT_START_INDEX; port <= hub_class->nports; port++) { if (hub_class->child[port - 1].connected) { USB_LOG_RAW("Hub %02u,Port %u,Port addr:0x%02x,VID:PID 0x%04x:0x%04x\r\n", hub_class->index, hub_class->child[port - 1].port, hub_class->child[port - 1].dev_addr, - hub_class->child[port - 1].device_desc.idVendor, hub_class->child[port - 1].device_desc.idProduct); + hub_class->child[port - 1].device_desc.idVendor, hub_class->child[port - 1].device_desc.idProduct); usbh_print_hubport_info(&hub_class->child[port - 1]); } } |
