Changeset 7bd2c19 in mainline

Timestamp:

2011-10-19T05:46:29Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

8158db7

Parents:

7bc4508 (diff), d75628da (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 with mainline

Files:

• boot/arch/amd64/Makefile.inc (modified) (1 diff)
• kernel/arch/ia64/src/ia64.c (modified) (1 diff)
• kernel/arch/ia64/src/start.S (modified) (3 diffs)
• uspace/Makefile (modified) (1 diff)
• uspace/doc/doxygroups.h (modified) (1 diff)
• uspace/drv/bus/usb/usbmouse/Makefile (deleted)
• uspace/drv/bus/usb/usbmouse/init.c (deleted)
• uspace/drv/bus/usb/usbmouse/main.c (deleted)
• uspace/drv/bus/usb/usbmouse/mouse.c (deleted)
• uspace/drv/bus/usb/usbmouse/mouse.h (deleted)
• uspace/drv/bus/usb/usbmouse/usbmouse.ma (deleted)

boot/arch/amd64/Makefile.inc

@@ -51 +51 @@
         bus/usb/usbmast \
         bus/usb/usbmid \
-        bus/usb/usbmouse \
         bus/usb/vhc
 

kernel/arch/ia64/src/ia64.c

@@ -93 +93 @@
 void arch_pre_mm_init(void)
 {
-        /*
-         * Set Interruption Vector Address (i.e. location of interruption vector
-         * table).
-         */
-        iva_write((uintptr_t) &ivt);
-        srlz_d();
-        
 }
 

kernel/arch/ia64/src/start.S

@@ -156 +156 @@
          * Now we are paging.
          */
+
+        #
+        # Set Interruption Vector Address
+        # (i.e. location of interruption vector table)
+        #
+        movl r8 = ivt ;; 
+        mov cr.iva = r8
+        srlz.d ;;       
+
         
         # Switch to register bank 1
@@ -165 +174 @@
         mov ar.bspstore = r8
         loadrs
-        
-        #
-        # Initialize memory stack to some sane value and allocate a scratch are
+
+        #
+        # Initialize memory stack to some sane value and allocate a scratch area
         # on it.
         #
@@ -187 +196 @@
         srlz.i
         srlz.d ;;
-        
+
         br.call.sptk.many b0 = arch_pre_main
 0:

uspace/Makefile

@@ -117 +117 @@
         drv/bus/usb/usbmast \
         drv/bus/usb/usbmid \
-        drv/bus/usb/usbmouse \
         drv/bus/usb/vhc \
         drv/nic/lo \

uspace/doc/doxygroups.h

@@ -272 +272 @@
 
         /**
-         * @defgroup drvusbmouse USB mouse driver
-         * @ingroup usb
-         * @brief USB driver for mouse with boot protocol.
-         */
-
-        /**
          * @defgroup drvusbmast USB mass storage driver
          * @ingroup usb