diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-01-27 21:03:20 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-01-27 21:03:20 +0000 |
| commit | a5849bb91060284dc6a7c3cd536ff2210662020e (patch) | |
| tree | d7ad01379d373d9e56fab0aba06f7ee976fe0491 /nuttx/configs | |
| parent | fce09ccb2453443e0083fa9a230d67727d139d8b (diff) | |
| download | px4-nuttx-a5849bb91060284dc6a7c3cd536ff2210662020e.tar.gz px4-nuttx-a5849bb91060284dc6a7c3cd536ff2210662020e.tar.bz2 px4-nuttx-a5849bb91060284dc6a7c3cd536ff2210662020e.zip | |
Most USB Composite device debug
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4344 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs')
| -rw-r--r-- | nuttx/configs/README.txt | 15 | ||||
| -rwxr-xr-x | nuttx/configs/stm3210e-eval/composite/defconfig | 15 |
2 files changed, 29 insertions, 1 deletions
diff --git a/nuttx/configs/README.txt b/nuttx/configs/README.txt index f53cb2a82..8154c22c2 100644 --- a/nuttx/configs/README.txt +++ b/nuttx/configs/README.txt @@ -1010,6 +1010,13 @@ defconfig -- This is a configuration file similar to the Linux be defined to offset the CDC/ACM interface numbers so that they are unique and contiguous. When used with the Mass Storage driver, the correct value for this offset is zero. + CONFIG_CDCACM_STRBASE + 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 four (this value actuallly only needs + to be defined if names are provided for the Notification interface, + CONFIG_CDCACM_NOTIFSTR, or the data interface, CONFIG_CDCACM_DATAIFSTR). CONFIG_CDCACM_EP0MAXPACKET Endpoint 0 max packet size. Default 64. CONFIG_CDCACM_EPINTIN @@ -1067,7 +1074,13 @@ defconfig -- This is a configuration file similar to the Linux be defined to offset the mass storage interface number so that it is unique and contiguous. When used with the CDC/ACM driver, the correct value for this offset is two (because of the two CDC/ACM - interfaces that will precede it). + interfaces that will precede it). + CONFIG_USBMSC_STRBASE + If the CDC driver is part of a composite device, then this may need to + be defined to offset the mass storage string numbers so that they are + unique and contiguous. When used with the CDC/ACM driver, the + correct value for this offset is four (or perhaps 5 or 6, depending + on if CONFIG_CDCACM_NOTIFSTR or CONFIG_CDCACM_DATAIFSTR are defined). CONFIG_USBMSC_EP0MAXPACKET Max packet size for endpoint 0 CONFIG_USBMSCEPBULKOUT and CONFIG_USBMSC_EPBULKIN diff --git a/nuttx/configs/stm3210e-eval/composite/defconfig b/nuttx/configs/stm3210e-eval/composite/defconfig index 46fa44814..7fb3b3ae8 100755 --- a/nuttx/configs/stm3210e-eval/composite/defconfig +++ b/nuttx/configs/stm3210e-eval/composite/defconfig @@ -719,6 +719,12 @@ CONFIG_PL2303_TXBUFSIZE=512 # unique and contiguous. When used with the CDC/ACM driver, the # correct value for this offset is two (because of the two CDC/ACM # interfaces that will precede it). +# CONFIG_USBMSC_STRBASE +# If the CDC driver is part of a composite device, then this may need to +# be defined to offset the mass storage string numbers so that they are +# unique and contiguous. When used with the CDC/ACM driver, the +# correct value for this offset is four (or perhaps 5 or 6, depending +# on if CONFIG_CDCACM_NOTIFSTR or CONFIG_CDCACM_DATAIFSTR are defined). # CONFIG_USBMSC_EP0MAXPACKET # Max packet size for endpoint 0 # CONFIG_USBMSC_EPBULKOUT and CONFIG_USBMSC_EPBULKIN @@ -740,6 +746,7 @@ CONFIG_PL2303_TXBUFSIZE=512 CONFIG_USBMSC=y CONFIG_USBMSC_COMPOSITE=y CONFIG_USBMSC_IFNOBASE=2 +CONFIG_USBMSC_STRBASE=4 CONFIG_USBMSC_EP0MAXPACKET=64 CONFIG_USBMSC_EPBULKOUT=4 CONFIG_USBMSC_EPBULKIN=5 @@ -767,6 +774,13 @@ CONFIG_USBMSC_REMOVABLE=y # be defined to offset the CDC/ACM interface numbers so that they are # unique and contiguous. When used with the Mass Storage driver, the # correct value for this offset is zero. +# CONFIG_CDCACM_STRBASE +# 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 four (this value actuallly only needs +# to be defined if names are provided for the Notification interface, +# CONFIG_CDCACM_NOTIFSTR, or the data interface, CONFIG_CDCACM_DATAIFSTR). # CONFIG_CDCACM_EP0MAXPACKET # Endpoint 0 max packet size. Default 64 # CONFIG_CDCACM_EPINTIN @@ -814,6 +828,7 @@ CONFIG_USBMSC_REMOVABLE=y CONFIG_CDCACM=y CONFIG_CDCACM_COMPOSITE=y CONFIG_CDCACM_IFNOBASE=0 +CONFIG_CDCACM_STRBASE=4 #CONFIG_CDCACM_EP0MAXPACKET CONFIG_CDCACM_EPINTIN=1 #CONFIG_CDCACM_EPINTIN_FSSIZE |