[Jnode-svn-commits] SF.net SVN: jnode: [4029] trunk

[<fd...@us...>]

Revision: 4029
          http://jnode.svn.sourceforge.net/jnode/?rev=4029&view=rev
Author:   fduminy
Date:     2008-04-27 03:11:54 -0700 (Sun, 27 Apr 2008)

Log Message:
-----------
- fixed some bugs in kernel.asm data area
- removed multiboot_infos data area + UnsafeX86.getMultibootInfos()

Modified Paths:
--------------
    trunk/core/src/core/org/jnode/vm/x86/UnsafeX86.java
    trunk/core/src/native/x86/kernel.asm
    trunk/core/src/native/x86/unsafex86.asm
    trunk/gui/src/driver/org/jnode/driver/video/vesa/VESADriver.java

Modified: trunk/core/src/core/org/jnode/vm/x86/UnsafeX86.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/x86/UnsafeX86.java	2008-04-27 07:09:02 UTC (rev 4028)
+++ trunk/core/src/core/org/jnode/vm/x86/UnsafeX86.java	2008-04-27 10:11:54 UTC (rev 4029)
@@ -79,7 +79,6 @@
     public static final native Address getVbeInfos();
     public static final native Address getVbeControlInfos();
     public static final native Address getVbeModeInfos();
-    public static final native Address getMultibootInfos();
     
     /**
      * Merge 32-bit ARGB values at the given memory address.

Modified: trunk/core/src/native/x86/kernel.asm
===================================================================
--- trunk/core/src/native/x86/kernel.asm	2008-04-27 07:09:02 UTC (rev 4028)
+++ trunk/core/src/native/x86/kernel.asm	2008-04-27 10:11:54 UTC (rev 4029)
@@ -45,9 +45,6 @@
 multiboot_ok:
 	; Copy the multiboot info block
 	cld
-%ifdef SETUP_VBE	
-	mov [multiboot_infos], ebx
-%endif	  
 	mov esi,ebx
 	mov edi,multiboot_info
 	mov ecx,MBI_SIZE
@@ -317,17 +314,11 @@
 
 %ifdef SETUP_VBE
 multiboot_vbe:
-	dd 0				; Entries
 	times (VBE_ESIZE) db 0
 	
 vbe_control_info:	
-	dd 0				; Entries
 	times (VBECTRLINFO_SIZE) db 0
 
 vbe_mode_info:	
-	dd 0				; Entries
 	times (VBEMODEINFO_SIZE) db 0
-	
-multiboot_infos:
-	dd 0	
 %endif
\ No newline at end of file

Modified: trunk/core/src/native/x86/unsafex86.asm
===================================================================
--- trunk/core/src/native/x86/unsafex86.asm	2008-04-27 07:09:02 UTC (rev 4028)
+++ trunk/core/src/native/x86/unsafex86.asm	2008-04-27 10:11:54 UTC (rev 4029)
@@ -112,16 +112,6 @@
 %endif	
 	ret
 
-; Address getMultibootInfos();
-GLABEL Q53org5jnode2vm3x869UnsafeX8623getMultibootInfos2e2829Lorg2fvmmagic2funboxed2fAddress3b
-%ifdef SETUP_VBE
-	mov AAX,multiboot_infos
-%endif	
-%ifndef SETUP_VBE
-	mov AAX,0
-%endif	
-	ret
-
 ; void setupBootCode(Address memory, int[] gdtBase, int[] tss);
 GLABEL Q53org5jnode2vm3x869UnsafeX8623setupBootCode2e28Lorg2fvmmagic2funboxed2fAddress3b5bI5bI29V
 	push ABX

Modified: trunk/gui/src/driver/org/jnode/driver/video/vesa/VESADriver.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/video/vesa/VESADriver.java	2008-04-27 07:09:02 UTC (rev 4028)
+++ trunk/gui/src/driver/org/jnode/driver/video/vesa/VESADriver.java	2008-04-27 10:11:54 UTC (rev 4029)
@@ -120,15 +120,13 @@
 		Unsafe.debug("\nbegin VESADriver.startDevice");
 		System.err.println("\nbegin VESADriver.startDevice");
 		try {
-			Address multibootInfos = UnsafeX86.getMultibootInfos();
-			Unsafe.debug("\nmultibootInfos="+NumberUtils.hex(multibootInfos.toInt()));
-			
 			Address vbeControlInfo = UnsafeX86.getVbeControlInfos();
 			VbeInfoBlock vbeInfoBlock = new VbeInfoBlock(vbeControlInfo);
 			if(vbeInfoBlock.isEmpty())
 			{
 				throw new DriverException("can't start device (vbeInfoBlock is empty): grub haven't switched to graphic mode");
 			}
+			Unsafe.debug("vbeInfoBlock="+vbeInfoBlock);
 			
 			Address vbeModeInfo = UnsafeX86.getVbeModeInfos();
 			ModeInfoBlock modeInfoBlock = new ModeInfoBlock(vbeModeInfo);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.