Changeset 1d5a540 in mainline for uspace/drv/bus/usb/vhc/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/vhc/main.c (modified) (3 diffs)

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

@@ -67 +67 @@
         }
 
-        vhc_data_t *data = malloc(sizeof(vhc_data_t));
+        vhc_data_t *data = ddf_dev_data_alloc(dev, sizeof(vhc_data_t));
         if (data == NULL) {
                 usb_log_fatal("Failed to allocate memory.\n");
@@ -89 +89 @@
         }
 
-        hc->ops = &vhc_ops;
+        ddf_fun_set_ops(hc, &vhc_ops);
         list_initialize(&data->devices);
         fibril_mutex_initialize(&data->guard);
         data->hub = &virtual_hub_device;
         data->hc_fun = hc;
-
-        dev->driver_data = data;
 
         rc = ddf_fun_bind(hc);
@@ -116 +114 @@
 
         usb_log_info("Virtual USB host controller ready (dev %zu, hc %zu).\n",
-            (size_t) dev->handle, (size_t) hc->handle);
-
-
+            (size_t) ddf_dev_get_handle(dev), (size_t) ddf_fun_get_handle(hc));
 
         rc = vhc_virtdev_plug_hub(data, data->hub, NULL);