Changeset 81140 in vbox

Timestamp:

Oct 8, 2019 9:55:14 AM (6 years ago)

Author:

vboxsync

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

133773

Message:

IPRT/system: RTSYSFWPROP -> RTSYSFWBOOL.

Location:

trunk

Files:

• include/iprt/system.h (modified) (2 diffs)
• src/VBox/Runtime/generic/RTSystemFirmware-generic.cpp (modified) (1 diff)
• src/VBox/Runtime/r3/linux/RTSystemFirmware-linux.cpp (modified) (2 diffs)
• src/VBox/Runtime/r3/win/RTSystemFirmware-win.cpp (modified) (1 diff)
• src/VBox/Runtime/testcase/tstRTSystemQueryFirmware.cpp (modified) (1 diff)

trunk/include/iprt/system.h

@@ -299 +299 @@
 
 /**
- * Enumeration for a system firmware property.
- */
-typedef enum RTSYSFWPRPOP
+ * Boolean firmware values queriable via RTSystemQueryFirmwareBoolean().
+ */
+typedef enum RTSYSFWBOOL
 {
     /** Invalid property, do not use. */
-    RTSYSFWPROP_INVALID = 0,
+    RTSYSFWBOOL_INVALID = 0,
     /** Whether Secure Boot is enabled or not (type: boolean). */
-    RTSYSFWPROP_SECURE_BOOT,
+    RTSYSFWBOOL_SECURE_BOOT,
     /** End of valid    */
-    RTSYSFWPROP_END,
+    RTSYSFWBOOL_END,
     /** The usual 32-bit hack.  */
-    RTSYSFWPROP_32_BIT_HACK = 0x7fffffff
-} RTSYSFWPROP;
+    RTSYSFWBOOL_32_BIT_HACK = 0x7fffffff
+} RTSYSFWBOOL;
 
 /**
@@ -318 +318 @@
  * @returns IPRT status code.
  * @retval  VERR_NOT_SUPPORTED if we cannot query firmware properties on the host.
- * @retval  VERR_SYS_UNSUPPORTED_FIRMWARE_PROPERTY if @a enmProp isn't
+ * @retval  VERR_SYS_UNSUPPORTED_FIRMWARE_PROPERTY if @a enmBoolean isn't
  *          supported.
- * @param   enmProp     The property to query the value of.
+ * @param   enmBoolean  The value to query.
  * @param   pfValue     Where to return the value.
  */
-RTDECL(int) RTSystemQueryFirmwareBoolean(RTSYSFWPROP enmProp, bool *pfValue);
+RTDECL(int) RTSystemQueryFirmwareBoolean(RTSYSFWBOOL enmBoolean, bool *pfValue);
 
 #ifdef RT_OS_WINDOWS

trunk/src/VBox/Runtime/generic/RTSystemFirmware-generic.cpp

@@ -45 +45 @@
 
 
-RTDECL(int) RTSystemQueryFirmwareBoolean(RTSYSFWPROP enmProp, bool *pfValue)
+RTDECL(int) RTSystemQueryFirmwareBoolean(RTSYSFWBOOL enmBoolean, bool *pfValue)
 {
-    RT_NOREF(enmProp, pfValue);
+    RT_NOREF(enmBoolean, pfValue);
     return VERR_NOT_SUPPORTED;
 }

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

@@ -61 +61 @@
 
 
-RTDECL(int) RTSystemQueryFirmwareBoolean(RTSYSFWPROP enmProp, bool *pfValue)
+RTDECL(int) RTSystemQueryFirmwareBoolean(RTSYSFWBOOL enmBoolean, bool *pfValue)
 {
     *pfValue = false;
@@ -69 +69 @@
      */
     const char *pszName;
-    switch (enmProp)
+    switch (enmBoolean)
     {
-        case RTSYSFWPROP_SECURE_BOOT:
+        case RTSYSFWBOOL_SECURE_BOOT:
             pszName = "firmware/efi/efivars/SecureBoot";
             break;
 
         default:
-            AssertReturn(enmProp > RTSYSFWPROP_INVALID && enmProp < RTSYSFWPROP_END, VERR_INVALID_PARAMETER);
+            AssertReturn(enmBoolean > RTSYSFWBOOL_INVALID && enmBoolean < RTSYSFWBOOL_END, VERR_INVALID_PARAMETER);
             return VERR_SYS_UNSUPPORTED_FIRMWARE_PROPERTY;
 

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

@@ -173 +173 @@
 
 
-RTDECL(int) RTSystemQueryFirmwareBoolean(RTSYSFWPROP enmProp, bool *pfValue)
+RTDECL(int) RTSystemQueryFirmwareBoolean(RTSYSFWBOOL enmBoolean, bool *pfValue)
 {
     *pfValue = false;
 
     /*
-     * Translate the enmProp to a name:
+     * Translate the enmBoolean to a name:
      */
     const wchar_t *pwszName = NULL;
-    switch (enmProp)
-    {
-        case RTSYSFWPROP_SECURE_BOOT:
+    switch (enmBoolean)
+    {
+        case RTSYSFWBOOL_SECURE_BOOT:
             pwszName = L"SecureBoot";
             break;
 
         default:
-            AssertReturn(enmProp > RTSYSFWPROP_INVALID && enmProp < RTSYSFWPROP_END, VERR_INVALID_PARAMETER);
+            AssertReturn(enmBoolean > RTSYSFWBOOL_INVALID && enmBoolean < RTSYSFWBOOL_END, VERR_INVALID_PARAMETER);
             return VERR_SYS_UNSUPPORTED_FIRMWARE_PROPERTY;
     }

trunk/src/VBox/Runtime/testcase/tstRTSystemQueryFirmware.cpp

@@ -73 +73 @@
     RTTestSub(hTest, "RTSystemQueryFirmwareBoolean");
     bool fValue;
-    rc = RTSystemQueryFirmwareBoolean(RTSYSFWPROP_SECURE_BOOT, &fValue);
+    rc = RTSystemQueryFirmwareBoolean(RTSYSFWBOOL_SECURE_BOOT, &fValue);
     if (RT_SUCCESS(rc))
         RTTestPrintf(hTest, RTTESTLVL_INFO, "  Secure Boot:   %s\n", fValue ? "enabled" : "disabled");
     else if (rc != VERR_NOT_SUPPORTED && rc != VERR_SYS_UNSUPPORTED_FIRMWARE_PROPERTY)
-        RTTestIFailed("RTSystemQueryFirmwareBoolean/RTSYSFWPROP_SECURE_BOOT failed: %Rrc", rc);
+        RTTestIFailed("RTSystemQueryFirmwareBoolean/RTSYSFWBOOL_SECURE_BOOT failed: %Rrc", rc);
 
     return RTTestSummaryAndDestroy(hTest);