Changes in uspace/drv/bus/usb/uhcirh/port.c [56fd7cf:ffa96c2] in mainline

File:

• uspace/drv/bus/usb/uhcirh/port.c (modified) (5 diffs)

uspace/drv/bus/usb/uhcirh/port.c

@@ -32 +32 @@
  * @brief UHCI root hub port routines
  */
-#include <libarch/ddi.h>  /* pio_read and pio_write */
+#include <ddi.h>
 #include <fibril_synch.h> /* async_usleep */
 #include <errno.h>
@@ -150 +150 @@
 {
         uhci_port_t *instance = port;
+        int rc;
         assert(instance);
 
         unsigned allowed_failures = MAX_ERROR_COUNT;
-#define CHECK_RET_FAIL(ret, msg...) \
-        if (ret != EOK) { \
-                usb_log_error(msg); \
-                if (!(allowed_failures-- > 0)) { \
-                        usb_log_fatal( \
-                           "Maximum number of failures reached, " \
-                           "bailing out.\n"); \
-                        return ret; \
-                } \
-                continue; \
-        } else (void)0
 
         while (1) {
@@ -182 +172 @@
                     instance->id_string, port_status);
 
-                int ret = usb_hc_connection_open(&instance->hc_connection);
-                CHECK_RET_FAIL(ret, "%s: Failed to connect to HC %s.\n",
-                    instance->id_string, str_error(ret));
+                rc = usb_hc_connection_open(&instance->hc_connection);
+                if (rc != EOK) {
+                        usb_log_error("%s: Failed to connect to HC %s.\n",
+                            instance->id_string, str_error(rc));
+                        if (!(allowed_failures-- > 0))
+                                goto fatal_error;
+                        continue;
+                }
 
                 /* Remove any old device */
@@ -204 +199 @@
                 }
 
-                ret = usb_hc_connection_close(&instance->hc_connection);
-                CHECK_RET_FAIL(ret, "%s: Failed to disconnect from hc: %s.\n",
-                    instance->id_string, str_error(ret));
-        }
-        return EOK;
+                rc = usb_hc_connection_close(&instance->hc_connection);
+                if (rc != EOK) {
+                        usb_log_error("%s: Failed to disconnect from HC %s.\n",
+                            instance->id_string, str_error(rc));
+                        if (!(allowed_failures-- > 0))
+                                goto fatal_error;
+                        continue;
+                }
+        }
+
+        return EOK;
+
+fatal_error:
+        usb_log_fatal("Maximum number of failures reached, bailing out.\n");
+        return rc;
 }
 
@@ -264 +269 @@
         int ret, count = MAX_ERROR_COUNT;
         do {
-                ret = usb_hc_new_device_wrapper(port->rh, &port->hc_connection,
+                port->attached_device.fun = ddf_fun_create(port->rh, fun_inner,
+                    NULL);
+                if (port->attached_device.fun == NULL) {
+                        ret = ENOMEM;
+                        continue;
+                }
+
+                ret = usb_hc_new_device_wrapper(port->rh,
+                    port->attached_device.fun,
+                    &port->hc_connection,
                     speed, uhci_port_reset_enable, port,
-                    &port->attached_device.address, NULL, NULL,
-                    &port->attached_device.fun);
+                    &port->attached_device.address, NULL);
+
+                if (ret != EOK) {
+                        ddf_fun_destroy(port->attached_device.fun);
+                        port->attached_device.fun = NULL;
+                }
+
         } while (ret != EOK && count-- > 0);