diff options
author | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-04-11 14:47:25 +0000 |
---|---|---|
committer | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-04-11 14:47:25 +0000 |
commit | d334d4d0153973bab43e156f8c5326c5084bdd6f (patch) | |
tree | 8da66a1ba7b7179a1a22907c7c434b903a5f85b6 | |
parent | 95c7a42c261171c4a867d4d59ec440fa88696d8f (diff) | |
download | px4-firmware-d334d4d0153973bab43e156f8c5326c5084bdd6f.tar.gz px4-firmware-d334d4d0153973bab43e156f8c5326c5084bdd6f.tar.bz2 px4-firmware-d334d4d0153973bab43e156f8c5326c5084bdd6f.zip |
Fix CDC/ACM alternate interface number (from Antti)
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4589 7fd9a85b-ad96-42d3-883c-3090e2eb8679
-rw-r--r-- | nuttx/Kconfig | 97 | ||||
-rwxr-xr-x | nuttx/configs/hymini-stm32v/usbserial/defconfig | 2 | ||||
-rw-r--r-- | nuttx/configs/mcu123-lpc214x/composite/defconfig | 2 | ||||
-rw-r--r-- | nuttx/configs/pic32-starterkit/nsh/defconfig | 2 | ||||
-rw-r--r-- | nuttx/configs/pic32-starterkit/nsh2/defconfig | 2 | ||||
-rw-r--r-- | nuttx/configs/pic32-starterkit/ostest/defconfig | 2 | ||||
-rwxr-xr-x | nuttx/configs/stm3210e-eval/composite/defconfig | 2 | ||||
-rw-r--r-- | nuttx/configs/stm3210e-eval/nsh2/defconfig | 2 | ||||
-rwxr-xr-x | nuttx/configs/stm3210e-eval/usbserial/defconfig | 2 | ||||
-rwxr-xr-x | nuttx/configs/stm32f4discovery/nsh/defconfig | 2 | ||||
-rwxr-xr-x | nuttx/configs/stm32f4discovery/ostest/defconfig | 2 | ||||
-rw-r--r-- | nuttx/configs/sure-pic32mx/nsh/defconfig | 2 | ||||
-rw-r--r-- | nuttx/configs/sure-pic32mx/usbnsh/defconfig | 2 | ||||
-rw-r--r-- | nuttx/drivers/usbdev/cdcacm.h | 4 | ||||
-rw-r--r-- | nuttx/mm/Kconfig | 22 |
15 files changed, 98 insertions, 49 deletions
diff --git a/nuttx/Kconfig b/nuttx/Kconfig index 84ef912fb..ccb8e994f 100644 --- a/nuttx/Kconfig +++ b/nuttx/Kconfig @@ -18,100 +18,123 @@ comment "General build options" config RRLOAD_BINARY bool "rrload binary format" default n + ---help--- + Create nuttx.rr in the rrload binary format used with + BSPs from www.ridgerun.com using the tools/mkimage.sh script. + config INTELHEX_BINARY bool "Intel HEX binary format" default n + ---help--- + Create the nuttx.hex in the Intel HEX binary format that is + used with many different loaders. This option will use the GNU objcopy program + and should not be selected if you are not using the GNU toolchain. + config MOTOROLA_SREC bool "Motorola S-Record binary format" default n + ---help--- + Create the nuttx.srec in the Motorola S-Record binary format that is + used with many different loaders. This option will use the GNU objcopy program + and should not be selected if you are not using the GNU toolchain. + config RAW_BINARY - bool "raw binary format" + bool "Raw binary format" default n + ---help--- + Create the nuttx.bin in the raw binary format that is used with many + different loaders using the GNU objcopy program. This option + should not be selected if you are not using the GNU toolchain. comment "General debug options" config DEBUG - bool "enable debug" + bool "Enable debug output" default n ---help--- enables built-in debug options if DEBUG config DEBUG_VERBOSE - bool "enable debug verbose" + bool "Enable debug verbose output" default n ---help--- enables verbose debug output config DEBUG_ENABLE - bool "enable debug interface" + bool "Enable debug controls" default n ---help--- Support an interface to enable or disable debug output. -config DEBUG_SYMBOLS - bool "enable debug symbols" - default n - ---help--- - build without optimization and with - debug symbols (needed for use with a debugger). - config DEBUG_SCHED - bool "enable debug sched" + bool "Enable scheduler debug output" default n ---help--- - enable OS debug output (disabled by - default) + Enable OS debug output (disabled by default) config DEBUG_MM - bool "enable debug mm" + bool "Enable memory manager debug output" default n ---help--- - enable memory management debug output - (disabled by default) + Enable memory management debug output (disabled by default) config DEBUG_NET - bool "enable debug net" + bool "Enable network debug output" default n ---help--- - enable network debug output (disabled - by default) + Enable network debug output (disabled by default) config DEBUG_USB - bool "enable debug usb" + bool "Enable USB debug output" default n ---help--- - enable usb debug output (disabled by - default) + Enable usb debug output (disabled by default) config DEBUG_FS - bool "enable debug fs" + bool "Enable file system debug output" default n ---help--- - enable filesystem debug output (disabled - by default) + Enable file system debug output (disabled by default) config DEBUG_LIB - bool "enable debug lib" + bool "Enable C library debug output" default n ---help--- - enable C library debug output (disabled - by default) + Enable C library debug output (disabled by default) config DEBUG_BINFMT - bool "enable debug binfmt" + bool "Enable binary loader debug output" default n ---help--- - enable binary loader debug output (disabled - by default) + Enable binary loader debug output (disabled by default) config DEBUG_GRAPHICS - bool "enable debug graphics" + bool "Enable graphics debug output" + default n + ---help--- + Enable NX graphics debug output (disabled by default) + +config DEBUG_I2C + bool "Enable I2C debug output" + default n + ---help--- + Enable I2C driver debug output (disabled by default) + +config DEBUG_SPI + bool "Enable SPI debug output" default n ---help--- - enable NX graphics debug output - (disabled by default) + Enable I2C driver debug output (disabled by default) + endif + +config DEBUG_SYMBOLS + bool "Enable debug symbols" + default n + ---help--- + Build without optimization and with debug symbols (needed + for use with a debugger). endmenu menu "System Type" @@ -137,6 +160,10 @@ menu "File systems" source fs/Kconfig endmenu +menu "Memory management" +source mm/Kconfig +endmenu + menu "Library routines" source lib/Kconfig source libxx/Kconfig diff --git a/nuttx/configs/hymini-stm32v/usbserial/defconfig b/nuttx/configs/hymini-stm32v/usbserial/defconfig index c3070e925..472b66331 100755 --- a/nuttx/configs/hymini-stm32v/usbserial/defconfig +++ b/nuttx/configs/hymini-stm32v/usbserial/defconfig @@ -712,7 +712,7 @@ CONFIG_PL2303_TXBUFSIZE=512 # products. This default VID was selected for compatibility with # the Linux CDC ACM default VID. # CONFIG_CDCACM_PRODUCTID and CONFIG_CDCACM_PRODUCTSTR -# The product ID code/string. Default 0xara7 and "CDC/ACM Serial" +# The product ID code/string. Default 0xa4a7 and "CDC/ACM Serial" # 0xa4a7 was selected for compatibility with the Linux CDC ACM # default PID. # CONFIG_CDCACM_RXBUFSIZE and CONFIG_CDCACM_TXBUFSIZE diff --git a/nuttx/configs/mcu123-lpc214x/composite/defconfig b/nuttx/configs/mcu123-lpc214x/composite/defconfig index f8efcb263..993a2e1e8 100644 --- a/nuttx/configs/mcu123-lpc214x/composite/defconfig +++ b/nuttx/configs/mcu123-lpc214x/composite/defconfig @@ -647,7 +647,7 @@ CONFIG_USBMSC_REMOVABLE=y # products. This default VID was selected for compatibility with # the Linux CDC ACM default VID. # CONFIG_CDCACM_PRODUCTID and CONFIG_CDCACM_PRODUCTSTR -# The product ID code/string. Default 0xara7 and "CDC/ACM Serial" +# The product ID code/string. Default 0xa4a7 and "CDC/ACM Serial" # 0xa4a7 was selected for compatibility with the Linux CDC ACM # default PID. # CONFIG_CDCACM_RXBUFSIZE and CONFIG_CDCACM_TXBUFSIZE diff --git a/nuttx/configs/pic32-starterkit/nsh/defconfig b/nuttx/configs/pic32-starterkit/nsh/defconfig index 0abaae58b..94a90cf75 100644 --- a/nuttx/configs/pic32-starterkit/nsh/defconfig +++ b/nuttx/configs/pic32-starterkit/nsh/defconfig @@ -931,7 +931,7 @@ CONFIG_PL2303_TXBUFSIZE=512 # products. This default VID was selected for compatibility with # the Linux CDC ACM default VID. # CONFIG_CDCACM_PRODUCTID and CONFIG_CDCACM_PRODUCTSTR -# The product ID code/string. Default 0xara7 and "CDC/ACM Serial" +# The product ID code/string. Default 0xa4a7 and "CDC/ACM Serial" # 0xa4a7 was selected for compatibility with the Linux CDC ACM # default PID. # CONFIG_CDCACM_RXBUFSIZE and CONFIG_CDCACM_TXBUFSIZE diff --git a/nuttx/configs/pic32-starterkit/nsh2/defconfig b/nuttx/configs/pic32-starterkit/nsh2/defconfig index e4f4e4eb2..8ee06e836 100644 --- a/nuttx/configs/pic32-starterkit/nsh2/defconfig +++ b/nuttx/configs/pic32-starterkit/nsh2/defconfig @@ -931,7 +931,7 @@ CONFIG_PL2303_TXBUFSIZE=512 # products. This default VID was selected for compatibility with # the Linux CDC ACM default VID. # CONFIG_CDCACM_PRODUCTID and CONFIG_CDCACM_PRODUCTSTR -# The product ID code/string. Default 0xara7 and "CDC/ACM Serial" +# The product ID code/string. Default 0xa4a7 and "CDC/ACM Serial" # 0xa4a7 was selected for compatibility with the Linux CDC ACM # default PID. # CONFIG_CDCACM_RXBUFSIZE and CONFIG_CDCACM_TXBUFSIZE diff --git a/nuttx/configs/pic32-starterkit/ostest/defconfig b/nuttx/configs/pic32-starterkit/ostest/defconfig index d4ac9cd8a..47706ae38 100644 --- a/nuttx/configs/pic32-starterkit/ostest/defconfig +++ b/nuttx/configs/pic32-starterkit/ostest/defconfig @@ -933,7 +933,7 @@ CONFIG_PL2303_TXBUFSIZE=512 # products. This default VID was selected for compatibility with # the Linux CDC ACM default VID. # CONFIG_CDCACM_PRODUCTID and CONFIG_CDCACM_PRODUCTSTR -# The product ID code/string. Default 0xara7 and "CDC/ACM Serial" +# The product ID code/string. Default 0xa4a7 and "CDC/ACM Serial" # 0xa4a7 was selected for compatibility with the Linux CDC ACM # default PID. # CONFIG_CDCACM_RXBUFSIZE and CONFIG_CDCACM_TXBUFSIZE diff --git a/nuttx/configs/stm3210e-eval/composite/defconfig b/nuttx/configs/stm3210e-eval/composite/defconfig index 39e79d087..88839cc3d 100755 --- a/nuttx/configs/stm3210e-eval/composite/defconfig +++ b/nuttx/configs/stm3210e-eval/composite/defconfig @@ -823,7 +823,7 @@ CONFIG_USBMSC_REMOVABLE=y # products. This default VID was selected for compatibility with # the Linux CDC ACM default VID. # CONFIG_CDCACM_PRODUCTID and CONFIG_CDCACM_PRODUCTSTR -# The product ID code/string. Default 0xara7 and "CDC/ACM Serial" +# The product ID code/string. Default 0xa4a7 and "CDC/ACM Serial" # 0xa4a7 was selected for compatibility with the Linux CDC ACM # default PID. # CONFIG_CDCACM_RXBUFSIZE and CONFIG_CDCACM_TXBUFSIZE diff --git a/nuttx/configs/stm3210e-eval/nsh2/defconfig b/nuttx/configs/stm3210e-eval/nsh2/defconfig index 9fbbcce88..b0f725619 100644 --- a/nuttx/configs/stm3210e-eval/nsh2/defconfig +++ b/nuttx/configs/stm3210e-eval/nsh2/defconfig @@ -838,7 +838,7 @@ CONFIG_PL2303_TXBUFSIZE=512 # products. This default VID was selected for compatibility with # the Linux CDC ACM default VID. # CONFIG_CDCACM_PRODUCTID and CONFIG_CDCACM_PRODUCTSTR -# The product ID code/string. Default 0xara7 and "CDC/ACM Serial" +# The product ID code/string. Default 0xa4a7 and "CDC/ACM Serial" # 0xa4a7 was selected for compatibility with the Linux CDC ACM # default PID. # CONFIG_CDCACM_RXBUFSIZE and CONFIG_CDCACM_TXBUFSIZE diff --git a/nuttx/configs/stm3210e-eval/usbserial/defconfig b/nuttx/configs/stm3210e-eval/usbserial/defconfig index 65aee85d8..c8cdb68da 100755 --- a/nuttx/configs/stm3210e-eval/usbserial/defconfig +++ b/nuttx/configs/stm3210e-eval/usbserial/defconfig @@ -746,7 +746,7 @@ CONFIG_PL2303_TXBUFSIZE=512 # products. This default VID was selected for compatibility with # the Linux CDC ACM default VID. # CONFIG_CDCACM_PRODUCTID and CONFIG_CDCACM_PRODUCTSTR -# The product ID code/string. Default 0xara7 and "CDC/ACM Serial" +# The product ID code/string. Default 0xa4a7 and "CDC/ACM Serial" # 0xa4a7 was selected for compatibility with the Linux CDC ACM # default PID. # CONFIG_CDCACM_RXBUFSIZE and CONFIG_CDCACM_TXBUFSIZE diff --git a/nuttx/configs/stm32f4discovery/nsh/defconfig b/nuttx/configs/stm32f4discovery/nsh/defconfig index f91748ff9..3b7baba84 100755 --- a/nuttx/configs/stm32f4discovery/nsh/defconfig +++ b/nuttx/configs/stm32f4discovery/nsh/defconfig @@ -945,7 +945,7 @@ CONFIG_PL2303_TXBUFSIZE=512 # products. This default VID was selected for compatibility with # the Linux CDC ACM default VID. # CONFIG_CDCACM_PRODUCTID and CONFIG_CDCACM_PRODUCTSTR -# The product ID code/string. Default 0xara7 and "CDC/ACM Serial" +# The product ID code/string. Default 0xa4a7 and "CDC/ACM Serial" # 0xa4a7 was selected for compatibility with the Linux CDC ACM # default PID. # CONFIG_CDCACM_RXBUFSIZE and CONFIG_CDCACM_TXBUFSIZE diff --git a/nuttx/configs/stm32f4discovery/ostest/defconfig b/nuttx/configs/stm32f4discovery/ostest/defconfig index dd67ea920..a83c38cc7 100755 --- a/nuttx/configs/stm32f4discovery/ostest/defconfig +++ b/nuttx/configs/stm32f4discovery/ostest/defconfig @@ -897,7 +897,7 @@ CONFIG_PL2303_TXBUFSIZE=512 # products. This default VID was selected for compatibility with # the Linux CDC ACM default VID. # CONFIG_CDCACM_PRODUCTID and CONFIG_CDCACM_PRODUCTSTR -# The product ID code/string. Default 0xara7 and "CDC/ACM Serial" +# The product ID code/string. Default 0xa4a7 and "CDC/ACM Serial" # 0xa4a7 was selected for compatibility with the Linux CDC ACM # default PID. # CONFIG_CDCACM_RXBUFSIZE and CONFIG_CDCACM_TXBUFSIZE diff --git a/nuttx/configs/sure-pic32mx/nsh/defconfig b/nuttx/configs/sure-pic32mx/nsh/defconfig index 209dac322..21c22544a 100644 --- a/nuttx/configs/sure-pic32mx/nsh/defconfig +++ b/nuttx/configs/sure-pic32mx/nsh/defconfig @@ -762,7 +762,7 @@ CONFIG_PL2303_TXBUFSIZE=512 # products. This default VID was selected for compatibility with # the Linux CDC ACM default VID. # CONFIG_CDCACM_PRODUCTID and CONFIG_CDCACM_PRODUCTSTR -# The product ID code/string. Default 0xara7 and "CDC/ACM Serial" +# The product ID code/string. Default 0xa4a7 and "CDC/ACM Serial" # 0xa4a7 was selected for compatibility with the Linux CDC ACM # default PID. # CONFIG_CDCACM_RXBUFSIZE and CONFIG_CDCACM_TXBUFSIZE diff --git a/nuttx/configs/sure-pic32mx/usbnsh/defconfig b/nuttx/configs/sure-pic32mx/usbnsh/defconfig index 07c4a199e..4a2d9ea68 100644 --- a/nuttx/configs/sure-pic32mx/usbnsh/defconfig +++ b/nuttx/configs/sure-pic32mx/usbnsh/defconfig @@ -760,7 +760,7 @@ CONFIG_PL2303_TXBUFSIZE=512 # products. This default VID was selected for compatibility with # the Linux CDC ACM default VID. # CONFIG_CDCACM_PRODUCTID and CONFIG_CDCACM_PRODUCTSTR -# The product ID code/string. Default 0xara7 and "CDC/ACM Serial" +# The product ID code/string. Default 0xa4a7 and "CDC/ACM Serial" # 0xa4a7 was selected for compatibility with the Linux CDC ACM # default PID. # CONFIG_CDCACM_RXBUFSIZE and CONFIG_CDCACM_TXBUFSIZE diff --git a/nuttx/drivers/usbdev/cdcacm.h b/nuttx/drivers/usbdev/cdcacm.h index 16f691259..8b06ca9f3 100644 --- a/nuttx/drivers/usbdev/cdcacm.h +++ b/nuttx/drivers/usbdev/cdcacm.h @@ -106,9 +106,9 @@ #define CDCACM_NINTERFACES (2) /* Number of interfaces in the configuration */ #define CDCACM_NOTIFID (CONFIG_CDCACM_IFNOBASE+0) -#define CDCACM_NOTALTIFID CDCACM_NOTIFID +#define CDCACM_NOTALTIFID (0) #define CDCACM_DATAIFID (CONFIG_CDCACM_IFNOBASE+1) -#define CDCACM_DATAALTIFID CDCACM_DATAIFID +#define CDCACM_DATAALTIFID (0) /* Configuration descriptor values */ diff --git a/nuttx/mm/Kconfig b/nuttx/mm/Kconfig index ae2bf3130..000217dc5 100644 --- a/nuttx/mm/Kconfig +++ b/nuttx/mm/Kconfig @@ -2,3 +2,25 @@ # For a description of the syntax of this configuration file, # see misc/tools/kconfig-language.txt. # + +config MM_REGIONS + int "Number of memory regions" + default 1 + ---help--- + If the architecture includes multiple, non-contiguous regions of + memory to allocate from, this specifies the number of memory regions + that the memory manager must handle and enables the API + mm_addregion(start, end); + +config MM_SMALL + bool "Small memory model" + default n + ---help--- + Each memory allocation has a small allocation overhead. The size + of that overhead is normally determined by the "width" of the + address support by the MCU. MCUs that support 16-bit addressability + have smaller overhead than devices that support 32-bit addressability. + However, there are many MCUs that support 32-bit addressability *but* + have internal SRAM of size less than or equal to 64Kb. In this case, + CONFIG_MM_SMALL can be defined so that those MCUs will also benefit + from the smaller, 16-bit-based allocation overhead. |