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

Ignore:
Timestamp:
2018-11-12T20:20:36Z (3 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
lfn, master
Children:
08f1a6d
Parents:
15639ec
git-author:
Jiří Zárevúcky <zarevucky.jiri@…> (2018-11-12 20:09:40)
git-committer:
Jiří Zárevúcky <zarevucky.jiri@…> (2018-11-12 20:20:36)
Message:

Remove realmode VESA code

This simply enables framebuffer setup via multiboot1
(multiboot2 already did it), and removes the obsolete code.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/amd64/src/boot/multiboot.S

    r15639ec r8781e9d  
    3838#include <arch/cpu.h>
    3939
     40// TODO: most of this file can be rewritten in C
     41
    4042#define START_STACK  (BOOT_OFFSET - BOOT_STACK_SIZE)
    4143
     
    5052
    5153.macro pm_status msg
    52 #ifdef CONFIG_EGA
     54#if defined(CONFIG_EGA) && !defined(CONFIG_FB)
    5355        pushl %esi
    5456        movl \msg, %esi
     
    6769multiboot_header:
    6870        .long MULTIBOOT_HEADER_MAGIC
     71#ifdef CONFIG_FB
    6972        .long MULTIBOOT_HEADER_FLAGS
    7073        .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS)  /* checksum */
     74#else
     75        .long MULTIBOOT_HEADER_FLAGS_NOFB
     76        .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS_NOFB)  /* checksum */
     77#endif
    7178        .long multiboot_header
    7279        .long unmapped_start
     
    7481        .long 0
    7582        .long multiboot_image_start
     83#ifdef CONFIG_FB
     84        .long 0
     85        .long CONFIG_BFB_WIDTH
     86        .long CONFIG_BFB_HEIGHT
     87        .long CONFIG_BFB_BPP
     88#endif
    7689
    7790SYMBOL(multiboot_image_start)
     
    158171        sse2_supported:
    159172
    160 #include "vesa_prot.inc"
    161 
    162173        pm2_status $status_prot2
    163174
     
    568579
    569580        ret
    570 
    571 #include "vesa_real.inc"
    572581
    573582.section K_INI_PTLS, "aw", @progbits
     
    708717status_prot:
    709718        .asciz "[prot] "
    710 status_vesa_copy:
    711         .asciz "[vesa_copy] "
    712719status_multiboot_cmdline:
    713720        .asciz "[multiboot_cmdline] "
    714 status_vesa_real:
    715         .asciz "[vesa_real] "
    716721status_prot2:
    717722        .asciz "[prot2] "
Note: See TracChangeset for help on using the changeset viewer.