Skip to content

Commit a0a0cbf

Browse files
LeilaCY-LinJohnAZoidberg
authored andcommitted
fwk: Use the config to distinguish the item in EC_CMD_READ_BOARDID
Use the config to distinguish the item in host command EC_CMD_READ_BOARDID. The enum name cannot correctly enable the definition. BRANCH=fwk-main BUG=Host command EC_CMD_READ_BOARDID get the error return. TEST=Host command EC_CMD_READ_BOARDID can get mainboard/touchpad/audio board id on sakura. TEST=Host command EC_CMD_READ_BOARDID can get mainboard/dgpu0/dgpu1 board id on tulip. Signed-off-by: LeilaCY-Lin <LeilaCY_Lin@compal.com> (cherry picked from commit 41db6e99a82ac7841a0c59d2db47abb612ac5002)
1 parent c1e834b commit a0a0cbf

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

zephyr/program/framework/include/board_host_command.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -600,9 +600,9 @@ enum ec_board_id_type {
600600
HC_BOARD_ID_MAINBOARD = 0,
601601
/* Power button board - Framework 12 */
602602
HC_BOARD_ID_POWERBUTTON_BOARD = 1,
603-
/* Power button board - Framework 12, 13, 16 */
603+
/* Touchpad board - Framework 12, 13 */
604604
HC_BOARD_ID_TOUCHPAD = 2,
605-
/* Power button board - Framework 12, 13 */
605+
/* Audio board - Framework 12, 13 */
606606
HC_BOARD_ID_AUDIO_BOARD = 3,
607607
/* dGPU board - Framework 16 */
608608
HC_BOARD_ID_DGPU0 = 4,

zephyr/program/framework/src/adc.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,17 +111,19 @@ static enum ec_status hc_read_boardid(struct host_cmd_handler_args *args)
111111
case HC_BOARD_ID_MAINBOARD:
112112
r->board_id = get_hardware_id(ADC_MAIN_BOARD_ID);
113113
break;
114-
#ifdef ADC_POWER_BUTTON_BOARD_ID
114+
#if defined(CONFIG_PLATFORM_EC_FRAMEWORK_LAPTOP_12)
115115
case HC_BOARD_ID_POWERBUTTON_BOARD:
116116
r->board_id = get_hardware_id(ADC_POWER_BUTTON_BOARD_ID);
117117
break;
118118
#endif
119-
#ifdef ADC_TOUCHPAD_ID
119+
#if defined(CONFIG_PLATFORM_EC_FRAMEWORK_LAPTOP_12) || \
120+
defined(CONFIG_PLATFORM_EC_FRAMEWORK_LAPTOP_13)
120121
case HC_BOARD_ID_TOUCHPAD:
121122
r->board_id = get_hardware_id(ADC_TOUCHPAD_ID);
122123
break;
123124
#endif
124-
#ifdef ADC_AUDIO_ID
125+
#if defined(CONFIG_PLATFORM_EC_FRAMEWORK_LAPTOP_12) || \
126+
defined(CONFIG_PLATFORM_EC_FRAMEWORK_LAPTOP_13)
125127
case HC_BOARD_ID_AUDIO_BOARD:
126128
r->board_id = get_hardware_id(ADC_AUDIO_ID);
127129
break;

0 commit comments

Comments
 (0)