Ignore:
Timestamp:
2011-07-08T17:01:01Z (13 years ago)
Author:
Martin Sucha <sucha14@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
cc1a727
Parents:
4e36219 (diff), 026793d (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 mainline changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/ia32/src/boot/vesa_real.inc

    r4e36219 rc028b22  
    154154        mov $e_vesa_init - vesa_init, %di
    155155        push %di
     156        /* Write the "VBE2" signature into the info structure in order
     157         * to get proper mode information. The presence of "VBE2"
     158         * indicates two things:
     159         *
     160         *  - VBE controller information structure is expected to be
     161         *    512 bytes long instead of 256 bytes.
     162         *  - The BIOS should report VBE 3.0 information (potentially
     163         *    including non-standard modes in the mode list).
     164         */
     165        movl $0x32454256, (%di)
    156166        int $0x10
    157167       
Note: See TracChangeset for help on using the changeset viewer.