[Jnode-svn-commits] SF.net SVN: jnode: [3989] trunk/builder/src/builder/org/jnode

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

Revision: 3989
          http://jnode.svn.sourceforge.net/jnode/?rev=3989&view=rev
Author:   fduminy
Date:     2008-04-20 15:23:15 -0700 (Sun, 20 Apr 2008)

Log Message:
-----------
vbe/vesa driver : added property to specify/disable the video setup by grub

Modified Paths:
--------------
    trunk/builder/src/builder/org/jnode/ant/taskdefs/Asm.java
    trunk/builder/src/builder/org/jnode/build/x86/BootImageBuilder.java

Modified: trunk/builder/src/builder/org/jnode/ant/taskdefs/Asm.java
===================================================================
--- trunk/builder/src/builder/org/jnode/ant/taskdefs/Asm.java	2008-04-20 22:21:31 UTC (rev 3988)
+++ trunk/builder/src/builder/org/jnode/ant/taskdefs/Asm.java	2008-04-20 22:23:15 UTC (rev 3989)
@@ -95,6 +95,8 @@
     
     private String version;
     
+    private boolean setVbe;
+    
     /**
      * Add an includedir
      * 
@@ -103,6 +105,12 @@
     public void addConfiguredIncludeDir(IncludeDir dir) {
         includeDirs.add(dir);
     }
+    
+    public void setVbeMode(String vbeMode)
+    {
+    	System.err.println("setVbeMode");
+    	this.setVbe = (vbeMode != null) && (vbeMode.trim().length() > 0);
+    }
 
     /**
      * Description of the Method
@@ -128,7 +136,7 @@
         }
 
         cmdLine.add("-o");
-        cmdLine.add(dstFile.toString());
+        cmdLine.add(dstFile.toString());        
 
         if (bits == 64) {
         	cmdLine.add("-m");
@@ -138,6 +146,13 @@
             cmdLine.add("nasm");
         }
         
+        if(setVbe)
+        {
+        	System.err.println("setVbeMode : add property");
+    		cmdLine.add("-D");
+    		cmdLine.add("SETUP_VBE");        		
+        }
+        
 		cmdLine.add("-D");
 		cmdLine.add("BITS" + bits);
         

Modified: trunk/builder/src/builder/org/jnode/build/x86/BootImageBuilder.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/x86/BootImageBuilder.java	2008-04-20 22:21:31 UTC (rev 3988)
+++ trunk/builder/src/builder/org/jnode/build/x86/BootImageBuilder.java	2008-04-20 22:23:15 UTC (rev 3989)
@@ -25,6 +25,8 @@
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.StringTokenizer;
+
 import org.apache.tools.ant.Project;
 import org.jnode.assembler.Label;
 import org.jnode.assembler.NativeStream;
@@ -74,6 +76,11 @@
 	private VmSharedStatics sharedStatics;
 
 	private int bits = 32;
+	
+	private boolean useVbe = false;
+	private int vbeWidth = 0;
+	private int vbeHeight = 0;
+	private int vbeDepth = 0;
 
 	/**
 	 * The offset in our (java) image file to the initial jump to our
@@ -598,6 +605,11 @@
 
 	private static final int MB_BSS_END_ADDR = 6 * 4;
 
+	private static final int MODE_TYPE = 8 * 4;
+	private static final int WIDTH = 9 * 4;
+	private static final int HEIGHT = 10 * 4;
+	private static final int DEPTH = 11 * 4;
+	
 	/**
 	 * Patch any fields in the header, just before the image is written to disk.
 	 * 
@@ -628,6 +640,12 @@
 				+ os.getLength());
 		os.set32(mb_hdr + MB_BSS_END_ADDR, (int) os.getBaseAddr()
 				+ os.getLength());
+
+		// initial wanted video mode (if possible)
+		os.set32(mb_hdr + MODE_TYPE, 0);
+		os.set32(mb_hdr + WIDTH, vbeWidth);
+		os.set32(mb_hdr + HEIGHT, vbeHeight);
+		os.set32(mb_hdr + DEPTH, vbeDepth);
 	}
 
 	/**
@@ -702,6 +720,46 @@
 		}
 		this.bits = bits;
 	}
+	
+	public final void setVbeMode(String videoMode)
+	{
+		System.out.println("videoMode="+videoMode);
+		if((videoMode == null) || (videoMode.trim().length() == 0))
+		{
+			useVbe = false; 
+			vbeWidth = 0;
+			vbeHeight = 0;
+			vbeDepth = 0;
+		}
+		else
+		{
+			StringTokenizer stok = new StringTokenizer(videoMode.trim().toLowerCase(), "x", false);
+			if(stok.countTokens() != 3)
+			{
+				throw new IllegalArgumentException("linearFrameBuffer must be of the form '<width>x<height>x<depth>'");
+			}
+			
+			vbeWidth = Integer.parseInt(stok.nextToken());
+			if(vbeWidth <= 0)
+			{
+				throw new IllegalArgumentException("vbeWidth must be > 0");
+			}
+				
+			vbeHeight = Integer.parseInt(stok.nextToken());
+			if(vbeWidth <= 0)
+			{
+				throw new IllegalArgumentException("vbeHeight must be > 0");
+			}
+				
+			vbeDepth = Integer.parseInt(stok.nextToken());
+			if(vbeWidth <= 0)
+			{
+				throw new IllegalArgumentException("vbeDepth must be > 0");
+			}
+			
+			useVbe = true;
+		}
+	}
     
     /**
      * Initialize the statics table.
@@ -730,6 +788,13 @@
             final Map<String,String> symbols = new HashMap<String, String>();
             symbols.put(bits,"");
             symbols.put("JNODE_VERSION", "'" + version + "'");
+            
+            if(useVbe)
+            {
+            	symbols.put("SETUP_VBE", "");	
+            	log("Grub will setup linear framebuffer mode "+vbeWidth+"x"+vbeHeight+"x"+vbeDepth);
+            }
+            
             log("Compiling native kernel with JNAsm, Version " + version + ", " + i_bist + " bits");
             JNAsm.assembler(os, sourceInfo, symbols);
         } catch(Exception e){


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