Changeset 41e645c in mainline for uspace/lib/drv/generic/remote_usb.c

Timestamp:

2011-02-20T21:43:50Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

070f11e, ace12560

Parents:

423e8c81 (diff), 063ead6f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Add simple USB multi interface device driver

The MID driver serves as a mini bus driver for devices with several
interfaces or for devices with classes defined at interface level.

The keyboard driver is working with this driver with the same problems
as before introduction of USB MID driver.

The merge also includes addition of bulk transfers.

File:

• uspace/lib/drv/generic/remote_usb.c (modified) (3 diffs)

uspace/lib/drv/generic/remote_usb.c

@@ -40 +40 @@
 
 
+static void remote_usb_get_address(device_t *, void *, ipc_callid_t, ipc_call_t *);
+static void remote_usb_get_interface(device_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usb_get_hc_handle(device_t *, void *, ipc_callid_t, ipc_call_t *);
 //static void remote_usb(device_t *, void *, ipc_callid_t, ipc_call_t *);
@@ -45 +47 @@
 /** Remote USB interface operations. */
 static remote_iface_func_ptr_t remote_usb_iface_ops [] = {
+        remote_usb_get_address,
+        remote_usb_get_interface,
         remote_usb_get_hc_handle
 };
@@ -56 +60 @@
 };
 
+
+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);
+        }
+}
+
+void remote_usb_get_interface(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_interface == NULL) {
+                async_answer_0(callid, ENOTSUP);
+                return;
+        }
+
+        devman_handle_t handle = DEV_IPC_GET_ARG1(*call);
+
+        int iface_no;
+        int rc = usb_iface->get_interface(device, handle, &iface_no);
+        if (rc != EOK) {
+                async_answer_0(callid, rc);
+        } else {
+                async_answer_1(callid, EOK, iface_no);
+        }
+}
 
 void remote_usb_get_hc_handle(device_t *device, void *iface,