Back part of a previous CDC/ACM change. Improve some Kconfig comments.

This commit is contained in:
Gregory Nutt 2016-03-19 12:45:33 -06:00
parent deed28b8f2
commit 75a4a5dcbe
2 changed files with 12 additions and 4 deletions

View File

@ -334,15 +334,19 @@ config CDCACM_IFNOBASE
config CDCACM_STRBASE
int "Offset the CDC/ACM string numbers"
default 0
default 4
---help---
If the CDC driver is part of a composite device, then this may need to
be defined to offset the CDC/ACM string numbers so that they are
unique and contiguous. When used with the Mass Storage driver, the
correct value for this offset is zero (this value actuallly only needs
correct value for this offset is four (this value actuallly only needs
to be defined if names are provided for the Notification interface,
config CDCACM_NOTIFSTR, or the data interface, CDCACM_DATAIFSTR).
The default of four accounts for strings IDs 0-3 used by the composite
descriptors. Any additional CDC/ACM string descripts must then begin
with string index four.
endif
config CDCACM_EP0MAXPACKET
@ -538,7 +542,7 @@ config USBMSC_IFNOBASE
config USBMSC_STRBASE
int "Offset the mass storage string numbers"
default 2
default 4
depends on USBMSC_COMPOSITE
---help---
If the CDC driver is part of a composite device, then this may need to
@ -547,6 +551,10 @@ config USBMSC_STRBASE
correct value for this offset is four (or perhaps 5 or 6, depending
on if CDCACM_NOTIFSTR or CDCACM_DATAIFSTR are defined).
String IDS 0-3 are used by the composite descriptors. This amount
may need to be incremented to account for string IDs used by other
members of the composite.
config USBMSC_EP0MAXPACKET
int "Max packet size for endpoint 0"
default 64

View File

@ -61,7 +61,7 @@
#endif
#if defined(CONFIG_CDCACM_COMPOSITE) && !defined(CONFIG_CDCACM_STRBASE)
# define CONFIG_CDCACM_STRBASE (0)
# define CONFIG_CDCACM_STRBASE (4)
#endif
#if defined(CONFIG_CDCACM_COMPOSITE) && !defined(CONFIG_COMPOSITE_IAD)