From: John Hodge <tpg@mutabah.net>
Date: Sat, 11 Jun 2011 13:39:36 +0000 (+0800)
Subject: Misc - x86_64 port related changes
X-Git-Tag: rel0.10~68
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=41762bf807e93df242e1cd9fdd4cd97a9d34d6c8;p=tpg%2Facess2.git

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 f4eadab5..4fa95233 100644
--- 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 c00746ae..9aaee8bc 100644
--- 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 dab99eca..d8a8e0d4 100644
--- 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 b1b2e22e..87c1d734 100644
--- 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);
 	
 	// 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);
 		return MODULE_ERR_NOTNEEDED;
 	}