Changeset 0918382f in mainline for uspace/lib/drv

Timestamp:

2013-08-07T15:00:36Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

14dd4c9

Parents:

2757247

Message:

usb: Switch to using port number as device identifier.

Port number info will be needed for HS SPLIT transactions. Moreover,
it can be used to produce predictable, persistent device names.

Switch port_number from size_t to unsigned. There are max 256 ports so
even short would be enough.

Location:

uspace/lib/drv

Files:

• generic/remote_usb.c (modified) (4 diffs)
• include/usb_iface.h (modified) (3 diffs)

uspace/lib/drv/generic/remote_usb.c

@@ -139 +139 @@
  * @return Error code.
  */
-int usb_device_enumerate(async_exch_t *exch, usb_device_handle_t *handle)
-{
-        if (!exch || !handle)
-                return EBADMEM;
-        sysarg_t h;
-        const int ret = async_req_1_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
-            IPC_M_USB_DEVICE_ENUMERATE, &h);
-        if (ret == EOK)
-                *handle = (usb_device_handle_t)h;
+int usb_device_enumerate(async_exch_t *exch, unsigned port)
+{
+        if (!exch)
+                return EBADMEM;
+        const int ret = async_req_2_0(exch, DEV_IFACE_ID(USB_DEV_IFACE),
+            IPC_M_USB_DEVICE_ENUMERATE, port);
         return ret;
 }
@@ -156 +153 @@
  * @return Error code.
  */
-int usb_device_remove(async_exch_t *exch, usb_device_handle_t handle)
+int usb_device_remove(async_exch_t *exch, unsigned port)
 {
         if (!exch)
                 return EBADMEM;
         return async_req_2_0(exch, DEV_IFACE_ID(USB_DEV_IFACE),
-            IPC_M_USB_DEVICE_REMOVE, handle);
+            IPC_M_USB_DEVICE_REMOVE, port);
 }
 
@@ -381 +378 @@
         }
 
-        usb_device_handle_t handle = 0;
-        const int ret = usb_iface->device_enumerate(fun, &handle);
-        if (ret != EOK) {
-                async_answer_0(callid, ret);
-        }
-
-        async_answer_1(callid, EOK, (sysarg_t) handle);
+        const unsigned port = DEV_IPC_GET_ARG1(*call);
+        const int ret = usb_iface->device_enumerate(fun, port);
+        async_answer_0(callid, ret);
 }
 
@@ -400 +393 @@
         }
 
-        usb_device_handle_t handle = DEV_IPC_GET_ARG1(*call);
-        const int ret = usb_iface->device_remove(fun, handle);
+        const unsigned port = DEV_IPC_GET_ARG1(*call);
+        const int ret = usb_iface->device_remove(fun, port);
         async_answer_0(callid, ret);
 }

uspace/lib/drv/include/usb_iface.h

@@ -42 +42 @@
 #include <usb/usb.h>
 
-typedef intptr_t usb_device_handle_t;
-enum {
-        USB_DEVICE_HANDLE_INVALID = -1
-};
 typedef async_sess_t usb_dev_session_t;
 
@@ -58 +54 @@
 int usb_release_default_address(async_exch_t *);
 
-int usb_device_enumerate(async_exch_t *, usb_device_handle_t *);
-int usb_device_remove(async_exch_t *, usb_device_handle_t);
+int usb_device_enumerate(async_exch_t *, unsigned port);
+int usb_device_remove(async_exch_t *, unsigned port);
 
 int usb_register_endpoint(async_exch_t *, usb_endpoint_t, usb_transfer_type_t,
@@ -81 +77 @@
         int (*release_default_address)(ddf_fun_t *);
 
-        int (*device_enumerate)(ddf_fun_t *, usb_device_handle_t *);
-        int (*device_remove)(ddf_fun_t *, usb_device_handle_t);
+        int (*device_enumerate)(ddf_fun_t *, unsigned);
+        int (*device_remove)(ddf_fun_t *, unsigned);
 
         int (*register_endpoint)(ddf_fun_t *, usb_endpoint_t,