Changeset 72af8da in mainline for uspace/drv/usbmid/usbmid.c

Timestamp:

2011-03-16T18:50:17Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

42a3a57

Parents:

3e7b7cd (diff), fcf07e6 (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 from usb/development

File:

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

uspace/drv/usbmid/usbmid.c

@@ -67 +67 @@
 }
 
+/** 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,
@@ -73 +74 @@
 };
 
-
+/** Operations for children - interface functions. */
 static ddf_dev_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 = {
         .interfaces[USB_DEV_IFACE] = &usb_iface_hub_impl
@@ -114 +116 @@
                 return NULL;
         }
+        rc = usb_endpoint_pipe_probe_default_control(&mid->ctrl_pipe);
+        if (rc != EOK) {
+                usb_log_error("Probing default control pipe failed: %s.\n",
+                    str_error(rc));
+                free(mid);
+                return NULL;
+        }
 
         mid->dev = dev;
@@ -123 +132 @@
 /** Create new interface for USB MID device.
  *
- * @param dev Backing generic DDF child device (representing interface).
+ * @param fun Backing generic DDF device function (representing interface).
  * @param iface_no Interface number.
  * @return New interface.