Changeset a29529b in mainline for uspace/drv/uhci-hcd

Timestamp:

2011-05-13T14:40:21Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

50cd285, 5e6e50b

Parents:

81db65b (diff), 8fcaeed (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:

Development branch changes

Location:

uspace/drv/uhci-hcd

Files:

• Makefile (modified) (1 diff)
• hw_struct/queue_head.h (modified) (1 diff)
• hw_struct/transfer_descriptor.c (modified) (1 diff)

uspace/drv/uhci-hcd/Makefile

@@ -28 +28 @@
 
 USPACE_PREFIX = ../..
-LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBUSB_PREFIX)/libusb.a
-EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBUSB_PREFIX)/include -I.
+
+LIBS = \
+        $(LIBUSBHOST_PREFIX)/libusbhost.a \
+        $(LIBUSB_PREFIX)/libusb.a \
+        $(LIBDRV_PREFIX)/libdrv.a
+EXTRA_CFLAGS += \
+        -I$(LIBUSB_PREFIX)/include \
+        -I$(LIBUSBHOST_PREFIX)/include \
+        -I$(LIBDRV_PREFIX)/include
+
 BINARY = uhci-hcd
 

uspace/drv/uhci-hcd/hw_struct/queue_head.h

@@ -38 +38 @@
 #include "link_pointer.h"
 #include "transfer_descriptor.h"
-#include "utils/malloc32.h"
+#include "../utils/malloc32.h"
 
 /** This structure is defined in UHCI design guide p. 31 */

uspace/drv/uhci-hcd/hw_struct/transfer_descriptor.c

@@ -36 +36 @@
 
 #include "transfer_descriptor.h"
-#include "utils/malloc32.h"
+#include "../utils/malloc32.h"
 
 /** Initialize Transfer Descriptor