Changes in uspace/drv/vhc/connhost.c [ce687bbe:a39f4cf] in mainline

File:

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

uspace/drv/vhc/connhost.c

@@ -36 +36 @@
 #include <errno.h>
 #include <usb/usb.h>
+#include <usb/hcd.h>
 
 #include "vhcd.h"
@@ -57 +58 @@
                 case USB_DIRECTION_IN:
                         transfer->in_callback(transfer->dev,
-                            size, outcome,
+                            outcome, size,
                             transfer->arg);
                         break;
@@ -92 +93 @@
     usbhc_iface_transfer_out_callback_t callback, void *arg)
 {
-        printf(NAME ": transfer OUT [%d.%d (%s); %u]\n",
+        dprintf(3, "transfer OUT [%d.%d (%s); %zu]",
             target.address, target.endpoint,
             usb_str_transfer_type(transfer_type),
@@ -112 +113 @@
     usbhc_iface_transfer_out_callback_t callback, void *arg)
 {
-        printf(NAME ": transfer SETUP [%d.%d (%s); %u]\n",
+        dprintf(3, "transfer SETUP [%d.%d (%s); %zu]",
             target.address, target.endpoint,
             usb_str_transfer_type(transfer_type),
@@ -132 +133 @@
     usbhc_iface_transfer_in_callback_t callback, void *arg)
 {
-        printf(NAME ": transfer IN [%d.%d (%s); %u]\n",
+        dprintf(3, "transfer IN [%d.%d (%s); %zu]",
             target.address, target.endpoint,
             usb_str_transfer_type(transfer_type),
@@ -218 +219 @@
 }
 
+static usb_address_keeping_t addresses;
+
+
+static int reserve_default_address(device_t *dev)
+{
+        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_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)
+{
+        usb_address_t addr = usb_address_keeping_find(&addresses, handle);
+        if (addr < 0) {
+                return addr;
+        }
+
+        *address = addr;
+        return EOK;
+}
+
+void address_init(void)
+{
+        usb_address_keeping_init(&addresses, 50);
+}
 
 usbhc_iface_t vhc_iface = {