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

Timestamp:

2018-02-28T16:37:50Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1b20da0

Parents:

f5e5f73 (diff), b2dca8de (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.

git-author:

Jakub Jermar <jakub@…> (2018-02-28 16:06:42)

git-committer:

Jakub Jermar <jakub@…> (2018-02-28 16:37:50)

Message:

Merge github.com:helenos-xhci-team/helenos

This commit merges support for USB 3 and generally refactors, fixes,
extends and cleans up the existing USB framework.

Notable additions and features:

• new host controller driver has been implemented to control various xHC models (among others, NEC Renesas uPD720200)
• isochronous data transfer mode
• support for explicit USB device removal
• USB tablet driver

File:

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

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2011 Vojtech Horky
+ * Copyright (c) 2018 Ondrej Hlavaty
  * All rights reserved.
  *
@@ -45 +46 @@
 #include "usbmid.h"
 
-/** Get USB device handle by calling the parent usb_device_t.
+/**
+ * Get USB device description by calling HC and altering the interface field.
  *
  * @param[in] fun Device function the operation is running on.
- * @param[out] handle Device handle.
+ * @param[out] desc Device descriptor.
  * @return Error code.
  */
-static errno_t usb_iface_device_handle(ddf_fun_t *fun, devman_handle_t *handle)
-{
-        assert(fun);
-        assert(handle);
-        usb_device_t *usb_dev = usb_device_get(ddf_fun_get_dev(fun));
-        *handle = usb_device_get_devman_handle(usb_dev);
-        return EOK;
-}
-
-/** Callback for DDF USB get interface. */
-static errno_t usb_iface_iface_no(ddf_fun_t *fun, int *iface_no)
+static errno_t usb_iface_description(ddf_fun_t *fun, usb_device_desc_t *desc)
 {
         usbmid_interface_t *iface = ddf_fun_data_get(fun);
         assert(iface);
+        usb_device_t *usb_dev = ddf_dev_data_get(ddf_fun_get_dev(fun));
+        assert(usb_dev);
 
-        if (iface_no)
-                *iface_no = iface->interface_no;
+        async_exch_t *exch = usb_device_bus_exchange_begin(usb_dev);
+        if (!exch)
+                return EPARTY;
+
+        usb_device_desc_t tmp_desc;
+        const errno_t ret = usb_get_my_description(exch, &tmp_desc);
+
+        if (ret == EOK && desc) {
+                *desc = tmp_desc;
+                desc->iface = iface->interface_no;
+        }
+
+        usb_device_bus_exchange_end(exch);
 
         return EOK;
@@ -74 +79 @@
 /** DDF interface of the child - USB functions. */
 static usb_iface_t child_usb_iface = {
-        .get_my_device_handle = usb_iface_device_handle,
-        .get_my_interface = usb_iface_iface_no,
+        .get_my_description = usb_iface_description,
 };
 
@@ -117 +121 @@
          * class name something humanly understandable.
          */
-        int ret = asprintf(&child_name, "%s%hhu",
+        errno_t ret = asprintf(&child_name, "%s%hhu",
             usb_str_class(interface_descriptor->interface_class),
             interface_descriptor->interface_number);