Changeset 357a302 in mainline for uspace/drv/vhc/connhost.c

Timestamp:

2011-02-20T14:17:40Z (13 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.

File:

• uspace/drv/vhc/connhost.c (modified) (5 diffs)

uspace/drv/vhc/connhost.c

@@ -37 +37 @@
 #include <usb/usb.h>
 #include <usb/addrkeep.h>
+#include <usb/ddfiface.h>
 
 #include "vhcd.h"
@@ -313 +314 @@
 static usb_address_keeping_t addresses;
 
+static int tell_address(device_t *dev, devman_handle_t handle,
+    usb_address_t *address)
+{
+        usb_address_t addr = usb_address_keeping_find(&addresses, handle);
+        if (addr < 0) {
+                return addr;
+        }
+
+        *address = addr;
+        return EOK;
+}
 
 static int reserve_default_address(device_t *dev, usb_speed_t ignored)
@@ -350 +362 @@
 }
 
-static int tell_address(device_t *dev, devman_handle_t handle,
-    usb_address_t *address)
-{
-        usb_address_t addr = usb_address_keeping_find(&addresses, handle);
-        if (addr < 0) {
-                return addr;
-        }
-
-        *address = addr;
-        return EOK;
-}
-
 void address_init(void)
 {
@@ -368 +368 @@
 
 usbhc_iface_t vhc_iface = {
-        .tell_address = tell_address,
-
         .reserve_default_address = reserve_default_address,
         .release_default_address = release_default_address,
@@ -383 +381 @@
 };
 
+usb_iface_t vhc_usb_iface = {
+        .get_hc_handle = usb_iface_get_hc_handle_hc_impl,
+        .get_address = tell_address
+};
+
+
 /**
  * @}