elal
/
eOS
mirror of https://github.com/E-Almqvist/eOS
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Indent fix

Browse Source
pull/15/head
E. Almqvist 3 years ago
parent 5c9ae46217
commit 8325d90e9b
3 changed files with 24 additions and 17 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      src/bootloader.asm
  2. 9
      src/pm.asm

4
src/bootloader.asm
Unescape View File

@ -31,12 +31,12 @@
%include "equ/ascii.asm" %include "equ/ascii.asm"
%include "bios.asm" %include "bios.asm"
%include "pm.asm"
; Data
welcome_string: db "e Operating-System (eOS)", ASCII_CARRIAGE_RETURN, ASCII_LINEBREAK, "Version 2021 0.0", ASCII_END welcome_string: db "e Operating-System (eOS)", ASCII_CARRIAGE_RETURN, ASCII_LINEBREAK, "Version 2021 0.0", ASCII_END
BOOT_DRIVE: db 0 BOOT_DRIVE: db 0
%include "pm.asm"
; Bootsector ; Bootsector
times 510-($-$$) db 0 times 510-($-$$) db 0
dw 0xaa55 ; magic BIOS numbers dw 0xaa55 ; magic BIOS numbers

9
src/pm.asm
Unescape View File

@ -3,4 +3,11 @@
%include "pm/vga/print.asm" %include "pm/vga/print.asm"
; GDT & switching to PM ; GDT & switching to PM
%include "pm/gdt.asm" ; GDT %include "pm/gdt.asm" ; GDT defined here
; Switching to PM
lgdt [gdt_descriptor] ; Tell the CPU about the GDT
mov eax, cr0 ; Set first bit of the CR0 register
or eax, 0x1 ; to 1
mov cr0, eax ; Update the control register

Write Preview
Loading…
Cancel
Save