[COMPBATT][CMBATT][BATTC] Enable debug logging & resuscitate these drivers

Author: GeoB99

drivers/battery/battc/battc.c

@@ -81,6 +81,7 @@ BatteryClassStatusNotify(PVOID ClassData)
     PBATTERY_CLASS_DATA BattClass;
     PBATTERY_WAIT_STATUS BattWait;
     BATTERY_STATUS BattStatus;
+    ULONG Tag;
     NTSTATUS Status;
 
     DPRINT("Received battery status notification from %p\n", ClassData);
@@ -99,7 +100,14 @@ BatteryClassStatusNotify(PVOID ClassData)
     {
         case EVENT_BATTERY_TAG:
             ExReleaseFastMutex(&BattClass->Mutex);
-            DPRINT1("Waiting for battery is UNIMPLEMENTED!\n");
+            Status = BattClass->MiniportInfo.QueryTag(BattClass->MiniportInfo.Context,
+                                                      &Tag);
+            if (!NT_SUCCESS(Status))
+                return Status;
+
+            ExAcquireFastMutex(&BattClass->Mutex);
+            KeSetEvent(&BattClass->WaitEvent, IO_NO_INCREMENT, FALSE);
+            ExReleaseFastMutex(&BattClass->Mutex);
             break;
 
         case EVENT_BATTERY_STATUS:
@@ -164,7 +172,7 @@ BatteryClassInitializeDevice(PBATTERY_MINIPORT_INFO MiniportInfo,
                                            &BattClass->InterfaceName);
         if (NT_SUCCESS(Status))
         {
-            DPRINT("Initialized battery interface: %wZ\n", &BattClass->InterfaceName);
+            DPRINT1("Initialized battery interface: %wZ\n", &BattClass->InterfaceName);
             Status = IoSetDeviceInterfaceState(&BattClass->InterfaceName, TRUE);
             if (Status == STATUS_OBJECT_NAME_EXISTS)
             {
@@ -223,7 +231,7 @@ BatteryClassIoctl(PVOID ClassData,
 
             WaitTime = IrpSp->Parameters.DeviceIoControl.InputBufferLength == sizeof(ULONG) ? *(PULONG)Irp->AssociatedIrp.SystemBuffer : 0;
 
-            Timeout.QuadPart = Int32x32To64(WaitTime, -1000);
+            Timeout.QuadPart = Int32x32To64(WaitTime, -10000);
 
             Status = BattClass->MiniportInfo.QueryTag(BattClass->MiniportInfo.Context,
                                                       (PULONG)Irp->AssociatedIrp.SystemBuffer);
@@ -272,7 +280,7 @@ BatteryClassIoctl(PVOID ClassData,
 
             BattWait = *(PBATTERY_WAIT_STATUS)Irp->AssociatedIrp.SystemBuffer;
 
-            Timeout.QuadPart = Int32x32To64(BattWait.Timeout, -1000);
+            Timeout.QuadPart = Int32x32To64(BattWait.Timeout, -10000);
 
             BattStatus = Irp->AssociatedIrp.SystemBuffer;
             Status = BattClass->MiniportInfo.QueryStatus(BattClass->MiniportInfo.Context,

drivers/bus/acpi/cmbatt/cmbatt.c

@@ -275,10 +275,12 @@ CmBattUnload(IN PDRIVER_OBJECT DriverObject)
 
 NTSTATUS
 NTAPI
-CmBattVerifyStaticInfo(PCMBATT_DEVICE_EXTENSION DeviceExtension,
-                       ULONG BatteryTag)
+CmBattVerifyStaticInfo(
+    _Inout_ PCMBATT_DEVICE_EXTENSION DeviceExtension,
+    _In_ ULONG BatteryTag)
 {
     ACPI_BIF_DATA BifData;
+    ULONG DesignVoltage;
     PBATTERY_INFORMATION Info = &DeviceExtension->BatteryInformation;
     NTSTATUS Status;
 
@@ -292,16 +294,73 @@ CmBattVerifyStaticInfo(PCMBATT_DEVICE_EXTENSION DeviceExtension,
         // FIXME: take from _BIX method: Info->CycleCount
         DeviceExtension->BifData = BifData;
 
-        if (BifData.PowerUnit == 1)
+        /* Check if the power stats are reported in ampere or watts */
+        if (BifData.PowerUnit == ACPI_BATT_POWER_UNIT_AMPS)
         {
-            DPRINT1("FIXME: need to convert mAh into mWh\n");
-            Info->DesignedCapacity = BATTERY_UNKNOWN_CAPACITY;
-            Info->FullChargedCapacity = BATTERY_UNKNOWN_CAPACITY;
-            Info->DefaultAlert1 = BATTERY_UNKNOWN_CAPACITY;
-            Info->DefaultAlert2 = BATTERY_UNKNOWN_CAPACITY;
+            /*
+             * We have got power stats in milli-ampere but ReactOS expects the values
+             * to be reported in milli-watts, so we have to convert them.
+             * In order to do so we must expect the design voltage of the battery
+             * is not unknown.
+             */
+            DesignVoltage = DeviceExtension->BifData.DesignVoltage;
+            if ((DesignVoltage != BATTERY_UNKNOWN_VOLTAGE) && (DesignVoltage))
+            {
+                /* Convert the design capacity */
+                if (BifData.DesignCapacity != BATTERY_UNKNOWN_CAPACITY)
+                {
+                    Info->DesignedCapacity = CONVERT_MAH_TO_MWH(BifData.DesignCapacity, DesignVoltage);
+                }
+                else
+                {
+                    Info->DesignedCapacity = BATTERY_UNKNOWN_CAPACITY;
+                }
+
+                /* Convert the full charged capacity */
+                if (BifData.LastFullCapacity != BATTERY_UNKNOWN_CAPACITY)
+                {
+                    Info->FullChargedCapacity = CONVERT_MAH_TO_MWH(BifData.LastFullCapacity, DesignVoltage);
+                }
+                else
+                {
+                    Info->FullChargedCapacity = BATTERY_UNKNOWN_CAPACITY;
+                }
+
+                /* Convert the low capacity alarm (DefaultAlert1) */
+                if (BifData.DesignCapacityLow != BATTERY_UNKNOWN_CAPACITY)
+                {
+                    Info->DefaultAlert1 = CONVERT_MAH_TO_MWH(BifData.DesignCapacityLow, DesignVoltage);
+                }
+                else
+                {
+                    Info->DefaultAlert1 = BATTERY_UNKNOWN_CAPACITY;
+                }
+
+                /* Convert the designed capacity warning alarm (DefaultAlert2) */
+                if (BifData.DesignCapacityWarning != BATTERY_UNKNOWN_CAPACITY)
+                {
+                    Info->DefaultAlert2 = CONVERT_MAH_TO_MWH(BifData.DesignCapacityWarning, DesignVoltage);
+                }
+                else
+                {
+                    Info->DefaultAlert2 = BATTERY_UNKNOWN_CAPACITY;
+                }
+            }
+            else
+            {
+                /*
+                 * Without knowing the nominal designed voltage of the battery
+                 * we cannot determine the power consumption of this battery.
+                 */
+                Info->DesignedCapacity = BATTERY_UNKNOWN_CAPACITY;
+                Info->FullChargedCapacity = BATTERY_UNKNOWN_CAPACITY;
+                Info->DefaultAlert1 = BATTERY_UNKNOWN_CAPACITY;
+                Info->DefaultAlert2 = BATTERY_UNKNOWN_CAPACITY;
+            }
         }
         else
         {
+            /* The stats are in milli-watts, use them directly */
             Info->DesignedCapacity = BifData.DesignCapacity;
             Info->FullChargedCapacity = BifData.LastFullCapacity;
             Info->DefaultAlert1 = BifData.DesignCapacityLow;
@@ -582,8 +641,13 @@ CmBattQueryTag(IN PCMBATT_DEVICE_EXTENSION DeviceExtension,
     Status = CmBattGetStaData(PdoDevice, &StaData);
     if (NT_SUCCESS(Status))
     {
-        /* Is a battery present? */
-        if (StaData & ACPI_STA_BATTERY_PRESENT)
+        /*
+         * Check if _STA method has returned us the battery state as being
+         * present. On some machines the returned _STA element might be 0xF
+         * which is still valid.
+         */
+        if ((StaData & ACPI_STA_BATTERY_PRESENT) ||
+            (StaData & ACPI_STA_BATTERY_PRESENT_V2))
         {
             /* Do we not have a tag yet? */
             if (DeviceExtension->Tag == BATTERY_TAG_INVALID)
@@ -939,7 +1003,7 @@ CmBattGetBatteryStatus(IN PCMBATT_DEVICE_EXTENSION DeviceExtension,
             }
         }
     }
-    else if ((DesignVoltage != CM_UNKNOWN_VALUE) && (DesignVoltage))
+    else if ((DesignVoltage != CM_UNKNOWN_VALUE) && (DesignVoltage)) // Same as doing DeviceExtension->BifData.PowerUnit == ACPI_BATT_POWER_UNIT_AMPS
     {
         /* We have voltage data, what about capacity? */
         if (RemainingCapacity == CM_UNKNOWN_VALUE)

drivers/bus/acpi/cmbatt/cmbatt.h

@@ -56,6 +56,7 @@ typedef enum _CMBATT_EXTENSION_TYPE
 #define ACPI_STA_SHOW_UI            0x04
 #define ACPI_STA_FUNCTIONAL         0x08
 #define ACPI_STA_BATTERY_PRESENT    0x10
+#define ACPI_STA_BATTERY_PRESENT_V2 0xF
 
 #define ACPI_BATT_NOTIFY_STATUS     0x80
 #define ACPI_BATT_NOTIFY_INFO       0x81
@@ -78,6 +79,8 @@ typedef struct _ACPI_BST_DATA
 #define ACPI_BATT_POWER_UNIT_WATTS  0x0
 #define ACPI_BATT_POWER_UNIT_AMPS   0x1
 
+#define CONVERT_MAH_TO_MWH(mA, Volts) ((mA * Volts + 500) / 1000)
+
 typedef struct _ACPI_BIF_DATA
 {
     ULONG PowerUnit;