Names of some USB device definitions changed to avoid collisions

11 files changed, 49 insertions, 26 deletions

diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index a30e19580..a1b475101 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -5597,4 +5597,7 @@
 	* nuttx/arch/arm/src/sama5/sam_clockconfig.c:  When 480MHz UPLL
 	  is used to drive OHCI, it should have a divider of 10.  However,
 	  that does not work.  A divider of 5 does.  Why? (2013-9-19).
+	* Several USB device driver files:  Change naming of SELFPOWERED
+	  and REMOTEWAKEUP to avoid name collisions.  Prepend the name
+	  of the driver (for example CDCACM_SELFPOWERED) (201309-20).
 
diff --git a/nuttx/Documentation/NuttShell.html b/nuttx/Documentation/NuttShell.html
index 16db13616..b8d59a09b 100644
--- a/nuttx/Documentation/NuttShell.html
+++ b/nuttx/Documentation/NuttShell.html
@@ -1173,7 +1173,7 @@ get [-b|-n] [-f <local-path>] -h <ip-address> <remote-path>
   <tr>
     <td><b><code>-b|-n</code></b></td>
     <td>
-      Selects either binary (&quot;octect&quot;) or test (&quot;netascii&quot;) transfer
+      Selects either binary (&quot;octet&quot;) or test (&quot;netascii&quot;) transfer
       mode.  Default: text.
     </td>
   </tr>
@@ -1885,7 +1885,7 @@ put [-b|-n] [-f &lt;remote-path&gt;] -h &lt;ip-address&gt; &lt;local-path&gt;
   <tr>
     <td><b><code>-b|-n</code></b></td>
     <td>
-      Selects either binary (&quot;octect&quot;) or test (&quot;netascii&quot;) transfer
+      Selects either binary (&quot;octet&quot;) or test (&quot;netascii&quot;) transfer
       mode.  Default: text.
     </td>
   </tr>
diff --git a/nuttx/configs/sama5d3x-ek/README.txt b/nuttx/configs/sama5d3x-ek/README.txt
index f3c3b83b7..dc8204275 100644
--- a/nuttx/configs/sama5d3x-ek/README.txt
+++ b/nuttx/configs/sama5d3x-ek/README.txt
@@ -1250,7 +1250,7 @@ Configurations
         buffered USB debug data once every second:
 
         Application Configuration -> NSH LIbrary:
-          CONFIG_NSH_USBDEV_TRACE=n               : No builtin tracing from NSH
+          CONFIG_NSH_USBDEV_TRACE=n               : No builtin tracing from NSH (USB device only)
           CONFIG_NSH_ARCHINIT=y                   : Automatically start the USB monitor
 
         Application Configuration -> System NSH Add-Ons:
diff --git a/nuttx/configs/sama5d3x-ek/demo/defconfig b/nuttx/configs/sama5d3x-ek/demo/defconfig
index 7a49c0a78..c991918c4 100644
--- a/nuttx/configs/sama5d3x-ek/demo/defconfig
+++ b/nuttx/configs/sama5d3x-ek/demo/defconfig
@@ -154,7 +154,6 @@ CONFIG_SAMA5_DMAC1=y
 CONFIG_SAMA5_UHPHS=y
 CONFIG_SAMA5_UDPHS=y
 # CONFIG_SAMA5_GMAC is not set
-# CONFIG_SAMA5_EMAC is not set
 # CONFIG_SAMA5_LCDC is not set
 # CONFIG_SAMA5_ISI is not set
 # CONFIG_SAMA5_SSC0 is not set
@@ -174,6 +173,8 @@ CONFIG_SAMA5_PIO_IRQ=y
 # CONFIG_SAMA5_PIOC_IRQ is not set
 CONFIG_SAMA5_PIOD_IRQ=y
 # CONFIG_SAMA5_PIOE_IRQ is not set
+CONFIG_SAMA5_HAVE_GMAC=y
+# CONFIG_SAMA5_HAVE_EMAC is not set
 
 #
 # SPI device driver options
@@ -642,7 +643,6 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 #
 # CONFIG_EXAMPLES_BUTTONS is not set
 # CONFIG_EXAMPLES_CAN is not set
-# CONFIG_EXAMPLES_CC3000BASIC is not set
 # CONFIG_EXAMPLES_COMPOSITE is not set
 # CONFIG_EXAMPLES_CXXTEST is not set
 # CONFIG_EXAMPLES_DHCPD is not set
diff --git a/nuttx/drivers/usbdev/cdcacm_desc.c b/nuttx/drivers/usbdev/cdcacm_desc.c
index 58dcc123f..6f22ddad8 100644
--- a/nuttx/drivers/usbdev/cdcacm_desc.c
+++ b/nuttx/drivers/usbdev/cdcacm_desc.c
@@ -134,7 +134,9 @@ static const struct usb_cfgdesc_s g_cfgdesc =
   CDCACM_NINTERFACES,                           /* ninterfaces */
   CDCACM_CONFIGID,                              /* cfgvalue */
   CDCACM_CONFIGSTRID,                           /* icfg */
-  USB_CONFIG_ATTR_ONE|SELFPOWERED|REMOTEWAKEUP, /* attr */
+  USB_CONFIG_ATTR_ONE |                         /* attr */
+    CDCACM_SELFPOWERED |
+    CDCACM_REMOTEWAKEUP,
   (CONFIG_USBDEV_MAXPOWER + 1) / 2              /* mxpower */
 };
 #endif
diff --git a/nuttx/drivers/usbdev/composite.h b/nuttx/drivers/usbdev/composite.h
index 0c022427c..ae97b25fb 100644
--- a/nuttx/drivers/usbdev/composite.h
+++ b/nuttx/drivers/usbdev/composite.h
@@ -103,6 +103,18 @@
 #undef CONFIG_COMPOSITE_CONFIGSTR
 #define CONFIG_COMPOSITE_CONFIGSTR "Composite"
 
+#ifdef CONFIG_USBDEV_SELFPOWERED
+#  define COMPOSITE_SELFPOWERED USB_CONFIG_ATTR_SELFPOWER
+#else
+#  define COMPOSITE_SELFPOWERED (0)
+#endif
+
+#ifdef CONFIG_USBDEV_REMOTEWAKEUP
+#  define COMPOSITE_REMOTEWAKEUP USB_CONFIG_ATTR_WAKEUP
+#else
+#  define COMPOSITE_REMOTEWAKEUP (0)
+#endif
+
 /* Constituent devices ******************************************************/
 
 #undef DEV1_IS_CDCACM
diff --git a/nuttx/drivers/usbdev/composite_desc.c b/nuttx/drivers/usbdev/composite_desc.c
index 0a0cd4a6a..2cc94e07f 100644
--- a/nuttx/drivers/usbdev/composite_desc.c
+++ b/nuttx/drivers/usbdev/composite_desc.c
@@ -125,7 +125,9 @@ static const struct usb_cfgdesc_s g_cfgdesc =
   COMPOSITE_NINTERFACES,                        /* ninterfaces */
   COMPOSITE_CONFIGID,                           /* cfgvalue */
   COMPOSITE_CONFIGSTRID,                        /* icfg */
-  USB_CONFIG_ATTR_ONE|SELFPOWERED|REMOTEWAKEUP, /* attr */
+  USB_CONFIG_ATTR_ONE |                         /* attr */
+    COMPOSITE_SELFPOWERED |
+    COMPOSITE_REMOTEWAKEUP,
   (CONFIG_USBDEV_MAXPOWER + 1) / 2              /* mxpower */
 };
 
diff --git a/nuttx/drivers/usbdev/pl2303.c b/nuttx/drivers/usbdev/pl2303.c
index 4f75275e2..8c36ade4c 100644
--- a/nuttx/drivers/usbdev/pl2303.c
+++ b/nuttx/drivers/usbdev/pl2303.c
@@ -139,16 +139,16 @@
 
 /* USB Controller */
 
-#ifndef CONFIG_USBDEV_SELFPOWERED
-#  define SELFPOWERED USB_CONFIG_ATTR_SELFPOWER
+#ifdef CONFIG_USBDEV_SELFPOWERED
+#  define PL2303_SELFPOWERED USB_CONFIG_ATTR_SELFPOWER
 #else
-#  define SELFPOWERED (0)
+#  define PL2303_SELFPOWERED (0)
 #endif
 
-#ifndef CONFIG_USBDEV_REMOTEWAKEUP
-#  define REMOTEWAKEUP USB_CONFIG_ATTR_WAKEUP
+#ifdef CONFIG_USBDEV_REMOTEWAKEUP
+#  define PL2303_REMOTEWAKEUP USB_CONFIG_ATTR_WAKEUP
 #else
-#  define REMOTEWAKEUP (0)
+#  define PL2303_REMOTEWAKEUP (0)
 #endif
 
 #ifndef CONFIG_USBDEV_MAXPOWER
@@ -438,7 +438,9 @@ static const struct usb_cfgdesc_s g_cfgdesc =
   PL2303_NINTERFACES,                           /* ninterfaces */
   PL2303_CONFIGID,                              /* cfgvalue */
   PL2303_CONFIGSTRID,                           /* icfg */
-  USB_CONFIG_ATTR_ONE|SELFPOWERED|REMOTEWAKEUP, /* attr */
+  USB_CONFIG_ATTR_ONE |                         /* attr */
+    PL2303_SELFPOWERED |
+    PL2303_REMOTEWAKEUP,
   (CONFIG_USBDEV_MAXPOWER + 1) / 2              /* mxpower */
 };
 
diff --git a/nuttx/drivers/usbdev/usbmsc.h b/nuttx/drivers/usbdev/usbmsc.h
index da35ae923..23c623692 100644
--- a/nuttx/drivers/usbdev/usbmsc.h
+++ b/nuttx/drivers/usbdev/usbmsc.h
@@ -1,7 +1,7 @@
 /****************************************************************************
  * drivers/usbdev/usbmsc.h
  *
- *   Copyright (C) 2008-2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Mass storage class device.  Bulk-only with SCSI subclass.
@@ -226,16 +226,16 @@
 
 /* USB Controller */
 
-#ifndef CONFIG_USBDEV_SELFPOWERED
-#  define SELFPOWERED USB_CONFIG_ATTR_SELFPOWER
+#ifdef CONFIG_USBDEV_SELFPOWERED
+#  define USBMSC_SELFPOWERED USB_CONFIG_ATTR_SELFPOWER
 #else
-#  define SELFPOWERED (0)
+#  define USBMSC_SELFPOWERED (0)
 #endif
 
-#ifndef  CONFIG_USBDEV_REMOTEWAKEUP
-#  define REMOTEWAKEUP USB_CONFIG_ATTR_WAKEUP
+#ifdef  CONFIG_USBDEV_REMOTEWAKEUP
+#  define USBMSC_REMOTEWAKEUP USB_CONFIG_ATTR_WAKEUP
 #else
-#  define REMOTEWAKEUP (0)
+#  define USBMSC_REMOTEWAKEUP (0)
 #endif
 
 #ifndef CONFIG_USBDEV_MAXPOWER
diff --git a/nuttx/drivers/usbdev/usbmsc_desc.c b/nuttx/drivers/usbdev/usbmsc_desc.c
index 90e9decda..81e188dab 100644
--- a/nuttx/drivers/usbdev/usbmsc_desc.c
+++ b/nuttx/drivers/usbdev/usbmsc_desc.c
@@ -116,7 +116,9 @@ static const struct usb_cfgdesc_s g_cfgdesc =
   USBMSC_NINTERFACES,                           /* ninterfaces */
   USBMSC_CONFIGID,                              /* cfgvalue */
   USBMSC_CONFIGSTRID,                           /* icfg */
-  USB_CONFIG_ATTR_ONE|SELFPOWERED|REMOTEWAKEUP, /* attr */
+  USB_CONFIG_ATTR_ONE |                         /* attr */
+    USBMSC_SELFPOWERED |
+    USBMSC_REMOTEWAKEUP,
   (CONFIG_USBDEV_MAXPOWER + 1) / 2              /* mxpower */
 };
 #endif
diff --git a/nuttx/include/nuttx/usb/cdcacm.h b/nuttx/include/nuttx/usb/cdcacm.h
index 398731165..1ede25024 100644
--- a/nuttx/include/nuttx/usb/cdcacm.h
+++ b/nuttx/include/nuttx/usb/cdcacm.h
@@ -220,15 +220,15 @@
 /* USB Controller */
 
 #ifdef CONFIG_USBDEV_SELFPOWERED
-#  define SELFPOWERED USB_CONFIG_ATTR_SELFPOWER
+#  define CDCACM_SELFPOWERED USB_CONFIG_ATTR_SELFPOWER
 #else
-#  define SELFPOWERED (0)
+#  define CDCACM_SELFPOWERED (0)
 #endif
 
 #ifdef CONFIG_USBDEV_REMOTEWAKEUP
-#  define REMOTEWAKEUP USB_CONFIG_ATTR_WAKEUP
+#  define CDCACM_REMOTEWAKEUP USB_CONFIG_ATTR_WAKEUP
 #else
-#  define REMOTEWAKEUP (0)
+#  define CDCACM_REMOTEWAKEUP (0)
 #endif
 
 #ifndef CONFIG_USBDEV_MAXPOWER