Changeset 8d6c1f1 in mainline for boot

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

Location:

boot

Files:

• Makefile.common (modified) (2 diffs)
• arch/amd64/Makefile.inc (modified) (1 diff)

boot/Makefile.common

@@ -146 +146 @@
         $(USPACE_PATH)/app/killall/killall \
         $(USPACE_PATH)/app/mkfat/mkfat \
+        $(USPACE_PATH)/app/lsusb/lsusb \
         $(USPACE_PATH)/app/sbi/sbi \
         $(USPACE_PATH)/app/redir/redir \
@@ -158 +159 @@
         $(USPACE_PATH)/app/ping/ping \
         $(USPACE_PATH)/app/stats/stats \
+        $(USPACE_PATH)/app/sysinfo/sysinfo \
         $(USPACE_PATH)/app/top/top \
-        $(USPACE_PATH)/app/sysinfo/sysinfo \
+        $(USPACE_PATH)/app/usbinfo/usbinfo \
+        $(USPACE_PATH)/app/vuhid/vuh \
+        $(USPACE_PATH)/app/mkbd/mkbd \
         $(USPACE_PATH)/app/websrv/websrv
 

boot/arch/amd64/Makefile.inc

@@ -42 +42 @@
         pciintel \
         isa \
-        ns8250
+        ns8250 \
+        ehci_hcd \
+        ohci \
+        uhci_hcd \
+        uhci_rhd \
+        usbflbk \
+        usbhub \
+        usbhid \
+        usbmast \
+        usbmid \
+        usbmouse \
+        vhc
 
 RD_DRV_CFG += \