diff options
| author | Dossym Nurmukhanov <dossym@google.com> | 2020-12-11 11:17:39 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-12-12 12:55:43 +0000 |
| commit | 61022575d3c8b75d07e4f3be3f1616e45767f673 (patch) | |
| tree | 236ac65b862e8bf1c825c5862e788a3ae783ee24 /board/hammer | |
| parent | a86aecb2de50437622e91ee451079175cdef5e1d (diff) | |
| download | chrome-ec-61022575d3c8b75d07e4f3be3f1616e45767f673.tar.gz | |
COIL: Use inclusive language for EC-EC communication code
Replace with server/client nomenclature
BUG=none
TEST=build and run on volteer
BRANCH=none
Signed-off-by: dossym@chromium.org
Change-Id: I23fe7de9228a9611b49eef1362bf15159b25aab7
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2586038
Reviewed-by: Nicolas Boichat <drinkcat@chromium.org>
Diffstat (limited to 'board/hammer')
| -rw-r--r-- | board/hammer/board.c | 16 | ||||
| -rw-r--r-- | board/hammer/ec.tasklist | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/board/hammer/board.c b/board/hammer/board.c index c0bb79b83f..d64d4975ad 100644 --- a/board/hammer/board.c +++ b/board/hammer/board.c @@ -145,15 +145,15 @@ struct keyboard_scan_config keyscan_config = { struct consumer const ec_ec_usart_consumer; static struct usart_config const ec_ec_usart; -struct queue const ec_ec_comm_slave_input = QUEUE_DIRECT(64, uint8_t, +struct queue const ec_ec_comm_server_input = QUEUE_DIRECT(64, uint8_t, ec_ec_usart.producer, ec_ec_usart_consumer); -struct queue const ec_ec_comm_slave_output = QUEUE_DIRECT(64, uint8_t, +struct queue const ec_ec_comm_server_output = QUEUE_DIRECT(64, uint8_t, null_producer, ec_ec_usart.consumer); struct consumer const ec_ec_usart_consumer = { - .queue = &ec_ec_comm_slave_input, + .queue = &ec_ec_comm_server_input, .ops = &((struct consumer_ops const) { - .written = ec_ec_comm_slave_written, + .written = ec_ec_comm_server_written, }), }; @@ -163,8 +163,8 @@ static struct usart_config const ec_ec_usart = usart_tx_interrupt, 115200, USART_CONFIG_FLAG_HDSEL, - ec_ec_comm_slave_input, - ec_ec_comm_slave_output); + ec_ec_comm_server_input, + ec_ec_comm_server_output); #endif /* BOARD_WAND && SECTION_IS_RW */ /****************************************************************************** @@ -184,8 +184,8 @@ static void board_init(void) #ifdef BOARD_WAND /* USB to serial queues */ - queue_init(&ec_ec_comm_slave_input); - queue_init(&ec_ec_comm_slave_output); + queue_init(&ec_ec_comm_server_input); + queue_init(&ec_ec_comm_server_output); /* UART init */ usart_init(&ec_ec_usart); diff --git a/board/hammer/ec.tasklist b/board/hammer/ec.tasklist index ecdb6db120..b568619065 100644 --- a/board/hammer/ec.tasklist +++ b/board/hammer/ec.tasklist @@ -13,7 +13,7 @@ TASK_ALWAYS_RW(TOUCHPAD, touchpad_task, NULL, LARGER_TASK_STACK_SIZE) \ TASK_ALWAYS_RW(CHARGER, charger_task, NULL, LARGER_TASK_STACK_SIZE) \ TASK_ALWAYS (CONSOLE, console_task, NULL, 1024) \ - TASK_ALWAYS_RW(ECCOMM, ec_ec_comm_slave_task, NULL, TASK_STACK_SIZE) \ + TASK_ALWAYS_RW(ECCOMM, ec_ec_comm_server_task, NULL, TASK_STACK_SIZE) \ TASK_NOTEST_RW(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) #elif defined(CONFIG_USB_ISOCHRONOUS) #define CONFIG_TASK_LIST \ |