Changeset c280d7e in mainline for uspace/lib/drv/include/usb_iface.h

Timestamp:

2018-01-20T03:02:36Z (7 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/drv/include/usb_iface.h (modified) (2 diffs)

uspace/lib/drv/include/usb_iface.h

@@ -40 +40 @@
 #include "ddf/driver.h"
 #include <async.h>
+#include <usbhc_iface.h>
 
 typedef async_sess_t usb_dev_session_t;
+
+typedef struct {
+        usb_address_t address;
+        usb_speed_t speed;
+        devman_handle_t handle;
+        int iface;
+} usb_device_desc_t;
 
 extern usb_dev_session_t *usb_dev_connect(devman_handle_t);
@@ -47 +55 @@
 extern void usb_dev_disconnect(usb_dev_session_t *);
 
-extern int usb_get_my_interface(async_exch_t *, int *);
-extern int usb_get_my_device_handle(async_exch_t *, devman_handle_t *);
+extern int usb_get_my_description(async_exch_t *, usb_device_desc_t *);
 
 /** USB device communication interface. */
 typedef struct {
-        int (*get_my_interface)(ddf_fun_t *, int *);
-        int (*get_my_device_handle)(ddf_fun_t *, devman_handle_t *);
+        int (*get_my_description)(ddf_fun_t *, usb_device_desc_t *);
 } usb_iface_t;