Changeset 14464 in vbox for trunk/src/VBox/Devices

Timestamp:

Nov 21, 2008 3:03:53 PM (16 years ago)

Author:

vboxsync

Message:

PDM_ACPI_BAT_STATE_DISCHARGING / PDM_ACPI_BAT_STATE_CHARGING mixed up

Location:

trunk/src/VBox/Devices/PC

Files:

• DevACPI.cpp (modified) (1 diff)
• DrvACPI.cpp (modified) (2 diffs)

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

@@ -142 +142 @@
 #define BAT_TECH_PRIMARY                        1
 #define BAT_TECH_SECONDARY                      2
-
-#define BAT_STATUS_DISCHARGING_MASK             RT_BIT(0)
-#define BAT_STATUS_CHARGING_MASK                RT_BIT(1)
-#define BAT_STATUS_CRITICAL_MASK                RT_BIT(2)
 
 #define STA_DEVICE_PRESENT_MASK                 RT_BIT(0)

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

@@ -211 +211 @@
         uint32_t uBs = PDM_ACPI_BAT_STATE_CHARGED;
         if (powerStatus.BatteryFlag & 8)
+            uBs = PDM_ACPI_BAT_STATE_CHARGING;
+        else if (powerStatus.ACLineStatus == 0 || powerStatus.ACLineStatus == 255)
             uBs = PDM_ACPI_BAT_STATE_DISCHARGING;
-        else if (powerStatus.ACLineStatus == 0 || powerStatus.ACLineStatus == 255)
-            uBs = PDM_ACPI_BAT_STATE_CHARGING;
         if (powerStatus.BatteryFlag & 4)
             uBs |= PDM_ACPI_BAT_STATE_CRITICAL;
@@ -396 +396 @@
     uint32_t uBs = PDM_ACPI_BAT_STATE_CHARGED;
     if (fDischarging)
+        uBs = PDM_ACPI_BAT_STATE_DISCHARGING;
+    else if (fCharging)
         uBs = PDM_ACPI_BAT_STATE_CHARGING;
-    else if (fCharging)
-        uBs = PDM_ACPI_BAT_STATE_DISCHARGING;
     if (fCritical)
         uBs |= PDM_ACPI_BAT_STATE_CRITICAL;