diff options
Diffstat (limited to 'nuttx/configs/mcu123-lpc214x')
-rw-r--r-- | nuttx/configs/mcu123-lpc214x/nsh/defconfig | 44 | ||||
-rw-r--r-- | nuttx/configs/mcu123-lpc214x/ostest/defconfig | 44 | ||||
-rw-r--r-- | nuttx/configs/mcu123-lpc214x/src/Makefile | 4 | ||||
-rwxr-xr-x | nuttx/configs/mcu123-lpc214x/src/up_usbmsc.c (renamed from nuttx/configs/mcu123-lpc214x/src/up_usbstrg.c) | 24 | ||||
-rw-r--r-- | nuttx/configs/mcu123-lpc214x/usbserial/defconfig | 44 | ||||
-rw-r--r-- | nuttx/configs/mcu123-lpc214x/usbstorage/defconfig | 76 |
6 files changed, 118 insertions, 118 deletions
diff --git a/nuttx/configs/mcu123-lpc214x/nsh/defconfig b/nuttx/configs/mcu123-lpc214x/nsh/defconfig index 872f8df0a..cfe99367c 100644 --- a/nuttx/configs/mcu123-lpc214x/nsh/defconfig +++ b/nuttx/configs/mcu123-lpc214x/nsh/defconfig @@ -500,39 +500,39 @@ CONFIG_USBSER_TXBUFSIZE=512 # # USB Storage Device Configuration # -# CONFIG_USBSTRG +# CONFIG_USBMSC # Enable compilation of the USB storage driver -# CONFIG_USBSTRG_EP0MAXPACKET +# CONFIG_USBMSC_EP0MAXPACKET # Max packet size for endpoint 0 -# CONFIG_USBSTRG_EPBULKOUT and CONFIG_USBSTRG_EPBULKIN +# CONFIG_USBMSC_EPBULKOUT and CONFIG_USBMSC_EPBULKIN # The logical 7-bit address of a hardware endpoints that support # bulk OUT and IN operations -# CONFIG_USBSTRG_NWRREQS and CONFIG_USBSTRG_NRDREQS +# CONFIG_USBMSC_NWRREQS and CONFIG_USBMSC_NRDREQS # The number of write/read requests that can be in flight -# CONFIG_USBSTRG_BULKINREQLEN and CONFIG_USBSTRG_BULKOUTREQLEN +# CONFIG_USBMSC_BULKINREQLEN and CONFIG_USBMSC_BULKOUTREQLEN # The size of the buffer in each write/read request. This # value needs to be at least as large as the endpoint # maxpacket and ideally as large as a block device sector. -# CONFIG_USBSTRG_VENDORID and CONFIG_USBSTRG_VENDORSTR +# CONFIG_USBMSC_VENDORID and CONFIG_USBMSC_VENDORSTR # The vendor ID code/string -# CONFIG_USBSTRG_PRODUCTID and CONFIG_USBSTRG_PRODUCTSTR +# CONFIG_USBMSC_PRODUCTID and CONFIG_USBMSC_PRODUCTSTR # The product ID code/string -# CONFIG_USBSTRG_REMOVABLE +# CONFIG_USBMSC_REMOVABLE # Select if the media is removable -CONFIG_USBSTRG=n -CONFIG_USBSTRG_EP0MAXPACKET=64 -CONFIG_USBSTRG_EPBULKOUT=2 -CONFIG_USBSTRG_EPBULKIN=5 -CONFIG_USBSTRG_NRDREQS=2 -CONFIG_USBSTRG_NWRREQS=2 -CONFIG_USBSTRG_BULKINREQLEN=256 -CONFIG_USBSTRG_BULKOUTREQLEN=256 -CONFIG_USBSTRG_VENDORID=0x584e -CONFIG_USBSTRG_VENDORSTR="NuttX" -CONFIG_USBSTRG_PRODUCTID=0x5342 -CONFIG_USBSTRG_PRODUCTSTR="USBdev Storage" -CONFIG_USBSTRG_VERSIONNO=0x0399 -CONFIG_USBSTRG_REMOVABLE=y +CONFIG_USBMSC=n +CONFIG_USBMSC_EP0MAXPACKET=64 +CONFIG_USBMSC_EPBULKOUT=2 +CONFIG_USBMSC_EPBULKIN=5 +CONFIG_USBMSC_NRDREQS=2 +CONFIG_USBMSC_NWRREQS=2 +CONFIG_USBMSC_BULKINREQLEN=256 +CONFIG_USBMSC_BULKOUTREQLEN=256 +CONFIG_USBMSC_VENDORID=0x584e +CONFIG_USBMSC_VENDORSTR="NuttX" +CONFIG_USBMSC_PRODUCTID=0x5342 +CONFIG_USBMSC_PRODUCTSTR="USBdev Storage" +CONFIG_USBMSC_VERSIONNO=0x0399 +CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/ostest diff --git a/nuttx/configs/mcu123-lpc214x/ostest/defconfig b/nuttx/configs/mcu123-lpc214x/ostest/defconfig index 06609469e..0d4d5010b 100644 --- a/nuttx/configs/mcu123-lpc214x/ostest/defconfig +++ b/nuttx/configs/mcu123-lpc214x/ostest/defconfig @@ -490,39 +490,39 @@ CONFIG_USBSER_TXBUFSIZE=512 # # USB Storage Device Configuration # -# CONFIG_USBSTRG +# CONFIG_USBMSC # Enable compilation of the USB storage driver -# CONFIG_USBSTRG_EP0MAXPACKET +# CONFIG_USBMSC_EP0MAXPACKET # Max packet size for endpoint 0 -# CONFIG_USBSTRG_EPBULKOUT and CONFIG_USBSTRG_EPBULKIN +# CONFIG_USBMSC_EPBULKOUT and CONFIG_USBMSC_EPBULKIN # The logical 7-bit address of a hardware endpoints that support # bulk OUT and IN operations -# CONFIG_USBSTRG_NWRREQS and CONFIG_USBSTRG_NRDREQS +# CONFIG_USBMSC_NWRREQS and CONFIG_USBMSC_NRDREQS # The number of write/read requests that can be in flight -# CONFIG_USBSTRG_BULKINREQLEN and CONFIG_USBSTRG_BULKOUTREQLEN +# CONFIG_USBMSC_BULKINREQLEN and CONFIG_USBMSC_BULKOUTREQLEN # The size of the buffer in each write/read request. This # value needs to be at least as large as the endpoint # maxpacket and ideally as large as a block device sector. -# CONFIG_USBSTRG_VENDORID and CONFIG_USBSTRG_VENDORSTR +# CONFIG_USBMSC_VENDORID and CONFIG_USBMSC_VENDORSTR # The vendor ID code/string -# CONFIG_USBSTRG_PRODUCTID and CONFIG_USBSTRG_PRODUCTSTR +# CONFIG_USBMSC_PRODUCTID and CONFIG_USBMSC_PRODUCTSTR # The product ID code/string -# CONFIG_USBSTRG_REMOVABLE +# CONFIG_USBMSC_REMOVABLE # Select if the media is removable -CONFIG_USBSTRG=n -CONFIG_USBSTRG_EP0MAXPACKET=64 -CONFIG_USBSTRG_EPBULKOUT=2 -CONFIG_USBSTRG_EPBULKIN=5 -CONFIG_USBSTRG_NRDREQS=2 -CONFIG_USBSTRG_NWRREQS=2 -CONFIG_USBSTRG_BULKINREQLEN=256 -CONFIG_USBSTRG_BULKOUTREQLEN=256 -CONFIG_USBSTRG_VENDORID=0x584e -CONFIG_USBSTRG_VENDORSTR="NuttX" -CONFIG_USBSTRG_PRODUCTID=0x5342 -CONFIG_USBSTRG_PRODUCTSTR="USBdev Storage" -CONFIG_USBSTRG_VERSIONNO=0x0399 -CONFIG_USBSTRG_REMOVABLE=y +CONFIG_USBMSC=n +CONFIG_USBMSC_EP0MAXPACKET=64 +CONFIG_USBMSC_EPBULKOUT=2 +CONFIG_USBMSC_EPBULKIN=5 +CONFIG_USBMSC_NRDREQS=2 +CONFIG_USBMSC_NWRREQS=2 +CONFIG_USBMSC_BULKINREQLEN=256 +CONFIG_USBMSC_BULKOUTREQLEN=256 +CONFIG_USBMSC_VENDORID=0x584e +CONFIG_USBMSC_VENDORSTR="NuttX" +CONFIG_USBMSC_PRODUCTID=0x5342 +CONFIG_USBMSC_PRODUCTSTR="USBdev Storage" +CONFIG_USBMSC_VERSIONNO=0x0399 +CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/ostest diff --git a/nuttx/configs/mcu123-lpc214x/src/Makefile b/nuttx/configs/mcu123-lpc214x/src/Makefile index a69beca5a..93071038b 100644 --- a/nuttx/configs/mcu123-lpc214x/src/Makefile +++ b/nuttx/configs/mcu123-lpc214x/src/Makefile @@ -51,8 +51,8 @@ CSRCS = up_spi.c up_leds.c ifeq ($(CONFIG_NSH_ARCHINIT),y) CSRCS += up_nsh.c endif -ifeq ($(CONFIG_USBSTRG),y) -CSRCS += up_usbstrg.c +ifeq ($(CONFIG_USBMSC),y) +CSRCS += up_usbmsc.c endif COBJS = $(CSRCS:.c=$(OBJEXT)) diff --git a/nuttx/configs/mcu123-lpc214x/src/up_usbstrg.c b/nuttx/configs/mcu123-lpc214x/src/up_usbmsc.c index c34a76cc0..f25486d89 100755 --- a/nuttx/configs/mcu123-lpc214x/src/up_usbstrg.c +++ b/nuttx/configs/mcu123-lpc214x/src/up_usbmsc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/mcu123-lpc214x/src/up_usbstrg.c + * configs/mcu123-lpc214x/src/up_usbmsc.c * * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> @@ -54,8 +54,8 @@ /* Configuration ************************************************************/ -#ifndef CONFIG_EXAMPLES_USBSTRG_DEVMINOR1 -# define CONFIG_EXAMPLES_USBSTRG_DEVMINOR1 0 +#ifndef CONFIG_EXAMPLES_USBMSC_DEVMINOR1 +# define CONFIG_EXAMPLES_USBMSC_DEVMINOR1 0 #endif /* PORT and SLOT number probably depend on the board configuration */ @@ -96,48 +96,48 @@ ****************************************************************************/ /**************************************************************************** - * Name: usbstrg_archinitialize + * Name: usbmsc_archinitialize * * Description: * Perform architecture specific initialization * ****************************************************************************/ -int usbstrg_archinitialize(void) +int usbmsc_archinitialize(void) { FAR struct spi_dev_s *spi; int ret; /* Get the SPI port */ - message("usbstrg_archinitialize: Initializing SPI port %d\n", + message("usbmsc_archinitialize: Initializing SPI port %d\n", LPC214X_MMCSDSPIPORTNO); spi = up_spiinitialize(LPC214X_MMCSDSPIPORTNO); if (!spi) { - message("usbstrg_archinitialize: Failed to initialize SPI port %d\n", + message("usbmsc_archinitialize: Failed to initialize SPI port %d\n", LPC214X_MMCSDSPIPORTNO); return -ENODEV; } - message("usbstrg_archinitialize: Successfully initialized SPI port %d\n", + message("usbmsc_archinitialize: Successfully initialized SPI port %d\n", LPC214X_MMCSDSPIPORTNO); /* Bind the SPI port to the slot */ - message("usbstrg_archinitialize: Binding SPI port %d to MMC/SD slot %d\n", + message("usbmsc_archinitialize: Binding SPI port %d to MMC/SD slot %d\n", LPC214X_MMCSDSPIPORTNO, LPC214X_MMCSDSLOTNO); - ret = mmcsd_spislotinitialize(CONFIG_EXAMPLES_USBSTRG_DEVMINOR1, LPC214X_MMCSDSLOTNO, spi); + ret = mmcsd_spislotinitialize(CONFIG_EXAMPLES_USBMSC_DEVMINOR1, LPC214X_MMCSDSLOTNO, spi); if (ret < 0) { - message("usbstrg_archinitialize: Failed to bind SPI port %d to MMC/SD slot %d: %d\n", + message("usbmsc_archinitialize: Failed to bind SPI port %d to MMC/SD slot %d: %d\n", LPC214X_MMCSDSPIPORTNO, LPC214X_MMCSDSLOTNO, ret); return ret; } - message("usbstrg_archinitialize: Successfuly bound SPI port %d to MMC/SD slot %d\n", + message("usbmsc_archinitialize: Successfuly bound SPI port %d to MMC/SD slot %d\n", LPC214X_MMCSDSPIPORTNO, LPC214X_MMCSDSLOTNO); return OK; } diff --git a/nuttx/configs/mcu123-lpc214x/usbserial/defconfig b/nuttx/configs/mcu123-lpc214x/usbserial/defconfig index 3a6edf786..8d241576a 100644 --- a/nuttx/configs/mcu123-lpc214x/usbserial/defconfig +++ b/nuttx/configs/mcu123-lpc214x/usbserial/defconfig @@ -491,39 +491,39 @@ CONFIG_NXFLAT=n # # USB Storage Device Configuration # -# CONFIG_USBSTRG +# CONFIG_USBMSC # Enable compilation of the USB storage driver -# CONFIG_USBSTRG_EP0MAXPACKET +# CONFIG_USBMSC_EP0MAXPACKET # Max packet size for endpoint 0 -# CONFIG_USBSTRG_EPBULKOUT and CONFIG_USBSTRG_EPBULKIN +# CONFIG_USBMSC_EPBULKOUT and CONFIG_USBMSC_EPBULKIN # The logical 7-bit address of a hardware endpoints that support # bulk OUT and IN operations -# CONFIG_USBSTRG_NWRREQS and CONFIG_USBSTRG_NRDREQS +# CONFIG_USBMSC_NWRREQS and CONFIG_USBMSC_NRDREQS # The number of write/read requests that can be in flight -# CONFIG_USBSTRG_BULKINREQLEN and CONFIG_USBSTRG_BULKOUTREQLEN +# CONFIG_USBMSC_BULKINREQLEN and CONFIG_USBMSC_BULKOUTREQLEN # The size of the buffer in each write/read request. This # value needs to be at least as large as the endpoint # maxpacket and ideally as large as a block device sector. -# CONFIG_USBSTRG_VENDORID and CONFIG_USBSTRG_VENDORSTR +# CONFIG_USBMSC_VENDORID and CONFIG_USBMSC_VENDORSTR # The vendor ID code/string -# CONFIG_USBSTRG_PRODUCTID and CONFIG_USBSTRG_PRODUCTSTR +# CONFIG_USBMSC_PRODUCTID and CONFIG_USBMSC_PRODUCTSTR # The product ID code/string -# CONFIG_USBSTRG_REMOVABLE +# CONFIG_USBMSC_REMOVABLE # Select if the media is removable -CONFIG_USBSTRG=n -CONFIG_USBSTRG_EP0MAXPACKET=64 -CONFIG_USBSTRG_EPBULKOUT=2 -CONFIG_USBSTRG_EPBULKIN=5 -CONFIG_USBSTRG_NRDREQS=2 -CONFIG_USBSTRG_NWRREQS=2 -CONFIG_USBSTRG_BULKINREQLEN=256 -CONFIG_USBSTRG_BULKOUTREQLEN=256 -CONFIG_USBSTRG_VENDORID=0x584e -CONFIG_USBSTRG_VENDORSTR="NuttX" -CONFIG_USBSTRG_PRODUCTID=0x5342 -CONFIG_USBSTRG_PRODUCTSTR="USBdev Storage" -CONFIG_USBSTRG_VERSIONNO=0x0399 -CONFIG_USBSTRG_REMOVABLE=y +CONFIG_USBMSC=n +CONFIG_USBMSC_EP0MAXPACKET=64 +CONFIG_USBMSC_EPBULKOUT=2 +CONFIG_USBMSC_EPBULKIN=5 +CONFIG_USBMSC_NRDREQS=2 +CONFIG_USBMSC_NWRREQS=2 +CONFIG_USBMSC_BULKINREQLEN=256 +CONFIG_USBMSC_BULKOUTREQLEN=256 +CONFIG_USBMSC_VENDORID=0x584e +CONFIG_USBMSC_VENDORSTR="NuttX" +CONFIG_USBMSC_PRODUCTID=0x5342 +CONFIG_USBMSC_PRODUCTSTR="USBdev Storage" +CONFIG_USBMSC_VERSIONNO=0x0399 +CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/ostest diff --git a/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig b/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig index bf0eaba32..98cf9b343 100644 --- a/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig +++ b/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig @@ -491,16 +491,16 @@ CONFIG_USBSER_TXBUFSIZE=512 # # USB Storage Device Configuration # -# CONFIG_USBSTRG +# CONFIG_USBMSC # Enable compilation of the USB storage driver -# CONFIG_USBSTRG_EP0MAXPACKET +# CONFIG_USBMSC_EP0MAXPACKET # Max packet size for endpoint 0 # CONFIG_USBSER_EPBULKOUT and CONFIG_USBSER_EPBULKIN # The logical 7-bit address of a hardware endpoints that support # bulk OUT and IN operations # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS # The number of write/read requests that can be in flight -# CONFIG_USBSTRG_BULKINREQLEN and CONFIG_USBSTRG_BULKOUTREQLEN +# CONFIG_USBMSC_BULKINREQLEN and CONFIG_USBMSC_BULKOUTREQLEN # The size of the buffer in each write/read request. This # value needs to be at least as large as the endpoint # maxpacket and ideally as large as a block device sector. @@ -508,22 +508,22 @@ CONFIG_USBSER_TXBUFSIZE=512 # The vendor ID code/string # CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR # The product ID code/string -# CONFIG_USBSTRG_REMOVABLE +# CONFIG_USBMSC_REMOVABLE # Select if the media is removable -CONFIG_USBSTRG=y -CONFIG_USBSTRG_EP0MAXPACKET=64 -CONFIG_USBSTRG_EPBULKOUT=2 -CONFIG_USBSTRG_EPBULKIN=5 -CONFIG_USBSTRG_NRDREQS=2 -CONFIG_USBSTRG_NWRREQS=2 -CONFIG_USBSTRG_BULKINREQLEN=256 -CONFIG_USBSTRG_BULKOUTREQLEN=256 -CONFIG_USBSTRG_VENDORID=0x584e -CONFIG_USBSTRG_VENDORSTR="NuttX" -CONFIG_USBSTRG_PRODUCTID=0x5342 -CONFIG_USBSTRG_PRODUCTSTR="USBdev Storage" -CONFIG_USBSTRG_VERSIONNO=0x0399 -CONFIG_USBSTRG_REMOVABLE=y +CONFIG_USBMSC=y +CONFIG_USBMSC_EP0MAXPACKET=64 +CONFIG_USBMSC_EPBULKOUT=2 +CONFIG_USBMSC_EPBULKIN=5 +CONFIG_USBMSC_NRDREQS=2 +CONFIG_USBMSC_NWRREQS=2 +CONFIG_USBMSC_BULKINREQLEN=256 +CONFIG_USBMSC_BULKOUTREQLEN=256 +CONFIG_USBMSC_VENDORID=0x584e +CONFIG_USBMSC_VENDORSTR="NuttX" +CONFIG_USBMSC_PRODUCTID=0x5342 +CONFIG_USBMSC_PRODUCTSTR="USBdev Storage" +CONFIG_USBMSC_VERSIONNO=0x0399 +CONFIG_USBMSC_REMOVABLE=y # # Settings for examples/ostest @@ -615,46 +615,46 @@ CONFIG_EXAMPLES_USBSERIAL_ONLYBIG=n # # Settings for examples/usbstorage # -# CONFIG_EXAMPLES_USBSTRG_NLUNS +# CONFIG_EXAMPLES_USBMSC_NLUNS # Defines the number of logical units (LUNs) exported by the USB storage # driver. Each LUN corresponds to one exported block driver (or partition # of a block driver). May be 1, 2, or 3. Default is 1. -# CONFIG_EXAMPLES_USBSTRG_DEVMINOR1 +# CONFIG_EXAMPLES_USBMSC_DEVMINOR1 # The minor device number of the block driver for the first LUN. For # example, N in /dev/mmcsdN. Used for registering the block driver. Default # is zero. -# CONFIG_EXAMPLES_USBSTRG_DEVPATH1 +# CONFIG_EXAMPLES_USBMSC_DEVPATH1 # The full path to the registered block driver. Default is "/dev/mmcsd0" -# CONFIG_EXAMPLES_USBSTRG_DEVMINOR2 and CONFIG_EXAMPLES_USBSTRG_DEVPATH2 -# Similar parameters that would have to be provided if CONFIG_EXAMPLES_USBSTRG_NLUNS +# CONFIG_EXAMPLES_USBMSC_DEVMINOR2 and CONFIG_EXAMPLES_USBMSC_DEVPATH2 +# Similar parameters that would have to be provided if CONFIG_EXAMPLES_USBMSC_NLUNS # is 2 or 3. No defaults. -# CONFIG_EXAMPLES_USBSTRG_DEVMINOR3 and CONFIG_EXAMPLES_USBSTRG_DEVPATH3 -# Similar parameters that would have to be provided if CONFIG_EXAMPLES_USBSTRG_NLUNS +# CONFIG_EXAMPLES_USBMSC_DEVMINOR3 and CONFIG_EXAMPLES_USBMSC_DEVPATH3 +# Similar parameters that would have to be provided if CONFIG_EXAMPLES_USBMSC_NLUNS # is 3. No defaults. # # If CONFIG_USBDEV_TRACE is enabled (or CONFIG_DEBUG and CONFIG_DEBUG_USB), then # the example code will also manage the USB trace output. The amount of trace output # can be controlled using: # -# CONFIG_EXAMPLES_USBSTRG_TRACEINIT +# CONFIG_EXAMPLES_USBMSC_TRACEINIT # Show initialization events -# CONFIG_EXAMPLES_USBSTRG_TRACECLASS +# CONFIG_EXAMPLES_USBMSC_TRACECLASS # Show class driver events -# CONFIG_EXAMPLES_USBSTRG_TRACETRANSFERS +# CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS # Show data transfer events -# CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER +# CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER # Show controller events -# CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS +# CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS # Show interrupt-related events. # -CONFIG_EXAMPLES_USBSTRG_NLUNS=1 -CONFIG_EXAMPLES_USBSTRG_DEVMINOR1=0 -CONFIG_EXAMPLES_USBSTRG_DEVPATH1="/dev/mmcsd0" -CONFIG_EXAMPLES_USBSTRG_TRACEINIT=n -CONFIG_EXAMPLES_USBSTRG_TRACECLASS=y -CONFIG_EXAMPLES_USBSTRG_TRACETRANSFERS=y -CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=y -CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n +CONFIG_EXAMPLES_USBMSC_NLUNS=1 +CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0 +CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0" +CONFIG_EXAMPLES_USBMSC_TRACEINIT=n +CONFIG_EXAMPLES_USBMSC_TRACECLASS=y +CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=y +CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=y +CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n # # Stack and heap information |