From c8af3feee6b35e33ab989ca8af0b48d738d4aedf Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Thu, 24 May 2018 13:07:43 -0400 Subject: command: Add a command_encode_and_frame() helper Add a helper function that calls command_encodef() followed by command_add_frame(). Signed-off-by: Kevin O'Connor --- src/generic/serial_irq.c | 3 +-- src/generic/usb_cdc.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src/generic') diff --git a/src/generic/serial_irq.c b/src/generic/serial_irq.c index 7c7842ea..6b682a0f 100644 --- a/src/generic/serial_irq.c +++ b/src/generic/serial_irq.c @@ -108,8 +108,7 @@ console_sendf(const struct command_encoder *ce, va_list args) // Generate message uint8_t *buf = &transmit_buf[tmax]; - uint_fast8_t msglen = command_encodef(buf, ce, args); - command_add_frame(buf, msglen); + uint_fast8_t msglen = command_encode_and_frame(buf, ce, args); // Start message transmit writeb(&transmit_max, tmax + msglen); diff --git a/src/generic/usb_cdc.c b/src/generic/usb_cdc.c index 49bb483e..56a60fac 100644 --- a/src/generic/usb_cdc.c +++ b/src/generic/usb_cdc.c @@ -65,8 +65,7 @@ console_sendf(const struct command_encoder *ce, va_list args) // Generate message uint8_t *buf = &transmit_buf[tpos]; - uint_fast8_t msglen = command_encodef(buf, ce, args); - command_add_frame(buf, msglen); + uint_fast8_t msglen = command_encode_and_frame(buf, ce, args); // Start message transmit transmit_pos = tpos + msglen; -- cgit v1.2.3-70-g09d2