Misc - x86_64 port related changes

- Made Log_KernelPanic actually panic
- Allowe BochsGA driver to supprt 0xB0C0
- x86_64 module configuration

diff --git a/Kernel/Makefile.BuildNum.x86_64 b/Kernel/Makefile.BuildNum.x86_64
index f4eadab..4fa9523 100644 (file)
--- a/Kernel/Makefile.BuildNum.x86_64
+++ b/Kernel/Makefile.BuildNum.x86_64
@@ -1 +1 @@
-BUILD_NUM = 238
+BUILD_NUM = 258

diff --git a/Kernel/logging.c b/Kernel/logging.c
index c00746a..9aaee8b 100644 (file)
--- a/Kernel/logging.c
+++ b/Kernel/logging.c
@@ -173,6 +173,7 @@ void Log_KernelPanic(const char *Ident, const char *Message, ...)
        va_start(args, Message);
        Log_AddEvent(Ident, LOG_LEVEL_KPANIC, Message, args);
        va_end(args);
+       Panic("Log_KernelPanic");
 }
 
 /**

diff --git a/Makefile.cfg b/Makefile.cfg
index dab99ec..d8a8e0d 100644 (file)
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -54,5 +54,14 @@ MODULES += Input/PS2KbMouse
 MODULES += x86/ISADMA x86/VGAText
 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
 DYNMODS := USB/Core

diff --git a/Modules/Display/BochsGA/bochsvbe.c b/Modules/Display/BochsGA/bochsvbe.c
index b1b2e22..87c1d73 100644 (file)
--- a/Modules/Display/BochsGA/bochsvbe.c
+++ b/Modules/Display/BochsGA/bochsvbe.c
@@ -98,7 +98,7 @@ int BGA_Install(char **Arguments)
        version = BGA_int_ReadRegister(VBE_DISPI_INDEX_ID);\r
        \r
        // NOTE: This driver was written for 0xB0C4, but they seem to be backwards compatable\r
-       if(version < 0xB0C4 || version > 0xB0C5) {\r
+       if(version != 0xB0C0 && (version < 0xB0C4 || version > 0xB0C5)) {\r
                Log_Warning("BGA", "Bochs Adapter Version is not 0xB0C4 or 0xB0C5, instead 0x%x", version);\r
                return MODULE_ERR_NOTNEEDED;\r
        }\r