Changeset 8d6c1f1 in mainline for uspace/app

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:

uspace/app

Files:

• init/init.c (modified) (1 diff)
• lsusb/Makefile (added)
• lsusb/main.c (added)
• mkbd/Makefile (added)
• mkbd/main.c (added)
• tester/Makefile (modified) (1 diff)
• tester/mm/mapping1.c (added)
• tester/mm/mapping1.def (added)
• tester/tester.c (modified) (1 diff)
• tester/tester.h (modified) (1 diff)
• usbinfo/Makefile (added)
• usbinfo/desctree.c (added)
• usbinfo/dev.c (added)
• usbinfo/dump.c (added)
• usbinfo/info.c (added)
• usbinfo/main.c (added)
• usbinfo/usbinfo.h (added)
• vuhid/Makefile (added)
• vuhid/device.c (added)
• vuhid/hids/bootkbd.c (added)
• vuhid/ifaces.c (added)
• vuhid/ifaces.h (added)
• vuhid/items.h (added)
• vuhid/main.c (added)
• vuhid/report.h (added)
• vuhid/stdreq.c (added)
• vuhid/stdreq.h (added)
• vuhid/virthid.h (added)

uspace/app/init/init.c

@@ -272 +272 @@
         mount_tmpfs();
         
-#ifdef CONFIG_START_DEVMAN
         spawn("/srv/devman");
-#endif
         spawn("/srv/apic");
         spawn("/srv/i8259");

uspace/app/tester/Makefile

@@ -55 +55 @@
         mm/malloc2.c \
         mm/malloc3.c \
+        mm/mapping1.c \
         devs/devman1.c \
         devs/devman2.c \

uspace/app/tester/tester.c

@@ -64 +64 @@
 #include "mm/malloc2.def"
 #include "mm/malloc3.def"
+#include "mm/mapping1.def"
 #include "hw/serial/serial1.def"
 #include "hw/misc/virtchar1.def"

uspace/app/tester/tester.h

@@ -97 +97 @@
 extern const char *test_malloc2(void);
 extern const char *test_malloc3(void);
+extern const char *test_mapping1(void);
 extern const char *test_serial1(void);
 extern const char *test_virtchar1(void);