Skip to content

Commit 9d45581

Browse files
jfischer-nonashif
authored andcommitted
usb: cdc_acm: prefix ringbuffers with cdc_acm
Prefix ringbuffers with cdc_acm because it is not possible to use static specifier with RING_BUF_*_DECLARE_* macros to avoid conflicts. Fixes: #36608 Signed-off-by: Johann Fischer <[email protected]>
1 parent 2304a27 commit 9d45581

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

subsys/usb/class/cdc_acm.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1084,14 +1084,14 @@ static const struct uart_driver_api cdc_acm_driver_api = {
10841084
.endpoint = cdc_acm_ep_data_##x, \
10851085
}; \
10861086
\
1087-
RING_BUF_DECLARE(rx_ringbuf_##x, \
1087+
RING_BUF_DECLARE(cdc_acm_rx_rb_##x, \
10881088
CONFIG_USB_CDC_ACM_RINGBUF_SIZE); \
1089-
RING_BUF_DECLARE(tx_ringbuf_##x, \
1089+
RING_BUF_DECLARE(cdc_acm_tx_rb_##x, \
10901090
CONFIG_USB_CDC_ACM_RINGBUF_SIZE); \
10911091
static struct cdc_acm_dev_data_t cdc_acm_dev_data_##x = { \
10921092
.line_coding = CDC_ACM_DEFAULT_BAUDRATE, \
1093-
.rx_ringbuf = &rx_ringbuf_##x, \
1094-
.tx_ringbuf = &tx_ringbuf_##x, \
1093+
.rx_ringbuf = &cdc_acm_rx_rb_##x, \
1094+
.tx_ringbuf = &cdc_acm_tx_rb_##x, \
10951095
};
10961096

10971097
#define DT_DRV_COMPAT zephyr_cdc_acm_uart

0 commit comments

Comments
 (0)