Changeset 9212f8a in mainline for uspace/app

Timestamp:

2011-05-08T20:26:04Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a81a1d09, c372e03

Parents:

ebf6a40 (diff), 3e4f2e0 (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:

Start libusb reorganization

Location:

uspace/app

Files:

• lsusb/Makefile (modified) (1 diff)
• tester/Makefile (modified) (1 diff)
• tester/adt/usbaddrkeep.def (deleted)
• tester/tester.c (modified) (1 diff)
• tester/tester.h (modified) (1 diff)
• usbinfo/Makefile (modified) (1 diff)
• usbinfo/info.c (modified) (1 diff)
• usbinfo/main.c (modified) (1 diff)
• vuhid/Makefile (modified) (1 diff)

uspace/app/lsusb/Makefile

@@ -30 +30 @@
 BINARY = lsusb
 
-LIBS = $(LIBUSB_PREFIX)/libusb.a $(LIBDRV_PREFIX)/libdrv.a
-EXTRA_CFLAGS = -I$(LIBUSB_PREFIX)/include -I$(LIBDRV_PREFIX)/include
+LIBS = \
+        $(LIBUSBDEV_PREFIX)/libusbdev.a \
+        $(LIBUSB_PREFIX)/libusb.a \
+        $(LIBDRV_PREFIX)/libdrv.a
+EXTRA_CFLAGS = \
+        -I$(LIBUSB_PREFIX)/include \
+        -I$(LIBUSBDEV_PREFIX)/include \
+        -I$(LIBDRV_PREFIX)/include
 
 SOURCES = \

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

@@ -64 +64 @@
 #include "mm/mapping1.def"
 #include "hw/serial/serial1.def"
-#include "adt/usbaddrkeep.def"
 #include "hw/misc/virtchar1.def"
 #include "devs/devman1.def"

uspace/app/tester/tester.h

@@ -80 +80 @@
 extern const char *test_mapping1(void);
 extern const char *test_serial1(void);
-extern const char *test_usbaddrkeep(void);
 extern const char *test_virtchar1(void);
 extern const char *test_devman1(void);

uspace/app/usbinfo/Makefile

@@ -30 +30 @@
 BINARY = usbinfo
 
-LIBS = $(LIBUSB_PREFIX)/libusb.a $(LIBDRV_PREFIX)/libdrv.a
-EXTRA_CFLAGS = -I$(LIBUSB_PREFIX)/include -I$(LIBDRV_PREFIX)/include
+LIBS = \
+        $(LIBUSBDEV_PREFIX)/libusbdev.a \
+        $(LIBUSB_PREFIX)/libusb.a \
+        $(LIBDRV_PREFIX)/libdrv.a
+EXTRA_CFLAGS = \
+        -I$(LIBUSB_PREFIX)/include \
+        -I$(LIBUSBDEV_PREFIX)/include \
+        -I$(LIBDRV_PREFIX)/include
 
 SOURCES = \

uspace/app/usbinfo/info.c

@@ -41 +41 @@
 #include <usb/request.h>
 #include <usb/classes/classes.h>
-#include <usb/classes/hid.h>
 #include <usb/classes/hub.h>
 #include "usbinfo.h"

uspace/app/usbinfo/main.c

@@ -46 +46 @@
 #include <usb/pipes.h>
 #include <usb/host.h>
+#include <usb/driver.h>
 #include "usbinfo.h"
 

uspace/app/vuhid/Makefile

@@ -34 +34 @@
 LIBS = \
         $(LIBUSBVIRT_PREFIX)/libusbvirt.a \
+        $(LIBUSBHID_PREFIX)/libusbhid.a \
+        $(LIBUSBDEV_PREFIX)/libusbdev.a \
         $(LIBUSB_PREFIX)/libusb.a
 EXTRA_CFLAGS = \
         -I$(LIBUSB_PREFIX)/include \
+        -I$(LIBUSBDEV_PREFIX)/include \
+        -I$(LIBUSBHID_PREFIX)/include \
         -I$(LIBUSBVIRT_PREFIX)/include \
         -I$(LIBDRV_PREFIX)/include