Changes in uspace/drv/usbmid/usbmid.c [bc1c6fb:51f0e410] in mainline

File:

• uspace/drv/usbmid/usbmid.c (modified) (12 diffs)

uspace/drv/usbmid/usbmid.c

@@ -45 +45 @@
 
 /** Callback for DDF USB interface. */
-static int usb_iface_get_address_impl(ddf_fun_t *fun, devman_handle_t handle,
+static int usb_iface_get_address_impl(device_t *device, devman_handle_t handle,
     usb_address_t *address)
 {
-        return usb_iface_get_address_hub_impl(fun, handle, address);
+        assert(device);
+        device_t *parent = device->parent;
+
+        /* Default error, device does not support this operation. */
+        int rc = ENOTSUP;
+
+        if (parent && parent->ops && parent->ops->interfaces[USB_DEV_IFACE]) {
+                usb_iface_t *usb_iface
+                    = (usb_iface_t *) parent->ops->interfaces[USB_DEV_IFACE];
+                assert(usb_iface != NULL);
+
+                if (usb_iface->get_address) {
+                        rc = usb_iface->get_address(parent, parent->handle,
+                            address);
+                }
+        }
+
+        return rc;
 }
 
 /** Callback for DDF USB interface. */
-static int usb_iface_get_interface_impl(ddf_fun_t *fun, devman_handle_t handle,
+static int usb_iface_get_interface_impl(device_t *device, devman_handle_t handle,
     int *iface_no)
 {
-        assert(fun);
-
-        usbmid_interface_t *iface = fun->driver_data;
+        assert(device);
+
+        usbmid_interface_t *iface = device->driver_data;
         assert(iface);
 
@@ -67 +84 @@
 }
 
-/** DDF interface of the child - interface function. */
 static usb_iface_t child_usb_iface = {
         .get_hc_handle = usb_iface_get_hc_handle_hub_child_impl,
@@ -74 +90 @@
 };
 
-/** Operations for children - interface functions. */
-static ddf_dev_ops_t child_device_ops = {
+
+static device_ops_t child_device_ops = {
         .interfaces[USB_DEV_IFACE] = &child_usb_iface
 };
 
-/** Operations of the device itself. */
-static ddf_dev_ops_t mid_device_ops = {
+static device_ops_t mid_device_ops = {
         .interfaces[USB_DEV_IFACE] = &usb_iface_hub_impl
 };
@@ -90 +105 @@
  * @retval NULL Error occured.
  */
-usbmid_device_t *usbmid_device_create(ddf_dev_t *dev)
+usbmid_device_t *usbmid_device_create(device_t *dev)
 {
         usbmid_device_t *mid = malloc(sizeof(usbmid_device_t));
@@ -118 +133 @@
 
         mid->dev = dev;
-        (void) &mid_device_ops;
+        dev->ops = &mid_device_ops;
 
         return mid;
@@ -125 +140 @@
 /** Create new interface for USB MID device.
  *
- * @param fun Backing generic DDF device function (representing interface).
+ * @param dev Backing generic DDF child device (representing interface).
  * @param iface_no Interface number.
  * @return New interface.
  * @retval NULL Error occured.
  */
-usbmid_interface_t *usbmid_interface_create(ddf_fun_t *fun, int iface_no)
+usbmid_interface_t *usbmid_interface_create(device_t *dev, int iface_no)
 {
         usbmid_interface_t *iface = malloc(sizeof(usbmid_interface_t));
@@ -139 +154 @@
         }
 
-        iface->fun = fun;
+        iface->dev = dev;
         iface->interface_no = iface_no;
 
@@ -157 +172 @@
     const usb_standard_interface_descriptor_t *interface_descriptor)
 {
-        ddf_fun_t *child = NULL;
+        device_t *child = NULL;
         char *child_name = NULL;
         usbmid_interface_t *child_as_interface = NULL;
         int rc;
+
+        /* Create the device. */
+        child = create_device();
+        if (child == NULL) {
+                rc = ENOMEM;
+                goto error_leave;
+        }
 
         /*
@@ -174 +196 @@
         }
 
-        /* Create the device. */
-        child = ddf_fun_create(parent->dev, fun_inner, child_name);
-        if (child == NULL) {
-                rc = ENOMEM;
-                goto error_leave;
-        }
-
-
-
         child_as_interface = usbmid_interface_create(child,
             (int) interface_descriptor->interface_number);
@@ -191 +204 @@
 
         child->driver_data = child_as_interface;
+        child->parent = parent->dev;
+        child->name = child_name;
         child->ops = &child_device_ops;
 
@@ -200 +215 @@
         }
 
-        rc = ddf_fun_bind(child);
+        rc = child_device_register(child, parent->dev);
         if (rc != EOK) {
                 goto error_leave;
@@ -211 +226 @@
                 child->name = NULL;
                 /* This takes care of match_id deallocation as well. */
-                ddf_fun_destroy(child);
+                delete_device(child);
         }
         if (child_name != NULL) {