Changeset 11208 in vbox for trunk/src/VBox

Timestamp:

Aug 7, 2008 3:40:10 PM (17 years ago)

Author:

vboxsync

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

34253

Message:

DevACPI: cosmetics.

File:

• trunk/src/VBox/Devices/PC/DevACPI.cpp (modified) (15 diffs)

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

@@ -21 +21 @@
 
 #define LOG_GROUP LOG_GROUP_DEV_ACPI
-
 #include <VBox/pdmdev.h>
 #include <VBox/log.h>
@@ -27 +26 @@
 #include <iprt/asm.h>
 #ifdef IN_RING3
-#include <iprt/alloc.h>
-#include <iprt/string.h>
+# include <iprt/alloc.h>
+# include <iprt/string.h>
 #endif /* IN_RING3 */
 
-#include "Builtins.h"
-
-#ifdef  LOG_ENABLED
-#define DEBUG_ACPI
+#include "../Builtins.h"
+
+#ifdef LOG_ENABLED
+# define DEBUG_ACPI
 #endif
 
@@ -733 +732 @@
 {
     int rc = PDMDevHlpVMPowerOff(s->pDevIns);
-    if (VBOX_FAILURE (rc))
+    if (RT_FAILURE (rc))
         AssertMsgFailed (("Could not power down the VM. rc = %Vrc\n", rc));
     return rc;
@@ -1447 +1446 @@
 
     rc = SSMR3GetStruct (pSSMHandle, s, &g_AcpiSavedStateFields[0]);
-    if (VBOX_SUCCESS (rc))
+    if (RT_SUCCESS (rc))
     {
         acpiFetchBatteryStatus (s);
@@ -1500 +1499 @@
 
     rc = CFGMR3QueryU64 (s->pDevIns->pCfgHandle, "RamSize", &s->u64RamSize);
-    if (VBOX_FAILURE (rc))
+    if (RT_FAILURE (rc))
         return PDMDEV_SET_ERROR(s->pDevIns, rc,
                                 N_("Configuration error: Querying "
@@ -1547 +1546 @@
 
     rc = acpiSetupRSDT (s, rsdt_addr + addend, cAddr, rsdt_addrs);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     return acpiSetupXSDT (s, xsdt_addr + addend, cAddr, rsdt_addrs);
@@ -1585 +1584 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         s->u8UseIOApic = 1;
-    else if (VBOX_FAILURE (rc))
+    else if (RT_FAILURE (rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to read \"IOAPIC\""));
@@ -1593 +1592 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         s->u8UseFdc = 1;
-    else if (VBOX_FAILURE (rc))
+    else if (RT_FAILURE (rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to read \"FdcEnabled\""));
@@ -1600 +1599 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         fGCEnabled = true;
-    else if (VBOX_FAILURE (rc))
+    else if (RT_FAILURE (rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to read \"GCEnabled\""));
@@ -1607 +1606 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         fR0Enabled = true;
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("configuration error: failed to read R0Enabled as boolean"));
@@ -1618 +1617 @@
 
     rc = acpiPlantTables (s);
-    if (VBOX_FAILURE (rc))
+    if (RT_FAILURE (rc))
         return rc;
 
     rc = PDMDevHlpROMRegister (pDevIns, rsdp_addr, 0x1000, s->au8RSDPPage, false /* fShadow */, "ACPI RSDP");
-    if (VBOX_FAILURE (rc))
+    if (RT_FAILURE (rc))
         return rc;
 
@@ -1629 +1628 @@
         rc = PDMDevHlpIOPortRegister (pDevIns, addr, cnt, s, writer, reader, \
                                       NULL, NULL, description);              \
-        if (VBOX_FAILURE (rc))                                               \
+        if (RT_FAILURE (rc))                                               \
             return rc;                                                       \
     } while (0)
@@ -1671 +1670 @@
 
     rc = PDMDevHlpTMTimerCreate (pDevIns, TMCLOCK_VIRTUAL_SYNC, acpiTimer, "ACPI Timer", &s->tsR3);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         AssertMsgFailed(("pfnTMTimerCreate -> %Vrc\n", rc));
@@ -1712 +1711 @@
 
     rc = PDMDevHlpPCIRegister (pDevIns, dev);
-    if (VBOX_FAILURE (rc))
+    if (RT_FAILURE (rc))
         return rc;
 
     rc = PDMDevHlpSSMRegister (pDevIns, pDevIns->pDevReg->szDeviceName, iInstance, 4, sizeof(*s),
                                NULL, acpi_save_state, NULL, NULL, acpi_load_state,  NULL);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
@@ -1734 +1733 @@
     */
    rc = PDMDevHlpDriverAttach (pDevIns, 0, &s->IBase, &s->pDrvBase, "ACPI Driver Port");
-   if (VBOX_SUCCESS (rc))
+   if (RT_SUCCESS (rc))
    {
        s->pDrv = (PPDMIACPICONNECTOR)s->pDrvBase->pfnQueryInterface (s->pDrvBase,