Changeset c280d7e in mainline for uspace/lib/usbdev/src/devdrv.c

Timestamp:

2018-01-20T03:02:36Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60d3f35

Parents:

3cdaa7f

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-20 03:02:32)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-20 03:02:36)

Message:

libdrv: usb iface callbacks joined

In addition to handle and current interface, it is good for the device
to know its address and speed. Also, it is expected to add some other
fields (stats, info tied to devices of specific speed and so on) in the
future. Instead of adding yet another call, join those two and let HC
fill a description structure.

File:

• uspace/lib/usbdev/src/devdrv.c (modified) (10 diffs)

uspace/lib/usbdev/src/devdrv.c

@@ -73 +73 @@
         /** Number of other endpoint pipes. */
         size_t pipes_count;
+
+        /** USB address of this device */
+        usb_address_t address;
+
+        /** USB speed of this device */
+        usb_speed_t speed;
 
         /** Current interface.
@@ -414 +420 @@
  */
 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, int interface_no)
+    const usb_endpoint_description_t **endpoints, const char **errstr_ptr)
 {
         assert(usb_dev != NULL);
@@ -423 +428 @@
 
         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;
@@ -431 +434 @@
         usb_dev->pipes = NULL;
 
-        usb_dev->bus_session = usb_dev_connect(handle);
+        usb_dev->bus_session = usb_dev_connect(usb_dev->handle);
 
         if (!usb_dev->bus_session) {
@@ -476 +479 @@
 }
 
-static int usb_device_get_info(async_sess_t *sess, devman_handle_t *handle,
-        int *iface_no)
-{
-        assert(handle);
-        assert(iface_no);
+static int usb_device_get_info(async_sess_t *sess, usb_device_t *dev)
+{
+        assert(dev);
 
         async_exch_t *exch = async_exchange_begin(sess);
@@ -486 +487 @@
                 return EPARTY;
 
-        int ret = usb_get_my_device_handle(exch, handle);
+        usb_device_desc_t dev_desc;
+        const int ret = usb_get_my_description(exch, &dev_desc);
+
         if (ret == EOK) {
-                ret = usb_get_my_interface(exch, iface_no);
-                if (ret == ENOTSUP) {
-                        *iface_no = -1;
-                        ret = EOK;
-                }
+                dev->address = dev_desc.address;
+                dev->speed = dev_desc.speed;
+                dev->handle = dev_desc.handle;
+                dev->interface_no = dev_desc.iface;
         }
 
@@ -504 +506 @@
         assert(ddf_dev);
         assert(err);
-
-        devman_handle_t h = 0;
-        int iface_no = -1;
 
         async_sess_t *sess = ddf_dev_parent_sess_get(ddf_dev);
         if (sess == NULL)
                 return ENOMEM;
-        const int ret = usb_device_get_info(sess, &h, &iface_no);
-        if (ret != EOK)
-                return ret;
 
         usb_device_t *usb_dev =
@@ -522 +518 @@
         }
 
-        return usb_device_init(usb_dev, ddf_dev, desc, err, h, iface_no);
+        const int ret = usb_device_get_info(sess, usb_dev);
+        if (ret != EOK)
+                return ret;
+
+        return usb_device_init(usb_dev, ddf_dev, desc, err);
 }
 
@@ -536 +536 @@
 usb_device_t * usb_device_create(devman_handle_t handle)
 {
-        devman_handle_t h = 0;
-        int iface_no = -1;
+        usb_device_t *usb_dev = malloc(sizeof(usb_device_t));
+        if (!usb_dev)
+                return NULL;
 
         async_sess_t *sess = devman_device_connect(handle, IPC_FLAG_BLOCKING);
-        int ret = usb_device_get_info(sess, &h, &iface_no);
+        int ret = usb_device_get_info(sess, usb_dev);
         if (sess)
                 async_hangup(sess);
@@ -546 +547 @@
                 return NULL;
 
-        usb_device_t *usb_dev = malloc(sizeof(usb_device_t));
-        if (!usb_dev)
-                return NULL;
-
         const char* dummy = NULL;
-        ret = usb_device_init(usb_dev, NULL, NULL, &dummy, handle, iface_no);
+        ret = usb_device_init(usb_dev, NULL, NULL, &dummy);
         if (ret != EOK) {
                 free(usb_dev);