From: Jack Lange <jarusl@cs.northwestern.edu>
Date: Wed, 3 Feb 2010 01:30:15 +0000 (-0600)
Subject: minor test kernel updates
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=9a745f4d990981e4a26b8548a5388162fc0f260c;hp=b0924234ef63d8e5a0f0317f455071f8293cf2bd;p=palacios-OLD.git

minor test kernel updates
---

diff --git a/test/geekos_test_vm/src/geekos/fd_boot.asm b/test/geekos_test_vm/src/geekos/fd_boot.asm
index d5fa120..ad01ab8 100644
--- a/test/geekos_test_vm/src/geekos/fd_boot.asm
+++ b/test/geekos_test_vm/src/geekos/fd_boot.asm
@@ -151,9 +151,9 @@ load_kernel:
 	push    bx
 	push    es		;
 
-	mov 	dx, cs
-	call 	PrintHex
-	call 	PrintNL
+;	mov 	dx, cs
+;	call 	PrintHex
+;	call 	PrintNL
 
 	push    cs
 	pop     es
@@ -166,32 +166,32 @@ load_kernel:
 	shl	cx, 8				; multiply by 9-1 to get number of bytes / 2 (words)
 
 	;; Print out the size of the kernel
-	mov     dx, cx	
-	call    PrintHex
-	call    PrintNL
+;	mov     dx, cx	
+;	call    PrintHex
+;	call    PrintNL
 
 	int     0x15
 	
 	adc     ax, 0
 
 	;; Print out the return code to the screen
-	mov     dx, ax	
-	call    PrintHex
-	call    PrintNL
+;	mov     dx, ax	
+;	call    PrintHex
+;	call    PrintNL
 
-	mov	dx, KERNSEG
-	call 	PrintHex
-	call 	PrintNL
+;	mov	dx, KERNSEG
+;	call 	PrintHex
+;	call 	PrintNL
 
-	mov	dx, SETUPSEG
-	call 	PrintHex
-	call 	PrintNL
+;	mov	dx, SETUPSEG
+;	call 	PrintHex
+;	call 	PrintNL
 
 
 
-	mov	dx, 0x4a4a
-	call 	PrintHex
-	call 	PrintNL
+;	mov	dx, 0x4a4a
+;	call 	PrintHex
+;	call 	PrintNL
 
 	pop     es		;
 	pop     bx
diff --git a/test/geekos_test_vm/src/geekos/main.c b/test/geekos_test_vm/src/geekos/main.c
index cc1f722..a163378 100644
--- a/test/geekos_test_vm/src/geekos/main.c
+++ b/test/geekos_test_vm/src/geekos/main.c
@@ -17,7 +17,7 @@
 #include <geekos/crc32.h>
 #include <geekos/tss.h>
 #include <geekos/int.h>
-#include <geekos/kthread.h>
+#include <geekos/kthread.h> 
 #include <geekos/trap.h>
 #include <geekos/timer.h>
 #include <geekos/keyboard.h>
@@ -243,6 +243,7 @@ void Main(struct Boot_Info* bootInfo)
   struct Kernel_Thread * spkr_thread;
 
 
+  //  VMConsPutLineN("hello\n", 6);
 
   ulong_t doIBuzz = 0;
 
@@ -335,7 +336,7 @@ void Main(struct Boot_Info* bootInfo)
 
       
       //  Invalidate_PG((void *)0x2000);
-      
+       
       //  VM_Test(bootInfo, 32);  
       //VM_Test(bootInfo, 1536);
   }
diff --git a/test/geekos_test_vm/src/geekos/setup.asm b/test/geekos_test_vm/src/geekos/setup.asm
index c88ed81..5fb60e5 100644
--- a/test/geekos_test_vm/src/geekos/setup.asm
+++ b/test/geekos_test_vm/src/geekos/setup.asm
@@ -31,6 +31,11 @@ start_setup:
 	mov	ds, ax
 
 
+;	mov	ah, 0x2e
+;	out    0xc0c0, ax
+;	mov	ah, 0xa
+;	out    0xc0c0, ax
+
 	; Use int 15h to find out size of extended memory in KB.
 	; Extended memory is the memory above 1MB.  So by
 	; adding 1MB to this amount, we get the total amount