Changeset aca85e4 in mainline for uspace/drv/vhc/connhost.c

Timestamp:

2010-12-05T10:19:28Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

818dc00

Parents:

35537a7 (diff), f995350 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with vojtechhorky/

File:

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

uspace/drv/vhc/connhost.c

@@ -36 +36 @@
 #include <errno.h>
 #include <usb/usb.h>
+#include <usb/hcd.h>
 
 #include "vhcd.h"
@@ -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 = {