Skip to content

Commit c4001b2

Browse files
yangsong8-a1lupyuen
authored andcommitted
Revert "boards/defconfig: remove fixed CDCACM BUFFER SIZE"
Use configuration CDCACM_DISABLE_TXBUF or CDCACM_DISABLE_RXBUF to choose whether to use usb req buffer as the serial buffer. Since the default value is n (not using req buf), the original configuration of buf is valid. This reverts commit 21c8ed8.
1 parent e8f9570 commit c4001b2

File tree

44 files changed

+96
-8
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+96
-8
lines changed

Documentation/platforms/arm/kinetis/boards/freedom-k64f/README.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,9 @@ USB Device Controller Support
577577
CONFIG_CDCACM_NRDREQS=8 : Number of read requests
578578
CONFIG_CDCACM_BULKIN_REQLEN=96 : Size of write request buffer (for full speed)
579579
CONFIG_CDCACM_BULKIN_REQLEN=768 : Size of write request buffer (for high speed)
580+
CONFIG_CDCACM_RXBUFSIZE=257 : Serial read buffer size
581+
CONFIG_CDCACM_TXBUFSIZE=193 : Serial transmit buffer size (for full speed)
582+
CONFIG_CDCACM_TXBUFSIZE=769 : Serial transmit buffer size (for high speed)
580583
CONFIG_CDCACM_VENDORID=0x0525 : Vendor ID
581584
CONFIG_CDCACM_PRODUCTID=0xa4a7 : Product ID
582585
CONFIG_CDCACM_VENDORSTR="NuttX" : Vendor string
@@ -590,7 +593,7 @@ USB Device Controller Support
590593

591594
CONFIG_SYSTEM_CDCACM=y : Enable connect/disconnect support
592595
CONFIG_SYSTEM_CDCACM_DEVMINOR=0 : Use device /dev/ttyACM0
593-
CONFIG_CDCACM_NRDREQS=??? : Multiple read requests may be needed
596+
CONFIG_CDCACM_RXBUFSIZE=??? : A large RX may be needed
594597

595598
If you include this CDC/ACM application, then you can connect the CDC/ACM
596599
serial device to the host by entering the command 'sercon' and you detach

Documentation/platforms/arm/kinetis/boards/freedom-k66f/README.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -580,6 +580,9 @@ USB Device Controller Support
580580
CONFIG_CDCACM_NRDREQS=8 : Number of read requests
581581
CONFIG_CDCACM_BULKIN_REQLEN=96 : Size of write request buffer (for full speed)
582582
CONFIG_CDCACM_BULKIN_REQLEN=768 : Size of write request buffer (for high speed)
583+
CONFIG_CDCACM_RXBUFSIZE=257 : Serial read buffer size
584+
CONFIG_CDCACM_TXBUFSIZE=193 : Serial transmit buffer size (for full speed)
585+
CONFIG_CDCACM_TXBUFSIZE=769 : Serial transmit buffer size (for high speed)
583586
CONFIG_CDCACM_VENDORID=0x0525 : Vendor ID
584587
CONFIG_CDCACM_PRODUCTID=0xa4a7 : Product ID
585588
CONFIG_CDCACM_VENDORSTR="NuttX" : Vendor string
@@ -593,7 +596,7 @@ USB Device Controller Support
593596

594597
CONFIG_SYSTEM_CDCACM=y : Enable connect/disconnect support
595598
CONFIG_SYSTEM_CDCACM_DEVMINOR=0 : Use device /dev/ttyACM0
596-
CONFIG_CDCACM_NRDREQS=??? : Multiple read requests may be needed
599+
CONFIG_CDCACM_RXBUFSIZE=??? : A large RX may be needed
597600

598601
If you include this CDC/ACM application, then you can connect the CDC/ACM
599602
serial device to the host by entering the command 'sercon' and you detach

Documentation/platforms/arm/sam34/boards/sam4e-ek/README.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -593,11 +593,9 @@ USB Full-Speed Device
593593

594594
1. RX buffer size. All incoming data is buffered by the serial driver
595595
until it can be read by the application. The default size of this
596-
RX buffer is related to CONFIG_CDCACM_NRDREQS, the maximum packet
597-
length and CONFIG_CDCACM_BULKOUT_REQLEN. It can be increased as you
598-
see fit:
596+
RX buffer is only 256 but can be increased as you see fit:
599597

600-
CONFIG_CDCACM_NRDREQS=xxx
598+
CONFIG_CDCACM_RXBUFSIZE=256 : Default RX buffer size is only 256 bytes
601599

602600
2. Upstream from the RX buffers are USB read request buffers. Each
603601
buffer is the maximum size of one USB packet (64 byte) and that cannot

Documentation/platforms/arm/samv7/boards/same70-xplained/README.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -646,6 +646,9 @@ serial device class:
646646
CONFIG_CDCACM_NRDREQS=8 : Number of read requests
647647
CONFIG_CDCACM_BULKIN_REQLEN=96 : Size of write request buffer (for full speed)
648648
CONFIG_CDCACM_BULKIN_REQLEN=768 : Size of write request buffer (for high speed)
649+
CONFIG_CDCACM_RXBUFSIZE=257 : Serial read buffer size
650+
CONFIG_CDCACM_TXBUFSIZE=193 : Serial transmit buffer size (for full speed)
651+
CONFIG_CDCACM_TXBUFSIZE=769 : Serial transmit buffer size (for high speed)
649652
CONFIG_CDCACM_VENDORID=0x0525 : Vendor ID
650653
CONFIG_CDCACM_PRODUCTID=0xa4a7 : Product ID
651654
CONFIG_CDCACM_VENDORSTR="NuttX" : Vendor string
@@ -659,7 +662,7 @@ CDC/ACM serial device:
659662

660663
CONFIG_SYSTEM_CDCACM=y : Enable connect/disconnect support
661664
CONFIG_SYSTEM_CDCACM_DEVMINOR=0 : Use device /dev/ttyACM0
662-
CONFIG_CDCACM_NRDREQS=??? : Multiple read requests may be needed
665+
CONFIG_CDCACM_RXBUFSIZE=??? : A large RX may be needed
663666

664667
If you include this CDC/ACM application, then you can connect the CDC/ACM
665668
serial device to the host by entering the command 'sercon' and you detach

Documentation/platforms/arm/samv7/boards/samv71-xult/README.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -967,6 +967,9 @@ serial device class:
967967
CONFIG_CDCACM_NRDREQS=8 : Number of read requests
968968
CONFIG_CDCACM_BULKIN_REQLEN=96 : Size of write request buffer (for full speed)
969969
CONFIG_CDCACM_BULKIN_REQLEN=768 : Size of write request buffer (for high speed)
970+
CONFIG_CDCACM_RXBUFSIZE=257 : Serial read buffer size
971+
CONFIG_CDCACM_TXBUFSIZE=193 : Serial transmit buffer size (for full speed)
972+
CONFIG_CDCACM_TXBUFSIZE=769 : Serial transmit buffer size (for high speed)
970973
CONFIG_CDCACM_VENDORID=0x0525 : Vendor ID
971974
CONFIG_CDCACM_PRODUCTID=0xa4a7 : Product ID
972975
CONFIG_CDCACM_VENDORSTR="NuttX" : Vendor string
@@ -980,7 +983,7 @@ CDC/ACM serial device:
980983

981984
CONFIG_SYSTEM_CDCACM=y : Enable connect/disconnect support
982985
CONFIG_SYSTEM_CDCACM_DEVMINOR=0 : Use device /dev/ttyACM0
983-
CONFIG_CDCACM_NRDREQS=??? : Multiple read requests may be needed
986+
CONFIG_CDCACM_RXBUFSIZE=??? : A large RX may be needed
984987

985988
If you include this CDC/ACM application, then you can connect the CDC/ACM
986989
serial device to the host by entering the command 'sercon' and you detach

Documentation/platforms/arm/stm32l4/boards/stm32l476vg-disco/index.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -488,6 +488,8 @@ NOTES:
488488
CONFIG_CDCACM_NRDREQS=4
489489
CONFIG_CDCACM_NWRREQS=4
490490
CONFIG_CDCACM_BULKIN_REQLEN=96
491+
CONFIG_CDCACM_RXBUFSIZE=257
492+
CONFIG_CDCACM_TXBUFSIZE=193
491493
CONFIG_CDCACM_VENDORID=0x0525
492494
CONFIG_CDCACM_PRODUCTID=0xa4a7
493495
CONFIG_CDCACM_VENDORSTR="NuttX"

Documentation/platforms/arm/stm32l4/boards/stm32l4r9ai-disco/index.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,8 @@ NOTES:
376376
CONFIG_CDCACM_NRDREQS=4
377377
CONFIG_CDCACM_NWRREQS=4
378378
CONFIG_CDCACM_BULKIN_REQLEN=96
379+
CONFIG_CDCACM_RXBUFSIZE=257
380+
CONFIG_CDCACM_TXBUFSIZE=193
379381
CONFIG_CDCACM_VENDORID=0x0525
380382
CONFIG_CDCACM_PRODUCTID=0xa4a7
381383
CONFIG_CDCACM_VENDORSTR="NuttX"

boards/arm/imxrt/imxrt1170-evk/configs/netnsh/defconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ CONFIG_CDCACM=y
3030
CONFIG_CDCACM_BULKIN_REQLEN=96
3131
CONFIG_CDCACM_PRODUCTID=0x001d
3232
CONFIG_CDCACM_PRODUCTSTR="PX4 FMURT1062 v1.x"
33+
CONFIG_CDCACM_RXBUFSIZE=600
34+
CONFIG_CDCACM_TXBUFSIZE=12000
3335
CONFIG_CDCACM_VENDORID=0x1FC9
3436
CONFIG_CDCACM_VENDORSTR="NXP SEMICONDUCTORS"
3537
CONFIG_DEBUG_ASSERTIONS=y

boards/arm/lpc214x/mcu123-lpc214x/configs/composite/defconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ CONFIG_BOARDCTL=y
2020
CONFIG_BOARD_LOOPSPERMSEC=3270
2121
CONFIG_CDCACM=y
2222
CONFIG_CDCACM_COMPOSITE=y
23+
CONFIG_CDCACM_RXBUFSIZE=256
24+
CONFIG_CDCACM_TXBUFSIZE=256
2325
CONFIG_COMPOSITE_CONFIGSTR="system/composite"
2426
CONFIG_COMPOSITE_IAD=y
2527
CONFIG_COMPOSITE_PRODUCTID=0x2022

boards/arm/lpc43xx/lpc4337-ws/configs/nsh/defconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ CONFIG_CDCACM_BULKIN_REQLEN=96
2525
CONFIG_CDCACM_EPBULKOUT=2
2626
CONFIG_CDCACM_PRODUCTID=0x2044
2727
CONFIG_CDCACM_PRODUCTSTR="lpc4337-ws"
28+
CONFIG_CDCACM_RXBUFSIZE=512
29+
CONFIG_CDCACM_TXBUFSIZE=2048
2830
CONFIG_CDCACM_VENDORID=0x03EB
2931
CONFIG_CDCACM_VENDORSTR="nuttx"
3032
CONFIG_FAT_LCNAMES=y

0 commit comments

Comments
 (0)