Changeset c01255c in mainline for uspace/drv/vhc

Timestamp:

2010-12-10T15:12:25Z (15 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

10096231

Parents:

98d06b8 (diff), 7964475 (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 remote smekideki repository

Location:

uspace/drv/vhc

Files:

• Makefile (modified) (1 diff)
• addrmgm.c (deleted)
• conn.h (modified) (1 diff)
• connhost.c (modified) (3 diffs)
• debug.c (modified) (1 diff)
• hcd.c (modified) (1 diff)
• vhcd.h (modified) (2 diffs)

uspace/drv/vhc/Makefile

@@ -39 +39 @@
 
 SOURCES = \
-        addrmgm.c \
         conndev.c \
         connhost.c \

uspace/drv/vhc/conn.h

@@ -48 +48 @@
 
 void address_init(void);
-int reserve_default_address(device_t *);
-int release_default_address(device_t *);
-int request_address(device_t *, usb_address_t *);
-int release_address(device_t *, usb_address_t);
-int bind_address(device_t *, usb_address_t, devman_handle_t);
 
-int tell_address(device_t *, devman_handle_t, usb_address_t *);
 
 void default_connection_handler(device_t *, ipc_callid_t, ipc_call_t *);

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;
@@ -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 = {

uspace/drv/vhc/debug.c

@@ -35 +35 @@
 #include <stdio.h>
 #include <ipc/ipc.h>
+#include <usb/debug.h>
 
 #include "vhcd.h"
 
-/** Current debug level. */
-int debug_level = 0;
-
-/** Debugging printf.
- * This function is intended for single-line messages as it
- * automatically prints debugging prefix at the beginning of the
- * line.
- *
- * @see printf
- * @param level Debugging level.
- */
-void dprintf(int level, const char *format, ...)
-{
-        if (level > debug_level) {
-                return;
-        }
-        
-        printf("%s(%d): ", NAME, level);
-        va_list args;
-        va_start(args, format);
-        vprintf(format, args);
-        va_end(args);
-        printf("\n");
-}
 
 /** Debug print informing of invalid call.

uspace/drv/vhc/hcd.c

@@ -111 +111 @@
         printf("%s: virtual USB host controller driver.\n", NAME);
 
-        debug_level = 10;
+        usb_dprintf_enable(NAME, 10);
 
         fid_t fid = fibril_create(hc_manager_fibril, NULL);

uspace/drv/vhc/vhcd.h

@@ -36 +36 @@
 #define VHCD_VHCD_H_
 
+#include <usb/debug.h>
+
 #define NAME "vhc"
 #define NAME_DEV "hcd-virt-dev"
@@ -43 +45 @@
 #define DEVMAP_PATH_DEV NAMESPACE "/" NAME_DEV
 
-extern int debug_level;
-void dprintf(int, const char *, ...);
+#define dprintf(level, format, ...) \
+        usb_dprintf(NAME, (level), format "\n", ##__VA_ARGS__)
 void dprintf_inval_call(int, ipc_call_t, ipcarg_t);