Changes in uspace/drv/vhc/connhost.c [357a302:b36e5de2] in mainline

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"
@@ -314 +313 @@
 static usb_address_keeping_t addresses;
 
+
+static int reserve_default_address(device_t *dev, usb_speed_t ignored)
+{
+        usb_address_keeping_reserve_default(&addresses);
+        return EOK;
+}
+
+static int release_default_address(device_t *dev)
+{
+        usb_address_keeping_release_default(&addresses);
+        return EOK;
+}
+
+static int request_address(device_t *dev, usb_speed_t ignored,
+    usb_address_t *address)
+{
+        usb_address_t addr = usb_address_keeping_request(&addresses);
+        if (addr < 0) {
+                return (int)addr;
+        }
+
+        *address = addr;
+        return EOK;
+}
+
+static int release_address(device_t *dev, usb_address_t address)
+{
+        return usb_address_keeping_release(&addresses, address);
+}
+
+static int bind_address(device_t *dev, usb_address_t address,
+    devman_handle_t handle)
+{
+        usb_address_keeping_devman_bind(&addresses, address, handle);
+        return EOK;
+}
+
 static int tell_address(device_t *dev, devman_handle_t handle,
     usb_address_t *address)
@@ -326 +362 @@
 }
 
-static int reserve_default_address(device_t *dev, usb_speed_t ignored)
-{
-        usb_address_keeping_reserve_default(&addresses);
-        return EOK;
-}
-
-static int release_default_address(device_t *dev)
-{
-        usb_address_keeping_release_default(&addresses);
-        return EOK;
-}
-
-static int request_address(device_t *dev, usb_speed_t ignored,
-    usb_address_t *address)
-{
-        usb_address_t addr = usb_address_keeping_request(&addresses);
-        if (addr < 0) {
-                return (int)addr;
-        }
-
-        *address = addr;
-        return EOK;
-}
-
-static int release_address(device_t *dev, usb_address_t address)
-{
-        return usb_address_keeping_release(&addresses, address);
-}
-
-static int bind_address(device_t *dev, usb_address_t address,
-    devman_handle_t handle)
-{
-        usb_address_keeping_devman_bind(&addresses, address, handle);
-        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,
@@ -381 +383 @@
 };
 
-usb_iface_t vhc_usb_iface = {
-        .get_hc_handle = usb_iface_get_hc_handle_hc_impl,
-        .get_address = tell_address
-};
-
-
 /**
  * @}