Changeset aca85e4 in mainline for uspace/lib

Timestamp:

2010-12-05T10:19:28Z (15 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/

Location:

uspace/lib/usb

Files:

• Makefile (modified) (2 diffs)
• include/usb/hcd.h (added)
• include/usb/usb.h (modified) (1 diff)
• include/usb/usbdrv.h (modified) (2 diffs)
• src/addrkeep.c (added)
• src/usbdrvreq.c (added)

uspace/lib/usb/Makefile

@@ -33 +33 @@
 
 SOURCES = \
+        src/addrkeep.c \
         src/hcdhubd.c \
         src/hcdrv.c \
@@ -38 +39 @@
         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.h"
+#include <usb/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
 /**