Changes in uspace/drv/bus/usb/uhcirh/main.c [c53007f:89e061d] in mainline

File:

• uspace/drv/bus/usb/uhcirh/main.c (modified) (4 diffs)

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

@@ -48 +48 @@
 #define NAME "uhcirh"
 
-static int hc_get_my_registers(ddf_dev_t *dev,
+static int hc_get_my_registers(const ddf_dev_t *dev,
     uintptr_t *io_reg_address, size_t *io_reg_size);
 
@@ -73 +73 @@
 {
         printf(NAME ": HelenOS UHCI root hub driver.\n");
-        log_init(NAME);
+        usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME);
         return ddf_driver_main(&uhci_rh_driver);
 }
@@ -88 +88 @@
 
         usb_log_debug2("uhci_rh_dev_add(handle=%" PRIun ")\n",
-            ddf_dev_get_handle(device));
+            device->handle);
 
         uintptr_t io_regs = 0;
         size_t io_size = 0;
         uhci_root_hub_t *rh = NULL;
-        int rc;
+        int ret = EOK;
 
-        rc = hc_get_my_registers(device, &io_regs, &io_size);
-        if (rc != EOK) {
-                usb_log_error( "Failed to get registers from HC: %s.\n",
-                    str_error(rc));
-                return rc;
-        }
+#define CHECK_RET_FREE_RH_RETURN(ret, message...) \
+if (ret != EOK) { \
+        usb_log_error(message); \
+        if (rh) \
+                free(rh); \
+        return ret; \
+} else (void)0
 
+        ret = hc_get_my_registers(device, &io_regs, &io_size);
+        CHECK_RET_FREE_RH_RETURN(ret,
+            "Failed to get registers from HC: %s.\n", str_error(ret));
         usb_log_debug("I/O regs at %p (size %zuB).\n",
             (void *) io_regs, io_size);
 
-        rh = ddf_dev_data_alloc(device, sizeof(uhci_root_hub_t));
-        if (rh == NULL) {
-                usb_log_error("Failed to allocate rh driver instance.\n");
-                return ENOMEM;
-        }
+        rh = malloc(sizeof(uhci_root_hub_t));
+        ret = (rh == NULL) ? ENOMEM : EOK;
+        CHECK_RET_FREE_RH_RETURN(ret,
+            "Failed to allocate rh driver instance.\n");
 
-        rc = uhci_root_hub_init(rh, (void*)io_regs, io_size, device);
-        if (rc != EOK) {
-                usb_log_error("Failed(%d) to initialize rh driver instance: "
-                    "%s.\n", rc, str_error(rc));
-                return rc;
-        }
+        ret = uhci_root_hub_init(rh, (void*)io_regs, io_size, device);
+        CHECK_RET_FREE_RH_RETURN(ret,
+            "Failed(%d) to initialize rh driver instance: %s.\n",
+            ret, str_error(ret));
 
+        device->driver_data = rh;
         usb_log_info("Controlling root hub '%s' (%" PRIun ").\n",
-            ddf_dev_get_name(device), ddf_dev_get_handle(device));
-
+            device->name, device->handle);
         return EOK;
 }
@@ -132 +133 @@
  */
 int hc_get_my_registers(
-    ddf_dev_t *dev, uintptr_t *io_reg_address, size_t *io_reg_size)
+    const ddf_dev_t *dev, uintptr_t *io_reg_address, size_t *io_reg_size)
 {
+        assert(dev);
+
         async_sess_t *parent_sess =
-            devman_parent_device_connect(EXCHANGE_SERIALIZE,
-            ddf_dev_get_handle(dev), IPC_FLAG_BLOCKING);
+            devman_parent_device_connect(EXCHANGE_SERIALIZE, dev->handle,
+            IPC_FLAG_BLOCKING);
         if (!parent_sess)
                 return ENOMEM;