Changeset 1d5a540 in mainline for uspace/drv/bus/usb/vhc

Timestamp:

2012-08-17T11:52:20Z (13 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.

Location:

uspace/drv/bus/usb/vhc

Files:

• conndev.c (modified) (2 diffs)
• connhost.c (modified) (3 diffs)
• hub.c (modified) (4 diffs)
• main.c (modified) (3 diffs)

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

@@ -94 +94 @@
     ipc_call_t *icall)
 {
-        vhc_data_t *vhc = fun->dev->driver_data;
+        vhc_data_t *vhc = ddf_dev_data_get(ddf_fun_get_dev(fun));
         
         async_sess_t *callback =
@@ -125 +125 @@
 void on_client_close(ddf_fun_t *fun)
 {
-        vhc_data_t *vhc = fun->dev->driver_data;
+        vhc_data_t *vhc = ddf_dev_data_get(ddf_fun_get_dev(fun));
 
         if (plugged_device_handle != 0) {

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

@@ -42 +42 @@
 
 #define GET_VHC_DATA(fun) \
-        ((vhc_data_t *)fun->dev->driver_data)
+        ((vhc_data_t *)ddf_dev_data_get(ddf_fun_get_dev(fun)))
 #define VHC_DATA(vhc, fun) \
         vhc_data_t *vhc = GET_VHC_DATA(fun); assert(vhc->magic == 0xdeadbeef)
@@ -483 +483 @@
         VHC_DATA(vhc, root_hub_fun);
 
-        *handle = vhc->hc_fun->handle;
+        *handle = ddf_fun_get_handle(vhc->hc_fun);
 
         return EOK;
@@ -492 +492 @@
         VHC_DATA(vhc, root_hub_fun);
 
-        devman_handle_t handle = root_hub_fun->handle;
+        devman_handle_t handle = ddf_fun_get_handle(root_hub_fun);
 
         usb_log_debug("tell_address_rh(handle=%" PRIun ")\n", handle);

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

@@ -100 +100 @@
         async_sess_t *sess;
         do {
-                sess = devman_device_connect(EXCHANGE_SERIALIZE, hc_dev->handle, 0);
+                sess = devman_device_connect(EXCHANGE_SERIALIZE,
+                    ddf_fun_get_handle(hc_dev), 0);
         } while (!sess);
         async_hangup(sess);
@@ -107 +108 @@
 
         usb_hc_connection_t hc_conn;
-        usb_hc_connection_initialize(&hc_conn, hc_dev->handle);
+        usb_hc_connection_initialize(&hc_conn, ddf_fun_get_handle(hc_dev));
 
         rc = usb_hc_connection_open(&hc_conn);
@@ -113 +114 @@
 
         ddf_fun_t *hub_dev;
-        rc = usb_hc_new_device_wrapper(hc_dev->dev, &hc_conn, USB_SPEED_FULL,
+        rc = usb_hc_new_device_wrapper(ddf_fun_get_dev(hc_dev), &hc_conn, USB_SPEED_FULL,
             pretend_port_rest, NULL, NULL, &rh_ops, hc_dev, &hub_dev);
         if (rc != EOK) {
@@ -123 +124 @@
 
         usb_log_info("Created root hub function (handle %zu).\n",
-            (size_t) hub_dev->handle);
+            (size_t) ddf_fun_get_handle(hub_dev));
 
         return 0;

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);