Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-07 09:18:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Massive name change USB STRG -> USB MSC

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4334 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2012-01-25 20:17:59 +00:00
parent 621ef6c996
commit c6b62075aa
145 changed files with 4231 additions and 4227 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/nuttx/usb/storage.h
+25 -25
View File
@@ -56,42 +56,42 @@
/* Mass storage requests */
#define USBSTRG_TYPE_SETUPIN (USB_DIR_IN|USB_REQ_TYPE_CLASS|USB_REQ_RECIPIENT_INTERFACE)
#define USBSTRG_TYPE_SETUPOUT (USB_DIR_OUT|USB_REQ_TYPE_CLASS|USB_REQ_RECIPIENT_INTERFACE)
#define USBMSC_TYPE_SETUPIN (USB_DIR_IN|USB_REQ_TYPE_CLASS|USB_REQ_RECIPIENT_INTERFACE)
#define USBMSC_TYPE_SETUPOUT (USB_DIR_OUT|USB_REQ_TYPE_CLASS|USB_REQ_RECIPIENT_INTERFACE)
#define USBSTRG_REQ_MSRESET (0xff) /* Reset mass storage device and interface */
#define USBSTRG_REQ_GETMAXLUN (0xfe) /* Return number LUNs supported */
#define USBMSC_REQ_MSRESET (0xff) /* Reset mass storage device and interface */
#define USBMSC_REQ_GETMAXLUN (0xfe) /* Return number LUNs supported */
/* Mass storage subclass codes */
#define USBSTRG_SUBCLASS_RBC (0x01) /* Reduced block commands (e.g., flash devices) */
#define USBSTRG_SUBCLASS_SFF1 (0x02) /* SFF-8020i/MMC-2 (ATAPI) (e.g., C/DVD) */
#define USBSTRG_SUBCLASS_QIC (0x03) /* QIC-157 (e.g., tape device) */
#define USBSTRG_SUBCLASS_UFI (0x04) /* e.g. floppy device */
#define USBSTRG_SUBCLASS_SFF2 (0x05) /* SFF-8070i (e.g. floppy disk) */
#define USBSTRG_SUBCLASS_SCSI (0x06) /* SCSI transparent */
#define USBMSC_SUBCLASS_RBC (0x01) /* Reduced block commands (e.g., flash devices) */
#define USBMSC_SUBCLASS_SFF1 (0x02) /* SFF-8020i/MMC-2 (ATAPI) (e.g., C/DVD) */
#define USBMSC_SUBCLASS_QIC (0x03) /* QIC-157 (e.g., tape device) */
#define USBMSC_SUBCLASS_UFI (0x04) /* e.g. floppy device */
#define USBMSC_SUBCLASS_SFF2 (0x05) /* SFF-8070i (e.g. floppy disk) */
#define USBMSC_SUBCLASS_SCSI (0x06) /* SCSI transparent */
/* Mass storage transport protocols */
#define USBSTRG_PROTO_CBI0 (0x00) /* CBI transport with command completion interrupt */
#define USBSTRG_PROTO_CBI1 (0x01) /* CBI transport without command completion interrupt */
#define USBSTRG_PROTO_BULKONLY (0x50) /* Bulk only transport */
#define USBMSC_PROTO_CBI0 (0x00) /* CBI transport with command completion interrupt */
#define USBMSC_PROTO_CBI1 (0x01) /* CBI transport without command completion interrupt */
#define USBMSC_PROTO_BULKONLY (0x50) /* Bulk only transport */
/* Common Block Wrapper (CBW) */
#define USBSTRG_CBW_SIZEOF (31)
#define USBSTRG_CBW_SIGNATURE (0x43425355) /* Little endian USBC */
#define USBSTRG_CBWFLAG_IN (0x80) /* Bit 7=1: Direction = IN */
#define USBMSC_CBW_SIZEOF (31)
#define USBMSC_CBW_SIGNATURE (0x43425355) /* Little endian USBC */
#define USBMSC_CBWFLAG_IN (0x80) /* Bit 7=1: Direction = IN */
#define USBSTRG_MAXCDBLEN (16) /* Max length of SCSI Command Data Block */
#define USBMSC_MAXCDBLEN (16) /* Max length of SCSI Command Data Block */
/* Command Status Wrapper (CSW) */
#define USBSTRG_CSW_SIZEOF (13)
#define USBSTRG_CSW_SIGNATURE (0x53425355) /* Little endian 'USBS' */
#define USBSTRG_CSWSTATUS_PASS (0)
#define USBSTRG_CSWSTATUS_FAIL (1)
#define USBSTRG_CSWSTATUS_PHASEERROR (2)
#define USBMSC_CSW_SIZEOF (13)
#define USBMSC_CSW_SIGNATURE (0x53425355) /* Little endian 'USBS' */
#define USBMSC_CSWSTATUS_PASS (0)
#define USBMSC_CSWSTATUS_FAIL (1)
#define USBMSC_CSWSTATUS_PHASEERROR (2)
/************************************************************************************
* Public Types
@@ -99,7 +99,7 @@
/* Command Block Wrapper (CBW) */
struct usbstrg_cbw_s
struct usbmsc_cbw_s
{
uint8_t signature[4]; /* 'USBC' = 0x43425355 */
uint8_t tag[4]; /* Depends on command id */
@@ -107,12 +107,12 @@ struct usbstrg_cbw_s
uint8_t flags; /* Bit 7: Direction=IN (other obsolete or reserved) */
uint8_t lun; /* LUN (normally 0) */
uint8_t cdblen; /* len of cdb[] */
uint8_t cdb[USBSTRG_MAXCDBLEN]; /* Command Data Block */
uint8_t cdb[USBMSC_MAXCDBLEN]; /* Command Data Block */
};
/* Command Status Wrapper (CSW) */
struct usbstrg_csw_s
struct usbmsc_csw_s
{
uint8_t signature[4]; /* 'USBS' = 0x53425355 */
uint8_t tag[4]; /* Same tag as original command */
include/nuttx/usb/usbdev.h
+22 -22
View File
@@ -361,7 +361,7 @@ EXTERN int usbdev_serialinitialize(int minor);
* Description:
* If the mass storage class driver is part of composite device, then
* its instantiation and configuration is a multi-step, board-specific,
* process (See comments for usbstrg_configure below). In this case,
* process (See comments for usbmsc_configure below). In this case,
* board-specific logic must provide board_mscclassobject().
*
* board_mscclassobject() is called from the composite driver. It must
@@ -378,21 +378,21 @@ EXTERN int usbdev_serialinitialize(int minor);
*
****************************************************************************/
#if defined(CONFIG_USBDEV_COMPOSITE) && defined(CONFIG_USBSTRG_COMPOSITE)
#if defined(CONFIG_USBDEV_COMPOSITE) && defined(CONFIG_USBMSC_COMPOSITE)
EXTERN int board_mscclassobject(FAR struct usbdevclass_driver_s **classdev);
#endif
/****************************************************************************
* Name: usbstrg_configure
* Name: usbmsc_configure
*
* Description:
* One-time initialization of the USB storage driver. The initialization
* sequence is as follows:
*
* 1. Call usbstrg_configure to perform one-time initialization specifying
* 1. Call usbmsc_configure to perform one-time initialization specifying
* the number of luns.
* 2. Call usbstrg_bindlun to configure each supported LUN
* 3. Call usbstrg_exportluns when all LUNs are configured
* 2. Call usbmsc_bindlun to configure each supported LUN
* 3. Call usbmsc_exportluns when all LUNs are configured
*
* Input Parameters:
* nluns - the number of LUNs that will be registered
@@ -403,16 +403,16 @@ EXTERN int board_mscclassobject(FAR struct usbdevclass_driver_s **classdev);
*
****************************************************************************/
EXTERN int usbstrg_configure(unsigned int nluns, void **handle);
EXTERN int usbmsc_configure(unsigned int nluns, void **handle);
/****************************************************************************
* Name: usbstrg_bindlun
* Name: usbmsc_bindlun
*
* Description:
* Bind the block driver specified by drvrpath to a USB storage LUN.
*
* Input Parameters:
* handle - The handle returned by a previous call to usbstrg_configure().
* handle - The handle returned by a previous call to usbmsc_configure().
* drvrpath - the full path to the block driver
* startsector - A sector offset into the block driver to the start of the
* partition on drvrpath (0 if no partitions)
@@ -425,18 +425,18 @@ EXTERN int usbstrg_configure(unsigned int nluns, void **handle);
*
****************************************************************************/
EXTERN int usbstrg_bindlun(FAR void *handle, FAR const char *drvrpath,
EXTERN int usbmsc_bindlun(FAR void *handle, FAR const char *drvrpath,
unsigned int lunno, off_t startsector, size_t nsectors,
bool readonly);
/****************************************************************************
* Name: usbstrg_unbindlun
* Name: usbmsc_unbindlun
*
* Description:
* Un-bind the block driver for the specified LUN
*
* Input Parameters:
* handle - The handle returned by a previous call to usbstrg_configure().
* handle - The handle returned by a previous call to usbmsc_configure().
* lun - the LUN to unbind from
*
* Returned Value:
@@ -444,24 +444,24 @@ EXTERN int usbstrg_bindlun(FAR void *handle, FAR const char *drvrpath,
*
****************************************************************************/
EXTERN int usbstrg_unbindlun(FAR void *handle, unsigned int lunno);
EXTERN int usbmsc_unbindlun(FAR void *handle, unsigned int lunno);
/****************************************************************************
* Name: usbstrg_exportluns
* Name: usbmsc_exportluns
*
* Description:
* After all of the LUNs have been bound, this function may be called
* in order to export those LUNs in the USB storage device.
*
* Input Parameters:
* handle - The handle returned by a previous call to usbstrg_configure().
* handle - The handle returned by a previous call to usbmsc_configure().
*
* Returned Value:
* 0 on success; a negated errno on failure
*
****************************************************************************/
EXTERN int usbstrg_exportluns(FAR void *handle);
EXTERN int usbmsc_exportluns(FAR void *handle);
/****************************************************************************
* Name: cdcser_classobject
@@ -470,32 +470,32 @@ EXTERN int usbstrg_exportluns(FAR void *handle);
* .
*
* Input Parameters:
* handle - The handle returned by a previous call to usbstrg_configure().
* handle - The handle returned by a previous call to usbmsc_configure().
*
* Returned Value:
* 0 on success; a negated errno on failure
*
****************************************************************************/
#if defined(CONFIG_USBDEV_COMPOSITE) && defined(CONFIG_USBSTRG_COMPOSITE)
EXTERN int usbstrg_classobject(FAR void *handle, FAR struct usbdevclass_driver_s **classdev);
#if defined(CONFIG_USBDEV_COMPOSITE) && defined(CONFIG_USBMSC_COMPOSITE)
EXTERN int usbmsc_classobject(FAR void *handle, FAR struct usbdevclass_driver_s **classdev);
#endif
/****************************************************************************
* Name: usbstrg_uninitialize
* Name: usbmsc_uninitialize
*
* Description:
* Un-initialize the USB storage class driver
*
* Input Parameters:
* handle - The handle returned by a previous call to usbstrg_configure().
* handle - The handle returned by a previous call to usbmsc_configure().
*
* Returned Value:
* None
*
****************************************************************************/
EXTERN void usbstrg_uninitialize(FAR void *handle);
EXTERN void usbmsc_uninitialize(FAR void *handle);
#undef EXTERN
#if defined(__cplusplus)
include/nuttx/usb/usbdev_trace.h
+133 -133
View File
@@ -246,142 +246,142 @@
/* State transitions */
#define USBSTRG_CLASSSTATE_IDLECMDPARSE 0x0001
#define USBSTRG_CLASSSTATE_CMDPARSECMDFINISH 0x0002
#define USBSTRG_CLASSSTATE_CMDPARSECMDREAD6 0x0003
#define USBSTRG_CLASSSTATE_CMDPARSECMDREAD10 0x0004
#define USBSTRG_CLASSSTATE_CMDPARSECMDREAD12 0x0005
#define USBSTRG_CLASSSTATE_CMDPARSECMDWRITE6 0x0006
#define USBSTRG_CLASSSTATE_CMDPARSECMDWRITE10 0x0007
#define USBSTRG_CLASSSTATE_CMDPARSECMDWRITE12 0x0008
#define USBSTRG_CLASSSTATE_CMDREAD 0x0009
#define USBSTRG_CLASSSTATE_CMDREADCMDFINISH 0x000a
#define USBSTRG_CLASSSTATE_CMDWRITE 0x000b
#define USBSTRG_CLASSSTATE_CMDWRITECMDFINISH 0x000c
#define USBSTRG_CLASSSTATE_CMDFINISHCMDSTATUS 0x000d
#define USBSTRG_CLASSSTATE_CMDSTATUSIDLE 0x000e
#define USBMSC_CLASSSTATE_IDLECMDPARSE 0x0001
#define USBMSC_CLASSSTATE_CMDPARSECMDFINISH 0x0002
#define USBMSC_CLASSSTATE_CMDPARSECMDREAD6 0x0003
#define USBMSC_CLASSSTATE_CMDPARSECMDREAD10 0x0004
#define USBMSC_CLASSSTATE_CMDPARSECMDREAD12 0x0005
#define USBMSC_CLASSSTATE_CMDPARSECMDWRITE6 0x0006
#define USBMSC_CLASSSTATE_CMDPARSECMDWRITE10 0x0007
#define USBMSC_CLASSSTATE_CMDPARSECMDWRITE12 0x0008
#define USBMSC_CLASSSTATE_CMDREAD 0x0009
#define USBMSC_CLASSSTATE_CMDREADCMDFINISH 0x000a
#define USBMSC_CLASSSTATE_CMDWRITE 0x000b
#define USBMSC_CLASSSTATE_CMDWRITECMDFINISH 0x000c
#define USBMSC_CLASSSTATE_CMDFINISHCMDSTATUS 0x000d
#define USBMSC_CLASSSTATE_CMDSTATUSIDLE 0x000e
/* Values of the class error ID used by the USB storage driver */
#define USBSTRG_TRACEERR_ALLOCCTRLREQ 0x0001
#define USBSTRG_TRACEERR_ALLOCDEVSTRUCT 0x0002
#define USBSTRG_TRACEERR_ALLOCIOBUFFER 0x0003
#define USBSTRG_TRACEERR_ALREADYCONFIGURED 0x0004
#define USBSTRG_TRACEERR_ALREADYUNINIT 0x0005
#define USBSTRG_TRACEERR_BADREQUEST 0x0006
#define USBSTRG_TRACEERR_BINDLUNINVALIDARGS2 0x0007
#define USBSTRG_TRACEERR_BINDLUNINVALIDARGS3 0x0008
#define USBSTRG_TRACEERR_BINDLUNINVALIDARGS4 0x0009
#define USBSTRG_TRACEERR_BINLUNINVALIDARGS1 0x000a
#define USBSTRG_TRACEERR_BLKDRVEOPEN 0x000b
#define USBSTRG_TRACEERR_CMDBADLUN 0x000c
#define USBSTRG_TRACEERR_CMDFINISHRESIDUE 0x000d
#define USBSTRG_TRACEERR_CMDFINISHRQEMPTY 0x000e
#define USBSTRG_TRACEERR_CMDFINISHSHORTPKT 0x000f
#define USBSTRG_TRACEERR_CMDFINISHSUBMIT 0x0010
#define USBSTRG_TRACEERR_CMDFINSHDIR 0x0011
#define USBSTRG_TRACEERR_CMDFINSHSUBMIT 0x0012
#define USBSTRG_TRACEERR_CMDPARSEWRREQLISTEMPTY 0x0013
#define USBSTRG_TRACEERR_CMDREADREADFAIL 0x0014
#define USBSTRG_TRACEERR_CMDREADSUBMIT 0x0015
#define USBSTRG_TRACEERR_CMDREADWRRQEMPTY 0x0016
#define USBSTRG_TRACEERR_CMDSTATUSRDREQLISTEMPTY 0x0017
#define USBSTRG_TRACEERR_CMDUNEVIOLATION 0x0018
#define USBSTRG_TRACEERR_CMDWRITERDSUBMIT 0x0019
#define USBSTRG_TRACEERR_CMDWRITERDRQEMPTY 0x001a
#define USBSTRG_TRACEERR_CMDWRITEWRITEFAIL 0x001b
#define USBSTRG_TRACEERR_CONFIGIDBAD 0x001c
#define USBSTRG_TRACEERR_CONFIGNONE 0x001d
#define USBSTRG_TRACEERR_DEFERREDRESPINVALIDARGS 0x001e
#define USBSTRG_TRACEERR_DEFERREDRESPSTALLED 0x001f
#define USBSTRG_TRACEERR_DEFERREDRESPSUBMIT 0x0020
#define USBSTRG_TRACEERR_DEVREGISTER 0x0021
#define USBSTRG_TRACEERR_DISCONNECTINVALIDARGS 0x0022
#define USBSTRG_TRACEERR_EP0NOTBOUND1 0x0023
#define USBSTRG_TRACEERR_EP0NOTBOUND2 0x0024
#define USBSTRG_TRACEERR_EP0NOTBOUND3 0x0025
#define USBSTRG_TRACEERR_EPBULKINALLOCFAIL 0x0026
#define USBSTRG_TRACEERR_EPBULKINCONFIGFAIL 0x0027
#define USBSTRG_TRACEERR_EPBULKOUTALLOCFAIL 0x0028
#define USBSTRG_TRACEERR_EPBULKOUTCONFIGFAIL 0x0029
#define USBSTRG_TRACEERR_EPRESPQ 0x002a
#define USBSTRG_TRACEERR_EXPORTLUNSINVALIDARGS 0x002b
#define USBSTRG_TRACEERR_GETMAXLUNNDX 0x002c
#define USBSTRG_TRACEERR_GETUNKNOWNDESC 0x002d
#define USBSTRG_TRACEERR_IDLERDREQLISTEMPTY 0x002e
#define USBSTRG_TRACEERR_IDLERDSUBMIT 0x002f
#define USBSTRG_TRACEERR_INQUIRYFLAGS 0x0030
#define USBSTRG_TRACEERR_INTERNALCONFUSION1 0x0031
#define USBSTRG_TRACEERR_INTERNALCONFUSION2 0x0032
#define USBSTRG_TRACEERR_INVALIDCBWCONTENT 0x0033
#define USBSTRG_TRACEERR_INVALIDCBWSIGNATURE 0x0034
#define USBSTRG_TRACEERR_INVALIDSTATE 0x0035
#define USBSTRG_TRACEERR_LUNALREADYBOUND 0x0036
#define USBSTRG_TRACEERR_LUNNOTBOUND 0x0037
#define USBSTRG_TRACEERR_MODEPAGEFLAGS 0x0038
#define USBSTRG_TRACEERR_MODESENSE10FLAGS 0x0039
#define USBSTRG_TRACEERR_MODESENSE6FLAGS 0x003a
#define USBSTRG_TRACEERR_MSRESETNDX 0x003b
#define USBSTRG_TRACEERR_NOGEOMETRY 0x003c
#define USBSTRG_TRACEERR_NOTCONFIGURED 0x003d
#define USBSTRG_TRACEERR_NOTREMOVABLE 0x003e
#define USBSTRG_TRACEERR_PCSAVED 0x003f
#define USBSTRG_TRACEERR_PHASEERROR1 0x0040
#define USBSTRG_TRACEERR_PHASEERROR2 0x0041
#define USBSTRG_TRACEERR_PHASEERROR3 0x0042
#define USBSTRG_TRACEERR_PREVENTMEDIUMREMOVALPREVENT 0x0043
#define USBSTRG_TRACEERR_RDALLOCREQ 0x0044
#define USBSTRG_TRACEERR_RDCOMPLETEINVALIDARGS 0x0045
#define USBSTRG_TRACEERR_RDCOMPLETERDSUBMIT 0x0046
#define USBSTRG_TRACEERR_RDSHUTDOWN 0x0047
#define USBSTRG_TRACEERR_RDSUBMIT 0x0048
#define USBSTRG_TRACEERR_RDUNEXPECTED 0x0049
#define USBSTRG_TRACEERR_READ10FLAGS 0x004a
#define USBSTRG_TRACEERR_READ10LBARANGE 0x004b
#define USBSTRG_TRACEERR_READ10MEDIANOTPRESENT 0x004c
#define USBSTRG_TRACEERR_READ12FLAGS 0x004d
#define USBSTRG_TRACEERR_READ12LBARANGE 0x004e
#define USBSTRG_TRACEERR_READ12MEDIANOTPRESENT 0x004f
#define USBSTRG_TRACEERR_READ6LBARANGE 0x0050
#define USBSTRG_TRACEERR_READ6MEDIANOTPRESENT 0x0051
#define USBSTRG_TRACEERR_READCAPACITYFLAGS 0x0052
#define USBSTRG_TRACEERR_REALLOCIOBUFFER 0x0053
#define USBSTRG_TRACEERR_REQRESULT 0x0054
#define USBSTRG_TRACEERR_SCSICMDCONTROL 0x0055
#define USBSTRG_TRACEERR_SETCONFIGINVALIDARGS 0x0056
#define USBSTRG_TRACEERR_SETUPINVALIDARGS 0x0057
#define USBSTRG_TRACEERR_SNDCSWFAIL 0x0058
#define USBSTRG_TRACEERR_SNDPHERROR 0x0059
#define USBSTRG_TRACEERR_SNDSTATUSSUBMIT 0x005a
#define USBSTRG_TRACEERR_SYNCCACHEMEDIANOTPRESENT 0x005b
#define USBSTRG_TRACEERR_THREADCREATE 0x005c
#define USBSTRG_TRACEERR_TOOMANYLUNS 0x005d
#define USBSTRG_TRACEERR_UNBINDINVALIDARGS 0x005e
#define USBSTRG_TRACEERR_UNBINDLUNINVALIDARGS1 0x005f
#define USBSTRG_TRACEERR_UNBINDLUNINVALIDARGS2 0x0060
#define USBSTRG_TRACEERR_UNINITIALIZEINVALIDARGS 0x0061
#define USBSTRG_TRACEERR_UNSUPPORTEDSTDREQ 0x0062
#define USBSTRG_TRACEERR_VERIFY10FLAGS 0x0063
#define USBSTRG_TRACEERR_VERIFY10LBARANGE 0x0064
#define USBSTRG_TRACEERR_VERIFY10MEDIANOTPRESENT 0x0065
#define USBSTRG_TRACEERR_VERIFY10NOBLOCKS 0x0066
#define USBSTRG_TRACEERR_VERIFY10READFAIL 0x0067
#define USBSTRG_TRACEERR_WRALLOCREQ 0x0068
#define USBSTRG_TRACEERR_SNDPHERROR 0x0069
#define USBSTRG_TRACEERR_WRCOMPLETEINVALIDARGS 0x006a
#define USBSTRG_TRACEERR_WRITE10FLAGS 0x006b
#define USBSTRG_TRACEERR_WRITE10LBARANGE 0x006c
#define USBSTRG_TRACEERR_WRITE10MEDIANOTPRESENT 0x006d
#define USBSTRG_TRACEERR_WRITE10READONLY 0x006e
#define USBSTRG_TRACEERR_WRITE12FLAGS 0x006f
#define USBSTRG_TRACEERR_WRITE12LBARANGE 0x0070
#define USBSTRG_TRACEERR_WRITE12MEDIANOTPRESENT 0x0071
#define USBSTRG_TRACEERR_WRITE12READONLY 0x0072
#define USBSTRG_TRACEERR_WRITE6LBARANGE 0x0073
#define USBSTRG_TRACEERR_WRITE6MEDIANOTPRESENT 0x0074
#define USBSTRG_TRACEERR_WRITE6READONLY 0x0075
#define USBSTRG_TRACEERR_WRSHUTDOWN 0x0076
#define USBSTRG_TRACEERR_WRUNEXPECTED 0x0077
#define USBMSC_TRACEERR_ALLOCCTRLREQ 0x0001
#define USBMSC_TRACEERR_ALLOCDEVSTRUCT 0x0002
#define USBMSC_TRACEERR_ALLOCIOBUFFER 0x0003
#define USBMSC_TRACEERR_ALREADYCONFIGURED 0x0004
#define USBMSC_TRACEERR_ALREADYUNINIT 0x0005
#define USBMSC_TRACEERR_BADREQUEST 0x0006
#define USBMSC_TRACEERR_BINDLUNINVALIDARGS2 0x0007
#define USBMSC_TRACEERR_BINDLUNINVALIDARGS3 0x0008
#define USBMSC_TRACEERR_BINDLUNINVALIDARGS4 0x0009
#define USBMSC_TRACEERR_BINLUNINVALIDARGS1 0x000a
#define USBMSC_TRACEERR_BLKDRVEOPEN 0x000b
#define USBMSC_TRACEERR_CMDBADLUN 0x000c
#define USBMSC_TRACEERR_CMDFINISHRESIDUE 0x000d
#define USBMSC_TRACEERR_CMDFINISHRQEMPTY 0x000e
#define USBMSC_TRACEERR_CMDFINISHSHORTPKT 0x000f
#define USBMSC_TRACEERR_CMDFINISHSUBMIT 0x0010
#define USBMSC_TRACEERR_CMDFINSHDIR 0x0011
#define USBMSC_TRACEERR_CMDFINSHSUBMIT 0x0012
#define USBMSC_TRACEERR_CMDPARSEWRREQLISTEMPTY 0x0013
#define USBMSC_TRACEERR_CMDREADREADFAIL 0x0014
#define USBMSC_TRACEERR_CMDREADSUBMIT 0x0015
#define USBMSC_TRACEERR_CMDREADWRRQEMPTY 0x0016
#define USBMSC_TRACEERR_CMDSTATUSRDREQLISTEMPTY 0x0017
#define USBMSC_TRACEERR_CMDUNEVIOLATION 0x0018
#define USBMSC_TRACEERR_CMDWRITERDSUBMIT 0x0019
#define USBMSC_TRACEERR_CMDWRITERDRQEMPTY 0x001a
#define USBMSC_TRACEERR_CMDWRITEWRITEFAIL 0x001b
#define USBMSC_TRACEERR_CONFIGIDBAD 0x001c
#define USBMSC_TRACEERR_CONFIGNONE 0x001d
#define USBMSC_TRACEERR_DEFERREDRESPINVALIDARGS 0x001e
#define USBMSC_TRACEERR_DEFERREDRESPSTALLED 0x001f
#define USBMSC_TRACEERR_DEFERREDRESPSUBMIT 0x0020
#define USBMSC_TRACEERR_DEVREGISTER 0x0021
#define USBMSC_TRACEERR_DISCONNECTINVALIDARGS 0x0022
#define USBMSC_TRACEERR_EP0NOTBOUND1 0x0023
#define USBMSC_TRACEERR_EP0NOTBOUND2 0x0024
#define USBMSC_TRACEERR_EP0NOTBOUND3 0x0025
#define USBMSC_TRACEERR_EPBULKINALLOCFAIL 0x0026
#define USBMSC_TRACEERR_EPBULKINCONFIGFAIL 0x0027
#define USBMSC_TRACEERR_EPBULKOUTALLOCFAIL 0x0028
#define USBMSC_TRACEERR_EPBULKOUTCONFIGFAIL 0x0029
#define USBMSC_TRACEERR_EPRESPQ 0x002a
#define USBMSC_TRACEERR_EXPORTLUNSINVALIDARGS 0x002b
#define USBMSC_TRACEERR_GETMAXLUNNDX 0x002c
#define USBMSC_TRACEERR_GETUNKNOWNDESC 0x002d
#define USBMSC_TRACEERR_IDLERDREQLISTEMPTY 0x002e
#define USBMSC_TRACEERR_IDLERDSUBMIT 0x002f
#define USBMSC_TRACEERR_INQUIRYFLAGS 0x0030
#define USBMSC_TRACEERR_INTERNALCONFUSION1 0x0031
#define USBMSC_TRACEERR_INTERNALCONFUSION2 0x0032
#define USBMSC_TRACEERR_INVALIDCBWCONTENT 0x0033
#define USBMSC_TRACEERR_INVALIDCBWSIGNATURE 0x0034
#define USBMSC_TRACEERR_INVALIDSTATE 0x0035
#define USBMSC_TRACEERR_LUNALREADYBOUND 0x0036
#define USBMSC_TRACEERR_LUNNOTBOUND 0x0037
#define USBMSC_TRACEERR_MODEPAGEFLAGS 0x0038
#define USBMSC_TRACEERR_MODESENSE10FLAGS 0x0039
#define USBMSC_TRACEERR_MODESENSE6FLAGS 0x003a
#define USBMSC_TRACEERR_MSRESETNDX 0x003b
#define USBMSC_TRACEERR_NOGEOMETRY 0x003c
#define USBMSC_TRACEERR_NOTCONFIGURED 0x003d
#define USBMSC_TRACEERR_NOTREMOVABLE 0x003e
#define USBMSC_TRACEERR_PCSAVED 0x003f
#define USBMSC_TRACEERR_PHASEERROR1 0x0040
#define USBMSC_TRACEERR_PHASEERROR2 0x0041
#define USBMSC_TRACEERR_PHASEERROR3 0x0042
#define USBMSC_TRACEERR_PREVENTMEDIUMREMOVALPREVENT 0x0043
#define USBMSC_TRACEERR_RDALLOCREQ 0x0044
#define USBMSC_TRACEERR_RDCOMPLETEINVALIDARGS 0x0045
#define USBMSC_TRACEERR_RDCOMPLETERDSUBMIT 0x0046
#define USBMSC_TRACEERR_RDSHUTDOWN 0x0047
#define USBMSC_TRACEERR_RDSUBMIT 0x0048
#define USBMSC_TRACEERR_RDUNEXPECTED 0x0049
#define USBMSC_TRACEERR_READ10FLAGS 0x004a
#define USBMSC_TRACEERR_READ10LBARANGE 0x004b
#define USBMSC_TRACEERR_READ10MEDIANOTPRESENT 0x004c
#define USBMSC_TRACEERR_READ12FLAGS 0x004d
#define USBMSC_TRACEERR_READ12LBARANGE 0x004e
#define USBMSC_TRACEERR_READ12MEDIANOTPRESENT 0x004f
#define USBMSC_TRACEERR_READ6LBARANGE 0x0050
#define USBMSC_TRACEERR_READ6MEDIANOTPRESENT 0x0051
#define USBMSC_TRACEERR_READCAPACITYFLAGS 0x0052
#define USBMSC_TRACEERR_REALLOCIOBUFFER 0x0053
#define USBMSC_TRACEERR_REQRESULT 0x0054
#define USBMSC_TRACEERR_SCSICMDCONTROL 0x0055
#define USBMSC_TRACEERR_SETCONFIGINVALIDARGS 0x0056
#define USBMSC_TRACEERR_SETUPINVALIDARGS 0x0057
#define USBMSC_TRACEERR_SNDCSWFAIL 0x0058
#define USBMSC_TRACEERR_SNDPHERROR 0x0059
#define USBMSC_TRACEERR_SNDSTATUSSUBMIT 0x005a
#define USBMSC_TRACEERR_SYNCCACHEMEDIANOTPRESENT 0x005b
#define USBMSC_TRACEERR_THREADCREATE 0x005c
#define USBMSC_TRACEERR_TOOMANYLUNS 0x005d
#define USBMSC_TRACEERR_UNBINDINVALIDARGS 0x005e
#define USBMSC_TRACEERR_UNBINDLUNINVALIDARGS1 0x005f
#define USBMSC_TRACEERR_UNBINDLUNINVALIDARGS2 0x0060
#define USBMSC_TRACEERR_UNINITIALIZEINVALIDARGS 0x0061
#define USBMSC_TRACEERR_UNSUPPORTEDSTDREQ 0x0062
#define USBMSC_TRACEERR_VERIFY10FLAGS 0x0063
#define USBMSC_TRACEERR_VERIFY10LBARANGE 0x0064
#define USBMSC_TRACEERR_VERIFY10MEDIANOTPRESENT 0x0065
#define USBMSC_TRACEERR_VERIFY10NOBLOCKS 0x0066
#define USBMSC_TRACEERR_VERIFY10READFAIL 0x0067
#define USBMSC_TRACEERR_WRALLOCREQ 0x0068
#define USBMSC_TRACEERR_SNDPHERROR 0x0069
#define USBMSC_TRACEERR_WRCOMPLETEINVALIDARGS 0x006a
#define USBMSC_TRACEERR_WRITE10FLAGS 0x006b
#define USBMSC_TRACEERR_WRITE10LBARANGE 0x006c
#define USBMSC_TRACEERR_WRITE10MEDIANOTPRESENT 0x006d
#define USBMSC_TRACEERR_WRITE10READONLY 0x006e
#define USBMSC_TRACEERR_WRITE12FLAGS 0x006f
#define USBMSC_TRACEERR_WRITE12LBARANGE 0x0070
#define USBMSC_TRACEERR_WRITE12MEDIANOTPRESENT 0x0071
#define USBMSC_TRACEERR_WRITE12READONLY 0x0072
#define USBMSC_TRACEERR_WRITE6LBARANGE 0x0073
#define USBMSC_TRACEERR_WRITE6MEDIANOTPRESENT 0x0074
#define USBMSC_TRACEERR_WRITE6READONLY 0x0075
#define USBMSC_TRACEERR_WRSHUTDOWN 0x0076
#define USBMSC_TRACEERR_WRUNEXPECTED 0x0077
/****************************************************************************
* Public Types
include/nuttx/usb/usbhost.h
+2 -2
View File
@@ -492,8 +492,8 @@
struct usbhost_id_s
{
uint8_t base; /* Base device class code (see USB_CLASS_* defines in usb.h) */
uint8_t subclass; /* Sub-class, depends on base class. Eg., See USBSTRG_SUBCLASS_* */
uint8_t proto; /* Protocol, depends on base class. Eg., See USBSTRG_PROTO_* */
uint8_t subclass; /* Sub-class, depends on base class. Eg., See USBMSC_SUBCLASS_* */
uint8_t proto; /* Protocol, depends on base class. Eg., See USBMSC_PROTO_* */
uint16_t vid; /* Vendor ID (for vendor/product specific devices) */
uint16_t pid; /* Product ID (for vendor/product specific devices) */
};