diff options
| author | Mary Ruthven <mruthven@chromium.org> | 2022-08-02 07:01:22 -0700 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-08-02 18:25:11 +0000 |
| commit | 069e5a958840405c02bf6592353227d2165b70c7 (patch) | |
| tree | 2ae640d4267498d55fa29cae76e09ab7d8105ae3 | |
| parent | e55cc58e28694bb4c01189466355b79c0744e434 (diff) | |
| download | chrome-ec-069e5a958840405c02bf6592353227d2165b70c7.tar.gz | |
c2d2: define usart to usb constants
All of the c2d2 consoles should be the same size. Define constants and
use them in the queue definitions.
BUG=b:240718978
BRANCH=servo
TEST=none
Change-Id: I69add9f13567833f8563d813cb63c29094845a44
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3805280
Reviewed-by: Ziting Shen <zitingshen@google.com>
Commit-Queue: Ziting Shen <zitingshen@google.com>
| -rw-r--r-- | board/c2d2/board.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/board/c2d2/board.c b/board/c2d2/board.c index abe5423db5..922b8df921 100644 --- a/board/c2d2/board.c +++ b/board/c2d2/board.c @@ -211,6 +211,8 @@ int usb_i2c_board_is_enabled(void) #define USB_STREAM_RX_SIZE 32 #define USB_STREAM_TX_SIZE 64 +#define USART_TO_USB_SIZE 1024 +#define USB_TO_USART_SIZE 64 /****************************************************************************** * Forward USART1 (EC) as a simple USB serial interface. @@ -219,10 +221,10 @@ int usb_i2c_board_is_enabled(void) static struct usart_config const usart1; struct usb_stream_config const usart1_usb; -static struct queue const usart1_to_usb = - QUEUE_DIRECT(1024, uint8_t, usart1.producer, usart1_usb.consumer); -static struct queue const usb_to_usart1 = - QUEUE_DIRECT(64, uint8_t, usart1_usb.producer, usart1.consumer); +static struct queue const usart1_to_usb = QUEUE_DIRECT( + USART_TO_USB_SIZE, uint8_t, usart1.producer, usart1_usb.consumer); +static struct queue const usb_to_usart1 = QUEUE_DIRECT( + USB_TO_USART_SIZE, uint8_t, usart1_usb.producer, usart1.consumer); static struct usart_rx_dma const usart1_rx_dma = USART_RX_DMA(STM32_DMAC_CH5, 32); @@ -243,10 +245,10 @@ USB_STREAM_CONFIG_USART_IFACE(usart1_usb, USB_IFACE_USART1_STREAM, static struct usart_config const usart3; struct usb_stream_config const usart3_usb; -static struct queue const usart3_to_usb = - QUEUE_DIRECT(1024, uint8_t, usart3.producer, usart3_usb.consumer); -static struct queue const usb_to_usart3 = - QUEUE_DIRECT(64, uint8_t, usart3_usb.producer, usart3.consumer); +static struct queue const usart3_to_usb = QUEUE_DIRECT( + USART_TO_USB_SIZE, uint8_t, usart3.producer, usart3_usb.consumer); +static struct queue const usb_to_usart3 = QUEUE_DIRECT( + USB_TO_USART_SIZE, uint8_t, usart3_usb.producer, usart3.consumer); static struct usart_rx_dma const usart3_rx_dma = USART_RX_DMA(STM32_DMAC_CH3, 32); @@ -269,10 +271,10 @@ USB_STREAM_CONFIG_USART_IFACE(usart3_usb, USB_IFACE_USART3_STREAM, static struct usart_config const usart4; struct usb_stream_config const usart4_usb; -static struct queue const usart4_to_usb = - QUEUE_DIRECT(1024, uint8_t, usart4.producer, usart4_usb.consumer); -static struct queue const usb_to_usart4 = - QUEUE_DIRECT(64, uint8_t, usart4_usb.producer, usart4.consumer); +static struct queue const usart4_to_usb = QUEUE_DIRECT( + USART_TO_USB_SIZE, uint8_t, usart4.producer, usart4_usb.consumer); +static struct queue const usb_to_usart4 = QUEUE_DIRECT( + USB_TO_USART_SIZE, uint8_t, usart4_usb.producer, usart4.consumer); static struct usart_config const usart4 = USART_CONFIG(usart4_hw, usart_rx_interrupt, usart_tx_interrupt, 115200, |