fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-16 01:03:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4350 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo
2012-01-31 14:15:36 +00:00
parent 019b83fc54
commit 5d7909fa42
7 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nuttx/drivers/usbdev/composite_descriptors.c
+3 -3
View File
@@ -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 */
nuttx/drivers/usbdev/pl2303.c
+3 -3
View File
@@ -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 */
nuttx/drivers/usbdev/usbmsc.c
+3 -4
View File
@@ -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;
nuttx/drivers/usbdev/usbmsc_descriptors.c
+3 -3
View File
@@ -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 */