Changeset 8d6c1f1 in mainline for uspace/Makefile

Timestamp:

2011-06-07T21:31:35Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

75608143

Parents:

ff4f073 (diff), eb522e8 (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 USB support.

Changes from bzr://helenos-usb.bzr.sourceforge.net/bzrroot/helenos-usb/mainline:

• replaced '-' with '_' in new driver names
• USB libs are built for each architecture
• devman starts early
• sys_thread_udelay() uses generic delay()
• sys_as_create_area() now creates cacheable areas by default

File:

• uspace/Makefile (modified) (6 diffs)

uspace/Makefile

@@ -44 +44 @@
         app/killall \
         app/klog \
+        app/lsusb \
         app/mkfat \
         app/redir \
@@ -54 +55 @@
         app/trace \
         app/top \
+        app/usbinfo \
+        app/vuhid \
         app/netecho \
         app/nettest1 \
@@ -60 +63 @@
         app/websrv \
         app/sysinfo \
+        app/mkbd \
         srv/clip \
         srv/devmap \
@@ -119 +123 @@
                 drv/ns8250 \
                 srv/hw/irc/apic \
-                srv/hw/irc/i8259
+                srv/hw/irc/i8259 \
+                drv/ehci_hcd \
+                drv/ohci \
+                drv/uhci_hcd \
+                drv/uhci_rhd \
+                drv/usbflbk \
+                drv/usbhid \
+                drv/usbhub \
+                drv/usbmast \
+                drv/usbmid \
+                drv/usbmouse \
+                drv/vhc
 endif
 
@@ -129 +144 @@
                 drv/ns8250 \
                 srv/hw/irc/apic \
-                srv/hw/irc/i8259
+                srv/hw/irc/i8259 \
+                drv/ehci_hcd \
+                drv/ohci \
+                drv/uhci_hcd \
+                drv/uhci_rhd \
+                drv/usbflbk \
+                drv/usbhid \
+                drv/usbhub \
+                drv/usbmast \
+                drv/usbmid \
+                drv/usbmouse \
+                drv/vhc
 endif
 
@@ -155 +181 @@
         lib/packet \
         lib/net \
-        lib/ext2
+        lib/ext2 \
+        lib/usb \
+        lib/usbhost \
+        lib/usbdev \
+        lib/usbhid \
+        lib/usbvirt
 
 LIBC_BUILD = $(addsuffix .build,$(LIBC))