Changes in / [aca85e4:35537a7] in mainline

Location:

uspace

Files:

• app/tester/Makefile (modified) (1 diff)
• app/tester/adt/usbaddrkeep.c (deleted)
• app/tester/adt/usbaddrkeep.def (deleted)
• app/tester/tester.c (modified) (1 diff)
• app/tester/tester.h (modified) (1 diff)
• drv/vhc/Makefile (modified) (1 diff)
• drv/vhc/addrmgm.c (added)
• drv/vhc/conn.h (modified) (1 diff)
• drv/vhc/connhost.c (modified) (2 diffs)
• lib/usb/Makefile (modified) (2 diffs)
• lib/usb/include/usb/hcd.h (deleted)
• lib/usb/include/usb/usb.h (modified) (1 diff)
• lib/usb/include/usb/usbdrv.h (modified) (2 diffs)
• lib/usb/src/addrkeep.c (deleted)
• lib/usb/src/usbdrvreq.c (deleted)

uspace/app/tester/Makefile

@@ -31 +31 @@
 BINARY = tester
 
-LIBS += $(LIBUSB_PREFIX)/libusb.a
-EXTRA_CFLAGS += -I$(LIBUSB_PREFIX)/include
-
 SOURCES = \
         tester.c \
-        adt/usbaddrkeep.c \
         thread/thread1.c \
         print/print1.c \

uspace/app/tester/tester.c

@@ -65 +65 @@
 #include "mm/malloc1.def"
 #include "hw/serial/serial1.def"
-#include "adt/usbaddrkeep.def"
         {NULL, NULL, NULL, false}
 };

uspace/app/tester/tester.h

@@ -82 +82 @@
 extern const char *test_malloc1(void);
 extern const char *test_serial1(void);
-extern const char *test_usbaddrkeep(void);
 
 extern test_t tests[];

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"
@@ -219 +218 @@
 }
 
-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/lib/usb/Makefile

@@ -33 +33 @@
 
 SOURCES = \
-        src/addrkeep.c \
         src/hcdhubd.c \
         src/hcdrv.c \
@@ -39 +38 @@
         src/remotedrv.c \
         src/usb.c \
-        src/usbdrvreq.c \
         src/usbdrv.c
 

uspace/lib/usb/include/usb/usb.h

@@ -69 +69 @@
 typedef int usb_address_t;
 
-/** Default USB address. */
-#define USB_ADDRESS_DEFAULT 0
-
 /** USB endpoint number type.
  * Negative values could be used to indicate error.

uspace/lib/usb/include/usb/usbdrv.h

@@ -36 +36 @@
 #define LIBUSB_USBDRV_H_
 
-#include <usb/usb.h>
+#include "usb.h"
 #include <driver.h>
 
@@ -70 +70 @@
 int usb_drv_async_wait_for(usb_handle_t);
 
-
-int usb_drv_req_set_address(int, usb_address_t, usb_address_t);
-
 #endif
 /**