Changeset 9693 in vbox

Timestamp:

Jun 13, 2008 4:30:46 PM (17 years ago)

Author:

vboxsync

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

32031

Message:

VMI BIOS stubs

Location:

trunk/src/VBox/Devices

Files:

• Builtins2.cpp (modified) (1 diff)
• Builtins2.h (modified) (2 diffs)
• Makefile.kmk (modified) (2 diffs)
• PC/DevPcBios.cpp (modified) (3 diffs)
• PC/DevPcBios.h (modified) (2 diffs)

trunk/src/VBox/Devices/Builtins2.cpp

@@ -42 +42 @@
     (void *)&g_abPcBiosBinary,
     (void *)&g_abVgaBiosBinary,
-    (void *)&g_abNetBiosBinary
+    (void *)&g_abNetBiosBinary,
+#ifndef VBOX_OSE
+    (void *)&g_abVmiBiosBinary,
+#endif
 };
 

trunk/src/VBox/Devices/Builtins2.h

@@ -34 +34 @@
 extern DECLEXPORT(const unsigned char)  g_abNetBiosBinary[];
 extern DECLEXPORT(const unsigned)       g_cbNetBiosBinary;
+extern DECLEXPORT(const unsigned char)  g_abVmiBiosBinary[];
+extern DECLEXPORT(const unsigned)       g_cbVmiBiosBinary;
 #else
 extern DECLIMPORT(const unsigned char)  g_abPcBiosBinary[];
@@ -41 +43 @@
 extern DECLIMPORT(const unsigned char)  g_abNetBiosBinary[];
 extern DECLIMPORT(const unsigned)       g_cbNetBiosBinary;
+extern DECLIMPORT(const unsigned char)  g_abVmiBiosBinary[];
+extern DECLIMPORT(const unsigned)       g_cbVmiBiosBinary;
 #endif
 extern const PDMDEVREG g_DeviceAPIC;

trunk/src/VBox/Devices/Makefile.kmk

@@ -25 +25 @@
 # Include sub-makefiles.
 include $(PATH_SUB_CURRENT)/PC/BIOS/Makefile.kmk
+ifndef VBOX_OSE # not yet
+ include $(PATH_SUB_CURRENT)/PC/VMI/Makefile.kmk
+endif
 include $(PATH_SUB_CURRENT)/Graphics/BIOS/Makefile.kmk
 include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
@@ -209 +212 @@
         $(PATH_LIB)/VgaBiosBin$(VBOX_SUFF_LIB) \
         $(PATH_LIB)/NetBiosBin$(VBOX_SUFF_LIB) \
+        $(PATH_LIB)/VmiBiosBin$(VBOX_SUFF_LIB) \
         $(LIB_VMM) \
         $(LIB_RUNTIME)

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

@@ -1143 +1143 @@
 
     if (pData->u8IOAPIC)
-        pcbiosPlantMPStable(pDevIns, pData->au8DMIPage + 0x100);
+        pcbiosPlantMPStable(pDevIns, pData->au8DMIPage + VBOX_DMI_TABLE_SIZE);
 }
 
@@ -1376 +1376 @@
         pcbiosPlantMPStable(pDevIns, pData->au8DMIPage + VBOX_DMI_TABLE_SIZE);
 
-    rc = PDMDevHlpROMRegister(pDevIns, VBOX_DMI_TABLE_BASE, 0x1000, pData->au8DMIPage, false /* fShadow */, "DMI tables");
+    rc = PDMDevHlpROMRegister(pDevIns, VBOX_DMI_TABLE_BASE, _4K, pData->au8DMIPage, false /* fShadow */, "DMI tables");
     if (VBOX_FAILURE(rc))
         return rc;
@@ -1506 +1506 @@
     if (VBOX_FAILURE(rc))
         return rc;
+
+#ifndef VBOX_OSE
+    /*
+     * Map the VMI BIOS into memory.
+     */
+    AssertReleaseMsg(g_cbVmiBiosBinary == _4K, ("cbVmiBiosBinary=%#x\n", g_cbVmiBiosBinary));
+    rc = PDMDevHlpROMRegister(pDevIns, VBOX_VMI_BIOS_BASE, g_cbVmiBiosBinary, g_abVmiBiosBinary, false, "VMI BIOS");
+    if (VBOX_FAILURE(rc))
+        return rc;
+#endif
 
     /*

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

@@ -23 +23 @@
 #define DEV_PCBIOS_H
 
-#define VBOX_DMI_TABLE_ENTR          3
-#define VBOX_DMI_TABLE_SIZE          0x100 /* XXX make this variable */
+/** @def VBOX_DMI_TABLE_BASE */
 #define VBOX_DMI_TABLE_BASE          0xe1000
 #define VBOX_DMI_TABLE_VER           0x25
+#define VBOX_DMI_TABLE_ENTR          3
+#define VBOX_DMI_TABLE_SIZE          0x100
+
+
+/** @def MPS_TABLE_BASE
+ *
+ * Must be located in the same page as the DMI table.
+ */
+#define VBOX_MPS_TABLE_BASE          0xe1100
 
 #define VBOX_SMBIOS_MAJOR_VER        2
@@ -32 +40 @@
 #define VBOX_SMBIOS_MAXSS            0xff   /* Not very accurate */
 
-#define VBOX_MPS_TABLE_BASE          0xe1100
 
+/** @def VBOX_VMI_TABLE_BASE
+ *
+ * Must be located between 0xC0000 and 0xDEFFF, otherwise it will not be
+ * recognized as regular BIOS.
+ */
+#define VBOX_VMI_BIOS_BASE           0xdf000
+
+
+/** @def VBOX_LANBOOT_SEG
+ */
 #define VBOX_LANBOOT_SEG             0xe200