Changes in uspace/drv/bus/usb/uhcirh/port.c [c53007f:e882e3a] in mainline

File:

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

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

@@ -32 +32 @@
  * @brief UHCI root hub port routines
  */
-#include <ddi.h>
+#include <libarch/ddi.h>  /* pio_read and pio_write */
 #include <fibril_synch.h> /* async_usleep */
 #include <errno.h>
@@ -63 +63 @@
         return pio_read_16(port->address);
 }
-
+/*----------------------------------------------------------------------------*/
 /** Register writing helper function.
  *
@@ -75 +75 @@
         pio_write_16(port->address, val);
 }
-
+/*----------------------------------------------------------------------------*/
 /** Initialize UHCI root hub port instance.
  *
@@ -127 +127 @@
         return EOK;
 }
-
+/*----------------------------------------------------------------------------*/
 /** Cleanup UHCI root hub port instance.
  *
@@ -141 +141 @@
         return;
 }
-
+/*----------------------------------------------------------------------------*/
 /** Periodically checks port status and reports new devices.
  *
@@ -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) {
@@ -172 +182 @@
                     instance->id_string, port_status);
 
-                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;
-                }
+                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));
 
                 /* Remove any old device */
@@ -199 +204 @@
                 }
 
-                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;
-}
-
+                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;
+}
+/*----------------------------------------------------------------------------*/
 /** Callback for enabling port during adding a new device.
  *
@@ -252 +247 @@
         return EOK;
 }
-
+/*----------------------------------------------------------------------------*/
 /** Initialize and report connected device.
  *
@@ -284 +279 @@
         usb_log_info("%s: New device, address %d (handle %" PRIun ").\n",
             port->id_string, port->attached_device.address,
-            ddf_fun_get_handle(port->attached_device.fun));
-        return EOK;
-}
-
+            port->attached_device.fun->handle);
+        return EOK;
+}
+/*----------------------------------------------------------------------------*/
 /** Remove device.
  *
@@ -329 +324 @@
         return EOK;
 }
-
+/*----------------------------------------------------------------------------*/
 /** Enable or disable root hub port.
  *
@@ -363 +358 @@
         return EOK;
 }
-
+/*----------------------------------------------------------------------------*/
 /** Print the port status value in a human friendly way
  *