mirror of
https://github.com/apache/nuttx.git
synced 2026-09-25 09:15:09 +08:00
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
This commit is contained in:
@@ -45,7 +45,7 @@ ifeq ($(CONFIG_CDCSER),y)
|
||||
CSRCS += cdcacm.c cdcacm_descriptors.c
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_USBSTRG),y)
|
||||
ifeq ($(CONFIG_USBMSC),y)
|
||||
CSRCS += msc.c msc_descriptors.c msc_scsi.c
|
||||
endif
|
||||
|
||||
|
||||
+27
-27
@@ -55,7 +55,7 @@
|
||||
# include "cdcacm.h"
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_USBSTRG_COMPOSITE
|
||||
#ifdef CONFIG_USBMSC_COMPOSITE
|
||||
# include "msc.h"
|
||||
#endif
|
||||
|
||||
@@ -114,18 +114,18 @@
|
||||
|
||||
/* Constituent devices ******************************************************/
|
||||
|
||||
#undef DEV1_IS_CDCSERIAL
|
||||
#undef DEV1_IS_USBSTRG
|
||||
#undef DEV1_IS_CDCACM
|
||||
#undef DEV1_IS_USBMSC
|
||||
|
||||
#undef DEV2_IS_CDCSERIAL
|
||||
#undef DEV2_IS_USBSTRG
|
||||
#undef DEV2_IS_CDCACM
|
||||
#undef DEV2_IS_USBMSC
|
||||
|
||||
/* Pick the first device in the composite. At present, this may only be
|
||||
* the CDC serial device or the mass storage device.
|
||||
*/
|
||||
|
||||
#if defined(CONFIG_CDCSER_COMPOSITE)
|
||||
# define DEV1_IS_CDCSERIAL 1
|
||||
# define DEV1_IS_CDCACM 1
|
||||
# define DEV1_MKCFGDESC cdcser_mkcfgdesc
|
||||
# define DEV1_CLASSOBJECT board_cdcclassobject
|
||||
# define DEV1_NCONFIGS CDCSER_NCONFIGS
|
||||
@@ -136,16 +136,16 @@
|
||||
# define DEV1_NSTRIDS (CDCSER_LASTSTRID-CONFIG_CDCSER_STRBASE)
|
||||
# define DEV1_CFGDESCSIZE SIZEOF_CDCSER_CFGDESC
|
||||
#elif defined(CONFIG_CDCSER_COMPOSITE)
|
||||
# define DEV1_IS_USBSTRG 1
|
||||
# define DEV1_MKCFGDESC usbstrg_mkcfgdesc
|
||||
# define DEV1_IS_USBMSC 1
|
||||
# define DEV1_MKCFGDESC usbmsc_mkcfgdesc
|
||||
# define DEV1_CLASSOBJECT board_mscclassobject
|
||||
# define DEV1_NCONFIGS USBSTRG_NCONFIGS
|
||||
# define DEV1_CONFIGID USBSTRG_CONFIGID
|
||||
# define DEV1_FIRSTINTERFACE CONFIG_USBSTRG_IFNOBASE
|
||||
# define DEV1_NINTERFACES USBSTRG_NINTERFACES
|
||||
# define DEV1_FIRSTSTRID CONFIG_USBSTRG_IFNOBASE
|
||||
# define DEV1_NSTRIDS (USBSTRG_LASTSTRID-CONFIG_USBSTRG_STRBASE)
|
||||
# define DEV1_CFGDESCSIZE SIZEOF_USBSTRG_CFGDESC
|
||||
# define DEV1_NCONFIGS USBMSC_NCONFIGS
|
||||
# define DEV1_CONFIGID USBMSC_CONFIGID
|
||||
# define DEV1_FIRSTINTERFACE CONFIG_USBMSC_IFNOBASE
|
||||
# define DEV1_NINTERFACES USBMSC_NINTERFACES
|
||||
# define DEV1_FIRSTSTRID CONFIG_USBMSC_IFNOBASE
|
||||
# define DEV1_NSTRIDS (USBMSC_LASTSTRID-CONFIG_USBMSC_STRBASE)
|
||||
# define DEV1_CFGDESCSIZE SIZEOF_USBMSC_CFGDESC
|
||||
#else
|
||||
# error "No members of the composite defined"
|
||||
#endif
|
||||
@@ -154,8 +154,8 @@
|
||||
* the CDC serial device or the mass storage device.
|
||||
*/
|
||||
|
||||
#if defined(CONFIG_CDCSER_COMPOSITE) && !defined(DEV1_IS_CDCSERIAL)
|
||||
# define DEV2_IS_CDCSERIAL 1
|
||||
#if defined(CONFIG_CDCSER_COMPOSITE) && !defined(DEV1_IS_CDCACM)
|
||||
# define DEV2_IS_CDCACM 1
|
||||
# define DEV2_MKCFGDESC cdcser_mkcfgdesc
|
||||
# define DEV2_CLASSOBJECT board_cdcclassobject
|
||||
# define DEV2_NCONFIGS CDCSER_NCONFIGS
|
||||
@@ -165,17 +165,17 @@
|
||||
# define DEV2_FIRSTSTRID CONFIG_CDCSER_STRBASE
|
||||
# define DEV2_NSTRIDS (CDCSER_LASTSTRID-CONFIG_CDCSER_STRBASE)
|
||||
# define DEV2_CFGDESCSIZE SIZEOF_CDCSER_CFGDESC
|
||||
#elif defined(CONFIG_CDCSER_COMPOSITE) && !defined(DEV1_IS_USBSTRG)
|
||||
# define DEV2_IS_USBSTRG 1
|
||||
# define DEV2_MKCFGDESC usbstrg_mkcfgdesc
|
||||
#elif defined(CONFIG_CDCSER_COMPOSITE) && !defined(DEV1_IS_USBMSC)
|
||||
# define DEV2_IS_USBMSC 1
|
||||
# define DEV2_MKCFGDESC usbmsc_mkcfgdesc
|
||||
# define DEV2_CLASSOBJECT board_mscclassobject
|
||||
# define DEV2_NCONFIGS USBSTRG_NCONFIGS
|
||||
# define DEV2_CONFIGID USBSTRG_CONFIGID
|
||||
# define DEV2_FIRSTINTERFACE CONFIG_USBSTRG_IFNOBASE
|
||||
# define DEV2_NINTERFACES USBSTRG_NINTERFACES
|
||||
# define DEV2_NCONFIGS USBMSC_NCONFIGS
|
||||
# define DEV2_CONFIGID USBMSC_CONFIGID
|
||||
# define DEV2_FIRSTINTERFACE CONFIG_USBMSC_IFNOBASE
|
||||
# define DEV2_NINTERFACES USBMSC_NINTERFACES
|
||||
# define DEV2_FIRSTSTRID CONFIG_CDCSER_STRBASE
|
||||
# define DEV2_NSTRIDS (USBSTRG_LASTSTRID-CONFIG_USBSTRG_STRBASE)
|
||||
# define DEV2_CFGDESCSIZE SIZEOF_USBSTRG_CFGDESC
|
||||
# define DEV2_NSTRIDS (USBMSC_LASTSTRID-CONFIG_USBMSC_STRBASE)
|
||||
# define DEV2_CFGDESCSIZE SIZEOF_USBMSC_CFGDESC
|
||||
#else
|
||||
# error "Insufficient members of the composite defined"
|
||||
#endif
|
||||
@@ -253,7 +253,7 @@ extern const char g_compserialstr[];
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Name: usbstrg_mkstrdesc
|
||||
* Name: usbmsc_mkstrdesc
|
||||
*
|
||||
* Description:
|
||||
* Construct a string descriptor
|
||||
|
||||
@@ -150,7 +150,7 @@ static const struct usb_qualdesc_s g_qualdesc =
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Name: usbstrg_mkstrdesc
|
||||
* Name: composite_mkstrdesc
|
||||
*
|
||||
* Description:
|
||||
* Construct a string descriptor
|
||||
|
||||
+242
-242
File diff suppressed because it is too large
Load Diff
+180
-180
File diff suppressed because it is too large
Load Diff
@@ -71,7 +71,7 @@
|
||||
* composite device logic.
|
||||
*/
|
||||
|
||||
#ifndef CONFIG_USBSTRG_COMPOSITE
|
||||
#ifndef CONFIG_USBMSC_COMPOSITE
|
||||
static const struct usb_devdesc_s g_devdesc =
|
||||
{
|
||||
USB_SIZEOF_DEVDESC, /* len */
|
||||
@@ -80,22 +80,22 @@ static const struct usb_devdesc_s g_devdesc =
|
||||
USB_CLASS_PER_INTERFACE, /* class */
|
||||
0, /* subclass */
|
||||
0, /* protocol */
|
||||
CONFIG_USBSTRG_EP0MAXPACKET, /* maxpacketsize */
|
||||
CONFIG_USBMSC_EP0MAXPACKET, /* maxpacketsize */
|
||||
{ /* vendor */
|
||||
LSBYTE(CONFIG_USBSTRG_VENDORID),
|
||||
MSBYTE(CONFIG_USBSTRG_VENDORID)
|
||||
LSBYTE(CONFIG_USBMSC_VENDORID),
|
||||
MSBYTE(CONFIG_USBMSC_VENDORID)
|
||||
},
|
||||
{ /* product */
|
||||
LSBYTE(CONFIG_USBSTRG_PRODUCTID),
|
||||
MSBYTE(CONFIG_USBSTRG_PRODUCTID) },
|
||||
LSBYTE(CONFIG_USBMSC_PRODUCTID),
|
||||
MSBYTE(CONFIG_USBMSC_PRODUCTID) },
|
||||
{ /* device */
|
||||
LSBYTE(CONFIG_USBSTRG_VERSIONNO),
|
||||
MSBYTE(CONFIG_USBSTRG_VERSIONNO)
|
||||
LSBYTE(CONFIG_USBMSC_VERSIONNO),
|
||||
MSBYTE(CONFIG_USBMSC_VERSIONNO)
|
||||
},
|
||||
USBSTRG_MANUFACTURERSTRID, /* imfgr */
|
||||
USBSTRG_PRODUCTSTRID, /* iproduct */
|
||||
USBSTRG_SERIALSTRID, /* serno */
|
||||
USBSTRG_NCONFIGS /* nconfigs */
|
||||
USBMSC_MANUFACTURERSTRID, /* imfgr */
|
||||
USBMSC_PRODUCTSTRID, /* iproduct */
|
||||
USBMSC_SERIALSTRID, /* serno */
|
||||
USBMSC_NCONFIGS /* nconfigs */
|
||||
};
|
||||
#endif
|
||||
|
||||
@@ -104,15 +104,15 @@ static const struct usb_devdesc_s g_devdesc =
|
||||
* composite device logic.
|
||||
*/
|
||||
|
||||
#ifndef CONFIG_USBSTRG_COMPOSITE
|
||||
#ifndef CONFIG_USBMSC_COMPOSITE
|
||||
static const struct usb_cfgdesc_s g_cfgdesc =
|
||||
{
|
||||
USB_SIZEOF_CFGDESC, /* len */
|
||||
USB_DESC_TYPE_CONFIG, /* type */
|
||||
{0, 0}, /* totallen -- to be provided */
|
||||
USBSTRG_NINTERFACES, /* ninterfaces */
|
||||
USBSTRG_CONFIGID, /* cfgvalue */
|
||||
USBSTRG_CONFIGSTRID, /* icfg */
|
||||
USBMSC_NINTERFACES, /* ninterfaces */
|
||||
USBMSC_CONFIGID, /* cfgvalue */
|
||||
USBMSC_CONFIGSTRID, /* icfg */
|
||||
USB_CONFIG_ATTR_ONE|SELFPOWERED|REMOTEWAKEUP, /* attr */
|
||||
(CONFIG_USBDEV_MAXPOWER + 1) / 2 /* mxpower */
|
||||
};
|
||||
@@ -124,13 +124,13 @@ static const struct usb_ifdesc_s g_ifdesc =
|
||||
{
|
||||
USB_SIZEOF_IFDESC, /* len */
|
||||
USB_DESC_TYPE_INTERFACE, /* type */
|
||||
USBSTRG_INTERFACEID, /* ifno */
|
||||
USBSTRG_ALTINTERFACEID, /* alt */
|
||||
USBSTRG_NENDPOINTS, /* neps */
|
||||
USBMSC_INTERFACEID, /* ifno */
|
||||
USBMSC_ALTINTERFACEID, /* alt */
|
||||
USBMSC_NENDPOINTS, /* neps */
|
||||
USB_CLASS_MASS_STORAGE, /* class */
|
||||
USBSTRG_SUBCLASS_SCSI, /* subclass */
|
||||
USBSTRG_PROTO_BULKONLY, /* protocol */
|
||||
USBSTRG_INTERFACESTRID /* iif */
|
||||
USBMSC_SUBCLASS_SCSI, /* subclass */
|
||||
USBMSC_PROTO_BULKONLY, /* protocol */
|
||||
USBMSC_INTERFACESTRID /* iif */
|
||||
};
|
||||
|
||||
/* Endpoint descriptors */
|
||||
@@ -139,11 +139,11 @@ static const struct usb_epdesc_s g_fsepbulkoutdesc =
|
||||
{
|
||||
USB_SIZEOF_EPDESC, /* len */
|
||||
USB_DESC_TYPE_ENDPOINT, /* type */
|
||||
USBSTRG_EPOUTBULK_ADDR, /* addr */
|
||||
USBSTRG_EPOUTBULK_ATTR, /* attr */
|
||||
USBMSC_EPOUTBULK_ADDR, /* addr */
|
||||
USBMSC_EPOUTBULK_ATTR, /* attr */
|
||||
{ /* maxpacket */
|
||||
LSBYTE(USBSTRG_FSBULKMAXPACKET),
|
||||
MSBYTE(USBSTRG_FSBULKMAXPACKET)
|
||||
LSBYTE(USBMSC_FSBULKMAXPACKET),
|
||||
MSBYTE(USBMSC_FSBULKMAXPACKET)
|
||||
},
|
||||
0 /* interval */
|
||||
};
|
||||
@@ -152,17 +152,17 @@ static const struct usb_epdesc_s g_fsepbulkindesc =
|
||||
{
|
||||
USB_SIZEOF_EPDESC, /* len */
|
||||
USB_DESC_TYPE_ENDPOINT, /* type */
|
||||
USBSTRG_EPINBULK_ADDR, /* addr */
|
||||
USBSTRG_EPINBULK_ATTR, /* attr */
|
||||
USBMSC_EPINBULK_ADDR, /* addr */
|
||||
USBMSC_EPINBULK_ATTR, /* attr */
|
||||
{ /* maxpacket */
|
||||
LSBYTE(USBSTRG_FSBULKMAXPACKET),
|
||||
MSBYTE(USBSTRG_FSBULKMAXPACKET)
|
||||
LSBYTE(USBMSC_FSBULKMAXPACKET),
|
||||
MSBYTE(USBMSC_FSBULKMAXPACKET)
|
||||
},
|
||||
0 /* interval */
|
||||
};
|
||||
|
||||
#ifdef CONFIG_USBDEV_DUALSPEED
|
||||
#ifndef CONFIG_USBSTRG_COMPOSITE
|
||||
#ifndef CONFIG_USBMSC_COMPOSITE
|
||||
static const struct usb_qualdesc_s g_qualdesc =
|
||||
{
|
||||
USB_SIZEOF_QUALDESC, /* len */
|
||||
@@ -174,8 +174,8 @@ static const struct usb_qualdesc_s g_qualdesc =
|
||||
USB_CLASS_PER_INTERFACE, /* class */
|
||||
0, /* subclass */
|
||||
0, /* protocol */
|
||||
CONFIG_USBSTRG_EP0MAXPACKET, /* mxpacketsize */
|
||||
USBSTRG_NCONFIGS, /* nconfigs */
|
||||
CONFIG_USBMSC_EP0MAXPACKET, /* mxpacketsize */
|
||||
USBMSC_NCONFIGS, /* nconfigs */
|
||||
0, /* reserved */
|
||||
};
|
||||
#endif
|
||||
@@ -184,11 +184,11 @@ static const struct usb_epdesc_s g_hsepbulkoutdesc =
|
||||
{
|
||||
USB_SIZEOF_EPDESC, /* len */
|
||||
USB_DESC_TYPE_ENDPOINT, /* type */
|
||||
USBSTRG_EPOUTBULK_ADDR, /* addr */
|
||||
USBSTRG_EPOUTBULK_ATTR, /* attr */
|
||||
USBMSC_EPOUTBULK_ADDR, /* addr */
|
||||
USBMSC_EPOUTBULK_ATTR, /* attr */
|
||||
{ /* maxpacket */
|
||||
LSBYTE(USBSTRG_HSBULKMAXPACKET),
|
||||
MSBYTE(USBSTRG_HSBULKMAXPACKET)
|
||||
LSBYTE(USBMSC_HSBULKMAXPACKET),
|
||||
MSBYTE(USBMSC_HSBULKMAXPACKET)
|
||||
},
|
||||
0 /* interval */
|
||||
};
|
||||
@@ -197,11 +197,11 @@ static const struct usb_epdesc_s g_hsepbulkindesc =
|
||||
{
|
||||
USB_SIZEOF_EPDESC, /* len */
|
||||
USB_DESC_TYPE_ENDPOINT, /* type */
|
||||
USBSTRG_EPINBULK_ADDR, /* addr */
|
||||
USBSTRG_EPINBULK_ATTR, /* attr */
|
||||
USBMSC_EPINBULK_ADDR, /* addr */
|
||||
USBMSC_EPINBULK_ATTR, /* attr */
|
||||
{ /* maxpacket */
|
||||
LSBYTE(USBSTRG_HSBULKMAXPACKET),
|
||||
MSBYTE(USBSTRG_HSBULKMAXPACKET)
|
||||
LSBYTE(USBMSC_HSBULKMAXPACKET),
|
||||
MSBYTE(USBMSC_HSBULKMAXPACKET)
|
||||
},
|
||||
0 /* interval */
|
||||
};
|
||||
@@ -212,10 +212,10 @@ static const struct usb_epdesc_s g_hsepbulkindesc =
|
||||
****************************************************************************/
|
||||
/* Strings ******************************************************************/
|
||||
|
||||
#ifndef CONFIG_USBSTRG_COMPOSITE
|
||||
const char g_msccendorstr[] = CONFIG_USBSTRG_VENDORSTR;
|
||||
const char g_mscproductstr[] = CONFIG_USBSTRG_PRODUCTSTR;
|
||||
const char g_mscserialstr[] = CONFIG_USBSTRG_SERIALSTR;
|
||||
#ifndef CONFIG_USBMSC_COMPOSITE
|
||||
const char g_msccendorstr[] = CONFIG_USBMSC_VENDORSTR;
|
||||
const char g_mscproductstr[] = CONFIG_USBMSC_PRODUCTSTR;
|
||||
const char g_mscserialstr[] = CONFIG_USBMSC_SERIALSTR;
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
@@ -227,14 +227,14 @@ const char g_mscserialstr[] = CONFIG_USBSTRG_SERIALSTR;
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Name: usbstrg_mkstrdesc
|
||||
* Name: usbmsc_mkstrdesc
|
||||
*
|
||||
* Description:
|
||||
* Construct a string descriptor
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
int usbstrg_mkstrdesc(uint8_t id, struct usb_strdesc_s *strdesc)
|
||||
int usbmsc_mkstrdesc(uint8_t id, struct usb_strdesc_s *strdesc)
|
||||
{
|
||||
const char *str;
|
||||
int len;
|
||||
@@ -243,34 +243,34 @@ int usbstrg_mkstrdesc(uint8_t id, struct usb_strdesc_s *strdesc)
|
||||
|
||||
switch (id)
|
||||
{
|
||||
#ifndef CONFIG_USBSTRG_COMPOSITE
|
||||
#ifndef CONFIG_USBMSC_COMPOSITE
|
||||
case 0:
|
||||
{
|
||||
/* Descriptor 0 is the language id */
|
||||
|
||||
strdesc->len = 4;
|
||||
strdesc->type = USB_DESC_TYPE_STRING;
|
||||
strdesc->data[0] = LSBYTE(USBSTRG_STR_LANGUAGE);
|
||||
strdesc->data[1] = MSBYTE(USBSTRG_STR_LANGUAGE);
|
||||
strdesc->data[0] = LSBYTE(USBMSC_STR_LANGUAGE);
|
||||
strdesc->data[1] = MSBYTE(USBMSC_STR_LANGUAGE);
|
||||
return 4;
|
||||
}
|
||||
|
||||
case USBSTRG_MANUFACTURERSTRID:
|
||||
case USBMSC_MANUFACTURERSTRID:
|
||||
str = g_vendorstr;
|
||||
break;
|
||||
|
||||
case USBSTRG_PRODUCTSTRID:
|
||||
case USBMSC_PRODUCTSTRID:
|
||||
str = g_productstr;
|
||||
break;
|
||||
|
||||
case USBSTRG_SERIALSTRID:
|
||||
case USBMSC_SERIALSTRID:
|
||||
str = g_serialstr;
|
||||
break;
|
||||
#endif
|
||||
|
||||
/* case USBSTRG_CONFIGSTRID: */
|
||||
case USBSTRG_INTERFACESTRID:
|
||||
str = CONFIG_USBSTRG_CONFIGSTR;
|
||||
/* case USBMSC_CONFIGSTRID: */
|
||||
case USBMSC_INTERFACESTRID:
|
||||
str = CONFIG_USBMSC_CONFIGSTR;
|
||||
break;
|
||||
|
||||
default:
|
||||
@@ -294,22 +294,22 @@ int usbstrg_mkstrdesc(uint8_t id, struct usb_strdesc_s *strdesc)
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
* Name: usbstrg_getepdesc
|
||||
* Name: usbmsc_getepdesc
|
||||
*
|
||||
* Description:
|
||||
* Return a pointer to the raw device descriptor
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef CONFIG_USBSTRG_COMPOSITE
|
||||
FAR const struct usb_devdesc_s *usbstrg_getdevdesc(void)
|
||||
#ifndef CONFIG_USBMSC_COMPOSITE
|
||||
FAR const struct usb_devdesc_s *usbmsc_getdevdesc(void)
|
||||
{
|
||||
return &g_devdesc;
|
||||
}
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Name: usbstrg_getepdesc
|
||||
* Name: usbmsc_getepdesc
|
||||
*
|
||||
* Description:
|
||||
* Return a pointer to the raw endpoint descriptor (used for configuring
|
||||
@@ -317,21 +317,21 @@ FAR const struct usb_devdesc_s *usbstrg_getdevdesc(void)
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
FAR const struct usb_epdesc_s *usbstrg_getepdesc(enum usbstrg_epdesc_e epid)
|
||||
FAR const struct usb_epdesc_s *usbmsc_getepdesc(enum usbmsc_epdesc_e epid)
|
||||
{
|
||||
switch (epid)
|
||||
{
|
||||
case USBSTRG_EPFSBULKOUT: /* Full speed bulk OUT endpoint descriptor */
|
||||
case USBMSC_EPFSBULKOUT: /* Full speed bulk OUT endpoint descriptor */
|
||||
return &g_fsepbulkoutdesc;
|
||||
|
||||
case USBSTRG_EPFSBULKIN: /* Full speed bulk IN endpoint descriptor */
|
||||
case USBMSC_EPFSBULKIN: /* Full speed bulk IN endpoint descriptor */
|
||||
return &g_fsepbulkindesc;
|
||||
|
||||
#ifdef CONFIG_USBDEV_DUALSPEED
|
||||
case USBSTRG_EPHSBULKOUT: /* High speed bulk OUT endpoint descriptor */
|
||||
case USBMSC_EPHSBULKOUT: /* High speed bulk OUT endpoint descriptor */
|
||||
return &g_hsepbulkoutdesc;
|
||||
|
||||
case USBSTRG_EPHSBULKIN: /* High speed bulk IN endpoint descriptor */
|
||||
case USBMSC_EPHSBULKIN: /* High speed bulk IN endpoint descriptor */
|
||||
return &g_hsepbulkindesc;
|
||||
#endif
|
||||
default:
|
||||
@@ -340,7 +340,7 @@ FAR const struct usb_epdesc_s *usbstrg_getepdesc(enum usbstrg_epdesc_e epid)
|
||||
};
|
||||
|
||||
/****************************************************************************
|
||||
* Name: usbstrg_mkcfgdesc
|
||||
* Name: usbmsc_mkcfgdesc
|
||||
*
|
||||
* Description:
|
||||
* Construct the configuration descriptor
|
||||
@@ -348,12 +348,12 @@ FAR const struct usb_epdesc_s *usbstrg_getepdesc(enum usbstrg_epdesc_e epid)
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef CONFIG_USBDEV_DUALSPEED
|
||||
int16_t usbstrg_mkcfgdesc(uint8_t *buf, uint8_t speed, uint8_t type)
|
||||
int16_t usbmsc_mkcfgdesc(uint8_t *buf, uint8_t speed, uint8_t type)
|
||||
#else
|
||||
int16_t usbstrg_mkcfgdesc(uint8_t *buf)
|
||||
int16_t usbmsc_mkcfgdesc(uint8_t *buf)
|
||||
#endif
|
||||
{
|
||||
#ifndef CONFIG_USBSTRG_COMPOSITE
|
||||
#ifndef CONFIG_USBMSC_COMPOSITE
|
||||
FAR struct usb_cfgdesc_s *cfgdesc = (struct usb_cfgdesc_s*)buf;
|
||||
#endif
|
||||
#ifdef CONFIG_USBDEV_DUALSPEED
|
||||
@@ -367,7 +367,7 @@ int16_t usbstrg_mkcfgdesc(uint8_t *buf)
|
||||
* size that we will be sending now.
|
||||
*/
|
||||
|
||||
totallen = USB_SIZEOF_CFGDESC + USB_SIZEOF_IFDESC + USBSTRG_NENDPOINTS * USB_SIZEOF_EPDESC;
|
||||
totallen = USB_SIZEOF_CFGDESC + USB_SIZEOF_IFDESC + USBMSC_NENDPOINTS * USB_SIZEOF_EPDESC;
|
||||
|
||||
/* Configuration descriptor -- Copy the canned descriptor and fill in the
|
||||
* type (we'll also need to update the size below). If the USB mass storage
|
||||
@@ -375,7 +375,7 @@ int16_t usbstrg_mkcfgdesc(uint8_t *buf)
|
||||
* descriptor will be provided by the composite device logic.
|
||||
*/
|
||||
|
||||
#ifndef CONFIG_USBSTRG_COMPOSITE
|
||||
#ifndef CONFIG_USBMSC_COMPOSITE
|
||||
memcpy(cfgdesc, &g_cfgdesc, USB_SIZEOF_CFGDESC);
|
||||
buf += USB_SIZEOF_CFGDESC;
|
||||
#endif
|
||||
@@ -396,12 +396,12 @@ int16_t usbstrg_mkcfgdesc(uint8_t *buf)
|
||||
hispeed = !hispeed;
|
||||
}
|
||||
|
||||
bulkmxpacket = USBSTRG_BULKMAXPACKET(hispeed);
|
||||
epdesc = USBSTRG_EPBULKINDESC(hispeed);
|
||||
bulkmxpacket = USBMSC_BULKMAXPACKET(hispeed);
|
||||
epdesc = USBMSC_EPBULKINDESC(hispeed);
|
||||
memcpy(buf, epdesc, USB_SIZEOF_EPDESC);
|
||||
buf += USB_SIZEOF_EPDESC;
|
||||
|
||||
epdesc = USBSTRG_EPBULKOUTDESC(hispeed);
|
||||
epdesc = USBMSC_EPBULKOUTDESC(hispeed);
|
||||
memcpy(buf, epdesc, USB_SIZEOF_EPDESC);
|
||||
#else
|
||||
memcpy(buf, &g_fsepbulkoutdesc, USB_SIZEOF_EPDESC);
|
||||
@@ -411,7 +411,7 @@ int16_t usbstrg_mkcfgdesc(uint8_t *buf)
|
||||
|
||||
/* Finally, fill in the total size of the configuration descriptor */
|
||||
|
||||
#ifndef CONFIG_USBSTRG_COMPOSITE
|
||||
#ifndef CONFIG_USBMSC_COMPOSITE
|
||||
cfgdesc->totallen[0] = LSBYTE(totallen);
|
||||
cfgdesc->totallen[1] = MSBYTE(totallen);
|
||||
#endif
|
||||
@@ -419,15 +419,15 @@ int16_t usbstrg_mkcfgdesc(uint8_t *buf)
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
* Name: usbstrg_getqualdesc
|
||||
* Name: usbmsc_getqualdesc
|
||||
*
|
||||
* Description:
|
||||
* Return a pointer to the raw qual descriptor
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
#if !defined(CONFIG_USBSTRG_COMPOSITE) && defined(CONFIG_USBDEV_DUALSPEED)
|
||||
FAR const struct usb_qualdesc_s *usbstrg_getqualdesc(void)
|
||||
#if !defined(CONFIG_USBMSC_COMPOSITE) && defined(CONFIG_USBDEV_DUALSPEED)
|
||||
FAR const struct usb_qualdesc_s *usbmsc_getqualdesc(void)
|
||||
{
|
||||
return &g_qualdesc;
|
||||
}
|
||||
|
||||
+432
-432
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user