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

ChangeLog

@@ -2393,3 +2393,7 @@
 	  for an upper and lower half battery driver.  Add the implementation of the
 	  common upper half battery driver.
 	* drivers/power/max1704x.c:  Add a driver for MAX17040x battery "fuel guage"
+	* arch/arm/src/stm32/stm32_i2c.c: Add support for I2C3
+	* drivers/usbdev/: Lots of name changes: cdc_serial->cdcacm, usbstrg->usbmsc, 
+	  usbser->pl2303
+	* drivers/usbdev/composite*: Fleshed out support for a composite USB device.

Documentation/NuttxPortingGuide.html

@@ -12,7 +12,7 @@
       <h1><big><font color="#3c34ec">
         <i>NuttX RTOS Porting Guide</i>
       </font></big></h1>
-      <p>Last Updated: January 24, 2011</p>
+      <p>Last Updated: January 25, 2011</p>
     </td>
   </tr>
 </table>
@@ -4987,41 +4987,41 @@ build
 <h3>USB Storage Device Configuration</h3>
 <ul>
   <li>
-    <code>CONFIG_USBSTRG</code>:
+    <code>CONFIG_USBMSC</code>:
     Enable compilation of the USB storage driver
   </li>
   <li>
-    <code>CONFIG_USBSTRG_COMPOSITE</code>:
+    <code>CONFIG_USBMSC_COMPOSITE</code>:
     Configure the mass storage driver as part of a composite driver
     (only if <code>CONFIG_USBDEV_COMPOSITE</code> is also defined)
   <li>
-    <code>CONFIG_USBSTRG_EP0MAXPACKET</code>:
+    <code>CONFIG_USBMSC_EP0MAXPACKET</code>:
     Max packet size for endpoint 0
   </li>
   <li>
-    <code>CONFIG_USBSTRGEPBULKOUT</code> and <code>CONFIG_USBSTRG_EPBULKIN</code>:
+    <code>CONFIG_USBMSCEPBULKOUT</code> and <code>CONFIG_USBMSC_EPBULKIN</code>:
     The logical 7-bit address of a hardware endpoints that support bulk OUT and IN operations
   </li>
   <li>
-    <code>CONFIG_USBSTRG_NWRREQS</code> and <code>CONFIG_USBSTRG_NRDREQS</code>:
+    <code>CONFIG_USBMSC_NWRREQS</code> and <code>CONFIG_USBMSC_NRDREQS</code>:
     The number of write/read requests that can be in flight
   </li>
   <li>
-    <code>CONFIG_USBSTRG_BULKINREQLEN</code> and <code>CONFIG_USBSTRG_BULKOUTREQLEN</code>:
+    <code>CONFIG_USBMSC_BULKINREQLEN</code> and <code>CONFIG_USBMSC_BULKOUTREQLEN</code>:
     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.
   </li>
   <li>
-    <code>CONFIG_USBSTRG_VENDORID</code> and <code>CONFIG_USBSTRG_VENDORSTR</code>:
+    <code>CONFIG_USBMSC_VENDORID</code> and <code>CONFIG_USBMSC_VENDORSTR</code>:
     The vendor ID code/string
   </li>
   <li>
-    <code>CONFIG_USBSTRG_PRODUCTID</code> and <code>CONFIG_USBSTRG_PRODUCTSTR</code>:
+    <code>CONFIG_USBMSC_PRODUCTID</code> and <code>CONFIG_USBMSC_PRODUCTSTR</code>:
     The product ID code/string
   </li>
   <li>
-    <code>CONFIG_USBSTRG_REMOVABLE</code>:
+    <code>CONFIG_USBMSC_REMOVABLE</code>:
     Select if the media is removable
   </li>
 </ul>

configs/README.txt

@@ -1052,27 +1052,27 @@ defconfig -- This is a configuration file similar to the Linux
 
 	USB Storage Device Configuration
 
-		CONFIG_USBSTRG
+		CONFIG_USBMSC
 		  Enable compilation of the USB storage driver
-		CONFIG_USBSTRG_COMPOSITE
+		CONFIG_USBMSC_COMPOSITE
 		  Configure the mass storage driver as part of a composite driver
 		  (only if CONFIG_USBDEV_COMPOSITE is also defined)
-		CONFIG_USBSTRG_EP0MAXPACKET
+		CONFIG_USBMSC_EP0MAXPACKET
 		  Max packet size for endpoint 0
-		CONFIG_USBSTRGEPBULKOUT and CONFIG_USBSTRG_EPBULKIN
+		CONFIG_USBMSCEPBULKOUT 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
 
 	Graphics related configuration settings

configs/amber/hello/defconfig

@@ -578,40 +578,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_USBMSC=n
-CONFIG_USBSTRG_EP0MAXPACKET=64
+CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBSTRG_EPBULKOUT=2
+CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBSTRG_EPBULKIN=5
+CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBSTRG_NRDREQS=2
+CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBSTRG_NWRREQS=2
+CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBSTRG_BULKINREQLEN=256
+CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBSTRG_BULKOUTREQLEN=256
+CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBSTRG_VENDORID=0x584e
+CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBSTRG_VENDORSTR="NuttX"
+CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBSTRG_PRODUCTID=0x5342
+CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBSTRG_PRODUCTSTR="USBdev Storage"
+CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBSTRG_VERSIONNO=0x0399
+CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBSTRG_REMOVABLE=y
+CONFIG_USBMSC_REMOVABLE=y
 
 #
 # Settings for examples/uip
@@ -745,46 +745,46 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=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
+#  CONFIG_EXAMPLES_USBMSC_DEVMINOR2 and CONFIG_EXAMPLES_USBMSC_DEVPATH2
-#    Similar parameters that would have to be provided if CONFIG_EXAMPLES_USBSTRG_NLUNS
+#    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
+#  CONFIG_EXAMPLES_USBMSC_DEVMINOR3 and CONFIG_EXAMPLES_USBMSC_DEVPATH3
-#    Similar parameters that would have to be provided if CONFIG_EXAMPLES_USBSTRG_NLUNS
+#    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_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBSTRG_DEVMINOR1=0
+CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBSTRG_DEVPATH1="/dev/mmcsd0"
+CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBSTRG_TRACEINIT=n
+CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBSTRG_TRACECLASS=n
+CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBSTRG_TRACETRANSFERS=n
+CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n
+CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n
+CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Stack and heap information

configs/avr32dev1/nsh/defconfig

@@ -606,40 +606,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_USBMSC=n
-CONFIG_USBSTRG_EP0MAXPACKET=64
+CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBSTRG_EPBULKOUT=2
+CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBSTRG_EPBULKIN=5
+CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBSTRG_NRDREQS=2
+CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBSTRG_NWRREQS=2
+CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBSTRG_BULKINREQLEN=256
+CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBSTRG_BULKOUTREQLEN=256
+CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBSTRG_VENDORID=0x584e
+CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBSTRG_VENDORSTR="NuttX"
+CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBSTRG_PRODUCTID=0x5342
+CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBSTRG_PRODUCTSTR="USBdev Storage"
+CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBSTRG_VERSIONNO=0x0399
+CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBSTRG_REMOVABLE=y
+CONFIG_USBMSC_REMOVABLE=y
 
 #
 # Settings for examples/uip

configs/avr32dev1/ostest/defconfig

@@ -606,40 +606,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_USBMSC=n
-CONFIG_USBSTRG_EP0MAXPACKET=64
+CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBSTRG_EPBULKOUT=2
+CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBSTRG_EPBULKIN=5
+CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBSTRG_NRDREQS=2
+CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBSTRG_NWRREQS=2
+CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBSTRG_BULKINREQLEN=256
+CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBSTRG_BULKOUTREQLEN=256
+CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBSTRG_VENDORID=0x584e
+CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBSTRG_VENDORSTR="NuttX"
+CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBSTRG_PRODUCTID=0x5342
+CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBSTRG_PRODUCTSTR="USBdev Storage"
+CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBSTRG_VERSIONNO=0x0399
+CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBSTRG_REMOVABLE=y
+CONFIG_USBMSC_REMOVABLE=y
 
 #
 # Settings for examples/uip

configs/demo9s12ne64/ostest/defconfig

@@ -582,40 +582,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_USBMSC=n
-CONFIG_USBSTRG_EP0MAXPACKET=64
+CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBSTRG_EPBULKOUT=2
+CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBSTRG_EPBULKIN=5
+CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBSTRG_NRDREQS=2
+CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBSTRG_NWRREQS=2
+CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBSTRG_BULKINREQLEN=256
+CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBSTRG_BULKOUTREQLEN=256
+CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBSTRG_VENDORID=0x584e
+CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBSTRG_VENDORSTR="NuttX"
+CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBSTRG_PRODUCTID=0x5342
+CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBSTRG_PRODUCTSTR="USBdev Storage"
+CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBSTRG_VERSIONNO=0x0399
+CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBSTRG_REMOVABLE=y
+CONFIG_USBMSC_REMOVABLE=y
 
 #
 # Settings for examples/uip

configs/ea3131/nsh/defconfig

@@ -589,40 +589,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_USBMSC=n
-CONFIG_USBSTRG_EP0MAXPACKET=64
+CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBSTRG_EPBULKOUT=2
+CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBSTRG_EPBULKIN=1
+CONFIG_USBMSC_EPBULKIN=1
-CONFIG_USBSTRG_NRDREQS=2
+CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBSTRG_NWRREQS=2
+CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBSTRG_BULKINREQLEN=256
+CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBSTRG_BULKOUTREQLEN=256
+CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBSTRG_VENDORID=0x584e
+CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBSTRG_VENDORSTR="NuttX"
+CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBSTRG_PRODUCTID=0x5342
+CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBSTRG_PRODUCTSTR="USBdev Storage"
+CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBSTRG_VERSIONNO=0x0399
+CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBSTRG_REMOVABLE=y
+CONFIG_USBMSC_REMOVABLE=y
 
 #
 # Settings for examples/uip

configs/ea3131/ostest/defconfig

@@ -589,40 +589,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_USBMSC=n
-CONFIG_USBSTRG_EP0MAXPACKET=64
+CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBSTRG_EPBULKOUT=2
+CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBSTRG_EPBULKIN=1
+CONFIG_USBMSC_EPBULKIN=1
-CONFIG_USBSTRG_NRDREQS=2
+CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBSTRG_NWRREQS=2
+CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBSTRG_BULKINREQLEN=256
+CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBSTRG_BULKOUTREQLEN=256
+CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBSTRG_VENDORID=0x584e
+CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBSTRG_VENDORSTR="NuttX"
+CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBSTRG_PRODUCTID=0x5342
+CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBSTRG_PRODUCTSTR="USBdev Storage"
+CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBSTRG_VERSIONNO=0x0399
+CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBSTRG_REMOVABLE=y
+CONFIG_USBMSC_REMOVABLE=y
 
 #
 # Settings for examples/uip

configs/ea3131/pgnsh/defconfig

@@ -740,40 +740,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_USBMSC=n
-CONFIG_USBSTRG_EP0MAXPACKET=64
+CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBSTRG_EPBULKOUT=2
+CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBSTRG_EPBULKIN=1
+CONFIG_USBMSC_EPBULKIN=1
-CONFIG_USBSTRG_NRDREQS=2
+CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBSTRG_NWRREQS=2
+CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBSTRG_BULKINREQLEN=256
+CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBSTRG_BULKOUTREQLEN=256
+CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBSTRG_VENDORID=0x584e
+CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBSTRG_VENDORSTR="NuttX"
+CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBSTRG_PRODUCTID=0x5342
+CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBSTRG_PRODUCTSTR="USBdev Storage"
+CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBSTRG_VERSIONNO=0x0399
+CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBSTRG_REMOVABLE=y
+CONFIG_USBMSC_REMOVABLE=y
 
 #
 # Settings for examples/uip

configs/ea3131/src/Makefile

@@ -59,8 +59,8 @@ endif
 ifeq ($(CONFIG_PAGING),y)
 CSRCS		+= up_fillpage.c
 endif
-ifeq ($(CONFIG_USBSTRG),y)
+ifeq ($(CONFIG_USBMSC),y)
-CSRCS		+= up_usbstrg.c
+CSRCS		+= up_usbmsc.c
 endif
 COBJS		= $(CSRCS:.c=$(OBJEXT))
 

configs/ea3131/src/up_usbmsc.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/ea3131/src/up_usbstrg.c
+ * configs/ea3131/src/up_usbmsc.c
  *
  *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@@ -56,34 +56,34 @@
 
 /* Configuration ************************************************************/
 
-#ifndef CONFIG_EXAMPLES_USBSTRG_DEVMINOR1
+#ifndef CONFIG_EXAMPLES_USBMSC_DEVMINOR1
-#  define CONFIG_EXAMPLES_USBSTRG_DEVMINOR1 0
+#  define CONFIG_EXAMPLES_USBMSC_DEVMINOR1 0
 #endif
 
-#ifndef CONFIG_EXAMPLES_USBSTRG_DEVPATH1
+#ifndef CONFIG_EXAMPLES_USBMSC_DEVPATH1
-#  define CONFIG_EXAMPLES_USBSTRG_DEVPATH1  "/dev/ram"
+#  define CONFIG_EXAMPLES_USBMSC_DEVPATH1  "/dev/ram"
 #endif
 
-static const char g_source[] = CONFIG_EXAMPLES_USBSTRG_DEVPATH1;
+static const char g_source[] = CONFIG_EXAMPLES_USBMSC_DEVPATH1;
 static struct fat_format_s g_fmt = FAT_FORMAT_INITIALIZER;
 
-#define USBSTRG_NSECTORS        64
+#define USBMSC_NSECTORS        64
-#define USBSTRG_SECTORSIZE      512
+#define USBMSC_SECTORSIZE      512
-#define BUFFER_SIZE             (USBSTRG_NSECTORS*USBSTRG_SECTORSIZE)
+#define BUFFER_SIZE            (USBMSC_NSECTORS*USBMSC_SECTORSIZE)
 
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
 
 /****************************************************************************
- * Name: usbstrg_archinitialize
+ * Name: usbmsc_archinitialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int usbstrg_archinitialize(void)
+int usbmsc_archinitialize(void)
 {
   uint8_t *pbuffer;
   int ret;
@@ -91,17 +91,17 @@ int usbstrg_archinitialize(void)
   pbuffer = (uint8_t *) malloc (BUFFER_SIZE);
   if (!pbuffer)
     {
-      lib_lowprintf ("usbstrg_archinitialize: Failed to allocate ramdisk of size %d\n",
+      lib_lowprintf ("usbmsc_archinitialize: Failed to allocate ramdisk of size %d\n",
                      BUFFER_SIZE);
       return -ENOMEM;
     }
 
   /* Register a RAMDISK device to manage this RAM image */
   
-  ret = ramdisk_register(CONFIG_EXAMPLES_USBSTRG_DEVMINOR1,
+  ret = ramdisk_register(CONFIG_EXAMPLES_USBMSC_DEVMINOR1,
                          pbuffer,
-                         USBSTRG_NSECTORS,
+                         USBMSC_NSECTORS,
-                         USBSTRG_SECTORSIZE,
+                         USBMSC_SECTORSIZE,
                          true);
   if (ret < 0)
     {

configs/ea3131/usbserial/defconfig

@@ -592,40 +592,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_USBMSC=n
-CONFIG_USBSTRG_EP0MAXPACKET=64
+CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBSTRG_EPBULKOUT=2
+CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBSTRG_EPBULKIN=1
+CONFIG_USBMSC_EPBULKIN=1
-CONFIG_USBSTRG_NRDREQS=2
+CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBSTRG_NWRREQS=2
+CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBSTRG_BULKINREQLEN=512
+CONFIG_USBMSC_BULKINREQLEN=512
-CONFIG_USBSTRG_BULKOUTREQLEN=512
+CONFIG_USBMSC_BULKOUTREQLEN=512
-CONFIG_USBSTRG_VENDORID=0x584e
+CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBSTRG_VENDORSTR="NuttX"
+CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBSTRG_PRODUCTID=0x5342
+CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBSTRG_PRODUCTSTR="USBdev Storage"
+CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBSTRG_VERSIONNO=0x0399
+CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBSTRG_REMOVABLE=y
+CONFIG_USBMSC_REMOVABLE=y
 
 #
 # Settings for examples/uip
@@ -746,45 +746,45 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=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
+#  CONFIG_EXAMPLES_USBMSC_DEVMINOR2 and CONFIG_EXAMPLES_USBMSC_DEVPATH2
-#    Similar parameters that would have to be provided if CONFIG_EXAMPLES_USBSTRG_NLUNS
+#    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
+#  CONFIG_EXAMPLES_USBMSC_DEVMINOR3 and CONFIG_EXAMPLES_USBMSC_DEVPATH3
-#    Similar parameters that would have to be provided if CONFIG_EXAMPLES_USBSTRG_NLUNS
+#    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_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBSTRG_DEVMINOR1=0
+CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBSTRG_DEVPATH1="/dev/ram0"
+CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/ram0"
-CONFIG_EXAMPLES_USBSTRG_TRACEINIT=n
+CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBSTRG_TRACECLASS=n
+CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBSTRG_TRACETRANSFERS=n
+CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n
+CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n
+CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Stack and heap information

configs/ea3131/usbstorage/defconfig

@@ -592,40 +592,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_USBMSC=y
-CONFIG_USBSTRG_EP0MAXPACKET=64
+CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBSTRG_EPBULKOUT=2
+CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBSTRG_EPBULKIN=1
+CONFIG_USBMSC_EPBULKIN=1
-CONFIG_USBSTRG_NRDREQS=2
+CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBSTRG_NWRREQS=2
+CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBSTRG_BULKINREQLEN=512
+CONFIG_USBMSC_BULKINREQLEN=512
-CONFIG_USBSTRG_BULKOUTREQLEN=512
+CONFIG_USBMSC_BULKOUTREQLEN=512
-CONFIG_USBSTRG_VENDORID=0x584e
+CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBSTRG_VENDORSTR="NuttX"
+CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBSTRG_PRODUCTID=0x5342
+CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBSTRG_PRODUCTSTR="USBdev Storage"
+CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBSTRG_VERSIONNO=0x0399
+CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBSTRG_REMOVABLE=y
+CONFIG_USBMSC_REMOVABLE=y
 
 #
 # Settings for examples/uip
@@ -746,46 +746,46 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=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
+#  CONFIG_EXAMPLES_USBMSC_DEVMINOR2 and CONFIG_EXAMPLES_USBMSC_DEVPATH2
-#    Similar parameters that would have to be provided if CONFIG_EXAMPLES_USBSTRG_NLUNS
+#    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
+#  CONFIG_EXAMPLES_USBMSC_DEVMINOR3 and CONFIG_EXAMPLES_USBMSC_DEVPATH3
-#    Similar parameters that would have to be provided if CONFIG_EXAMPLES_USBSTRG_NLUNS
+#    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_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBSTRG_DEVMINOR1=0
+CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBSTRG_DEVPATH1="/dev/ram0"
+CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/ram0"
-CONFIG_EXAMPLES_USBSTRG_TRACEINIT=n
+CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBSTRG_TRACECLASS=n
+CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBSTRG_TRACETRANSFERS=n
+CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n
+CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n
+CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Stack and heap information

configs/ea3152/ostest/defconfig

@@ -590,40 +590,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_USBMSC=n
-CONFIG_USBSTRG_EP0MAXPACKET=64
+CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBSTRG_EPBULKOUT=2
+CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBSTRG_EPBULKIN=1
+CONFIG_USBMSC_EPBULKIN=1
-CONFIG_USBSTRG_NRDREQS=2
+CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBSTRG_NWRREQS=2
+CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBSTRG_BULKINREQLEN=256
+CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBSTRG_BULKOUTREQLEN=256
+CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBSTRG_VENDORID=0x584e
+CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBSTRG_VENDORSTR="NuttX"
+CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBSTRG_PRODUCTID=0x5342
+CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBSTRG_PRODUCTSTR="USBdev Storage"
+CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBSTRG_VERSIONNO=0x0399
+CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBSTRG_REMOVABLE=y
+CONFIG_USBMSC_REMOVABLE=y
 
 #
 # Settings for examples/uip

configs/ea3152/src/Makefile

@@ -59,8 +59,8 @@ endif
 ifeq ($(CONFIG_PAGING),y)
 CSRCS		+= up_fillpage.c
 endif
-ifeq ($(CONFIG_USBSTRG),y)
+ifeq ($(CONFIG_USBMSC),y)
-CSRCS		+= up_usbstrg.c
+CSRCS		+= up_usbmsc.c
 endif
 COBJS		= $(CSRCS:.c=$(OBJEXT))
 

configs/ea3152/src/up_usbmsc.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/ea3152/src/up_usbstrg.c
+ * configs/ea3152/src/up_usbmsc.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -56,34 +56,34 @@
 
 /* Configuration ************************************************************/
 
-#ifndef CONFIG_EXAMPLES_USBSTRG_DEVMINOR1
+#ifndef CONFIG_EXAMPLES_USBMSC_DEVMINOR1
-#  define CONFIG_EXAMPLES_USBSTRG_DEVMINOR1 0
+#  define CONFIG_EXAMPLES_USBMSC_DEVMINOR1 0
 #endif
 
-#ifndef CONFIG_EXAMPLES_USBSTRG_DEVPATH1
+#ifndef CONFIG_EXAMPLES_USBMSC_DEVPATH1
-#  define CONFIG_EXAMPLES_USBSTRG_DEVPATH1  "/dev/ram"
+#  define CONFIG_EXAMPLES_USBMSC_DEVPATH1  "/dev/ram"
 #endif
 
-static const char g_source[] = CONFIG_EXAMPLES_USBSTRG_DEVPATH1;
+static const char g_source[] = CONFIG_EXAMPLES_USBMSC_DEVPATH1;
 static struct fat_format_s g_fmt = FAT_FORMAT_INITIALIZER;
 
-#define USBSTRG_NSECTORS        64
+#define USBMSC_NSECTORS        64
-#define USBSTRG_SECTORSIZE      512
+#define USBMSC_SECTORSIZE      512
-#define BUFFER_SIZE             (USBSTRG_NSECTORS*USBSTRG_SECTORSIZE)
+#define BUFFER_SIZE            (USBMSC_NSECTORS*USBMSC_SECTORSIZE)
 
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
 
 /****************************************************************************
- * Name: usbstrg_archinitialize
+ * Name: usbmsc_archinitialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int usbstrg_archinitialize(void)
+int usbmsc_archinitialize(void)
 {
   uint8_t *pbuffer;
   int ret;
@@ -91,17 +91,17 @@ int usbstrg_archinitialize(void)
   pbuffer = (uint8_t *) malloc (BUFFER_SIZE);
   if (!pbuffer)
     {
-      lib_lowprintf ("usbstrg_archinitialize: Failed to allocate ramdisk of size %d\n",
+      lib_lowprintf ("usbmsc_archinitialize: Failed to allocate ramdisk of size %d\n",
                      BUFFER_SIZE);
       return -ENOMEM;
     }
 
   /* Register a RAMDISK device to manage this RAM image */
   
-  ret = ramdisk_register(CONFIG_EXAMPLES_USBSTRG_DEVMINOR1,
+  ret = ramdisk_register(CONFIG_EXAMPLES_USBMSC_DEVMINOR1,
                          pbuffer,
-                         USBSTRG_NSECTORS,
+                         USBMSC_NSECTORS,
-                         USBSTRG_SECTORSIZE,
+                         USBMSC_SECTORSIZE,
                          true);
   if (ret < 0)
     {

configs/ez80f910200kitg/ostest/defconfig

@@ -501,39 +501,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_USBMSC=n
-CONFIG_USBSTRG_EP0MAXPACKET=64
+CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBSTRG_EPBULKOUT=2
+CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBSTRG_EPBULKIN=5
+CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBSTRG_NRDREQS=2
+CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBSTRG_NWRREQS=2
+CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBSTRG_BULKINREQLEN=256
+CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBSTRG_BULKOUTREQLEN=256
+CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBSTRG_VENDORID=0x584e
+CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBSTRG_VENDORSTR="NuttX"
+CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBSTRG_PRODUCTID=0x5342
+CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBSTRG_PRODUCTSTR="USBdev Storage"
+CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBSTRG_VERSIONNO=0x0399
+CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBSTRG_REMOVABLE=y
+CONFIG_USBMSC_REMOVABLE=y
 
 #
 # CONFIG_NX

configs/ez80f910200zco/dhcpd/defconfig

@@ -509,39 +509,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_USBMSC=n
-CONFIG_USBSTRG_EP0MAXPACKET=64
+CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBSTRG_EPBULKOUT=2
+CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBSTRG_EPBULKIN=5
+CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBSTRG_NRDREQS=2
+CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBSTRG_NWRREQS=2
+CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBSTRG_BULKINREQLEN=256
+CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBSTRG_BULKOUTREQLEN=256
+CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBSTRG_VENDORID=0x584e
+CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBSTRG_VENDORSTR="NuttX"
+CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBSTRG_PRODUCTID=0x5342
+CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBSTRG_PRODUCTSTR="USBdev Storage"
+CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBSTRG_VERSIONNO=0x0399
+CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBSTRG_REMOVABLE=y
+CONFIG_USBMSC_REMOVABLE=y
 
 #
 # CONFIG_NX

configs/ez80f910200zco/httpd/defconfig

@@ -509,39 +509,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_USBMSC=n
-CONFIG_USBSTRG_EP0MAXPACKET=64
+CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBSTRG_EPBULKOUT=2
+CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBSTRG_EPBULKIN=5
+CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBSTRG_NRDREQS=2
+CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBSTRG_NWRREQS=2
+CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBSTRG_BULKINREQLEN=256
+CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBSTRG_BULKOUTREQLEN=256
+CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBSTRG_VENDORID=0x584e
+CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBSTRG_VENDORSTR="NuttX"
+CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBSTRG_PRODUCTID=0x5342
+CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBSTRG_PRODUCTSTR="USBdev Storage"
+CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBSTRG_VERSIONNO=0x0399
+CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBSTRG_REMOVABLE=y
+CONFIG_USBMSC_REMOVABLE=y
 
 #
 # CONFIG_NX

configs/ez80f910200zco/nettest/defconfig

@@ -509,39 +509,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_USBMSC=n
-CONFIG_USBSTRG_EP0MAXPACKET=64
+CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBSTRG_EPBULKOUT=2
+CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBSTRG_EPBULKIN=5
+CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBSTRG_NRDREQS=2
+CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBSTRG_NWRREQS=2
+CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBSTRG_BULKINREQLEN=256
+CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBSTRG_BULKOUTREQLEN=256
+CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBSTRG_VENDORID=0x584e
+CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBSTRG_VENDORSTR="NuttX"
+CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBSTRG_PRODUCTID=0x5342
+CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBSTRG_PRODUCTSTR="USBdev Storage"
+CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBSTRG_VERSIONNO=0x0399
+CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBSTRG_REMOVABLE=y
+CONFIG_USBMSC_REMOVABLE=y
 
 #
 # CONFIG_NX

configs/ez80f910200zco/nsh/defconfig

@@ -509,39 +509,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_USBMSC=n
-CONFIG_USBSTRG_EP0MAXPACKET=64
+CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBSTRG_EPBULKOUT=2
+CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBSTRG_EPBULKIN=5
+CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBSTRG_NRDREQS=2
+CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBSTRG_NWRREQS=2
+CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBSTRG_BULKINREQLEN=256
+CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBSTRG_BULKOUTREQLEN=256
+CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBSTRG_VENDORID=0x584e
+CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBSTRG_VENDORSTR="NuttX"
+CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBSTRG_PRODUCTID=0x5342
+CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBSTRG_PRODUCTSTR="USBdev Storage"
+CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBSTRG_VERSIONNO=0x0399
+CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBSTRG_REMOVABLE=y
+CONFIG_USBMSC_REMOVABLE=y
 
 #
 # CONFIG_NX

configs/ez80f910200zco/ostest/defconfig

@@ -504,39 +504,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_USBMSC=n
-CONFIG_USBSTRG_EP0MAXPACKET=64
+CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBSTRG_EPBULKOUT=2
+CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBSTRG_EPBULKIN=5
+CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBSTRG_NRDREQS=2
+CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBSTRG_NWRREQS=2
+CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBSTRG_BULKINREQLEN=256
+CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBSTRG_BULKOUTREQLEN=256
+CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBSTRG_VENDORID=0x584e
+CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBSTRG_VENDORSTR="NuttX"
+CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBSTRG_PRODUCTID=0x5342
+CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBSTRG_PRODUCTSTR="USBdev Storage"
+CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBSTRG_VERSIONNO=0x0399
+CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBSTRG_REMOVABLE=y
+CONFIG_USBMSC_REMOVABLE=y
 
 #
 # CONFIG_NX

configs/ez80f910200zco/poll/defconfig

@@ -509,39 +509,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_USBMSC=n
-CONFIG_USBSTRG_EP0MAXPACKET=64
+CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBSTRG_EPBULKOUT=2
+CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBSTRG_EPBULKIN=5
+CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBSTRG_NRDREQS=2
+CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBSTRG_NWRREQS=2
+CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBSTRG_BULKINREQLEN=256
+CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBSTRG_BULKOUTREQLEN=256
+CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBSTRG_VENDORID=0x584e
+CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBSTRG_VENDORSTR="NuttX"
+CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBSTRG_PRODUCTID=0x5342
+CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBSTRG_PRODUCTSTR="USBdev Storage"
+CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBSTRG_VERSIONNO=0x0399
+CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBSTRG_REMOVABLE=y
+CONFIG_USBMSC_REMOVABLE=y
 
 #
 # CONFIG_NX

configs/hymini-stm32v/README.txt

@@ -580,7 +580,7 @@ Where <subdir> 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:

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_USBMSC=n
-CONFIG_USBSTRG_EP0MAXPACKET=64
+CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBSTRG_EPBULKOUT=2
+CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBSTRG_EPBULKIN=5
+CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBSTRG_NRDREQS=2
+CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBSTRG_NWRREQS=2
+CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBSTRG_BULKINREQLEN=256
+CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBSTRG_BULKOUTREQLEN=256
+CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBSTRG_VENDORID=0x584e
+CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBSTRG_VENDORSTR="NuttX"
+CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBSTRG_PRODUCTID=0x5342
+CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBSTRG_PRODUCTSTR="USBdev Storage"
+CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBSTRG_VERSIONNO=0x0399
+CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBSTRG_REMOVABLE=y
+CONFIG_USBMSC_REMOVABLE=y
 
 #
 # Settings for examples/uip

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_USBMSC=n
-CONFIG_USBSTRG_EP0MAXPACKET=64
+CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBSTRG_EPBULKOUT=2
+CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBSTRG_EPBULKIN=5
+CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBSTRG_NRDREQS=2
+CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBSTRG_NWRREQS=2
+CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBSTRG_BULKINREQLEN=256
+CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBSTRG_BULKOUTREQLEN=256
+CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBSTRG_VENDORID=0x584e
+CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBSTRG_VENDORSTR="NuttX"
+CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBSTRG_PRODUCTID=0x5342
+CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBSTRG_PRODUCTSTR="USBdev Storage"
+CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBSTRG_VERSIONNO=0x0399
+CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBSTRG_REMOVABLE=y
+CONFIG_USBMSC_REMOVABLE=y
 
 #
 # Settings for examples/uip

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_USBMSC=y
-CONFIG_USBSTRG_EP0MAXPACKET=64
+CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBSTRG_EPBULKOUT=2
+CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBSTRG_EPBULKIN=5
+CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBSTRG_NRDREQS=2
+CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBSTRG_NWRREQS=2
+CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBSTRG_BULKINREQLEN=256
+CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBSTRG_BULKOUTREQLEN=256
+CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBSTRG_VENDORID=0x584e
+CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBSTRG_VENDORSTR="NuttX"
+CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBSTRG_PRODUCTID=0x5342
+CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBSTRG_PRODUCTSTR="USBdev Storage"
+CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBSTRG_VERSIONNO=0x0399
+CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBSTRG_REMOVABLE=y
+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
+#  CONFIG_EXAMPLES_USBMSC_DEVMINOR2 and CONFIG_EXAMPLES_USBMSC_DEVPATH2
-#    Similar parameters that would have to be provided if CONFIG_EXAMPLES_USBSTRG_NLUNS
+#    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
+#  CONFIG_EXAMPLES_USBMSC_DEVMINOR3 and CONFIG_EXAMPLES_USBMSC_DEVPATH3
-#    Similar parameters that would have to be provided if CONFIG_EXAMPLES_USBSTRG_NLUNS
+#    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_USBMSC_BUILTIN=y
-CONFIG_EXAMPLES_USBSTRG_NLUNS=1
+CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBSTRG_DEVMINOR1=0
+CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBSTRG_DEVPATH1="/dev/mmcsd0"
+CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBSTRG_DEBUGMM=n
+CONFIG_EXAMPLES_USBMSC_DEBUGMM=n
-CONFIG_EXAMPLES_USBSTRG_TRACEINIT=n
+CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBSTRG_TRACECLASS=n
+CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBSTRG_TRACETRANSFERS=n
+CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n
+CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n
+CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
 
 
 CONFIG_EXAMPLES_LCDTEST_BUILTIN=y

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_USBMSC=n
-CONFIG_USBSTRG_EP0MAXPACKET=64
+CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBSTRG_EPBULKOUT=2
+CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBSTRG_EPBULKIN=5
+CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBSTRG_NRDREQS=2
+CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBSTRG_NWRREQS=2
+CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBSTRG_BULKINREQLEN=256
+CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBSTRG_BULKOUTREQLEN=256
+CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBSTRG_VENDORID=0x584e
+CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBSTRG_VENDORSTR="NuttX"
+CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBSTRG_PRODUCTID=0x5342
+CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBSTRG_PRODUCTSTR="USBdev Storage"
+CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBSTRG_VERSIONNO=0x0399
+CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBSTRG_REMOVABLE=y
+CONFIG_USBMSC_REMOVABLE=y
 
 #
 # Graphics related configuration settings

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_USBMSC=n
-CONFIG_USBSTRG_EP0MAXPACKET=64
+CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBSTRG_EPBULKOUT=2
+CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBSTRG_EPBULKIN=5
+CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBSTRG_NRDREQS=2
+CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBSTRG_NWRREQS=2
+CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBSTRG_BULKINREQLEN=256
+CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBSTRG_BULKOUTREQLEN=256
+CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBSTRG_VENDORID=0x584e
+CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBSTRG_VENDORSTR="NuttX"
+CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBSTRG_PRODUCTID=0x5342
+CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBSTRG_PRODUCTSTR="USBdev Storage"
+CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBSTRG_VERSIONNO=0x0399
+CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBSTRG_REMOVABLE=y
+CONFIG_USBMSC_REMOVABLE=y
 
 #
 # Graphics related configuration settings

configs/hymini-stm32v/src/Makefile

@@ -55,8 +55,8 @@ ifeq ($(CONFIG_INPUT),y)
 CSRCS		+= up_ts.c
 endif
 
-ifeq ($(CONFIG_USBSTRG),y)
+ifeq ($(CONFIG_USBMSC),y)
-CSRCS		+= up_usbstrg.c
+CSRCS		+= up_usbmsc.c
 endif
 
 COBJS		= $(CSRCS:.c=$(OBJEXT))

configs/hymini-stm32v/src/up_usbmsc.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/hymini-stm32v/src/up_usbstrg.c
+ * configs/hymini-stm32v/src/up_usbmsc.c
  *
  *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -60,8 +60,8 @@
 
 /* Configuration ************************************************************/
 
-#ifndef CONFIG_EXAMPLES_USBSTRG_DEVMINOR1
+#ifndef CONFIG_EXAMPLES_USBMSC_DEVMINOR1
-#  define CONFIG_EXAMPLES_USBSTRG_DEVMINOR1 0
+#  define CONFIG_EXAMPLES_USBMSC_DEVMINOR1 0
 #endif
 
 /* SLOT number(s) could depend on the board configuration */
@@ -100,53 +100,53 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: usbstrg_archinitialize
+ * Name: usbmsc_archinitialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int usbstrg_archinitialize(void)
+int usbmsc_archinitialize(void)
 {
-  /* If examples/usbstrg is built as an NSH command, then SD slot should
+  /* 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_USBSTRG_BUILTIN
+#ifndef CONFIG_EXAMPLES_USBMSC_BUILTIN
   FAR struct sdio_dev_s *sdio;
   int ret;
 
   /* First, get an instance of the SDIO interface */
 
-  message("usbstrg_archinitialize: "
+  message("usbmsc_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",
+      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("usbstrg_archinitialize: "
+  message("usbmsc_archinitialize: "
           "Bind SDIO to the MMC/SD driver, minor=%d\n",
-          CONFIG_EXAMPLES_USBSTRG_DEVMINOR1);
+          CONFIG_EXAMPLES_USBMSC_DEVMINOR1);
 
-  ret = mmcsd_slotinitialize(CONFIG_EXAMPLES_USBSTRG_DEVMINOR1, sdio);
+  ret = mmcsd_slotinitialize(CONFIG_EXAMPLES_USBMSC_DEVMINOR1, sdio);
   if (ret != OK)
     {
-      message("usbstrg_archinitialize: "
+      message("usbmsc_archinitialize: "
               "Failed to bind SDIO to the MMC/SD driver: %d\n",
               ret);
       return ret;
     }
-  message("usbstrg_archinitialize: "
+  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
@@ -156,7 +156,7 @@ int usbstrg_archinitialize(void)
 
    sdio_mediachange(sdio, true);
 
-#endif /* CONFIG_EXAMPLES_USBSTRG_BUILTIN */
+#endif /* CONFIG_EXAMPLES_USBMSC_BUILTIN */
 
    return OK;
 }

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_USBMSC=n
-CONFIG_USBSTRG_EP0MAXPACKET=64
+CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBSTRG_EPBULKOUT=2
+CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBSTRG_EPBULKIN=5
+CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBSTRG_NRDREQS=2
+CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBSTRG_NWRREQS=2
+CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBSTRG_BULKINREQLEN=256
+CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBSTRG_BULKOUTREQLEN=256
+CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBSTRG_VENDORID=0x584e
+CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBSTRG_VENDORSTR="NuttX"
+CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBSTRG_PRODUCTID=0x5342
+CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBSTRG_PRODUCTSTR="USBdev Storage"
+CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBSTRG_VERSIONNO=0x0399
+CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBSTRG_REMOVABLE=y
+CONFIG_USBMSC_REMOVABLE=y
 
 #
 # Settings for examples/uip

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_USBMSC=y
-CONFIG_USBSTRG_EP0MAXPACKET=64
+CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBSTRG_EPBULKOUT=2
+CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBSTRG_EPBULKIN=5
+CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBSTRG_NRDREQS=2
+CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBSTRG_NWRREQS=2
+CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBSTRG_BULKINREQLEN=256
+CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBSTRG_BULKOUTREQLEN=256
+CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBSTRG_VENDORID=0x584e
+CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBSTRG_VENDORSTR="NuttX"
+CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBSTRG_PRODUCTID=0x5342
+CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBSTRG_PRODUCTSTR="USBdev Storage"
+CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBSTRG_VERSIONNO=0x0399
+CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBSTRG_REMOVABLE=y
+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
+#  CONFIG_EXAMPLES_USBMSC_DEVMINOR2 and CONFIG_EXAMPLES_USBMSC_DEVPATH2
-#    Similar parameters that would have to be provided if CONFIG_EXAMPLES_USBSTRG_NLUNS
+#    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
+#  CONFIG_EXAMPLES_USBMSC_DEVMINOR3 and CONFIG_EXAMPLES_USBMSC_DEVPATH3
-#    Similar parameters that would have to be provided if CONFIG_EXAMPLES_USBSTRG_NLUNS
+#    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_USBMSC_BUILTIN=n
-CONFIG_EXAMPLES_USBSTRG_NLUNS=1
+CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBSTRG_DEVMINOR1=0
+CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBSTRG_DEVPATH1="/dev/mmcsd0"
+CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBSTRG_DEBUGMM=n
+CONFIG_EXAMPLES_USBMSC_DEBUGMM=n
-CONFIG_EXAMPLES_USBSTRG_TRACEINIT=n
+CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBSTRG_TRACECLASS=n
+CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBSTRG_TRACETRANSFERS=n
+CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n
+CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n
+CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Stack and heap information

configs/kwikstik-k40/ostest/defconfig

@@ -733,40 +733,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_USBMSC=n
-CONFIG_USBSTRG_EP0MAXPACKET=64
+CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBSTRG_EPBULKOUT=2
+CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBSTRG_EPBULKIN=5
+CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBSTRG_NRDREQS=2
+CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBSTRG_NWRREQS=2
+CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBSTRG_BULKINREQLEN=256
+CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBSTRG_BULKOUTREQLEN=256
+CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBSTRG_VENDORID=0x584e
+CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBSTRG_VENDORSTR="NuttX"
+CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBSTRG_PRODUCTID=0x5342
+CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBSTRG_PRODUCTSTR="USBdev Storage"
+CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBSTRG_VERSIONNO=0x0399
+CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBSTRG_REMOVABLE=y
+CONFIG_USBMSC_REMOVABLE=y
 
 #
 # Settings for examples/uip

configs/kwikstik-k40/src/Makefile

@@ -58,8 +58,8 @@ ifeq ($(CONFIG_USBDEV),y)
 CSRCS		+= up_usbdev.c
 endif
 
-ifeq ($(CONFIG_USBSTRG),y)
+ifeq ($(CONFIG_USBMSC),y)
-CSRCS		+= up_usbstrg.c
+CSRCS		+= up_usbmsc.c
 endif
 
 COBJS		= $(CSRCS:.c=$(OBJEXT))

configs/kwikstik-k40/src/up_usbmsc.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/kwikstik-k40/src/up_usbstrg.c
+ * configs/kwikstik-k40/src/up_usbmsc.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@@ -56,8 +56,8 @@
 
 /* Configuration ************************************************************/
 
-#ifndef CONFIG_EXAMPLES_USBSTRG_DEVMINOR1
+#ifndef CONFIG_EXAMPLES_USBMSC_DEVMINOR1
-#  define CONFIG_EXAMPLES_USBSTRG_DEVMINOR1 0
+#  define CONFIG_EXAMPLES_USBMSC_DEVMINOR1 0
 #endif
 
 /* SLOT number(s) could depend on the board configuration */
@@ -96,23 +96,23 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: usbstrg_archinitialize
+ * Name: usbmsc_archinitialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int usbstrg_archinitialize(void)
+int usbmsc_archinitialize(void)
 {
-  /* If examples/usbstrg is built as an NSH command, then SD slot should
+  /* If examples/usbmsc is built as an NSH command, then SD slot should
    * already have been initized in nsh_archinitialize() (see up_nsh.c).  In
    * this case, there is nothing further to be done here.
    */
 
-#ifndef CONFIG_EXAMPLES_USBSTRG_BUILTIN
+#ifndef CONFIG_EXAMPLES_USBMSC_BUILTIN
 #  warning "Missing logic"
-#endif /* CONFIG_EXAMPLES_USBSTRG_BUILTIN */
+#endif /* CONFIG_EXAMPLES_USBMSC_BUILTIN */
 
    return OK;
 }

configs/lpcxpresso-lpc1768/dhcpd/defconfig

@@ -668,40 +668,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_USBMSC=n
-CONFIG_USBSTRG_EP0MAXPACKET=64
+CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBSTRG_EPBULKOUT=2
+CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBSTRG_EPBULKIN=5
+CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBSTRG_NRDREQS=2
+CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBSTRG_NWRREQS=2
+CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBSTRG_BULKINREQLEN=256
+CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBSTRG_BULKOUTREQLEN=256
+CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBSTRG_VENDORID=0x584e
+CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBSTRG_VENDORSTR="NuttX"
+CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBSTRG_PRODUCTID=0x5342
+CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBSTRG_PRODUCTSTR="USBdev Storage"
+CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBSTRG_VERSIONNO=0x0399
+CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBSTRG_REMOVABLE=y
+CONFIG_USBMSC_REMOVABLE=y
 
 #
 # Settings for examples/uip
@@ -843,46 +843,46 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=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
+#  CONFIG_EXAMPLES_USBMSC_DEVMINOR2 and CONFIG_EXAMPLES_USBMSC_DEVPATH2
-#    Similar parameters that would have to be provided if CONFIG_EXAMPLES_USBSTRG_NLUNS
+#    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
+#  CONFIG_EXAMPLES_USBMSC_DEVMINOR3 and CONFIG_EXAMPLES_USBMSC_DEVPATH3
-#    Similar parameters that would have to be provided if CONFIG_EXAMPLES_USBSTRG_NLUNS
+#    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_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBSTRG_DEVMINOR1=0
+CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBSTRG_DEVPATH1="/dev/mmcsd0"
+CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBSTRG_TRACEINIT=n
+CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBSTRG_TRACECLASS=n
+CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBSTRG_TRACETRANSFERS=n
+CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n
+CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n
+CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Stack and heap information

configs/lpcxpresso-lpc1768/nsh/defconfig

@@ -708,40 +708,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_USBMSC=n
-CONFIG_USBSTRG_EP0MAXPACKET=64
+CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBSTRG_EPBULKOUT=2
+CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBSTRG_EPBULKIN=5
+CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBSTRG_NRDREQS=2
+CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBSTRG_NWRREQS=2
+CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBSTRG_BULKINREQLEN=256
+CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBSTRG_BULKOUTREQLEN=256
+CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBSTRG_VENDORID=0x584e
+CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBSTRG_VENDORSTR="NuttX"
+CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBSTRG_PRODUCTID=0x5342
+CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBSTRG_PRODUCTSTR="USBdev Storage"
+CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBSTRG_VERSIONNO=0x0399
+CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBSTRG_REMOVABLE=y
+CONFIG_USBMSC_REMOVABLE=y
 
 #
 # Settings for examples/uip
@@ -875,46 +875,46 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=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
+#  CONFIG_EXAMPLES_USBMSC_DEVMINOR2 and CONFIG_EXAMPLES_USBMSC_DEVPATH2
-#    Similar parameters that would have to be provided if CONFIG_EXAMPLES_USBSTRG_NLUNS
+#    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
+#  CONFIG_EXAMPLES_USBMSC_DEVMINOR3 and CONFIG_EXAMPLES_USBMSC_DEVPATH3
-#    Similar parameters that would have to be provided if CONFIG_EXAMPLES_USBSTRG_NLUNS
+#    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_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBSTRG_DEVMINOR1=0
+CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBSTRG_DEVPATH1="/dev/mmcsd0"
+CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBSTRG_TRACEINIT=n
+CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBSTRG_TRACECLASS=n
+CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBSTRG_TRACETRANSFERS=n
+CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n
+CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n
+CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Stack and heap information

configs/lpcxpresso-lpc1768/nx/defconfig

@@ -679,40 +679,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_USBMSC=n
-CONFIG_USBSTRG_EP0MAXPACKET=64
+CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBSTRG_EPBULKOUT=2
+CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBSTRG_EPBULKIN=5
+CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBSTRG_NRDREQS=2
+CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBSTRG_NWRREQS=2
+CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBSTRG_BULKINREQLEN=256
+CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBSTRG_BULKOUTREQLEN=256
+CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBSTRG_VENDORID=0x584e
+CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBSTRG_VENDORSTR="NuttX"
+CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBSTRG_PRODUCTID=0x5342
+CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBSTRG_PRODUCTSTR="USBdev Storage"
+CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBSTRG_VERSIONNO=0x0399
+CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBSTRG_REMOVABLE=y
+CONFIG_USBMSC_REMOVABLE=y
 
 #
 # Graphics related configuration settings
@@ -963,46 +963,46 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=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
+#  CONFIG_EXAMPLES_USBMSC_DEVMINOR2 and CONFIG_EXAMPLES_USBMSC_DEVPATH2
-#    Similar parameters that would have to be provided if CONFIG_EXAMPLES_USBSTRG_NLUNS
+#    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
+#  CONFIG_EXAMPLES_USBMSC_DEVMINOR3 and CONFIG_EXAMPLES_USBMSC_DEVPATH3
-#    Similar parameters that would have to be provided if CONFIG_EXAMPLES_USBSTRG_NLUNS
+#    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_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBSTRG_DEVMINOR1=0
+CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBSTRG_DEVPATH1="/dev/mmcsd0"
+CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBSTRG_TRACEINIT=n
+CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBSTRG_TRACECLASS=n
+CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBSTRG_TRACETRANSFERS=n
+CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n
+CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n
+CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Settings for examples/nx

configs/lpcxpresso-lpc1768/ostest/defconfig

@@ -664,40 +664,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_USBMSC=n
-CONFIG_USBSTRG_EP0MAXPACKET=64
+CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBSTRG_EPBULKOUT=2
+CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBSTRG_EPBULKIN=5
+CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBSTRG_NRDREQS=2
+CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBSTRG_NWRREQS=2
+CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBSTRG_BULKINREQLEN=256
+CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBSTRG_BULKOUTREQLEN=256
+CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBSTRG_VENDORID=0x584e
+CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBSTRG_VENDORSTR="NuttX"
+CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBSTRG_PRODUCTID=0x5342
+CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBSTRG_PRODUCTSTR="USBdev Storage"
+CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBSTRG_VERSIONNO=0x0399
+CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBSTRG_REMOVABLE=y
+CONFIG_USBMSC_REMOVABLE=y
 
 #
 # Settings for examples/uip
@@ -831,46 +831,46 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=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
+#  CONFIG_EXAMPLES_USBMSC_DEVMINOR2 and CONFIG_EXAMPLES_USBMSC_DEVPATH2
-#    Similar parameters that would have to be provided if CONFIG_EXAMPLES_USBSTRG_NLUNS
+#    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
+#  CONFIG_EXAMPLES_USBMSC_DEVMINOR3 and CONFIG_EXAMPLES_USBMSC_DEVPATH3
-#    Similar parameters that would have to be provided if CONFIG_EXAMPLES_USBSTRG_NLUNS
+#    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_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBSTRG_DEVMINOR1=0
+CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBSTRG_DEVPATH1="/dev/mmcsd0"
+CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBSTRG_TRACEINIT=n
+CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBSTRG_TRACECLASS=n
+CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBSTRG_TRACETRANSFERS=n
+CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n
+CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n
+CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Stack and heap information

configs/lpcxpresso-lpc1768/src/Makefile

@@ -48,8 +48,8 @@ ifeq ($(CONFIG_NX_LCDDRIVER),y)
 CSRCS       += up_oled.c
 endif
 
-ifeq ($(CONFIG_USBSTRG),y)
+ifeq ($(CONFIG_USBMSC),y)
-CSRCS		+= up_usbstrg.c
+CSRCS		+= up_usbmsc.c
 endif
 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))

configs/lpcxpresso-lpc1768/src/up_usbmsc.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/lpcxpresso-lpc1768/src/up_usbstrg.c
+ * configs/lpcxpresso-lpc1768/src/up_usbmsc.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@@ -54,8 +54,8 @@
 
 /* Configuration ************************************************************/
 
-#ifndef CONFIG_EXAMPLES_USBSTRG_DEVMINOR1
+#ifndef CONFIG_EXAMPLES_USBMSC_DEVMINOR1
-#  define CONFIG_EXAMPLES_USBSTRG_DEVMINOR1 0
+#  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",
           LPC17XX_MMCSDSPIPORTNO);
 
   spi = up_spiinitialize(LPC17XX_MMCSDSPIPORTNO);
   if (!spi)
     {
-      message("usbstrg_archinitialize: Failed to initialize SPI port %d\n",
+      message("usbmsc_archinitialize: Failed to initialize SPI port %d\n",
               LPC17XX_MMCSDSPIPORTNO);
       return -ENODEV;
     }
 
-  message("usbstrg_archinitialize: Successfully initialized SPI port %d\n",
+  message("usbmsc_archinitialize: Successfully initialized SPI port %d\n",
           LPC17XX_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",
           LPC17XX_MMCSDSPIPORTNO, LPC17XX_MMCSDSLOTNO);
 
-  ret = mmcsd_spislotinitialize(CONFIG_EXAMPLES_USBSTRG_DEVMINOR1, LPC17XX_MMCSDSLOTNO, spi);
+  ret = mmcsd_spislotinitialize(CONFIG_EXAMPLES_USBMSC_DEVMINOR1, LPC17XX_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",
               LPC17XX_MMCSDSPIPORTNO, LPC17XX_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",
           LPC17XX_MMCSDSPIPORTNO, LPC17XX_MMCSDSLOTNO);
   return OK;
 }

configs/lpcxpresso-lpc1768/thttpd/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_USBMSC=n
-CONFIG_USBSTRG_EP0MAXPACKET=64
+CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBSTRG_EPBULKOUT=2
+CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBSTRG_EPBULKIN=5
+CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBSTRG_NRDREQS=2
+CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBSTRG_NWRREQS=2
+CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBSTRG_BULKINREQLEN=256
+CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBSTRG_BULKOUTREQLEN=256
+CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBSTRG_VENDORID=0x584e
+CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBSTRG_VENDORSTR="NuttX"
+CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBSTRG_PRODUCTID=0x5342
+CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBSTRG_PRODUCTSTR="USBdev Storage"
+CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBSTRG_VERSIONNO=0x0399
+CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBSTRG_REMOVABLE=y
+CONFIG_USBMSC_REMOVABLE=y
 
 #
 # THTTPD settings
@@ -930,46 +930,46 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=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
+#  CONFIG_EXAMPLES_USBMSC_DEVMINOR2 and CONFIG_EXAMPLES_USBMSC_DEVPATH2
-#    Similar parameters that would have to be provided if CONFIG_EXAMPLES_USBSTRG_NLUNS
+#    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
+#  CONFIG_EXAMPLES_USBMSC_DEVMINOR3 and CONFIG_EXAMPLES_USBMSC_DEVPATH3
-#    Similar parameters that would have to be provided if CONFIG_EXAMPLES_USBSTRG_NLUNS
+#    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_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBSTRG_DEVMINOR1=0
+CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBSTRG_DEVPATH1="/dev/mmcsd0"
+CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBSTRG_TRACEINIT=n
+CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBSTRG_TRACECLASS=n
+CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBSTRG_TRACETRANSFERS=n
+CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n
+CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n
+CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Stack and heap information

configs/lpcxpresso-lpc1768/usbstorage/defconfig

@@ -653,40 +653,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_USBMSC=y
-CONFIG_USBSTRG_EP0MAXPACKET=64
+CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBSTRG_EPBULKOUT=2
+CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBSTRG_EPBULKIN=5
+CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBSTRG_NRDREQS=2
+CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBSTRG_NWRREQS=2
+CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBSTRG_BULKINREQLEN=256
+CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBSTRG_BULKOUTREQLEN=256
+CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBSTRG_VENDORID=0x584e
+CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBSTRG_VENDORSTR="NuttX"
+CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBSTRG_PRODUCTID=0x5342
+CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBSTRG_PRODUCTSTR="USBdev Storage"
+CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBSTRG_VERSIONNO=0x0399
+CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBSTRG_REMOVABLE=y
+CONFIG_USBMSC_REMOVABLE=y
 
 #
 # Settings for examples/uip
@@ -820,46 +820,46 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=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
+#  CONFIG_EXAMPLES_USBMSC_DEVMINOR2 and CONFIG_EXAMPLES_USBMSC_DEVPATH2
-#    Similar parameters that would have to be provided if CONFIG_EXAMPLES_USBSTRG_NLUNS
+#    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
+#  CONFIG_EXAMPLES_USBMSC_DEVMINOR3 and CONFIG_EXAMPLES_USBMSC_DEVPATH3
-#    Similar parameters that would have to be provided if CONFIG_EXAMPLES_USBSTRG_NLUNS
+#    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_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBSTRG_DEVMINOR1=0
+CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBSTRG_DEVPATH1="/dev/mmcsd0"
+CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBSTRG_TRACEINIT=n
+CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBSTRG_TRACECLASS=n
+CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBSTRG_TRACETRANSFERS=n
+CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n
+CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n
+CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Stack and heap information

configs/mbed/hidkbd/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_USBMSC=n
-CONFIG_USBSTRG_EP0MAXPACKET=64
+CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBSTRG_EPBULKOUT=2
+CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBSTRG_EPBULKIN=5
+CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBSTRG_NRDREQS=2
+CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBSTRG_NWRREQS=2
+CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBSTRG_BULKINREQLEN=256
+CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBSTRG_BULKOUTREQLEN=256
+CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBSTRG_VENDORID=0x584e
+CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBSTRG_VENDORSTR="NuttX"
+CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBSTRG_PRODUCTID=0x5342
+CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBSTRG_PRODUCTSTR="USBdev Storage"
+CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBSTRG_VERSIONNO=0x0399
+CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBSTRG_REMOVABLE=y
+CONFIG_USBMSC_REMOVABLE=y
 
 #
 # Settings for examples/uip

configs/mbed/nsh/defconfig

@@ -638,40 +638,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_USBMSC=n
-CONFIG_USBSTRG_EP0MAXPACKET=64
+CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBSTRG_EPBULKOUT=2
+CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBSTRG_EPBULKIN=5
+CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBSTRG_NRDREQS=2
+CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBSTRG_NWRREQS=2
+CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBSTRG_BULKINREQLEN=256
+CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBSTRG_BULKOUTREQLEN=256
+CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBSTRG_VENDORID=0x584e
+CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBSTRG_VENDORSTR="NuttX"
+CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBSTRG_PRODUCTID=0x5342
+CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBSTRG_PRODUCTSTR="USBdev Storage"
+CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBSTRG_VERSIONNO=0x0399
+CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBSTRG_REMOVABLE=y
+CONFIG_USBMSC_REMOVABLE=y
 
 #
 # Settings for examples/uip

configs/mbed/src/Makefile

@@ -42,8 +42,8 @@ CSRCS		= up_boot.c up_leds.c
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
 CSRCS		+= up_nsh.c
 endif
-ifeq ($(CONFIG_USBSTRG),y)
+ifeq ($(CONFIG_USBMSC),y)
-CSRCS		+= up_usbstrg.c
+CSRCS		+= up_usbmsc.c
 endif
 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))

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_USBMSC=n
-CONFIG_USBSTRG_EP0MAXPACKET=64
+CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBSTRG_EPBULKOUT=2
+CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBSTRG_EPBULKIN=5
+CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBSTRG_NRDREQS=2
+CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBSTRG_NWRREQS=2
+CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBSTRG_BULKINREQLEN=256
+CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBSTRG_BULKOUTREQLEN=256
+CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBSTRG_VENDORID=0x584e
+CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBSTRG_VENDORSTR="NuttX"
+CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBSTRG_PRODUCTID=0x5342
+CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBSTRG_PRODUCTSTR="USBdev Storage"
+CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBSTRG_VERSIONNO=0x0399
+CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBSTRG_REMOVABLE=y
+CONFIG_USBMSC_REMOVABLE=y
 
 #
 # Settings for examples/ostest

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_USBMSC=n
-CONFIG_USBSTRG_EP0MAXPACKET=64
+CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBSTRG_EPBULKOUT=2
+CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBSTRG_EPBULKIN=5
+CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBSTRG_NRDREQS=2
+CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBSTRG_NWRREQS=2
+CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBSTRG_BULKINREQLEN=256
+CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBSTRG_BULKOUTREQLEN=256
+CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBSTRG_VENDORID=0x584e
+CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBSTRG_VENDORSTR="NuttX"
+CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBSTRG_PRODUCTID=0x5342
+CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBSTRG_PRODUCTSTR="USBdev Storage"
+CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBSTRG_VERSIONNO=0x0399
+CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBSTRG_REMOVABLE=y
+CONFIG_USBMSC_REMOVABLE=y
 
 #
 # Settings for examples/ostest