Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
NuttX RTOS
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
f4grx
NuttX RTOS
Commits
75a4a5dc
Commit
75a4a5dc
authored
9 years ago
by
Gregory Nutt
Browse files
Options
Downloads
Patches
Plain Diff
Back part of a previous CDC/ACM change. Improve some Kconfig comments.
parent
deed28b8
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
drivers/usbdev/Kconfig
+11
-3
11 additions, 3 deletions
drivers/usbdev/Kconfig
drivers/usbdev/cdcacm.h
+1
-1
1 addition, 1 deletion
drivers/usbdev/cdcacm.h
with
12 additions
and
4 deletions
drivers/usbdev/Kconfig
+
11
−
3
View file @
75a4a5dc
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
drivers/usbdev/cdcacm.h
+
1
−
1
View file @
75a4a5dc
...
...
@@ -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)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment