Changeset 357a302 in mainline for uspace/drv/uhci-hcd

Timestamp:

2011-02-20T14:17:40Z (15 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/drv/uhci-hcd

Files:

• iface.c (modified) (2 diffs)
• main.c (modified) (1 diff)

uspace/drv/uhci-hcd/iface.c

@@ -42 +42 @@
 #include "uhci.h"
 
-static int get_address(device_t *dev, devman_handle_t handle,
-    usb_address_t *address)
-{
-        assert(dev);
-        uhci_t *hc = dev_to_uhci(dev);
-        assert(hc);
-        *address = usb_address_keeping_find(&hc->address_manager, handle);
-        if (*address <= 0)
-          return *address;
-        return EOK;
-}
 /*----------------------------------------------------------------------------*/
 static int reserve_default_address(device_t *dev, usb_speed_t speed)
@@ -168 +157 @@
 /*----------------------------------------------------------------------------*/
 usbhc_iface_t uhci_iface = {
-        .tell_address = get_address,
-
         .reserve_default_address = reserve_default_address,
         .release_default_address = release_default_address,

uspace/drv/uhci-hcd/main.c

@@ -55 +55 @@
 }
 
+static int usb_iface_get_address(device_t *dev, devman_handle_t handle,
+    usb_address_t *address)
+{
+        assert(dev);
+        uhci_t *hc = dev_to_uhci(dev);
+        assert(hc);
+
+        usb_address_t addr = usb_address_keeping_find(&hc->address_manager,
+            handle);
+        if (addr < 0) {
+                return addr;
+        }
+
+        if (address != NULL) {
+                *address = addr;
+        }
+
+        return EOK;
+}
+
 static usb_iface_t hc_usb_iface = {
-        .get_hc_handle = usb_iface_get_hc_handle
+        .get_hc_handle = usb_iface_get_hc_handle,
+        .get_address = usb_iface_get_address
 };