Changeset 24078 in vbox for trunk/src

Timestamp:

Oct 26, 2009 2:16:50 PM (15 years ago)

Author:

vboxsync

Message:

DevACPI: order

File:

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

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

@@ -2002 +2002 @@
 }
 
+static DECLCALLBACK(void) acpiReset(PPDMDEVINS pDevIns)
+{
+    ACPIState *s = PDMINS_2_DATA(pDevIns, ACPIState *);
+
+    s->pm1a_en           = 0;
+    s->pm1a_sts          = 0;
+    s->pm1a_ctl          = 0;
+    s->pm_timer_initial  = TMTimerGet(s->CTX_SUFF(ts));
+    acpiPMTimerReset(s);
+    s->uBatteryIndex     = 0;
+    s->uSystemInfoIndex  = 0;
+    s->gpe0_en           = 0;
+    s->gpe0_sts          = 0;
+    s->uSleepState       = 0;
+
+    /** @todo Should we really reset PM base? */
+    acpiUpdatePmHandlers(s, PM_PORT_BASE);
+
+    acpiPlantTables(s);
+}
+
+/**
+ * Relocates the GC pointer members.
+ */
+static DECLCALLBACK(void) acpiRelocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
+{
+    ACPIState *s = PDMINS_2_DATA(pDevIns, ACPIState *);
+    s->tsRC = TMTimerRCPtr(s->CTX_SUFF(ts));
+}
+
 /**
  * Construct a device instance for a VM.
@@ -2219 +2249 @@
 
     return rc;
-}
-
-/**
- * Relocates the GC pointer members.
- */
-static DECLCALLBACK(void) acpiRelocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
-{
-    ACPIState *s = PDMINS_2_DATA(pDevIns, ACPIState *);
-    s->tsRC = TMTimerRCPtr(s->CTX_SUFF(ts));
-}
-
-static DECLCALLBACK(void) acpiReset(PPDMDEVINS pDevIns)
-{
-    ACPIState *s = PDMINS_2_DATA(pDevIns, ACPIState *);
-
-    s->pm1a_en           = 0;
-    s->pm1a_sts          = 0;
-    s->pm1a_ctl          = 0;
-    s->pm_timer_initial  = TMTimerGet(s->CTX_SUFF(ts));
-    acpiPMTimerReset(s);
-    s->uBatteryIndex     = 0;
-    s->uSystemInfoIndex  = 0;
-    s->gpe0_en           = 0;
-    s->gpe0_sts          = 0;
-    s->uSleepState       = 0;
-
-    /** @todo Should we really reset PM base? */
-    acpiUpdatePmHandlers(s, PM_PORT_BASE);
-
-    acpiPlantTables(s);
 }