Changeset 1d5a540 in mainline for uspace/drv/bus/usb/uhcirh/main.c

Timestamp:

2012-08-17T11:52:20Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

034c4202

Parents:

8312577 (diff), 56fd7cf (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge DDF interface tightening.

File:

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

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

@@ -48 +48 @@
 #define NAME "uhcirh"
 
-static int hc_get_my_registers(const ddf_dev_t *dev,
+static int hc_get_my_registers(ddf_dev_t *dev,
     uintptr_t *io_reg_address, size_t *io_reg_size);
 
@@ -88 +88 @@
 
         usb_log_debug2("uhci_rh_dev_add(handle=%" PRIun ")\n",
-            device->handle);
+            ddf_dev_get_handle(device));
 
         uintptr_t io_regs = 0;
@@ -98 +98 @@
 if (ret != EOK) { \
         usb_log_error(message); \
-        if (rh) \
-                free(rh); \
         return ret; \
 } else (void)0
@@ -109 +107 @@
             (void *) io_regs, io_size);
 
-        rh = malloc(sizeof(uhci_root_hub_t));
+        rh = ddf_dev_data_alloc(device, sizeof(uhci_root_hub_t));
         ret = (rh == NULL) ? ENOMEM : EOK;
         CHECK_RET_FREE_RH_RETURN(ret,
@@ -119 +117 @@
             ret, str_error(ret));
 
-        device->driver_data = rh;
         usb_log_info("Controlling root hub '%s' (%" PRIun ").\n",
-            device->name, device->handle);
+            ddf_dev_get_name(device), ddf_dev_get_handle(device));
         return EOK;
 }
@@ -133 +130 @@
  */
 int hc_get_my_registers(
-    const ddf_dev_t *dev, uintptr_t *io_reg_address, size_t *io_reg_size)
+    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, dev->handle,
-            IPC_FLAG_BLOCKING);
+            devman_parent_device_connect(EXCHANGE_SERIALIZE,
+            ddf_dev_get_handle(dev), IPC_FLAG_BLOCKING);
         if (!parent_sess)
                 return ENOMEM;