Skip to content
Snippets Groups Projects
Commit 41762bf8 authored by John Hodge's avatar John Hodge
Browse files

Misc - x86_64 port related changes

- Made Log_KernelPanic actually panic
- Allowe BochsGA driver to supprt 0xB0C0
- x86_64 module configuration
parent 0be4add5
Branches
Tags
No related merge requests found
BUILD_NUM = 238 BUILD_NUM = 258
...@@ -173,6 +173,7 @@ void Log_KernelPanic(const char *Ident, const char *Message, ...) ...@@ -173,6 +173,7 @@ void Log_KernelPanic(const char *Ident, const char *Message, ...)
va_start(args, Message); va_start(args, Message);
Log_AddEvent(Ident, LOG_LEVEL_KPANIC, Message, args); Log_AddEvent(Ident, LOG_LEVEL_KPANIC, Message, args);
va_end(args); va_end(args);
Panic("Log_KernelPanic");
} }
/** /**
......
...@@ -54,5 +54,14 @@ MODULES += Input/PS2KbMouse ...@@ -54,5 +54,14 @@ MODULES += Input/PS2KbMouse
MODULES += x86/ISADMA x86/VGAText MODULES += x86/ISADMA x86/VGAText
endif endif
ifeq ($(ARCHDIR),x86_64)
MODULES += Storage/ATA Storage/FDD
MODULES += Network/NE2000 Network/RTL8139
MODULES += Display/BochsGA
MODULES += Interfaces/UDI
MODULES += Input/PS2KbMouse
MODULES += x86/ISADMA x86/VGAText
endif
MODULES += IPStack # So the other modules are loaded before it MODULES += IPStack # So the other modules are loaded before it
DYNMODS := USB/Core DYNMODS := USB/Core
...@@ -98,7 +98,7 @@ int BGA_Install(char **Arguments) ...@@ -98,7 +98,7 @@ int BGA_Install(char **Arguments)
version = BGA_int_ReadRegister(VBE_DISPI_INDEX_ID); version = BGA_int_ReadRegister(VBE_DISPI_INDEX_ID);
// NOTE: This driver was written for 0xB0C4, but they seem to be backwards compatable // NOTE: This driver was written for 0xB0C4, but they seem to be backwards compatable
if(version < 0xB0C4 || version > 0xB0C5) { if(version != 0xB0C0 && (version < 0xB0C4 || version > 0xB0C5)) {
Log_Warning("BGA", "Bochs Adapter Version is not 0xB0C4 or 0xB0C5, instead 0x%x", version); Log_Warning("BGA", "Bochs Adapter Version is not 0xB0C4 or 0xB0C5, instead 0x%x", version);
return MODULE_ERR_NOTNEEDED; return MODULE_ERR_NOTNEEDED;
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment