Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 7bd2c19 in mainline


Ignore:
Timestamp:
2011-10-19T05:46:29Z (9 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
master
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:
6 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • boot/arch/amd64/Makefile.inc

    r7bc4508 r7bd2c19  
    5151        bus/usb/usbmast \
    5252        bus/usb/usbmid \
    53         bus/usb/usbmouse \
    5453        bus/usb/vhc
    5554
  • kernel/arch/ia64/src/ia64.c

    r7bc4508 r7bd2c19  
    9393void arch_pre_mm_init(void)
    9494{
    95         /*
    96          * Set Interruption Vector Address (i.e. location of interruption vector
    97          * table).
    98          */
    99         iva_write((uintptr_t) &ivt);
    100         srlz_d();
    101        
    10295}
    10396
  • kernel/arch/ia64/src/start.S

    r7bc4508 r7bd2c19  
    156156         * Now we are paging.
    157157         */
     158
     159        #
     160        # Set Interruption Vector Address
     161        # (i.e. location of interruption vector table)
     162        #
     163        movl r8 = ivt ;;
     164        mov cr.iva = r8
     165        srlz.d ;;       
     166
    158167       
    159168        # Switch to register bank 1
     
    165174        mov ar.bspstore = r8
    166175        loadrs
    167        
    168         #
    169         # Initialize memory stack to some sane value and allocate a scratch are
     176
     177        #
     178        # Initialize memory stack to some sane value and allocate a scratch area
    170179        # on it.
    171180        #
     
    187196        srlz.i
    188197        srlz.d ;;
    189        
     198
    190199        br.call.sptk.many b0 = arch_pre_main
    1912000:
  • uspace/Makefile

    r7bc4508 r7bd2c19  
    117117        drv/bus/usb/usbmast \
    118118        drv/bus/usb/usbmid \
    119         drv/bus/usb/usbmouse \
    120119        drv/bus/usb/vhc \
    121120        drv/nic/lo \
  • uspace/doc/doxygroups.h

    r7bc4508 r7bd2c19  
    272272
    273273        /**
    274          * @defgroup drvusbmouse USB mouse driver
    275          * @ingroup usb
    276          * @brief USB driver for mouse with boot protocol.
    277          */
    278 
    279         /**
    280274         * @defgroup drvusbmast USB mass storage driver
    281275         * @ingroup usb
Note: See TracChangeset for help on using the changeset viewer.