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/ia32/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
     
    6668multiboot_header:
    6769        .long MULTIBOOT_HEADER_MAGIC
     70#ifdef CONFIG_FB
    6871        .long MULTIBOOT_HEADER_FLAGS
    6972        .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS)  /* checksum */
     73#else
     74        .long MULTIBOOT_HEADER_FLAGS_NOFB
     75        .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS_NOFB)  /* checksum */
     76#endif
    7077        .long multiboot_header
    7178        .long unmapped_start
     
    7380        .long 0
    7481        .long multiboot_image_start
     82#ifdef CONFIG_FB
     83        .long 0
     84        .long CONFIG_BFB_WIDTH
     85        .long CONFIG_BFB_HEIGHT
     86        .long CONFIG_BFB_BPP
     87#endif
    7588
    7689SYMBOL(multiboot_image_start)
     
    104117
    105118        pm_status $status_prot
    106 
    107 #include "vesa_prot.inc"
    108119
    109120#ifndef PROCESSOR_i486
     
    685696        ret
    686697
    687 #include "vesa_real.inc"
    688 
    689698.section K_DATA_START, "aw", @progbits
    690699
     
    720729status_non_pse:
    721730        .asciz "[non_pse] "
    722 status_vesa_copy:
    723         .asciz "[vesa_copy] "
    724731status_multiboot_cmdline:
    725732        .asciz "[multiboot_cmdline] "
    726 status_vesa_real:
    727         .asciz "[vesa_real] "
    728733status_prot2:
    729734        .asciz "[prot2] "
Note: See TracChangeset for help on using the changeset viewer.