summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt DeVillier <matt.devillier@gmail.com>2017-02-17 19:48:56 -0600
committerMartin Roth <martinroth@google.com>2017-06-04 18:42:07 +0200
commitaf4c0a431c24a38519815a6e44325d29f9073da7 (patch)
tree0610b106fe51a9d8f7622a7cf576f6f76aca6f9b
parent32a618b03bc5f405b60972eec91032114cdea5a1 (diff)
downloadcoreboot-af4c0a431c24a38519815a6e44325d29f9073da7.tar.xz
ec/ene_kb3940q: correct ACPI battery data fed into ToString()
ToString() requires the input buffer data to be null-terminated, but the data returned by the EC is not, leading Windows to fail to report any battery data at all. Correct this by concatenating a null terminator (0x00) to the end of the buffer data before inputting to ToString() where needed TEST: boot Windows on google/butterfly, observe battery data reported correctly. Change-Id: I395cc7fbdf26c8cc816e47107e552c0533580fa1 Signed-off-by: Matt DeVillier <matt.devillier@gmail.com> Reviewed-on: https://review.coreboot.org/19961 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Martin Roth <martinroth@google.com>
-rw-r--r--src/ec/quanta/ene_kb3940q/acpi/battery.asl4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ec/quanta/ene_kb3940q/acpi/battery.asl b/src/ec/quanta/ene_kb3940q/acpi/battery.asl
index bcc9a98f34..dd9ba2ff99 100644
--- a/src/ec/quanta/ene_kb3940q/acpi/battery.asl
+++ b/src/ec/quanta/ene_kb3940q/acpi/battery.asl
@@ -90,9 +90,9 @@ Device (BATX)
Store(Local0, Index(PBIF, 5))
Multiply(Local1, 0x05, Local0)
Store (Local0, Index (PBIF, 6))
- Store (ToString(BATD), Index (PBIF, 9)) // Model Number
+ Store (ToString(Concatenate(BATD, 0x00)), Index (PBIF, 9)) // Model Number
Store (ToDecimalString(BSN0), Index (PBIF, 10)) // Serial Number
- Store (ToString(BCHM), Index (PBIF, 11)) // Battery Type
+ Store (ToString(Concatenate(BCHM, 0x00)), Index (PBIF, 11)) // Battery Type
Store (\BATV, Index (PBIF, 12)) // OEM information
Return (PBIF)