X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fdefs.asm;h=fa151abaeff322bd4506898282bd140d5091148f;hb=c07f7f11e5d781b90f4d8876d12f3fc4e47309ad;hp=0135f31a7e8ecab2284616565296420497323d2e;hpb=3d293c0d07537b122d249e035b6c85ed54baf406;p=palacios.git

diff --git a/palacios/src/geekos/defs.asm b/palacios/src/geekos/defs.asm
index 0135f31..fa151ab 100644
--- a/palacios/src/geekos/defs.asm
+++ b/palacios/src/geekos/defs.asm
@@ -1,6 +1,6 @@
 ; Definitions for use in GeekOS boot code
 ; Copyright (c) 2001, David H. Hovemeyer <daveho@cs.umd.edu>
-; $Revision: 1.3 $
+; $Revision: 1.11 $
 
 ; This is free software.  You are permitted to use,
 ; redistribute, and modify it as specified in the file "COPYING".
@@ -16,14 +16,20 @@
 %ifndef DEFS_ASM
 %define DEFS_ASM
 
-TOP_OF_MEM   equ 0x40000000
-VM_SIZE      equ 0x20000000
-START_OF_VM  equ 0x0
-VM_KERNEL_TARGET	equ 0x100000
+;Zheng 08/01/2008
+SYSSEG equ 0x1000
+COMMAND_LINE_SIZE equ 1024
+
+SETUPSECTS      equ 4            ; /* default nr of setup-sectors */
+SYSSIZE         equ 0x7f00       ; /* system size: # of 16-byte clicks */
+ROOT_DEV        equ 0            ; /* ROOT_DEV is now written by "build" */
+SWAP_DEV        equ 0            ; /* SWAP_DEV is now written by "build" */
+
+;VM_KERNEL_TARGET	equ 0x100000
 	
 ; BIOS loads the boot sector at offset 0 in this segment
 BOOTSEG equ 0x07C0
-
+ 
 ; We'll move the boot sector up to higher memory.
 ; Note that the "ISA hole" begins at segment 0xA000 == 640K.
 INITSEG equ 0x9000
@@ -40,7 +46,7 @@ KERNSEG equ 0x1000
 ;; Note that this segment must not colide with where the VMM kernel
 ;; is initially loaded.  At this point, we just place it in the last
 ;; 64K of RAM available before the ISA hole and hope for the best
-VMSEG equ 0x9000		;
+ VMSEG equ 0x8000
 
 ; Size of PFAT boot record.
 ; Keep up to date with <geekos/pfat.h>.
@@ -57,7 +63,7 @@ VIDSEG equ 0xb800
 
 ; The following information is correct for a 1.44M floppy.
 ; Yes, I'm hard coding this.
-SECTORS_PER_TRACK equ 18
+;SECTORS_PER_TRACK equ 18	
 HEADS equ 2
 CYLINDERS equ 80
 
@@ -89,7 +95,7 @@ KERNEL_DS equ 2<<3	; kernel data segment is GDT entry 2
 ; the one we construct for Main().  Keep these up to date with defs.h.
 ; We put them at 1MB, for no particular reason.
 	;;  Moved to just after where the VM will go
-KERN_THREAD_OBJ equ (START_OF_VM+VM_SIZE)
+KERN_THREAD_OBJ equ 4096
 KERN_STACK equ KERN_THREAD_OBJ + 4096
 
 %endif