Changeset 243cb86 in mainline for boot

Timestamp:

2010-12-12T10:50:19Z (15 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

8365533

Parents:

101ef25c (diff), ebb98c5 (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 from development + several changes to hid driver.

Changes to hid driver:

• copied some code to usbkbd_get_descriptors() function
• base structure for hid descriptor and report parser (files uspace/lib/usb/include/usb/classes/hidparser.h

and uspace/lib/usb/src/hidparser.c)

Location:

boot

Files:

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

boot/Makefile.common

@@ -111 +111 @@
 RD_DRVS = \
         root \
+        rootvirt \
+        test1 \
+        test2 \
         vhc
 
@@ -142 +145 @@
         $(USPACE_PATH)/app/ping/ping \
         $(USPACE_PATH)/app/stats/stats \
-        $(USPACE_PATH)/app/virtusbkbd/vuk \
         $(USPACE_PATH)/app/tasks/tasks \
-        $(USPACE_PATH)/app/top/top
+        $(USPACE_PATH)/app/top/top \
+        $(USPACE_PATH)/app/usbinfo/usbinfo \
+        $(USPACE_PATH)/app/virtusbkbd/vuk
 
 ifneq ($(CONFIG_BAREBONE),y)

boot/arch/amd64/Makefile.inc

@@ -37 +37 @@
 
 RD_DRVS += \
-        rootia32 \
+        rootpc \
         pciintel \
         isa \
         ns8250 \
         uhci \
+        usbhub \
         usbkbd
         

boot/arch/mips32/include/arch.h

@@ -40 +40 @@
 
 #define MSIM_VIDEORAM_ADDRESS  0xb0000000
-#define MSIM_DORDER_ADDRESS    0xb0000004
+#define MSIM_DORDER_ADDRESS    0xb0000100
 
 #ifndef __ASM__