Changeset cd4ae1e in mainline for uspace/app/vuhid/Makefile

Timestamp:

2011-04-28T13:14:14Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

54d71e1, a146aa33

Parents:

74f00b6 (diff), c82135a8 (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:

Better virtual USB HID; USB-virt rewritten

The new virtual USB HID is easily extensible with new interfaces that
might provide different report descriptors.

The virtual host controller was completely rewritten together
with the libusbvirt.

The documentation is missing and the code would deserver some refactoring.
That will appear later.

File:

• uspace/app/vuhid/Makefile (moved) (moved from uspace/app/virtusbhub/Makefile ) (1 diff)

uspace/app/vuhid/Makefile

@@ -28 +28 @@
 
 USPACE_PREFIX = ../..
-# acronym for virtual USB hub
+# acronym for virtual USB human input device
 # (it is really annoying to write long names)
 BINARY = vuh
 
-LIBS = $(LIBUSB_PREFIX)/libusb.a $(LIBUSBVIRT_PREFIX)/libusbvirt.a
-EXTRA_CFLAGS = -DSTANDALONE_HUB \
-        -DHUB_PORT_COUNT=10 \
-        -I$(LIBUSB_PREFIX)/include -I$(LIBUSBVIRT_PREFIX)/include -I$(LIBDRV_PREFIX)/include
+LIBS = \
+        $(LIBUSBVIRT_PREFIX)/libusbvirt.a \
+        $(LIBUSB_PREFIX)/libusb.a
+EXTRA_CFLAGS = \
+        -I$(LIBUSB_PREFIX)/include \
+        -I$(LIBUSBVIRT_PREFIX)/include \
+        -I$(LIBDRV_PREFIX)/include
+
+
+SOURCES_INTERFACES = \
+        hids/bootkbd.c
 
 SOURCES = \
         main.c \
-        $(STOLEN_VHC_SOURCES)
-
-STOLEN_VHC_SOURCES = \
-        vhc_hub/hub.c \
-        vhc_hub/virthub.c \
-        vhc_hub/virthubops.c 
-STOLEN_VHC_HEADERS = \
-        vhc_hub/hub.h \
-        vhc_hub/virthub.h
-
-PRE_DEPEND = $(STOLEN_VHC_SOURCES) $(STOLEN_VHC_HEADERS)
-
-EXTRA_CLEAN = $(STOLEN_VHC_SOURCES) $(STOLEN_VHC_HEADERS)
-
-HUB_IN_VHC = $(USPACE_PREFIX)/drv/vhc/hub
+        device.c \
+        ifaces.c \
+        stdreq.c \
+        $(SOURCES_INTERFACES)
+        
 
 include $(USPACE_PREFIX)/Makefile.common
-
-vhc_hub/%.h: $(HUB_IN_VHC)/%.h
-        ln -sfn ../$(HUB_IN_VHC)/$*.h $@
-vhc_hub/%.c: $(HUB_IN_VHC)/%.c
-        ln -sfn ../$(HUB_IN_VHC)/$*.c $@