Changeset 357a302 in mainline for uspace/lib/usb/src

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/usb/src

Files:

• ddfiface.c (added)
• hub.c (modified) (1 diff)
• pipes.c (modified) (5 diffs)
• recognise.c (modified) (2 diffs)

uspace/lib/usb/src/hub.c

@@ -301 +301 @@
 }
 
-
 /**
  * @}

uspace/lib/usb/src/pipes.c

@@ -36 +36 @@
 #include <usb/pipes.h>
 #include <usbhc_iface.h>
+#include <usb_iface.h>
 #include <errno.h>
 #include <assert.h>
@@ -41 +42 @@
 /** Tell USB address assigned to given device.
  *
- * @param phone Phone to my HC.
+ * @param phone Phone to parent device.
  * @param dev Device in question.
  * @return USB address or error code.
@@ -48 +49 @@
 {
         sysarg_t address;
-        int rc = async_req_2_1(phone, DEV_IFACE_ID(USBHC_DEV_IFACE),
-            IPC_M_USBHC_GET_ADDRESS,
+        int rc = async_req_2_1(phone, DEV_IFACE_ID(USB_DEV_IFACE),
+            IPC_M_USB_GET_ADDRESS,
             dev->handle, &address);
 
@@ -80 +81 @@
         }
 
-        int hc_phone = devman_device_connect(hc_handle, 0);
-        if (hc_phone < 0) {
-                return hc_phone;
-        }
-
-        my_address = get_my_address(hc_phone, device);
+        int parent_phone = devman_parent_device_connect(device->handle,
+            IPC_FLAG_BLOCKING);
+        if (parent_phone < 0) {
+                return parent_phone;
+        }
+
+        my_address = get_my_address(parent_phone, device);
         if (my_address < 0) {
                 rc = my_address;
@@ -95 +97 @@
 
 leave:
-        async_hangup(hc_phone);
+        async_hangup(parent_phone);
         return rc;
 }

uspace/lib/usb/src/recognise.c

@@ -34 +34 @@
  */
 #include <sys/types.h>
-#include <usb_iface.h>
 #include <usb/usbdrv.h>
 #include <usb/pipes.h>
 #include <usb/recognise.h>
+#include <usb/ddfiface.h>
 #include <usb/request.h>
 #include <usb/classes/classes.h>
@@ -46 +46 @@
 static FIBRIL_MUTEX_INITIALIZE(device_name_index_mutex);
 
-/** Callback for getting host controller handle.
- *
- * @param dev Device in question.
- * @param[out] handle Devman handle of the host controller.
- * @return Error code.
- */
-static int usb_iface_get_hc_handle(device_t *dev, devman_handle_t *handle)
-{
-        assert(dev);
-        assert(dev->parent != NULL);
-
-        device_t *parent = dev->parent;
-
-        if (parent->ops && parent->ops->interfaces[USB_DEV_IFACE]) {
-                usb_iface_t *usb_iface
-                    = (usb_iface_t *) parent->ops->interfaces[USB_DEV_IFACE];
-                assert(usb_iface != NULL);
-                if (usb_iface->get_hc_handle) {
-                        int rc = usb_iface->get_hc_handle(parent, handle);
-                        return rc;
-                }
-        }
-
-        return ENOTSUP;
-}
-
-static usb_iface_t usb_iface = {
-        .get_hc_handle = usb_iface_get_hc_handle
-};
-
 device_ops_t child_ops = {
-        .interfaces[USB_DEV_IFACE] = &usb_iface
+        .interfaces[USB_DEV_IFACE] = &usb_iface_hub_child_impl
 };