Changeset 8e4219ab in mainline

Timestamp:

2013-08-02T14:04:51Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

6fe7683

Parents:

9d15d1b

Message:

Implement and use usb_get_device_handle.

Enables object instantiation on usb interface functions.
avoids forwarding in usbmid driver.

Location:

uspace

Files:

• drv/bus/usb/usbmid/usbmid.c (modified) (2 diffs)
• lib/usbdev/include/usb/dev/device.h (modified) (2 diffs)
• lib/usbdev/src/devdrv.c (modified) (10 diffs)
• lib/usbhost/src/ddf_helpers.c (modified) (2 diffs)

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

@@ -59 +59 @@
 }
 
+static int 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));
+        assert(usb_dev);
+        *handle = usb_device_get_devman_handle(usb_dev);
+        return EOK;
+}
+
 /** Get USB device address by calling the parent usb_device_t.
  *
@@ -119 +129 @@
         .get_hc_handle = usb_iface_device_hc_handle,
         .get_my_address = usb_iface_device_address,
+        .get_device_handle = usb_iface_device_handle,
         .get_my_interface = usb_iface_iface,
         .register_endpoint = usb_iface_register_endpoint,

uspace/lib/usbdev/include/usb/dev/device.h

@@ -62 +62 @@
 }
 
-
 usb_device_t * usb_device_create(devman_handle_t);
 void usb_device_destroy(usb_device_t *);
@@ -86 +85 @@
 
 int usb_device_get_iface_number(usb_device_t *);
+devman_handle_t usb_device_get_devman_handle(usb_device_t *);
 
 const usb_device_descriptors_t * usb_device_descriptors(usb_device_t *);

uspace/lib/usbdev/src/devdrv.c

@@ -78 +78 @@
         void *driver_data;
 
+        /** Connection to device on USB bus */
         usb_dev_session_t *bus_session;
+        /** devman handle */
+        devman_handle_t handle;
 } usb_device_t;
 
@@ -331 +334 @@
 }
 
+devman_handle_t usb_device_get_devman_handle(usb_device_t *usb_dev)
+{
+        assert(usb_dev);
+        return usb_dev->handle;
+}
+
 const usb_device_descriptors_t *usb_device_descriptors(usb_device_t *usb_dev)
 {
@@ -405 +414 @@
 static int usb_device_init(usb_device_t *usb_dev, ddf_dev_t *ddf_dev,
     const usb_endpoint_description_t **endpoints, const char **errstr_ptr,
-    devman_handle_t handle)
+    devman_handle_t handle, int interface_no)
 {
         assert(usb_dev != NULL);
@@ -413 +422 @@
 
         usb_dev->ddf_dev = ddf_dev;
+        usb_dev->handle = handle;
+        usb_dev->interface_no = interface_no;
         usb_dev->driver_data = NULL;
         usb_dev->descriptors.full_config = NULL;
@@ -419 +430 @@
         usb_dev->pipes = NULL;
 
-        if (ddf_dev)
-                usb_dev->bus_session = usb_dev_connect_to_self(ddf_dev);
-        else
-                usb_dev->bus_session = usb_dev_connect(handle);
+        usb_dev->bus_session = usb_dev_connect(handle);
 
         if (!usb_dev->bus_session) {
@@ -433 +441 @@
         usb_address_t address;
 
-        int rc = usb_dev_get_info(usb_dev,
-            &hc_handle, &address, &usb_dev->interface_no);
+        int rc = usb_dev_get_info(usb_dev, &hc_handle, &address, NULL);
         if (rc != EOK) {
                 usb_dev_disconnect(usb_dev->bus_session);
@@ -503 +510 @@
 }
 
+static int usb_device_get_info(async_sess_t *sess, devman_handle_t *handle,
+        int *iface_no)
+{
+        assert(handle);
+        assert(iface_no);
+        async_exch_t *exch = async_exchange_begin(sess);
+        if (!exch)
+                return EPARTY;
+        int ret = usb_get_device_handle(exch, handle);
+        if (ret == EOK) {
+                ret = usb_get_my_interface(exch, iface_no);
+                if (ret == ENOTSUP) {
+                        *iface_no = -1;
+                        ret = EOK;
+                }
+        }
+        async_exchange_end(exch);
+        return ret;
+}
+
 int usb_device_create_ddf(ddf_dev_t *ddf_dev,
     const usb_endpoint_description_t **desc, const char **err)
@@ -508 +535 @@
         assert(ddf_dev);
         assert(err);
+
+        devman_handle_t h = 0;
+        int iface_no = -1;
+
+        async_sess_t *sess = devman_parent_device_connect(EXCHANGE_ATOMIC,
+            ddf_dev_get_handle(ddf_dev), IPC_FLAG_BLOCKING);
+        const int ret = usb_device_get_info(sess, &h, &iface_no);
+        async_hangup(sess);
+        if (ret != EOK)
+                return ret;
+
         usb_device_t *usb_dev =
             ddf_dev_data_alloc(ddf_dev, sizeof(usb_device_t));
@@ -514 +552 @@
                 return ENOMEM;
         }
-        return usb_device_init(usb_dev, ddf_dev, desc, err, 0);
+        
+        return usb_device_init(usb_dev, ddf_dev, desc, err, h, iface_no);
 }
 
@@ -528 +567 @@
 usb_device_t * usb_device_create(devman_handle_t handle)
 {
+        devman_handle_t h = 0;
+        int iface_no = -1;
+
+        async_sess_t *sess = devman_device_connect(
+            EXCHANGE_ATOMIC, handle, IPC_FLAG_BLOCKING);
+        int ret = usb_device_get_info(sess, &h, &iface_no);
+        async_hangup(sess);
+        if (ret != EOK)
+                return NULL;
+
         usb_device_t *usb_dev = malloc(sizeof(usb_device_t));
         if (!usb_dev)
                 return NULL;
+
         const char* dummy = NULL;
-        const int ret = usb_device_init(usb_dev, NULL, NULL, &dummy, handle);
+        ret = usb_device_init(usb_dev, NULL, NULL, &dummy, handle, iface_no);
         if (ret != EOK) {
                 free(usb_dev);

uspace/lib/usbhost/src/ddf_helpers.c

@@ -216 +216 @@
 }
 
+/** Gets handle of the respective hc (this device, hc function).
+ *
+ * @param[in] root_hub_fun Root hub function seeking hc handle.
+ * @param[out] handle Place to write the handle.
+ * @return Error code.
+ */
+static int get_device_handle(ddf_fun_t *fun, devman_handle_t *handle)
+{
+        assert(fun);
+        if (handle)
+                *handle = ddf_fun_get_handle(fun);
+        return EOK;
+}
+
 /** Root hub USB interface */
 static usb_iface_t usb_iface = {
         .get_hc_handle = get_hc_handle,
         .get_my_address = get_my_address,
+
+        .get_device_handle = get_device_handle,
 
         .reserve_default_address = reserve_default_address,
@@ -228 +244 @@
         .unregister_endpoint = unregister_endpoint,
 };
-/** Standard USB RH options (RH interface) */
+
+/** Standard USB RH options (device interface) */
 static ddf_dev_ops_t usb_ops = {
         .interfaces[USB_DEV_IFACE] = &usb_iface,