From 79d89b136965b0dfaae5bfea11d4b506f824b4cd Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Fri, 9 Dec 2016 18:14:57 -0600 Subject: [PATCH] UPSTREAM: ec/ene932: 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 BUG=None BRANCH=None TEST=None Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/17783 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber Change-Id: Ic86048d1d6354b9b0dac3c8957df318d0825c905 Reviewed-on: https://chromium-review.googlesource.com/421167 Commit-Ready: Furquan Shaikh Tested-by: Furquan Shaikh Reviewed-by: Furquan Shaikh --- src/ec/compal/ene932/acpi/battery.asl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ec/compal/ene932/acpi/battery.asl b/src/ec/compal/ene932/acpi/battery.asl index 12092c7b8a..f86cb0169e 100644 --- a/src/ec/compal/ene932/acpi/battery.asl +++ b/src/ec/compal/ene932/acpi/battery.asl @@ -84,9 +84,9 @@ Device (BATX) Multiply(Local1, 0x03, Local1) Store (Local1, Index (PBIF, 6)) - Store (ToString(BATD), Index (PBIF, 9)) // model + Store (ToString(Concatenate(BATD, 0x00)), Index (PBIF, 9)) // model Store (ToHexString(BSN0), Index (PBIF, 10)) // serial - Store (ToString(BMFN), Index (PBIF, 12)) // venor + Store (ToString(BMFN), Index (PBIF, 12)) // vendor Store(BDN0, BTNM) // Save the battery number