From 7fa18f56441dd596927845198ea61dbe164d7a00 Mon Sep 17 00:00:00 2001 From: "YongBeum.Ha" Date: Thu, 22 Apr 2021 15:34:18 +0900 Subject: dedede : fix alignment in cbi_ssfc fix bit alignment in cbi_ssfc BUG=b:186067339 BRANCH=none TEST=make -j BOARD=sasuke Signed-off-by: YongBeum.Ha Change-Id: I15902938ddefe27aeb36530008cfb899440c9d15 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2845195 Reviewed-by: Aseda Aboagye Commit-Queue: Aseda Aboagye --- baseboard/dedede/cbi_ssfc.c | 6 +++--- baseboard/dedede/cbi_ssfc.h | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/baseboard/dedede/cbi_ssfc.c b/baseboard/dedede/cbi_ssfc.c index 346da842d5..de5568005e 100644 --- a/baseboard/dedede/cbi_ssfc.c +++ b/baseboard/dedede/cbi_ssfc.c @@ -27,15 +27,15 @@ DECLARE_HOOK(HOOK_INIT, cbi_ssfc_init, HOOK_PRIO_FIRST); enum ec_ssfc_base_sensor get_cbi_ssfc_base_sensor(void) { - return cached_ssfc.base_sensor; + return (enum ec_ssfc_base_sensor) cached_ssfc.base_sensor; } enum ec_ssfc_lid_sensor get_cbi_ssfc_lid_sensor(void) { - return cached_ssfc.lid_sensor; + return (enum ec_ssfc_lid_sensor) cached_ssfc.lid_sensor; } enum ec_ssfc_usb_ss_mux get_cbi_ssfc_usb_ss_mux(void) { - return cached_ssfc.usb_ss_mux; + return (enum ec_ssfc_lid_sensor) cached_ssfc.usb_ss_mux; } diff --git a/baseboard/dedede/cbi_ssfc.h b/baseboard/dedede/cbi_ssfc.h index 92ab06c646..ae9ef076db 100644 --- a/baseboard/dedede/cbi_ssfc.h +++ b/baseboard/dedede/cbi_ssfc.h @@ -42,10 +42,10 @@ enum ec_ssfc_usb_ss_mux { union dedede_cbi_ssfc { struct { - enum ec_ssfc_base_sensor base_sensor : 3; - enum ec_ssfc_lid_sensor lid_sensor : 3; - enum ec_ssfc_usb_ss_mux usb_ss_mux : 3; - uint32_t reserved_2 : 20; + uint32_t base_sensor : 3; + uint32_t lid_sensor : 3; + uint32_t usb_ss_mux : 3; + uint32_t reserved_2 : 23; }; uint32_t raw_value; }; -- cgit v1.2.1