Changeset 472235a in mainline for uspace/drv/bus/usb/xhci/rh.c

Timestamp:

2017-10-03T16:53:47Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

65e079b

Parents:

efe9463

Message:

xhci: refactoring

Revise error paths, refactor some code.

File:

• uspace/drv/bus/usb/xhci/rh.c (modified) (5 diffs)

uspace/drv/bus/usb/xhci/rh.c

@@ -135 +135 @@
         xhci_cmd_fini(&cmd);
 
-        // TODO: Issue configure endpoint commands (sec 4.3.5).
+        // TODO: Issue configure endpoint commands (sec 4.3.5).
 
         return EOK;
@@ -165 +165 @@
                         usb_log_debug("Detected new device on port %u, port speed id %u.", port_id, port_speed);
 
-                        alloc_dev(hc, port_id, 0);
+                        return alloc_dev(hc, port_id, 0);
                 }
                 else if (link_state == 5) {
                         /* USB 3 failed to enable. */
                         usb_log_error("USB 3 port couldn't be enabled.");
+                        return EAGAIN;
                 }
                 else {
                         usb_log_error("USB 3 port is in invalid state %u.", link_state);
+                        return EINVAL;
                 }
         }
@@ -183 +185 @@
                         going around?
                 */
-        }
-
-        return EOK;
+                return EOK;
+        }
 }
 
 int xhci_handle_port_status_change_event(xhci_hc_t *hc, xhci_trb_t *trb)
 {
+        int err;
+
         uint8_t port_id = xhci_get_hub_port(trb);
         usb_log_debug("Port status change event detected for port %u.", port_id);
@@ -202 +205 @@
                 usb_log_debug2("Detected port reset on port %u, port speed id %u.", port_id, port_speed);
                 /** FIXME: only if that port is not yet initialized */
-                alloc_dev(hc, port_id, 0);
+                if ((err = alloc_dev(hc, port_id, 0)) != EOK)
+                        return err;
         }
 
@@ -210 +214 @@
 
                 if (XHCI_REG_RD(regs, XHCI_PORT_CCS) == 1) {
-                        handle_connected_device(hc, regs, port_id);
+                        if ((err = handle_connected_device(hc, regs, port_id)) != EOK)
+                                return err;
                 } else {
                         // TODO: Device disconnected
+                        return ENOTSUP;
                 }
         }