Changeset c2245a3 in mainline for uspace/drv/bus/usb/usbmid/usbmid.c

Timestamp:

2011-11-10T20:03:48Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

fa76f81

Parents:

27ca3a3 (diff), 747ef72 (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 with mainline

File:

• uspace/drv/bus/usb/usbmid/usbmid.c (modified) (4 diffs)

uspace/drv/bus/usb/usbmid/usbmid.c

@@ -62 +62 @@
 /** 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,
-        .get_address = usb_iface_get_address_hub_impl,
-        .get_interface = usb_iface_get_interface_impl
+        .get_hc_handle = usb_iface_get_hc_handle_device_impl,
+        .get_my_address = usb_iface_get_my_address_forward_impl,
+        .get_interface = usb_iface_get_interface_impl,
 };
 
@@ -110 +110 @@
          * class name something humanly understandable.
          */
-        rc = asprintf(&child_name, "%s%d",
+        rc = asprintf(&child_name, "%s%hhu",
             usb_str_class(interface_descriptor->interface_class),
-            (int) interface_descriptor->interface_number);
+            interface_descriptor->interface_number);
         if (rc < 0) {
                 return ENOMEM;
@@ -123 +123 @@
                 return ENOMEM;
         }
-
-        iface->fun = child;
-
-        child->driver_data = iface;
-        child->ops = &child_device_ops;
 
         rc = usb_device_create_match_ids_from_interface(device_descriptor,
@@ -143 +138 @@
         }
 
+        iface->fun = child;
+        child->driver_data = iface;
+        child->ops = &child_device_ops;
+
         return EOK;
 }