STM32 GPIO fix; Fixes for PIC32 USB term example

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4241 42af7a65-404d-4744-a932-0658087f49c3

1 files changed, 112 insertions, 0 deletions

diff --git a/nuttx/configs/sure-pic32mx/nsh/defconfig b/nuttx/configs/sure-pic32mx/nsh/defconfig
index 70d4017cf..3f2d9edcb 100644
--- a/nuttx/configs/sure-pic32mx/nsh/defconfig
+++ b/nuttx/configs/sure-pic32mx/nsh/defconfig
@@ -324,10 +324,14 @@ CONFIG_HAVE_LIBM=n
 # CONFIG_SCHED_ATEXIT - Enabled the atexit() API
 #
 #CONFIG_APPS_DIR=
+
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
 CONFIG_DEBUG_SCHED=n
+CONFIG_DEBUG_USB=n
+CONFIG_PIC32MX_USBDEV_REGDEBUG=n
+
 CONFIG_HAVE_CXX=n
 CONFIG_MM_REGIONS=1
 CONFIG_ARCH_LOWPUTC=y
@@ -687,6 +691,75 @@ CONFIG_USBSER_RXBUFSIZE=512
 CONFIG_USBSER_TXBUFSIZE=512
 
 #
+# USB serial device class driver (Standard CDC ACM class)
+#
+# CONFIG_CDCSER
+#   Enable compilation of the USB serial driver
+# CONFIG_CDCSER_EP0MAXPACKET
+#   Endpoint 0 max packet size. Default 64
+# CONFIG_CDCSER_EPINTIN
+#   The logical 7-bit address of a hardware endpoint that supports
+#   interrupt IN operation.  Default 2.
+# CONFIG_CDCSER_EPINTIN_FSSIZE
+#   Max package size for the interrupt IN endpoint if full speed mode.
+#   Default 64.
+# CONFIG_CDCSER_EPINTIN_HSSIZE
+#   Max package size for the interrupt IN endpoint if high speed mode.
+#   Default 64
+# CONFIG_CDCSER_EPBULKOUT
+#   The logical 7-bit address of a hardware endpoint that supports
+#   bulk OUT operation
+# CONFIG_CDCSER_EPBULKOUT_FSSIZE
+#   Max package size for the bulk OUT endpoint if full speed mode.
+#   Default 64.
+# CONFIG_CDCSER_EPBULKOUT_HSSIZE
+#   Max package size for the bulk OUT  endpoint if high speed mode.
+#   Default 512.
+# CONFIG_CDCSER_EPBULKIN
+#   The logical 7-bit address of a hardware endpoint that supports
+#   bulk IN operation
+# CONFIG_CDCSER_EPBULKIN_FSSIZE
+#   Max package size for the bulk IN endpoint if full speed mode.
+#   Default 64.
+# CONFIG_CDCSER_EPBULKIN_HSSIZE
+#   Max package size for the bulk IN  endpoint if high speed mode.
+#   Default 512.
+# CONFIG_CDCSER_NWRREQS and CONFIG_CDCSER_NRDREQS
+#   The number of write/read requests that can be in flight.
+#   Default 256.
+# CONFIG_CDCSER_VENDORID and CONFIG_CDCSER_VENDORSTR
+#   The vendor ID code/string.  Default 0x0525 and "NuttX"
+#   0x0525 is the Netchip vendor and should not be used in any
+#   products.  This default VID was selected for compatibility with
+#   the Linux CDC ACM default VID.
+# CONFIG_CDCSER_PRODUCTID and CONFIG_CDCSER_PRODUCTSTR
+#   The product ID code/string. Default 0xara7 and "CDC/ACM Serial"
+#   0xa4a7 was selected for compatibility with the Linux CDC ACM
+#   default PID.
+# CONFIG_CDCSER_RXBUFSIZE and CONFIG_CDCSER_TXBUFSIZE
+#   Size of the serial receive/transmit buffers. Default 256.
+#
+CONFIG_CDCSER=n
+#CONFIG_CDCSER_EP0MAXPACKET
+#CONFIG_CDCSER_EPINTIN
+#CONFIG_CDCSER_EPINTIN_FSSIZE
+#CONFIG_CDCSER_EPINTIN_HSSIZE
+#CONFIG_CDCSER_EPBULKOUT
+#CONFIG_CDCSER_EPBULKOUT_FSSIZE
+#CONFIG_CDCSER_EPBULKOUT_HSSIZE
+#CONFIG_CDCSER_EPBULKIN
+#CONFIG_CDCSER_EPBULKIN_FSSIZE
+#CONFIG_CDCSER_EPBULKIN_HSSIZE
+#CONFIG_CDCSER_NWRREQS
+#CONFIG_CDCSER_NRDREQS
+#CONFIG_CDCSER_VENDORID
+#CONFIG_CDCSER_VENDORSTR
+#CONFIG_CDCSER_PRODUCTID
+#CONFIG_CDCSER_PRODUCTSTR
+#CONFIG_CDCSER_RXBUFSIZE
+#CONFIG_CDCSER_TXBUFSIZE
+
+#
 # USB Storage Device Configuration
 #
 # CONFIG_USBSTRG
@@ -902,6 +975,45 @@ CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n
 
 #
+# Settings for examples/usbterm
+#
+# CONFIG_EXAMPLES_USBTERM_BUILTIN - Build the usbterm example as an NSH
+#   built-in command.  NOTE:  This is not fully functional as of this
+#   writing.. It should work, but there is no mechanism in place yet
+#   to exit the USB terminal program and return to NSH.
+# CONFIG_EXAMPLES_USBTERM_DEVINIT - If defined, then the example will
+#   call a user provided function as part of its initialization:
+#      int usbterm_devinit(void);
+#   And another user provided function at termination:
+#      void usbterm_devuninit(void);
+# CONFIG_EXAMPLES_USBTERM_BUFLEN - The size of the input and output
+#   buffers used for receiving data. Default 256 bytes.
+#
+# If CONFIG_USBDEV_TRACE is enabled (or CONFIG_DEBUG and CONFIG_DEBUG_USB, or
+# CONFIG_USBDEV_TRACE), then the example code will also manage the USB trace
+# output.  The amount of trace output can be controlled using:
+#
+# CONFIG_EXAMPLES_USBTERM_TRACEINIT
+#   Show initialization events
+# CONFIG_EXAMPLES_USBTERM_TRACECLASS
+#   Show class driver events
+# CONFIG_EXAMPLES_USBTERM_TRACETRANSFERS
+#   Show data transfer events
+# CONFIG_EXAMPLES_USBTERM_TRACECONTROLLER
+#   Show controller events
+# CONFIG_EXAMPLES_USBTERM_TRACEINTERRUPTS
+#   Show interrupt-related events.
+#
+CONFIG_EXAMPLES_USBTERM_BUILTIN=y
+CONFIG_EXAMPLES_USBTERM_DEVINIT=y
+#CONFIG_EXAMPLES_USBTERM_BUFLEN
+CONFIG_EXAMPLES_USBTERM_TRACEINIT=n
+CONFIG_EXAMPLES_USBTERM_TRACECLASS=n
+CONFIG_EXAMPLES_USBTERM_TRACETRANSFERS=n
+CONFIG_EXAMPLES_USBTERM_TRACECONTROLLER=n
+CONFIG_EXAMPLES_USBTERM_TRACEINTERRUPTS=n
+
+#
 # Stack and heap information
 #
 # CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP