Changeset 357a302 in mainline for uspace/lib/drv/generic

Timestamp:

2011-02-20T14:17:40Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

b68b279

Parents:

3ae93a8

Message:

USB interfaces reorganization

The most important change is that getting USB address of a device
is an operation of generic USB interface, not USB-HC interface.
That is needed for proper functionality of a MID driver.

Also added sample implementation of USB interface operations as is
needed by most drivers (sample does not mean unfunctional or partially
implemented here).
They are stored in libusb/ddfiface.h

Updated UHCI, UHCI-RH, hub, VHC drivers to use these sample
implementations.

Updated libusb device recognition routines to route get_address requests
through USB interface.

Location:

uspace/lib/drv/generic

Files:

• remote_usb.c (modified) (2 diffs)
• remote_usbhc.c (modified) (3 diffs)

uspace/lib/drv/generic/remote_usb.c

@@ -41 +41 @@
 
 static void remote_usb_get_hc_handle(device_t *, void *, ipc_callid_t, ipc_call_t *);
+static void remote_usb_get_address(device_t *, void *, ipc_callid_t, ipc_call_t *);
 //static void remote_usb(device_t *, void *, ipc_callid_t, ipc_call_t *);
 
 /** Remote USB interface operations. */
 static remote_iface_func_ptr_t remote_usb_iface_ops [] = {
+        remote_usb_get_address,
         remote_usb_get_hc_handle
 };
@@ -55 +57 @@
         .methods = remote_usb_iface_ops
 };
+
+
+void remote_usb_get_address(device_t *device, void *iface,
+    ipc_callid_t callid, ipc_call_t *call)
+{
+        usb_iface_t *usb_iface = (usb_iface_t *) iface;
+
+        if (usb_iface->get_address == NULL) {
+                async_answer_0(callid, ENOTSUP);
+                return;
+        }
+
+        devman_handle_t handle = DEV_IPC_GET_ARG1(*call);
+
+        usb_address_t address;
+        int rc = usb_iface->get_address(device, handle, &address);
+        if (rc != EOK) {
+                async_answer_0(callid, rc);
+        } else {
+                async_answer_1(callid, EOK, address);
+        }
+}
 
 

uspace/lib/drv/generic/remote_usbhc.c

@@ -43 +43 @@
 #define HACK_MAX_PACKET_SIZE_INTERRUPT_IN 4
 
-static void remote_usbhc_get_address(device_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usbhc_interrupt_out(device_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usbhc_interrupt_in(device_t *, void *, ipc_callid_t, ipc_call_t *);
@@ -59 +58 @@
 /** Remote USB host controller interface operations. */
 static remote_iface_func_ptr_t remote_usbhc_iface_ops [] = {
-        remote_usbhc_get_address,
-
         remote_usbhc_reserve_default_address,
         remote_usbhc_release_default_address,
@@ -124 +121 @@
 
         return trans;
-}
-
-void remote_usbhc_get_address(device_t *device, void *iface,
-    ipc_callid_t callid, ipc_call_t *call)
-{
-        usbhc_iface_t *usb_iface = (usbhc_iface_t *) iface;
-
-        if (!usb_iface->tell_address) {
-                async_answer_0(callid, ENOTSUP);
-                return;
-        }
-
-        devman_handle_t handle = DEV_IPC_GET_ARG1(*call);
-
-        usb_address_t address;
-        int rc = usb_iface->tell_address(device, handle, &address);
-        if (rc != EOK) {
-                async_answer_0(callid, rc);
-        } else {
-                async_answer_1(callid, EOK, address);
-        }
 }