Changes in uspace/drv/bus/usb/uhcirh/main.c [920d0fc:9d58539] in mainline

File:

• uspace/drv/bus/usb/uhcirh/main.c (modified) (7 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;
@@ -98 +98 @@
 if (ret != EOK) { \
         usb_log_error(message); \
+        if (rh) \
+                free(rh); \
         return ret; \
 } else (void)0
@@ -107 +109 @@
             (void *) io_regs, io_size);
 
-        rh = ddf_dev_data_alloc(device, sizeof(uhci_root_hub_t));
+        rh = malloc(sizeof(uhci_root_hub_t));
         ret = (rh == NULL) ? ENOMEM : EOK;
         CHECK_RET_FREE_RH_RETURN(ret,
@@ -117 +119 @@
             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;
 }
@@ -130 +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;