Changeset eb1a2f4 in mainline for uspace/drv/usbmid/usbmid.c

Timestamp:

2011-02-22T23:30:56Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

3b5d1535, a9c674e0

Parents:

dbe25f1 (diff), 664af708 (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 mainline changes (DDF refactoring)

This merge includes DDF refactoring that brought multifunctional devices
(i.e. ddf_dev_t and ddf_fun_t). Please, see ticket #295 at HelenOS
upstream Trac.

The conflicts themselves were easy to solve (merely several renamings).

Changes to USB subsystem:

• drivers uses ddf_dev_t and ddf_fun_t
• different signatures of many library functions
• several hacks around communication with parent device (now the communication is clearer and somehow what we have now is hack about other hacks)
  • will repair and clean later
• maybe added some extra debugging messages (the diff has about 240K, and I admit I have no energy to double check that)

WARNING:

• the diff is VERY long, recommended is viewing partial diffs of the merge (i.e. merges in mainline branch that lead to the parent one)
• merging with your branches might involve huge renamings, sorry, no other way is possible

BUGS:

• hub driver will not work (no function created)

GOOD NEWS:

• QEMU keyboard seems to work with QEMU 0.13 and 0.14
• we are up-to-date with mainline again

File:

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

uspace/drv/usbmid/usbmid.c

@@ -45 +45 @@
 
 /** Callback for DDF USB interface. */
-static int usb_iface_get_address_impl(device_t *device, devman_handle_t handle,
+static int usb_iface_get_address_impl(ddf_fun_t *fun, devman_handle_t handle,
     usb_address_t *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;
+        return usb_iface_get_address_hub_impl(fun, handle, address);
 }
 
 /** Callback for DDF USB interface. */
-static int usb_iface_get_interface_impl(device_t *device, devman_handle_t handle,
+static int usb_iface_get_interface_impl(ddf_fun_t *fun, devman_handle_t handle,
     int *iface_no)
 {
-        assert(device);
-
-        usbmid_interface_t *iface = device->driver_data;
+        assert(fun);
+
+        usbmid_interface_t *iface = fun->driver_data;
         assert(iface);
 
@@ -91 +74 @@
 
 
-static device_ops_t child_device_ops = {
+static ddf_dev_ops_t child_device_ops = {
         .interfaces[USB_DEV_IFACE] = &child_usb_iface
 };
 
-static device_ops_t mid_device_ops = {
+static ddf_dev_ops_t mid_device_ops = {
         .interfaces[USB_DEV_IFACE] = &usb_iface_hub_impl
 };
@@ -105 +88 @@
  * @retval NULL Error occured.
  */
-usbmid_device_t *usbmid_device_create(device_t *dev)
+usbmid_device_t *usbmid_device_create(ddf_dev_t *dev)
 {
         usbmid_device_t *mid = malloc(sizeof(usbmid_device_t));
@@ -133 +116 @@
 
         mid->dev = dev;
-        dev->ops = &mid_device_ops;
+        (void) &mid_device_ops;
 
         return mid;
@@ -145 +128 @@
  * @retval NULL Error occured.
  */
-usbmid_interface_t *usbmid_interface_create(device_t *dev, int iface_no)
+usbmid_interface_t *usbmid_interface_create(ddf_fun_t *fun, int iface_no)
 {
         usbmid_interface_t *iface = malloc(sizeof(usbmid_interface_t));
@@ -154 +137 @@
         }
 
-        iface->dev = dev;
+        iface->fun = fun;
         iface->interface_no = iface_no;
 
@@ -172 +155 @@
     const usb_standard_interface_descriptor_t *interface_descriptor)
 {
-        device_t *child = NULL;
+        ddf_fun_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;
-        }
 
         /*
@@ -196 +172 @@
         }
 
+        /* 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);
@@ -204 +189 @@
 
         child->driver_data = child_as_interface;
-        child->parent = parent->dev;
-        child->name = child_name;
         child->ops = &child_device_ops;
 
@@ -215 +198 @@
         }
 
-        rc = child_device_register(child, parent->dev);
+        rc = ddf_fun_bind(child);
         if (rc != EOK) {
                 goto error_leave;
@@ -226 +209 @@
                 child->name = NULL;
                 /* This takes care of match_id deallocation as well. */
-                delete_device(child);
+                ddf_fun_destroy(child);
         }
         if (child_name != NULL) {