Changeset 81137 in vbox for trunk/src/VBox/Runtime/r3/linux

Timestamp:

Oct 8, 2019 8:28:31 AM (5 years ago)

Author:

vboxsync

Message:

IPRT/RTSystem*Firmware: Simplified the interface and made it follow the style of the rest of RTSystemQuery*. Added RTSystemFirmwareTypeName() to avoid duplicating enum->string code over and over again.

File:

• trunk/src/VBox/Runtime/r3/linux/RTSystemFirmware-linux.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/r3/linux/RTSystemFirmware-linux.cpp

@@ -45 +45 @@
 
 
-RTDECL(int) RTSystemFirmwareQueryType(PRTSYSFWTYPE penmFirmwareType)
+RTDECL(int) RTSystemQueryFirmwareType(PRTSYSFWTYPE penmFirmwareType)
 {
     if (RTLinuxSysFsExists("firmware/efi/"))
@@ -58 +58 @@
     return VINF_SUCCESS;
 }
-RT_EXPORT_SYMBOL(RTSystemFirmwareQueryType);
+RT_EXPORT_SYMBOL(RTSystemQueryFirmwareType);
 
 
-RTDECL(void) RTSystemFirmwareFreeValue(PRTSYSFWVALUE pValue)
+RTDECL(int) RTSystemQueryFirmwareBoolean(RTSYSFWPROP enmProp, bool *pfValue)
 {
-    RT_NOREF(pValue);
-}
-RT_EXPORT_SYMBOL(RTSystemFirmwareFreeValue);
-
-
-RTDECL(int) RTSystemFirmwareQueryValue(RTSYSFWPROP enmProp, PRTSYSFWVALUE pValue)
-{
-    RT_ZERO(*pValue);
+    *pfValue = false;
 
     /*
-     * Translate the property into type and variable base filename.
+     * Translate the property to variable base filename.
      */
     const char *pszName;
@@ -79 +72 @@
     {
         case RTSYSFWPROP_SECURE_BOOT:
-            pValue->enmType = RTSYSFWVALUETYPE_BOOLEAN;
             pszName = "firmware/efi/efivars/SecureBoot";
             break;
@@ -95 +87 @@
     int rc = RTLinuxSysFsOpen(&hFile, "%s-" VBOX_UEFI_UUID_GLOBALS, pszName);
     /** @todo try other suffixes if file-not-found. */
-
-    switch (pValue->enmType)
+    if (RT_SUCCESS(rc))
     {
-        case RTSYSFWVALUETYPE_BOOLEAN:
-        {
-            if (RT_SUCCESS(rc))
-            {
-                uint8_t abBuf[16];
-                size_t  cbRead = 0;
-                rc = RTLinuxSysFsReadFile(hFile, abBuf, sizeof(abBuf), &cbRead);
-                pValue->u.fVal = cbRead > 1 && abBuf[cbRead - 1] != 0;
-                RTFileClose(hFile);
-            }
-            else if (rc == VERR_FILE_NOT_FOUND || rc == VERR_PATH_NOT_FOUND)
-                rc = VINF_SUCCESS;
-            else if (rc == VERR_PERMISSION_DENIED)
-                rc = VERR_NOT_SUPPORTED;
-            break;
-        }
-
-        default:
-            AssertFailedReturn(VERR_INTERNAL_ERROR);
+        uint8_t abBuf[16];
+        size_t  cbRead = 0;
+        rc = RTLinuxSysFsReadFile(hFile, abBuf, sizeof(abBuf), &cbRead);
+        *pfValue = cbRead > 1 && abBuf[cbRead - 1] != 0;
+        RTFileClose(hFile);
     }
+    else if (rc == VERR_FILE_NOT_FOUND || rc == VERR_PATH_NOT_FOUND)
+        rc = VINF_SUCCESS;
+    else if (rc == VERR_PERMISSION_DENIED)
+        rc = VERR_NOT_SUPPORTED;
 
     return rc;
 }
-RT_EXPORT_SYMBOL(RTSystemFirmwareQueryValue);
+RT_EXPORT_SYMBOL(RTSystemQueryFirmwareBoolean);