Changeset 16247 in vbox

Timestamp:

Jan 26, 2009 8:54:05 PM (16 years ago)

Author:

vboxsync

Message:

some todos

Location:

trunk/src/VBox/Devices

Files:

• PC/DevACPI.cpp (modified) (4 diffs)
• testcase/tstDeviceStructSizeGC.cpp (modified) (1 diff)

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

@@ -184 +184 @@
      *  acpiBatIndexWrite() for handling this. */
     uint8_t             u8IndexShift;
+    /** provide an I/O-APIC */
     uint8_t             u8UseIOApic;
-    uint8_t             u8UseFdc;
+    /** provide a floppy controller */
+    bool                fUseFdc;
     /** If High Precision Event Timer device should be supported */
-    uint8_t             u8UseHpet;
+    bool                fUseHpet;
     /** If System Management Controller device should be supported */
-    uint8_t             u8UseSmc;
-/** @todo conver the above to bool where possible.  */
-
+    bool                fUseSmc;
+    /** the guest handled the last power button event */
     bool                fPowerButtonHandled;
     /** Aligning IBase. */
-    bool                afAlignment[6];
+    bool                afAlignment[3];
 
     /** ACPI port base interface. */
@@ -1306 +1307 @@
 
                 case SYSTEM_INFO_INDEX_HPET_STATUS:
-                    *pu32 = s->u8UseHpet ? (  STA_DEVICE_PRESENT_MASK
-                                            | STA_DEVICE_ENABLED_MASK
-                                            | STA_DEVICE_SHOW_IN_UI_MASK
-                                            | STA_DEVICE_FUNCTIONING_PROPERLY_MASK)
-                            : 0;
-                    break;
-
-                case SYSTEM_INFO_INDEX_SMC_STATUS:
-                    *pu32 = s->u8UseSmc ? (  STA_DEVICE_PRESENT_MASK
+                    *pu32 = s->fUseHpet ? (  STA_DEVICE_PRESENT_MASK
                                            | STA_DEVICE_ENABLED_MASK
-                                           /* no need to show this device in the UI */
+                                           | STA_DEVICE_SHOW_IN_UI_MASK
                                            | STA_DEVICE_FUNCTIONING_PROPERLY_MASK)
                             : 0;
                     break;
 
+                case SYSTEM_INFO_INDEX_SMC_STATUS:
+                    *pu32 = s->fUseSmc ? (  STA_DEVICE_PRESENT_MASK
+                                          | STA_DEVICE_ENABLED_MASK
+                                          /* no need to show this device in the UI */
+                                          | STA_DEVICE_FUNCTIONING_PROPERLY_MASK)
+                            : 0;
+                    break;
+
                 case SYSTEM_INFO_INDEX_FDC_STATUS:
-                    *pu32 = s->u8UseFdc ? (  STA_DEVICE_PRESENT_MASK
-                                           | STA_DEVICE_ENABLED_MASK
-                                           | STA_DEVICE_SHOW_IN_UI_MASK
-                                           | STA_DEVICE_FUNCTIONING_PROPERLY_MASK)
+                    *pu32 = s->fUseFdc ? (  STA_DEVICE_PRESENT_MASK
+                                          | STA_DEVICE_ENABLED_MASK
+                                          | STA_DEVICE_SHOW_IN_UI_MASK
+                                          | STA_DEVICE_FUNCTIONING_PROPERLY_MASK)
                             : 0;
                     break;
@@ -1787 +1788 @@
 
     /* query whether we are supposed to present an IOAPIC */
-    rc = CFGMR3QueryU8 (pCfgHandle, "IOAPIC", &s->u8UseIOApic);
-    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
-        s->u8UseIOApic = 1;
-    else if (RT_FAILURE (rc))
+    rc = CFGMR3QueryU8Def (pCfgHandle, "IOAPIC", &s->u8UseIOApic, 1);
+    if (RT_FAILURE (rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to read \"IOAPIC\""));
@@ -1800 +1799 @@
 
     /* query whether we are supposed to present an FDC controller */
-    rc = CFGMR3QueryU8 (pCfgHandle, "FdcEnabled", &s->u8UseFdc);
-    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
-        s->u8UseFdc = 1;
-    else if (RT_FAILURE (rc))
+    rc = CFGMR3QueryBoolDef (pCfgHandle, "FdcEnabled", &s->fUseFdc, true);
+    if (RT_FAILURE (rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to read \"FdcEnabled\""));
 
     /* query whether we are supposed to present HPET */
-    rc = CFGMR3QueryU8Def (pCfgHandle, "HpetEnabled", &s->u8UseHpet, 0);
+    rc = CFGMR3QueryBoolDef (pCfgHandle, "HpetEnabled", &s->fUseHpet, false);
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to read \"HpetEnabled\""));
     /* query whether we are supposed to present SMC */
-    rc = CFGMR3QueryU8Def (pCfgHandle, "SmcEnabled", &s->u8UseSmc, 0);
+    rc = CFGMR3QueryBoolDef (pCfgHandle, "SmcEnabled", &s->fUseSmc, false);
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,

trunk/src/VBox/Devices/testcase/tstDeviceStructSizeGC.cpp

@@ -446 +446 @@
     GEN_CHECK_OFF(ACPIState, u8IndexShift);
     GEN_CHECK_OFF(ACPIState, u8UseIOApic);
-    GEN_CHECK_OFF(ACPIState, u8UseFdc);
-    GEN_CHECK_OFF(ACPIState, u8UseHpet);
-    GEN_CHECK_OFF(ACPIState, u8UseSmc);
+    GEN_CHECK_OFF(ACPIState, fUseFdc);
+    GEN_CHECK_OFF(ACPIState, fUseHpet);
+    GEN_CHECK_OFF(ACPIState, fUseSmc);
     GEN_CHECK_OFF(ACPIState, IBase);
     GEN_CHECK_OFF(ACPIState, IACPIPort);