vbox的更動 9440 路徑 trunk/src/VBox/Devices/PC

時間撮記:

2008-6-5 下午04:48:03 (16 年 以前)

作者:

vboxsync

訊息:

Added SMBIOS header for DMI data to make Vista and Solaris recognize the data.

位置:

trunk/src/VBox/Devices/PC

檔案:

• BIOS/rombios.c (修改) (1 筆差異)
• DevPcBios.cpp (修改) (2 筆差異)
• DevPcBios.h (修改) (1 筆差異)

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

@@ -11572 +11572 @@
 
 #ifdef VBOX
+// The SMBIOS header
+.org 0xff30
+.align 16
+ db   0x5f, 0x53, 0x4d, 0x5f          ; "_SM_" signature
+ ; calculate Entry Point Structure checksum - note that we already
+ ; know the checksum for the DMI header paragraph is zero
+       db ( - ( 0x5f + 0x53 + 0x4d + 0x5f \
+               + 0x1f \
+               + ((VBOX_SMBIOS_MAJOR_VER    ) & 0xff) + ((VBOX_SMBIOS_MINOR_VER    ) & 0xff) \
+               + ((VBOX_SMBIOS_MAXSS        ) & 0xff) + ((VBOX_SMBIOS_MAXSS   >>  8) & 0xff) \
+          )) & 0xff
+ db 0x1f                              ; EPS length - defined by standard
+ db VBOX_SMBIOS_MAJOR_VER             ; SMBIOS major version
+ db VBOX_SMBIOS_MINOR_VER             ; SMBIOS minor version
+ dw VBOX_SMBIOS_MAXSS                 ; Maximum structure size
+ db 0x00                              ; Entry point revision
+ db 0x00, 0x00, 0x00, 0x00, 0x00
+
 // The DMI header
-.org 0xff40
-.align 16
  db   0x5f, 0x44, 0x4d, 0x49, 0x5f    ; "_DMI_" signature
  ; calculate the DMI header checksum

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

@@ -963 +963 @@
     *pszStr++                    = '\0';
 
+    /* End-of-table marker - includes padding to account for fixed table size. */
+    PDMIHDR pEndOfTable          = (PDMIHDR)pszStr;
+    pEndOfTable->u8Type          = 0x7f;
+    pEndOfTable->u8Length        = cbMax - ((char *)pszStr - (char *)pTable) - 2;
+    pEndOfTable->u16Handle       = 0xFFFF;
+
     /* If more fields are added here, fix the size check in STRCPY */
 
@@ -980 +986 @@
     return VINF_SUCCESS;
 }
-AssertCompile(VBOX_DMI_TABLE_ENTR == 2);
+AssertCompile(VBOX_DMI_TABLE_ENTR == 3);
 
 

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

@@ -23 +23 @@
 #define DEV_PCBIOS_H
 
-#define VBOX_DMI_TABLE_ENTR          2
+#define VBOX_DMI_TABLE_ENTR          3
 #define VBOX_DMI_TABLE_SIZE          0x100 /* XXX make this variable */
 #define VBOX_DMI_TABLE_BASE          0xe1000
-#define VBOX_DMI_TABLE_VER           0x23
+#define VBOX_DMI_TABLE_VER           0x25
+
+#define VBOX_SMBIOS_MAJOR_VER        2
+#define VBOX_SMBIOS_MINOR_VER        5
+#define VBOX_SMBIOS_MAXSS            0xff   /* Not very accurate */
 
 #define VBOX_MPS_TABLE_BASE          0xe1100