From a3ef890d4f4e213f69c04dba3fb1df3e1dd8fb54 Mon Sep 17 00:00:00 2001 From: John Hodge Date: Mon, 7 May 2012 21:23:55 +0800 Subject: [PATCH] Reduced chattiness of threading, x86 IRQs and BochsGA --- KernelLand/Kernel/arch/x86/irq.c | 2 +- KernelLand/Kernel/threads.c | 2 +- KernelLand/Modules/Display/BochsGA/bochsvbe.c | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/KernelLand/Kernel/arch/x86/irq.c b/KernelLand/Kernel/arch/x86/irq.c index 3d23636e..eb891398 100644 --- a/KernelLand/Kernel/arch/x86/irq.c +++ b/KernelLand/Kernel/arch/x86/irq.c @@ -62,7 +62,7 @@ int IRQ_AddHandler( int Num, void (*Callback)(int, void*), void *Ptr ) for( i = 0; i < MAX_CALLBACKS_PER_IRQ; i++ ) { if( gIRQ_Handlers[Num][i] == NULL ) { - Log_Log("IRQ", "Added IRQ%i Cb#%i %p", Num, i, Callback); +// Log_Log("IRQ", "Added IRQ%i Cb#%i %p", Num, i, Callback); gIRQ_Handlers[Num][i] = Callback; gaIRQ_DataPointers[Num][i] = Ptr; return 1; diff --git a/KernelLand/Kernel/threads.c b/KernelLand/Kernel/threads.c index 8189cf44..60996211 100644 --- a/KernelLand/Kernel/threads.c +++ b/KernelLand/Kernel/threads.c @@ -211,7 +211,7 @@ int Threads_SetName(const char *NewName) if( IsHeap(oldname) ) free( oldname ); cur->ThreadName = strdup(NewName); - Log_Debug("Threads", "Thread renamed to '%s'", NewName); +// Log_Debug("Threads", "Thread renamed to '%s'", NewName); return 0; } diff --git a/KernelLand/Modules/Display/BochsGA/bochsvbe.c b/KernelLand/Modules/Display/BochsGA/bochsvbe.c index 4e0e600d..70f0c915 100644 --- a/KernelLand/Modules/Display/BochsGA/bochsvbe.c +++ b/KernelLand/Modules/Display/BochsGA/bochsvbe.c @@ -103,6 +103,10 @@ int BGA_Install(char **Arguments) // Check BGA Version version = BGA_int_ReadRegister(VBE_DISPI_INDEX_ID); LOG("version = 0x%x", version); + if( version == 0xFFFF ) { + // Floating bus, nothing there + return MODULE_ERR_NOTNEEDED; + } // NOTE: This driver was written for BGA versions >= 0xBOC2 // NOTE: However, Qemu is braindead and doesn't return the actual version -- 2.20.1