From 657f0d2092b325bbaec6d61cce725295e38df61e Mon Sep 17 00:00:00 2001 From: patacongo Date: Wed, 25 Jan 2012 20:17:59 +0000 Subject: Massive name change USB STRG -> USB MSC git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4334 42af7a65-404d-4744-a932-0658087f49c3 --- nuttx/configs/hymini-stm32v/README.txt | 2 +- nuttx/configs/hymini-stm32v/buttons/defconfig | 44 +++--- nuttx/configs/hymini-stm32v/nsh/defconfig | 44 +++--- nuttx/configs/hymini-stm32v/nsh2/defconfig | 92 ++++++------- nuttx/configs/hymini-stm32v/nx/defconfig | 44 +++--- nuttx/configs/hymini-stm32v/nxlines/defconfig | 44 +++--- nuttx/configs/hymini-stm32v/src/Makefile | 4 +- nuttx/configs/hymini-stm32v/src/up_usbmsc.c | 164 +++++++++++++++++++++++ nuttx/configs/hymini-stm32v/src/up_usbstrg.c | 164 ----------------------- nuttx/configs/hymini-stm32v/usbserial/defconfig | 44 +++--- nuttx/configs/hymini-stm32v/usbstorage/defconfig | 92 ++++++------- 11 files changed, 369 insertions(+), 369 deletions(-) create mode 100644 nuttx/configs/hymini-stm32v/src/up_usbmsc.c delete mode 100644 nuttx/configs/hymini-stm32v/src/up_usbstrg.c (limited to 'nuttx/configs/hymini-stm32v') diff --git a/nuttx/configs/hymini-stm32v/README.txt b/nuttx/configs/hymini-stm32v/README.txt index 6ed3bc452..a3241da72 100755 --- a/nuttx/configs/hymini-stm32v/README.txt +++ b/nuttx/configs/hymini-stm32v/README.txt @@ -580,7 +580,7 @@ Where is one of the following: long file names in the FAT file system. Please refer to the details in the top-level COPYING file. Please do not use FAT long file name unless you are familiar with these patent issues. - (5) When built as an NSH add-on command (CONFIG_EXAMPLES_USBSTRG_BUILTIN=y), + (5) When built as an NSH add-on command (CONFIG_EXAMPLES_USBMSC_BUILTIN=y), Caution should be used to assure that the SD drive is not in use when the USB storage device is configured. Specifically, the SD driver should be unmounted like: diff --git a/nuttx/configs/hymini-stm32v/buttons/defconfig b/nuttx/configs/hymini-stm32v/buttons/defconfig index ccfff5a11..908d9eebf 100644 --- a/nuttx/configs/hymini-stm32v/buttons/defconfig +++ b/nuttx/configs/hymini-stm32v/buttons/defconfig @@ -673,40 +673,40 @@ 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/uip diff --git a/nuttx/configs/hymini-stm32v/nsh/defconfig b/nuttx/configs/hymini-stm32v/nsh/defconfig index 999cacfa4..d30c40a0b 100755 --- a/nuttx/configs/hymini-stm32v/nsh/defconfig +++ b/nuttx/configs/hymini-stm32v/nsh/defconfig @@ -676,40 +676,40 @@ 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/uip diff --git a/nuttx/configs/hymini-stm32v/nsh2/defconfig b/nuttx/configs/hymini-stm32v/nsh2/defconfig index 240d77fc5..8e4963650 100644 --- a/nuttx/configs/hymini-stm32v/nsh2/defconfig +++ b/nuttx/configs/hymini-stm32v/nsh2/defconfig @@ -646,40 +646,40 @@ 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=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 # # Graphics related configuration settings @@ -1120,54 +1120,54 @@ CONFIG_EXAMPLES_NXLINES_EXTERNINIT=n # # Settings for examples/usbstorage # -# CONFIG_EXAMPLES_USBSTRG_BUILTIN +# CONFIG_EXAMPLES_USBMSC_BUILTIN # This example can be built as two NSH "built-in" commands if this option # is selection: 'msconn' will connect the USB mass storage device; 'msdis' # will disconnect the USB storage device. -# 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. -# CONFIG_EXAMPLES_USBSTRG_DEBUGMM +# CONFIG_EXAMPLES_USBMSC_DEBUGMM # Enables some debug tests to check for memory usage and memory leaks. # # 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_BUILTIN=y -CONFIG_EXAMPLES_USBSTRG_NLUNS=1 -CONFIG_EXAMPLES_USBSTRG_DEVMINOR1=0 -CONFIG_EXAMPLES_USBSTRG_DEVPATH1="/dev/mmcsd0" -CONFIG_EXAMPLES_USBSTRG_DEBUGMM=n -CONFIG_EXAMPLES_USBSTRG_TRACEINIT=n -CONFIG_EXAMPLES_USBSTRG_TRACECLASS=n -CONFIG_EXAMPLES_USBSTRG_TRACETRANSFERS=n -CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n -CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n +CONFIG_EXAMPLES_USBMSC_BUILTIN=y +CONFIG_EXAMPLES_USBMSC_NLUNS=1 +CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0 +CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0" +CONFIG_EXAMPLES_USBMSC_DEBUGMM=n +CONFIG_EXAMPLES_USBMSC_TRACEINIT=n +CONFIG_EXAMPLES_USBMSC_TRACECLASS=n +CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n +CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n +CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n CONFIG_EXAMPLES_LCDTEST_BUILTIN=y diff --git a/nuttx/configs/hymini-stm32v/nx/defconfig b/nuttx/configs/hymini-stm32v/nx/defconfig index a392b9461..ab7b9b2ac 100644 --- a/nuttx/configs/hymini-stm32v/nx/defconfig +++ b/nuttx/configs/hymini-stm32v/nx/defconfig @@ -692,40 +692,40 @@ 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 # # Graphics related configuration settings diff --git a/nuttx/configs/hymini-stm32v/nxlines/defconfig b/nuttx/configs/hymini-stm32v/nxlines/defconfig index 1e88a048c..5e3a2e9b0 100644 --- a/nuttx/configs/hymini-stm32v/nxlines/defconfig +++ b/nuttx/configs/hymini-stm32v/nxlines/defconfig @@ -696,40 +696,40 @@ 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 # # Graphics related configuration settings diff --git a/nuttx/configs/hymini-stm32v/src/Makefile b/nuttx/configs/hymini-stm32v/src/Makefile index d79260748..5bb03930a 100644 --- a/nuttx/configs/hymini-stm32v/src/Makefile +++ b/nuttx/configs/hymini-stm32v/src/Makefile @@ -55,8 +55,8 @@ ifeq ($(CONFIG_INPUT),y) CSRCS += up_ts.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/hymini-stm32v/src/up_usbmsc.c b/nuttx/configs/hymini-stm32v/src/up_usbmsc.c new file mode 100644 index 000000000..1ce55adcc --- /dev/null +++ b/nuttx/configs/hymini-stm32v/src/up_usbmsc.c @@ -0,0 +1,164 @@ +/**************************************************************************** + * configs/hymini-stm32v/src/up_usbmsc.c + * + * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Configure and register the STM32 MMC/SD SDIO block driver. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include +#include +#include + +#include +#include + +#include "stm32_internal.h" + +/* There is nothing to do here if SDIO support is not selected. */ + +#ifdef CONFIG_STM32_SDIO + +/**************************************************************************** + * Pre-Processor Definitions + ****************************************************************************/ + +/* Configuration ************************************************************/ + +#ifndef CONFIG_EXAMPLES_USBMSC_DEVMINOR1 +# define CONFIG_EXAMPLES_USBMSC_DEVMINOR1 0 +#endif + +/* SLOT number(s) could depend on the board configuration */ + +#ifdef CONFIG_ARCH_BOARD_HYMINI_STM32V +# undef STM32_MMCSDSLOTNO +# define STM32_MMCSDSLOTNO 0 +#else + /* Add configuration for new STM32 boards here */ +# error "Unrecognized STM32 board" +#endif + +/* Debug ********************************************************************/ + +#ifdef CONFIG_CPP_HAVE_VARARGS +# ifdef CONFIG_DEBUG +# define message(...) lib_lowprintf(__VA_ARGS__) +# define msgflush() +# else +# define message(...) printf(__VA_ARGS__) +# define msgflush() fflush(stdout) +# endif +#else +# ifdef CONFIG_DEBUG +# define message lib_lowprintf +# define msgflush() +# else +# define message printf +# define msgflush() fflush(stdout) +# endif +#endif + + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: usbmsc_archinitialize + * + * Description: + * Perform architecture specific initialization + * + ****************************************************************************/ + +int usbmsc_archinitialize(void) +{ + /* If examples/usbmsc is built as an NSH command, then SD slot should + * already have been initialized in nsh_archinitialize() (see up_nsh.c). In + * this case, there is nothing further to be done here. + */ + +#ifndef CONFIG_EXAMPLES_USBMSC_BUILTIN + FAR struct sdio_dev_s *sdio; + int ret; + + /* First, get an instance of the SDIO interface */ + + message("usbmsc_archinitialize: " + "Initializing SDIO slot %d\n", + STM32_MMCSDSLOTNO); + + sdio = sdio_initialize(STM32_MMCSDSLOTNO); + if (!sdio) + { + message("usbmsc_archinitialize: Failed to initialize SDIO slot %d\n", + STM32_MMCSDSLOTNO); + return -ENODEV; + } + + /* Now bind the SDIO interface to the MMC/SD driver */ + + message("usbmsc_archinitialize: " + "Bind SDIO to the MMC/SD driver, minor=%d\n", + CONFIG_EXAMPLES_USBMSC_DEVMINOR1); + + ret = mmcsd_slotinitialize(CONFIG_EXAMPLES_USBMSC_DEVMINOR1, sdio); + if (ret != OK) + { + message("usbmsc_archinitialize: " + "Failed to bind SDIO to the MMC/SD driver: %d\n", + ret); + return ret; + } + message("usbmsc_archinitialize: " + "Successfully bound SDIO to the MMC/SD driver\n"); + + /* Then let's guess and say that there is a card in the slot. I need to check to + * see if the Hy-Mini STM32v board supports a GPIO to detect if there is a card in + * the slot. + */ + + sdio_mediachange(sdio, true); + +#endif /* CONFIG_EXAMPLES_USBMSC_BUILTIN */ + + return OK; +} + +#endif /* CONFIG_STM32_SDIO */ diff --git a/nuttx/configs/hymini-stm32v/src/up_usbstrg.c b/nuttx/configs/hymini-stm32v/src/up_usbstrg.c deleted file mode 100644 index 8a309c270..000000000 --- a/nuttx/configs/hymini-stm32v/src/up_usbstrg.c +++ /dev/null @@ -1,164 +0,0 @@ -/**************************************************************************** - * configs/hymini-stm32v/src/up_usbstrg.c - * - * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt - * - * Configure and register the STM32 MMC/SD SDIO block driver. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name NuttX nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include - -#include -#include -#include - -#include -#include - -#include "stm32_internal.h" - -/* There is nothing to do here if SDIO support is not selected. */ - -#ifdef CONFIG_STM32_SDIO - -/**************************************************************************** - * Pre-Processor Definitions - ****************************************************************************/ - -/* Configuration ************************************************************/ - -#ifndef CONFIG_EXAMPLES_USBSTRG_DEVMINOR1 -# define CONFIG_EXAMPLES_USBSTRG_DEVMINOR1 0 -#endif - -/* SLOT number(s) could depend on the board configuration */ - -#ifdef CONFIG_ARCH_BOARD_HYMINI_STM32V -# undef STM32_MMCSDSLOTNO -# define STM32_MMCSDSLOTNO 0 -#else - /* Add configuration for new STM32 boards here */ -# error "Unrecognized STM32 board" -#endif - -/* Debug ********************************************************************/ - -#ifdef CONFIG_CPP_HAVE_VARARGS -# ifdef CONFIG_DEBUG -# define message(...) lib_lowprintf(__VA_ARGS__) -# define msgflush() -# else -# define message(...) printf(__VA_ARGS__) -# define msgflush() fflush(stdout) -# endif -#else -# ifdef CONFIG_DEBUG -# define message lib_lowprintf -# define msgflush() -# else -# define message printf -# define msgflush() fflush(stdout) -# endif -#endif - - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -/**************************************************************************** - * Name: usbstrg_archinitialize - * - * Description: - * Perform architecture specific initialization - * - ****************************************************************************/ - -int usbstrg_archinitialize(void) -{ - /* If examples/usbstrg is built as an NSH command, then SD slot should - * already have been initialized in nsh_archinitialize() (see up_nsh.c). In - * this case, there is nothing further to be done here. - */ - -#ifndef CONFIG_EXAMPLES_USBSTRG_BUILTIN - FAR struct sdio_dev_s *sdio; - int ret; - - /* First, get an instance of the SDIO interface */ - - message("usbstrg_archinitialize: " - "Initializing SDIO slot %d\n", - STM32_MMCSDSLOTNO); - - sdio = sdio_initialize(STM32_MMCSDSLOTNO); - if (!sdio) - { - message("usbstrg_archinitialize: Failed to initialize SDIO slot %d\n", - STM32_MMCSDSLOTNO); - return -ENODEV; - } - - /* Now bind the SDIO interface to the MMC/SD driver */ - - message("usbstrg_archinitialize: " - "Bind SDIO to the MMC/SD driver, minor=%d\n", - CONFIG_EXAMPLES_USBSTRG_DEVMINOR1); - - ret = mmcsd_slotinitialize(CONFIG_EXAMPLES_USBSTRG_DEVMINOR1, sdio); - if (ret != OK) - { - message("usbstrg_archinitialize: " - "Failed to bind SDIO to the MMC/SD driver: %d\n", - ret); - return ret; - } - message("usbstrg_archinitialize: " - "Successfully bound SDIO to the MMC/SD driver\n"); - - /* Then let's guess and say that there is a card in the slot. I need to check to - * see if the Hy-Mini STM32v board supports a GPIO to detect if there is a card in - * the slot. - */ - - sdio_mediachange(sdio, true); - -#endif /* CONFIG_EXAMPLES_USBSTRG_BUILTIN */ - - return OK; -} - -#endif /* CONFIG_STM32_SDIO */ diff --git a/nuttx/configs/hymini-stm32v/usbserial/defconfig b/nuttx/configs/hymini-stm32v/usbserial/defconfig index 33d4033f7..4f087671f 100755 --- a/nuttx/configs/hymini-stm32v/usbserial/defconfig +++ b/nuttx/configs/hymini-stm32v/usbserial/defconfig @@ -740,40 +740,40 @@ CONFIG_CDCSER=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/uip diff --git a/nuttx/configs/hymini-stm32v/usbstorage/defconfig b/nuttx/configs/hymini-stm32v/usbstorage/defconfig index 43b2c1d8f..5e32895ff 100755 --- a/nuttx/configs/hymini-stm32v/usbstorage/defconfig +++ b/nuttx/configs/hymini-stm32v/usbstorage/defconfig @@ -684,40 +684,40 @@ 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=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/uip @@ -844,54 +844,54 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n # # Settings for examples/usbstorage # -# CONFIG_EXAMPLES_USBSTRG_BUILTIN +# CONFIG_EXAMPLES_USBMSC_BUILTIN # This example can be built as two NSH "built-in" commands if this option # is selection: 'msconn' will connect the USB mass storage device; 'msdis' # will disconnect the USB storage device. -# 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. -# CONFIG_EXAMPLES_USBSTRG_DEBUGMM +# CONFIG_EXAMPLES_USBMSC_DEBUGMM # Enables some debug tests to check for memory usage and memory leaks. # # 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_BUILTIN=n -CONFIG_EXAMPLES_USBSTRG_NLUNS=1 -CONFIG_EXAMPLES_USBSTRG_DEVMINOR1=0 -CONFIG_EXAMPLES_USBSTRG_DEVPATH1="/dev/mmcsd0" -CONFIG_EXAMPLES_USBSTRG_DEBUGMM=n -CONFIG_EXAMPLES_USBSTRG_TRACEINIT=n -CONFIG_EXAMPLES_USBSTRG_TRACECLASS=n -CONFIG_EXAMPLES_USBSTRG_TRACETRANSFERS=n -CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n -CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n +CONFIG_EXAMPLES_USBMSC_BUILTIN=n +CONFIG_EXAMPLES_USBMSC_NLUNS=1 +CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0 +CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0" +CONFIG_EXAMPLES_USBMSC_DEBUGMM=n +CONFIG_EXAMPLES_USBMSC_TRACEINIT=n +CONFIG_EXAMPLES_USBMSC_TRACECLASS=n +CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n +CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n +CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n # # Stack and heap information -- cgit v1.2.3