Can't use 'class' as a field name! Backward conditional compilation in usbmsc.c

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

4 files changed, 12 insertions, 13 deletions

diff --git a/nuttx/drivers/usbdev/composite_descriptors.c b/nuttx/drivers/usbdev/composite_descriptors.c
index 3fbc5d7d3..9ea6ef2d7 100644
--- a/nuttx/drivers/usbdev/composite_descriptors.c
+++ b/nuttx/drivers/usbdev/composite_descriptors.c
@@ -85,11 +85,11 @@ static const struct usb_devdesc_s g_devdesc =
     MSBYTE(0x0200)
   },
 #ifdef CONFIG_COMPOSITE_IAD
-  USB_CLASS_MISC,                               /* class */
+  USB_CLASS_MISC,                               /* classid */
   2,                                            /* subclass */
   1,                                            /* protocol */
 #else
-  USB_CLASS_PER_INTERFACE,                      /* class */
+  USB_CLASS_PER_INTERFACE,                      /* classid */
   0,                                            /* subclass */
   0,                                            /* protocol */
 #endif
@@ -138,7 +138,7 @@ static const struct usb_qualdesc_s g_qualdesc =
      LSBYTE(0x0200),
      MSBYTE(0x0200)
   },
-  USB_CLASS_VENDOR_SPEC,                        /* class */
+  USB_CLASS_VENDOR_SPEC,                        /* classid */
   0,                                            /* subclass */
   0,                                            /* protocol */
   CONFIG_COMPOSITE_EP0MAXPACKET,                /* mxpacketsize */
diff --git a/nuttx/drivers/usbdev/pl2303.c b/nuttx/drivers/usbdev/pl2303.c
index 81c3376dc..3931dac10 100644
--- a/nuttx/drivers/usbdev/pl2303.c
+++ b/nuttx/drivers/usbdev/pl2303.c
@@ -394,7 +394,7 @@ static const struct usb_devdesc_s g_devdesc =
   USB_SIZEOF_DEVDESC,                           /* len */
   USB_DESC_TYPE_DEVICE,                         /* type */
   {LSBYTE(0x0200), MSBYTE(0x0200)},             /* usb */
-  USB_CLASS_PER_INTERFACE,                      /* class */
+  USB_CLASS_PER_INTERFACE,                      /* classid */
   0,                                            /* subclass */
   0,                                            /* protocol */
   CONFIG_PL2303_EP0MAXPACKET,                   /* maxpacketsize */
@@ -429,7 +429,7 @@ static const struct usb_ifdesc_s g_ifdesc =
   0,                                            /* ifno */
   0,                                            /* alt */
   PL2303_NENDPOINTS,                            /* neps */
-  USB_CLASS_VENDOR_SPEC,                        /* class */
+  USB_CLASS_VENDOR_SPEC,                        /* classid */
   0,                                            /* subclass */
   0,                                            /* protocol */
   PL2303_CONFIGSTRID                            /* iif */
@@ -472,7 +472,7 @@ static const struct usb_qualdesc_s g_qualdesc =
   USB_SIZEOF_QUALDESC,                          /* len */
   USB_DESC_TYPE_DEVICEQUALIFIER,                /* type */
   {LSBYTE(0x0200), MSBYTE(0x0200) },            /* USB */
-  USB_CLASS_VENDOR_SPEC,                        /* class */
+  USB_CLASS_VENDOR_SPEC,                        /* classid */
   0,                                            /* subclass */
   0,                                            /* protocol */
   CONFIG_PL2303_EP0MAXPACKET,                   /* mxpacketsize */
diff --git a/nuttx/drivers/usbdev/usbmsc.c b/nuttx/drivers/usbdev/usbmsc.c
index 948b72fe6..51caeb431 100644
--- a/nuttx/drivers/usbdev/usbmsc.c
+++ b/nuttx/drivers/usbdev/usbmsc.c
@@ -139,7 +139,7 @@ static void   usbmsc_disconnect(FAR struct usbdevclass_driver_s *driver,
 /* Initialization/Uninitialization ******************************************/
 
 static void   usbmsc_lununinitialize(struct usbmsc_lun_s *lun);
-#ifndef CONFIG_USBMSC_COMPOSITE
+#ifdef CONFIG_USBMSC_COMPOSITE
 static int    usbmsc_exportluns(FAR void *handle);
 #endif
 
@@ -1578,7 +1578,7 @@ int usbmsc_unbindlun(FAR void *handle, unsigned int lunno)
  *
  ****************************************************************************/
 
-#ifndef CONFIG_USBMSC_COMPOSITE
+#ifdef CONFIG_USBMSC_COMPOSITE
 static
 #endif
 int usbmsc_exportluns(FAR void *handle)
@@ -1708,7 +1708,6 @@ void usbmsc_uninitialize(FAR void *handle)
   pthread_attr_t attr;
 #endif
   void *value;
-  int ret;
   int i;
 
 #ifdef CONFIG_DEBUG
@@ -1743,7 +1742,7 @@ void usbmsc_uninitialize(FAR void *handle)
        * garbage
        */
 
-      ret = pthread_join(priv->thread, &value);
+      (void)pthread_join(priv->thread, &value);
     }
   priv->thread = 0;
 
diff --git a/nuttx/drivers/usbdev/usbmsc_descriptors.c b/nuttx/drivers/usbdev/usbmsc_descriptors.c
index 5d8efd448..8305a660a 100644
--- a/nuttx/drivers/usbdev/usbmsc_descriptors.c
+++ b/nuttx/drivers/usbdev/usbmsc_descriptors.c
@@ -77,7 +77,7 @@ static const struct usb_devdesc_s g_devdesc =
   USB_SIZEOF_DEVDESC,                           /* len */
   USB_DESC_TYPE_DEVICE,                         /* type */
   {LSBYTE(0x0200), MSBYTE(0x0200)},             /* usb */
-  USB_CLASS_PER_INTERFACE,                      /* class */
+  USB_CLASS_PER_INTERFACE,                      /* classid */
   0,                                            /* subclass */
   0,                                            /* protocol */
   CONFIG_USBMSC_EP0MAXPACKET,                   /* maxpacketsize */
@@ -130,7 +130,7 @@ static const struct usb_ifdesc_s g_ifdesc =
   USBMSC_INTERFACEID,                           /* ifno */
   USBMSC_ALTINTERFACEID,                        /* alt */
   USBMSC_NENDPOINTS,                            /* neps */
-  USB_CLASS_MASS_STORAGE,                       /* class */
+  USB_CLASS_MASS_STORAGE,                       /* classid */
   USBMSC_SUBCLASS_SCSI,                         /* subclass */
   USBMSC_PROTO_BULKONLY,                        /* protocol */
   USBMSC_INTERFACESTRID                         /* iif */
@@ -174,7 +174,7 @@ static const struct usb_qualdesc_s g_qualdesc =
     LSBYTE(0x0200),
     MSBYTE(0x0200)
   },
-  USB_CLASS_PER_INTERFACE,                      /* class */
+  USB_CLASS_PER_INTERFACE,                      /* classid */
   0,                                            /* subclass */
   0,                                            /* protocol */
   CONFIG_USBMSC_EP0MAXPACKET,                   /* mxpacketsize */