Add USB storage trace definitions

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

1 files changed, 187 insertions, 46 deletions

diff --git a/nuttx/include/nuttx/usbdev_trace.h b/nuttx/include/nuttx/usbdev_trace.h
index 13a02833a..7ba401c4a 100644
--- a/nuttx/include/nuttx/usbdev_trace.h
+++ b/nuttx/include/nuttx/usbdev_trace.h
@@ -151,55 +151,196 @@
 
 /* UART interface API calls */
 
-#define USBSER_TRACECLASSAPI_SETUP          0x0001
-#define USBSER_TRACECLASSAPI_SHUTDOWN       0x0002
-#define USBSER_TRACECLASSAPI_ATTACH         0x0003
-#define USBSER_TRACECLASSAPI_DETACH         0x0004
-#define USBSER_TRACECLASSAPI_IOCTL          0x0005
-#define USBSER_TRACECLASSAPI_RECEIVE        0x0006
-#define USBSER_TRACECLASSAPI_RXINT          0x0007
-#define USBSER_TRACECLASSAPI_RXAVAILABLE    0x0008
-#define USBSER_TRACECLASSAPI_SEND           0x0009
-#define USBSER_TRACECLASSAPI_TXINT          0x000a
-#define USBSER_TRACECLASSAPI_TXREADY        0x000b
-#define USBSER_TRACECLASSAPI_TXEMPTY        0x000c
+#define USBSER_TRACECLASSAPI_SETUP                   0x0001
+#define USBSER_TRACECLASSAPI_SHUTDOWN                0x0002
+#define USBSER_TRACECLASSAPI_ATTACH                  0x0003
+#define USBSER_TRACECLASSAPI_DETACH                  0x0004
+#define USBSER_TRACECLASSAPI_IOCTL                   0x0005
+#define USBSER_TRACECLASSAPI_RECEIVE                 0x0006
+#define USBSER_TRACECLASSAPI_RXINT                   0x0007
+#define USBSER_TRACECLASSAPI_RXAVAILABLE             0x0008
+#define USBSER_TRACECLASSAPI_SEND                    0x0009
+#define USBSER_TRACECLASSAPI_TXINT                   0x000a
+#define USBSER_TRACECLASSAPI_TXREADY                 0x000b
+#define USBSER_TRACECLASSAPI_TXEMPTY                 0x000c
 
 /* Values of the class error ID used by the USB serial driver */
 
-#define USBSER_TRACEERR_ALLOCCTRLREQ        0x0001
-#define USBSER_TRACEERR_ALLOCDEVSTRUCT      0x0002
-#define USBSER_TRACEERR_ALREADYCLOSED       0x0003
-#define USBSER_TRACEERR_ALREADYCONFIGURED   0x0004
-#define USBSER_TRACEERR_CONFIGIDBAD         0x0005
-#define USBSER_TRACEERR_CONFIGNONE          0x0006
-#define USBSER_TRACEERR_CONSOLEREGISTER     0x0007
-#define USBSER_TRACEERR_DEVREGISTER         0x0008
-#define USBSER_TRACEERR_EPRESPQ             0x0009
-#define USBSER_TRACEERR_GETUNKNOWNDESC      0x000a
-#define USBSER_TRACEERR_INVALIDARG          0x000b
-#define USBSER_TRACEERR_EP0NOTBOUND         0x000c
-#define USBSER_TRACEERR_EPBULKINALLOCFAIL   0x000d
-#define USBSER_TRACEERR_EPBULKINCONFIGFAIL  0x000e
-#define USBSER_TRACEERR_EPBULKOUTALLOCFAIL  0x000f
-#define USBSER_TRACEERR_EPINTINALLOCFAIL    0x0010
-#define USBSER_TRACEERR_EPINTINCONFIGFAIL   0x0011
-#define USBSER_TRACEERR_EPBULKOUTCONFIGFAIL 0x0012
-#define USBSER_TRACEERR_RDALLOCREQ          0x0013
-#define USBSER_TRACEERR_RDSHUTDOWN          0x0014
-#define USBSER_TRACEERR_RDSUBMIT            0x0015
-#define USBSER_TRACEERR_RDUNEXPECTED        0x0016
-#define USBSER_TRACEERR_REQRESULT           0x0017
-#define USBSER_TRACEERR_RXOVERRUN           0x0018
-#define USBSER_TRACEERR_SETUPNOTCONNECTED   0x0019
-#define USBSER_TRACEERR_SUBMITFAIL          0x001a
-#define USBSER_TRACEERR_UARTREGISTER        0x001b
-#define USBSER_TRACEERR_UNSUPPORTEDCTRLREQ  0x001c
-#define USBSER_TRACEERR_UNSUPPORTEDRWREQ    0x001d
-#define USBSER_TRACEERR_UNSUPPORTEDSTDREQ   0x001e
-#define USBSER_TRACEERR_UNSUPPORTEDTYPE     0x001f
-#define USBSER_TRACEERR_WRALLOCREQ          0x0020
-#define USBSER_TRACEERR_WRSHUTDOWN          0x0021
-#define USBSER_TRACEERR_WRUNEXPECTED        0x0022
+#define USBSER_TRACEERR_ALLOCCTRLREQ                 0x0001
+#define USBSER_TRACEERR_ALLOCDEVSTRUCT               0x0002
+#define USBSER_TRACEERR_ALREADYCLOSED                0x0003
+#define USBSER_TRACEERR_ALREADYCONFIGURED            0x0004
+#define USBSER_TRACEERR_CONFIGIDBAD                  0x0005
+#define USBSER_TRACEERR_CONFIGNONE                   0x0006
+#define USBSER_TRACEERR_CONSOLEREGISTER              0x0007
+#define USBSER_TRACEERR_DEVREGISTER                  0x0008
+#define USBSER_TRACEERR_EPRESPQ                      0x0009
+#define USBSER_TRACEERR_GETUNKNOWNDESC               0x000a
+#define USBSER_TRACEERR_INVALIDARG                   0x000b
+#define USBSER_TRACEERR_EP0NOTBOUND                  0x000c
+#define USBSER_TRACEERR_EPBULKINALLOCFAIL            0x000d
+#define USBSER_TRACEERR_EPBULKINCONFIGFAIL           0x000e
+#define USBSER_TRACEERR_EPBULKOUTALLOCFAIL           0x000f
+#define USBSER_TRACEERR_EPINTINALLOCFAIL             0x0010
+#define USBSER_TRACEERR_EPINTINCONFIGFAIL            0x0011
+#define USBSER_TRACEERR_EPBULKOUTCONFIGFAIL          0x0012
+#define USBSER_TRACEERR_RDALLOCREQ                   0x0013
+#define USBSER_TRACEERR_RDSHUTDOWN                   0x0014
+#define USBSER_TRACEERR_RDSUBMIT                     0x0015
+#define USBSER_TRACEERR_RDUNEXPECTED                 0x0016
+#define USBSER_TRACEERR_REQRESULT                    0x0017
+#define USBSER_TRACEERR_RXOVERRUN                    0x0018
+#define USBSER_TRACEERR_SETUPNOTCONNECTED            0x0019
+#define USBSER_TRACEERR_SUBMITFAIL                   0x001a
+#define USBSER_TRACEERR_UARTREGISTER                 0x001b
+#define USBSER_TRACEERR_UNSUPPORTEDCTRLREQ           0x001c
+#define USBSER_TRACEERR_UNSUPPORTEDRWREQ             0x001d
+#define USBSER_TRACEERR_UNSUPPORTEDSTDREQ            0x001e
+#define USBSER_TRACEERR_UNSUPPORTEDTYPE              0x001f
+#define USBSER_TRACEERR_WRALLOCREQ                   0x0020
+#define USBSER_TRACEERR_WRSHUTDOWN                   0x0021
+#define USBSER_TRACEERR_WRUNEXPECTED                 0x0022
+
+/* USB Storage driver class events ******************************************/
+
+/* 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
+
+/* 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_ALREADYINIT                 0x0005
+#define USBSTRG_TRACEERR_ALREADYUNINIT               0x0006
+#define USBSTRG_TRACEERR_BADREQUEST                  0x0007
+#define USBSTRG_TRACEERR_BINDLUNINVALIDARGS2         0x0008
+#define USBSTRG_TRACEERR_BINDLUNINVALIDARGS3         0x0009
+#define USBSTRG_TRACEERR_BINDLUNINVALIDARGS4         0x000a
+#define USBSTRG_TRACEERR_BINLUNINVALIDARGS1          0x000b
+#define USBSTRG_TRACEERR_BLKDRVEOPEN                 0x000c
+#define USBSTRG_TRACEERR_CMDBADLUN                   0x000d
+#define USBSTRG_TRACEERR_CMDFINISHRESIDUE            0x000e
+#define USBSTRG_TRACEERR_CMDFINISHRQEMPTY            0x000f
+#define USBSTRG_TRACEERR_CMDFINISHSHORTPKT           0x0010
+#define USBSTRG_TRACEERR_CMDFINISHSUBMIT             0x0011
+#define USBSTRG_TRACEERR_CMDFINSHDIR                 0x0012
+#define USBSTRG_TRACEERR_CMDFINSHSUBMIT              0x0013
+#define USBSTRG_TRACEERR_CMDPARSEWRREQLISTEMPTY      0x0014
+#define USBSTRG_TRACEERR_CMDREADREADFAIL             0x0015
+#define USBSTRG_TRACEERR_CMDREADSUBMIT               0x0016
+#define USBSTRG_TRACEERR_CMDREADWRRQEMPTY            0x0017
+#define USBSTRG_TRACEERR_CMDSTATUSRDREQLISTEMPTY     0x0018
+#define USBSTRG_TRACEERR_CMDUNEVIOLATION             0x0019
+#define USBSTRG_TRACEERR_CMDWRITERDSUBMIT            0x001a
+#define USBSTRG_TRACEERR_CMDWRITERDRQEMPTY           0x001b
+#define USBSTRG_TRACEERR_CMDWRITEWRITEFAIL           0x001c
+#define USBSTRG_TRACEERR_CONFIGIDBAD                 0x001d
+#define USBSTRG_TRACEERR_CONFIGNONE                  0x001e
+#define USBSTRG_TRACEERR_DEVREGISTER                 0x001f
+#define USBSTRG_TRACEERR_DISCONNECTINVALIDARGS       0x0020
+#define USBSTRG_TRACEERR_EP0NOTBOUND1                0x0021
+#define USBSTRG_TRACEERR_EP0NOTBOUND2                0x0022
+#define USBSTRG_TRACEERR_EP0NOTBOUND3                0x0023
+#define USBSTRG_TRACEERR_EPBULKINALLOCFAIL           0x0024
+#define USBSTRG_TRACEERR_EPBULKINCONFIGFAIL          0x0025
+#define USBSTRG_TRACEERR_EPBULKOUTALLOCFAIL          0x0026
+#define USBSTRG_TRACEERR_EPBULKOUTCONFIGFAIL         0x0027
+#define USBSTRG_TRACEERR_EPRESPQ                     0x0028
+#define USBSTRG_TRACEERR_EXPORTLUNSINVALIDARGS       0x0029
+#define USBSTRG_TRACEERR_GETMAXLUNNDX                0x002a
+#define USBSTRG_TRACEERR_GETUNKNOWNDESC              0x002b
+#define USBSTRG_TRACEERR_IDLERDREQLISTEMPTY          0x002c
+#define USBSTRG_TRACEERR_IDLERDSUBMIT                0x002d
+#define USBSTRG_TRACEERR_INQUIRYFLAGS                0x002e
+#define USBSTRG_TRACEERR_INTERNALCONFUSION1          0x002f
+#define USBSTRG_TRACEERR_INTERNALCONFUSION2          0x0030
+#define USBSTRG_TRACEERR_INVALIDCBWCONTENT           0x0031
+#define USBSTRG_TRACEERR_INVALIDCBWSIGNATURE         0x0032
+#define USBSTRG_TRACEERR_INVALIDSTATE                0x0033
+#define USBSTRG_TRACEERR_LUNALREADYBOUND             0x0034
+#define USBSTRG_TRACEERR_LUNNOTBOUND                 0x0035
+#define USBSTRG_TRACEERR_MODEPAGEFLAGS               0x0036
+#define USBSTRG_TRACEERR_MODESENSE10FLAGS            0x0037
+#define USBSTRG_TRACEERR_MODESENSE6FLAGS             0x0038
+#define USBSTRG_TRACEERR_MSRESETNDX                  0x0039
+#define USBSTRG_TRACEERR_NOGEOMETRY                  0x003a
+#define USBSTRG_TRACEERR_NOTCONFIGURED               0x003b
+#define USBSTRG_TRACEERR_NOTREMOVABLE                0x003c
+#define USBSTRG_TRACEERR_PCSAVED                     0x003d
+#define USBSTRG_TRACEERR_PHASEERROR1                 0x003e
+#define USBSTRG_TRACEERR_PHASEERROR2                 0x003f
+#define USBSTRG_TRACEERR_PHASEERROR3                 0x0040
+#define USBSTRG_TRACEERR_PREVENTMEDIUMREMOVALFLAGS   0x0041
+#define USBSTRG_TRACEERR_PREVENTMEDIUMREMOVALPREVENT 0x0042
+#define USBSTRG_TRACEERR_RDALLOCREQ                  0x0043
+#define USBSTRG_TRACEERR_RDCOMPLETEINVALIDARGS       0x0044
+#define USBSTRG_TRACEERR_RDCOMPLETERDSUBMIT          0x0045
+#define USBSTRG_TRACEERR_RDSHUTDOWN                  0x0046
+#define USBSTRG_TRACEERR_RDSUBMIT                    0x0047
+#define USBSTRG_TRACEERR_RDUNEXPECTED                0x0048
+#define USBSTRG_TRACEERR_READ10FLAGS                 0x0049
+#define USBSTRG_TRACEERR_READ10LBARANGE              0x004a
+#define USBSTRG_TRACEERR_READ10MEDIANOTPRESENT       0x004b
+#define USBSTRG_TRACEERR_READ12FLAGS                 0x004c
+#define USBSTRG_TRACEERR_READ12LBARANGE              0x004d
+#define USBSTRG_TRACEERR_READ12MEDIANOTPRESENT       0x004e
+#define USBSTRG_TRACEERR_READ6FLAGS                  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_SETCONFIGINVALIDARGS        0x0055
+#define USBSTRG_TRACEERR_SETUPINVALIDARGS            0x0056
+#define USBSTRG_TRACEERR_SNDCSWFAIL                  0x0057
+#define USBSTRG_TRACEERR_SNDPHERROR                  0x0058
+#define USBSTRG_TRACEERR_SNDSTATUSSUBMIT             0x0059
+#define USBSTRG_TRACEERR_SYNCCACHEMEDIANOTPRESENT    0x005a
+#define USBSTRG_TRACEERR_THREADCREATE                0x005b
+#define USBSTRG_TRACEERR_TOOMANYLUNS                 0x005c
+#define USBSTRG_TRACEERR_UNBINDINVALIDARGS           0x005d
+#define USBSTRG_TRACEERR_UNBINDLUNINVALIDARGS1       0x005e
+#define USBSTRG_TRACEERR_UNBINDLUNINVALIDARGS2       0x005f
+#define USBSTRG_TRACEERR_UNINITIALIZEINVALIDARGS     0x0060
+#define USBSTRG_TRACEERR_UNSUPPORTEDSTDREQ           0x0061
+#define USBSTRG_TRACEERR_VERIFY10FLAGS               0x0062
+#define USBSTRG_TRACEERR_VERIFY10LBARANGE            0x0063
+#define USBSTRG_TRACEERR_VERIFY10MEDIANOTPRESENT     0x0064
+#define USBSTRG_TRACEERR_VERIFY10NOBLOCKS            0x0065
+#define USBSTRG_TRACEERR_VERIFY10READFAIL            0x0066
+#define USBSTRG_TRACEERR_WRALLOCREQ                  0x0067
+#define USBSTRG_TRACEERR_SNDPHERROR                  0x0068
+#define USBSTRG_TRACEERR_WRCOMPLETEINVALIDARGS       0x0069
+#define USBSTRG_TRACEERR_WRITE10FLAGS                0x006a
+#define USBSTRG_TRACEERR_WRITE10LBARANGE             0x006b
+#define USBSTRG_TRACEERR_WRITE10MEDIANOTPRESENT      0x006c
+#define USBSTRG_TRACEERR_WRITE10READONLY             0x006d
+#define USBSTRG_TRACEERR_WRITE12FLAGS                0x006e
+#define USBSTRG_TRACEERR_WRITE12LBARANGE             0x006f
+#define USBSTRG_TRACEERR_WRITE12MEDIANOTPRESENT      0x0070
+#define USBSTRG_TRACEERR_WRITE12READONLY             0x0071
+#define USBSTRG_TRACEERR_WRITE6FLAGS                 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
 
 /****************************************************************************
  * Public Types