Changeset b317b0b in mainline for uspace/lib/usbvirt

Timestamp:

2011-02-21T19:50:41Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

15b0432

Parents:

ace12560 (diff), 41b70d30 (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 from usb/development

Location:

uspace/lib/usbvirt

Files:

• Makefile (modified) (1 diff)
• include/usbvirt/device.h (modified) (1 diff)
• src/stdreq.c (modified) (1 diff)

uspace/lib/usbvirt/Makefile

@@ -30 +30 @@
 LIBRARY = libusbvirt
 
-EXTRA_CFLAGS = -I$(LIBUSB_PREFIX)/include -Iinclude
+EXTRA_CFLAGS = -I$(LIBUSB_PREFIX)/include -I$(LIBDRV_PREFIX)/include -Iinclude
 
 SOURCES = \

uspace/lib/usbvirt/include/usbvirt/device.h

@@ -37 +37 @@
 
 #include <usb/usb.h>
+#include <usb/request.h>
 #include <usb/descriptor.h>
-#include <usb/devreq.h>
 
 /** Request type of a control transfer. */

uspace/lib/usbvirt/src/stdreq.c

@@ -36 +36 @@
 #include <stdlib.h>
 #include <mem.h>
-#include <usb/devreq.h>
+#include <usb/request.h>
 
 #include "private.h"