diff --git a/sys/include/usb/usbus/cdc/acm.h b/sys/include/usb/usbus/cdc/acm.h index 8bd2f09c48..6eba372af3 100644 --- a/sys/include/usb/usbus/cdc/acm.h +++ b/sys/include/usb/usbus/cdc/acm.h @@ -46,15 +46,28 @@ extern "C" { * @brief Buffer size for STDIN and STDOUT data to and from USB when using * the USBUS_CDC_ACM_STDIO module */ -#ifndef USBUS_CDC_ACM_STDIO_BUF_SIZE -#define USBUS_CDC_ACM_STDIO_BUF_SIZE (128) +#ifdef CONFIG_USBUS_CDC_ACM_STDIO_BUF_SIZE_EXP +#define CONFIG_USBUS_CDC_ACM_STDIO_BUF_SIZE (1<iface_data, USB_EP_TYPE_BULK, USB_EP_DIR_IN, - USBUS_CDC_ACM_BULK_EP_SIZE); + CONFIG_USBUS_CDC_ACM_BULK_EP_SIZE); ep->interval = 0; /* Interval is not used with bulk endpoints */ usbus_enable_endpoint(ep); /* Store the endpoint reference to activate it * when DTE present is signalled by the host */ ep = usbus_add_endpoint(usbus, &cdcacm->iface_data, USB_EP_TYPE_BULK, USB_EP_DIR_OUT, - USBUS_CDC_ACM_BULK_EP_SIZE); + CONFIG_USBUS_CDC_ACM_BULK_EP_SIZE); ep->interval = 0; /* Interval is not used with bulk endpoints */ usbus_enable_endpoint(ep); @@ -319,12 +319,12 @@ static void _handle_in(usbus_cdcacm_device_t *cdcacm, (cdcacm->state != USBUS_CDC_ACM_LINE_STATE_DTE)) { return; } - /* copy at most USBUS_CDC_ACM_BULK_EP_SIZE chars from input into ep->buf */ + /* copy at most CONFIG_USBUS_CDC_ACM_BULK_EP_SIZE chars from input into ep->buf */ unsigned old = irq_disable(); while (!tsrb_empty(&cdcacm->tsrb)) { int c = tsrb_get_one(&cdcacm->tsrb); ep->buf[cdcacm->occupied++] = (uint8_t)c; - if (cdcacm->occupied >= USBUS_CDC_ACM_BULK_EP_SIZE) { + if (cdcacm->occupied >= CONFIG_USBUS_CDC_ACM_BULK_EP_SIZE) { break; } } diff --git a/sys/usb/usbus/cdc/acm/cdc_acm_stdio.c b/sys/usb/usbus/cdc/acm/cdc_acm_stdio.c index a14dc1a073..9b133c15e8 100644 --- a/sys/usb/usbus/cdc/acm/cdc_acm_stdio.c +++ b/sys/usb/usbus/cdc/acm/cdc_acm_stdio.c @@ -38,8 +38,8 @@ #endif static usbus_cdcacm_device_t cdcacm; -static uint8_t _cdc_tx_buf_mem[USBUS_CDC_ACM_STDIO_BUF_SIZE]; -static uint8_t _cdc_rx_buf_mem[USBUS_CDC_ACM_STDIO_BUF_SIZE]; +static uint8_t _cdc_tx_buf_mem[CONFIG_USBUS_CDC_ACM_STDIO_BUF_SIZE]; +static uint8_t _cdc_rx_buf_mem[CONFIG_USBUS_CDC_ACM_STDIO_BUF_SIZE]; static isrpipe_t _cdc_stdio_isrpipe = ISRPIPE_INIT(_cdc_rx_buf_mem); void stdio_init(void)