summaryrefslogtreecommitdiff
path: root/src/boot.asm
diff options
context:
space:
mode:
Diffstat (limited to 'src/boot.asm')
-rw-r--r--src/boot.asm28
1 files changed, 4 insertions, 24 deletions
diff --git a/src/boot.asm b/src/boot.asm
index eb3b2c9..c74145c 100644
--- a/src/boot.asm
+++ b/src/boot.asm
@@ -5,13 +5,12 @@ kernel_sectors equ 64
kernel_segment equ 0x3000
support_flags equ 0x4000
-pci_hw_char equ 0x4001
-pci_ver equ 0x4002
+pci_hw_char equ 0x4001
+pci_ver equ 0x4002
+last_pci_bus equ 0x4004
pci_support equ 0x80
-vesa_segment equ 0x0420
-
in al, 0x92
or al, 0x02
out 0x92, al
@@ -44,19 +43,9 @@ vesa_segment equ 0x0420
mov byte [support_flags], pci_support
mov byte [pci_hw_char], al
mov word [pci_ver], bx
+ mov byte [last_pci_bus], cl
no_pci:
- mov dword [vesa_segment * 16], 'V' + 'B' * 256 + 'E' * 65535 + '2' * 16777216
-
- mov ax, vesa_segment
- mov es, ax
- xor di, di
- mov ax, 0x4f00
- int 0x10
-
- cmp ax, 0x004f
- jne no_vbe
-
cli
lgdt [gdt]
@@ -67,15 +56,6 @@ no_pci:
jmp 0x08:pmode
-no_vbe:
- ;TODO
-
- cli
-
-real_halt:
- hlt
- jmp real_halt
-
bits 32
pmode: