Changeset 31 in vbox

Timestamp:

Jan 15, 2007 5:07:24 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

17460

Message:

Move etherboot BIOS from 0xc8000...0xcffff to 0xcb000...0xcffff as it does not need more than 20KB and the VGA BIOS needs more than 32KB in future versions.

Location:

trunk/src/VBox/Devices/PC

Files:

• BIOS/rombios.c (modified) (5 diffs)
• DevPcBios.cpp (modified) (3 diffs)
• DevPcBios.h (modified) (1 diff)
• Etherboot-src/Makefile.kmk (modified) (1 diff)
• Etherboot-src/util/makerom.c (modified) (1 diff)

trunk/src/VBox/Devices/PC/BIOS/rombios.c

@@ -120 +120 @@
 //
 //   BCC Bug: find a generic way to handle the bug of #asm after an "if"  (fixed in 0.16.7)
+
+#ifdef VBOX
+#include "DevPcBios.h"
+#endif
 
 #define DEBUG_ROMBIOS      0
@@ -7873 +7877 @@
   // Check for boot from LAN first
   if (bootlan == 1) {
-    if (read_word(0xc800,0) == 0xaa55) {
+    if (read_word(VBOX_LANBOOT_SEG,0) == 0xaa55) {
       Bit16u pnpoff;
       // This is NOT a generic PnP implementation, but an Etherboot-specific hack.
-      pnpoff = read_word(0xc800,0x1a);
-      if (read_dword(0xc800,pnpoff) == 0x506e5024 && read_dword(0xc800,read_word(0xc800,pnpoff+0xe)) == 0x65687445) {
+      pnpoff = read_word(VBOX_LANBOOT_SEG,0x1a);
+      if (read_dword(VBOX_LANBOOT_SEG,pnpoff) == 0x506e5024 &&
+          read_dword(VBOX_LANBOOT_SEG,read_word(VBOX_LANBOOT_SEG,pnpoff+0xe)) == 0x65687445) {
         // Found PnP signature and Etherboot manufacturer string.
         print_boot_device(bootcd, bootlan, bootdrv);
@@ -7884 +7889 @@
     push es
     pusha
-    calli 0x0006,0xc800
+    calli 0x0006,VBOX_LANBOOT_SEG
     popa
     pop es
@@ -10841 +10846 @@
 
 #ifdef VBOX
-#include "DevPcBios.h"
 // The DMI header
 .org 0xff40
@@ -10848 +10852 @@
  ; calculate the DMI header checksum
  db ( - ( 0x5f + 0x44 + 0x4d + 0x49 + 0x5f \
-         + ((DMI_TABLE_BASE      ) & 0xff) + ((DMI_TABLE_BASE >>  8) & 0xff) \
-         + ((DMI_TABLE_BASE >> 16) & 0xff) + ((DMI_TABLE_BASE >> 24) & 0xff) \
-         + ((DMI_TABLE_SIZE      ) & 0xff) + ((DMI_TABLE_SIZE >>  8) & 0xff) \
-         + ((DMI_TABLE_ENTR      ) & 0xff) + ((DMI_TABLE_ENTR >>  8) & 0xff) \
-         + DMI_TABLE_VER \
+         + ((VBOX_DMI_TABLE_BASE      ) & 0xff) + ((VBOX_DMI_TABLE_BASE >>  8) & 0xff) \
+         + ((VBOX_DMI_TABLE_BASE >> 16) & 0xff) + ((VBOX_DMI_TABLE_BASE >> 24) & 0xff) \
+         + ((VBOX_DMI_TABLE_SIZE      ) & 0xff) + ((VBOX_DMI_TABLE_SIZE >>  8) & 0xff) \
+         + ((VBOX_DMI_TABLE_ENTR      ) & 0xff) + ((VBOX_DMI_TABLE_ENTR >>  8) & 0xff) \
+         + VBOX_DMI_TABLE_VER \
     )) & 0xff
- dw DMI_TABLE_SIZE                    ; DMI tables length
- dd DMI_TABLE_BASE                    ; DMI tables base
- dw DMI_TABLE_ENTR                    ; DMI tables entries
- db DMI_TABLE_VER                     ; DMI version
+ dw VBOX_DMI_TABLE_SIZE               ; DMI tables length
+ dd VBOX_DMI_TABLE_BASE               ; DMI tables base
+ dw VBOX_DMI_TABLE_ENTR               ; DMI tables entries
+ db VBOX_DMI_TABLE_VER                ; DMI version
  db 0x00                              ; Just for alignment
 #endif

trunk/src/VBox/Devices/PC/DevPcBios.cpp

@@ -827 +827 @@
     *pszStr++                    = '\0';
 
-    AssertMsg(pszStr - (char*)table == DMI_TABLE_SIZE,
-              ("DMI_TABLE_SIZE=%d, actual DMI table size is %d",
-              DMI_TABLE_SIZE, pszStr - (char*)table));
+    AssertMsg(pszStr - (char*)table == VBOX_DMI_TABLE_SIZE,
+              ("VBOX_DMI_TABLE_SIZE=%d, actual DMI table size is %d",
+              VBOX_DMI_TABLE_SIZE, pszStr - (char*)table));
 }
 
-AssertCompile(DMI_TABLE_ENTR == 2);
+AssertCompile(VBOX_DMI_TABLE_ENTR == 2);
 
 
@@ -918 +918 @@
     pcbiosPlantDMITable(pData->au8DMIPage);
 
-    rc = PDMDevHlpROMRegister(pDevIns, DMI_TABLE_BASE, 0x1000, pData->au8DMIPage, "DMI tables");
+    rc = PDMDevHlpROMRegister(pDevIns, VBOX_DMI_TABLE_BASE, 0x1000, pData->au8DMIPage, "DMI tables");
     if (VBOX_FAILURE(rc))
         return rc;
@@ -1172 +1172 @@
      */
     if (pu8LanBoot)
-        rc = PDMDevHlpROMRegister(pDevIns, 0x000c8000, cbFileLanBoot, pu8LanBoot, "Net Boot ROM");
+        rc = PDMDevHlpROMRegister(pDevIns, VBOX_LANBOOT_SEG << 4, cbFileLanBoot, pu8LanBoot, "Net Boot ROM");
 
     return rc;

trunk/src/VBox/Devices/PC/DevPcBios.h

@@ -24 +24 @@
 #define DEV_PCBIOS_H
 
-#define DMI_TABLE_ENTR          2
-#define DMI_TABLE_SIZE          160
-#define DMI_TABLE_BASE          0xe1000
-#define DMI_TABLE_VER           0x23
+#define VBOX_DMI_TABLE_ENTR          2
+#define VBOX_DMI_TABLE_SIZE          160
+#define VBOX_DMI_TABLE_BASE          0xe1000
+#define VBOX_DMI_TABLE_VER           0x23
+
+#define VBOX_LANBOOT_SEG             0xcb00
 
 #endif

trunk/src/VBox/Devices/PC/Etherboot-src/Makefile.kmk

@@ -101 +101 @@
 
 #
-# Rule for making the bios.
+# Rule for making the bios
+# Note: The BIOS image occupies 0xCB000...0xCFFFF, therefore its size is limited to 20KB.
 #
 $(PATH_TARGET)/NetBiosBin.c: $(PATH_TARGET)/pcnet32.zrom $(VBOX_BIN2C)
         $(call MSG_L1,bin2c $< => $@)
-        $(QUIET)$(VBOX_BIN2C) -min 32 -max 64 -mask 0xfff -export NetBiosBinary $< $@
+        $(QUIET)$(VBOX_BIN2C) -min 16 -max 20 -mask 0xfff -export NetBiosBinary $< $@
 
 #

trunk/src/VBox/Devices/PC/Etherboot-src/util/makerom.c

@@ -290 +290 @@
         }
         /* shrink it down to the smallest size that will do */
+#ifndef VBOX
         for (romsize = MAXROMSIZE; romsize > MINROMSIZE && romsize >= 2*fs; )
                 romsize /= 2L;
+#else
+        /* VBox can handle ROM BIOS at page boundaries */
+        romsize = (fs + 4095) & ~0xfff;
+#endif
         rom[2] = romsize / 512L;
         rom[5] = 0;