Changeset 21869 in vbox

Timestamp:

Jul 30, 2009 9:03:19 AM (15 years ago)

Author:

vboxsync

Message:

Dev/PCBios: Added OEM strings for VBox version/revision.

Location:

trunk/src/VBox/Devices/PC

Files:

• DevPcBios.cpp (modified) (6 diffs)
• DevPcBios.h (modified) (1 diff)

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

@@ -29 +29 @@
 
 #include <VBox/log.h>
+#ifdef VBOX_WITH_DMI_OEMSTRINGS
+ #include <VBox/version.h>
+#endif
 #include <iprt/assert.h>
 #include <iprt/alloc.h>
@@ -252 +255 @@
     uint16_t        u16ProcessorCharacteristics;
     uint16_t        u16ProcessorFamily2;
-} PDMIPROCESSORINF;
+} *PDMIPROCESSORINF;
 AssertCompileSize(DMIPROCESSORINF, 0x2a);
+
+#ifdef VBOX_WITH_DMI_OEMSTRINGS
+/** DMI OEM strings */
+typedef struct DMIOEMSTRINGS
+{
+    DMIHDR          header;
+    uint8_t         u8Count;
+    uint8_t         u8VboxVersion;
+    uint8_t         u8VboxRevision;
+} *PDMIOEMSTRINGS;
+AssertCompileSize(DMIOEMSTRINGS, 0x7);
+#endif
 
 /** MPS floating pointer structure */
@@ -918 +933 @@
     int  iDmiBIOSReleaseMajor, iDmiBIOSReleaseMinor, iDmiBIOSFirmwareMajor, iDmiBIOSFirmwareMinor;
     char *pszDmiSystemVendor, *pszDmiSystemProduct, *pszDmiSystemVersion, *pszDmiSystemSerial, *pszDmiSystemUuid, *pszDmiSystemFamily;
+#ifdef VBOX_WITH_DMI_OEMSTRINGS
+    char *pszDmiOEMVBoxVer, *pszDmiOEMVBoxRev;
+#endif
 
 #define SETSTRING(memb, str) \
@@ -1056 +1074 @@
     *pszStr++                    = '\0';
 
+#ifdef VBOX_WITH_DMI_OEMSTRINGS
+    /* DMI OEM strings */
+    PDMIOEMSTRINGS pOEMStrings    = (PDMIOEMSTRINGS)pszStr;
+    pszStr                        = (char *)(pOEMStrings + 1);
+    iStrNr                        = 1;
+    pOEMStrings->header.u8Type    = 0xb; /* OEM Strings */
+    pOEMStrings->header.u8Length  = sizeof(*pOEMStrings);
+    pOEMStrings->header.u16Handle = 0x0002;    
+    pOEMStrings->u8Count          = 2;
+
+    char* pszVBoxVer, *pszVBoxRev;
+    RTStrAPrintf(&pszVBoxVer, "vboxVer_%d.%d.%d",
+                  VBOX_VERSION_MAJOR, VBOX_VERSION_MINOR, VBOX_VERSION_BUILD);
+    RTStrAPrintf(&pszVBoxRev, "vboxRev_%ld", VBOX_SVN_REV);
+    READCFGSTR("DmiOEMVBoxVer", pszDmiOEMVBoxVer, pszVBoxVer);
+    READCFGSTR("DmiOEMVBoxRev", pszDmiOEMVBoxRev, pszVBoxRev);
+    SETSTRING(pOEMStrings->u8VboxVersion, pszDmiOEMVBoxVer);
+    SETSTRING(pOEMStrings->u8VboxRevision, pszDmiOEMVBoxRev);
+    RTStrFree(pszVBoxVer);
+    RTStrFree(pszVBoxRev);
+
+    *pszStr++                    = '\0';
+#endif
+
     /* End-of-table marker - includes padding to account for fixed table size. */
     PDMIHDR pEndOfTable          = (PDMIHDR)pszStr;
@@ -1076 +1118 @@
     MMR3HeapFree(pszDmiSystemUuid);
     MMR3HeapFree(pszDmiSystemFamily);
+#ifdef VBOX_WITH_DMI_OEMSTRINGS
+    MMR3HeapFree(pszDmiOEMVBoxVer);
+    MMR3HeapFree(pszDmiOEMVBoxRev);
+#endif
 
     return VINF_SUCCESS;
 }
-AssertCompile(VBOX_DMI_TABLE_ENTR == 3);
+AssertCompile(VBOX_DMI_TABLE_ENTR == 4);
 
 
@@ -1417 +1463 @@
                               "DmiSystemUuid\0"
                               "DmiSystemVendor\0"
-                              "DmiSystemVersion\0"))
+                              "DmiSystemVersion\0"
+                              "DmiOEMVBoxVer\0"
+                              "DmiOEMVBoxRev\0"))
         return PDMDEV_SET_ERROR(pDevIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES,
                                 N_("Invalid configuraton for  device pcbios device"));

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

@@ -26 +26 @@
 #define VBOX_DMI_TABLE_BASE          0xe1000
 #define VBOX_DMI_TABLE_VER           0x25
-#define VBOX_DMI_TABLE_ENTR          3
+#define VBOX_DMI_TABLE_ENTR          4
 #define VBOX_DMI_TABLE_SIZE          0x100