Extend USB trace logic. When we are configured to decode and stringify trace data, de-stringification support is not included for class driver trace output

1 files changed, 153 insertions, 150 deletions

diff --git a/nuttx/include/nuttx/usb/usbdev_trace.h b/nuttx/include/nuttx/usb/usbdev_trace.h
index d9de60b11..5a5d40670 100644
--- a/nuttx/include/nuttx/usb/usbdev_trace.h
+++ b/nuttx/include/nuttx/usb/usbdev_trace.h
@@ -239,159 +239,159 @@
 
 /* USB Storage driver class events ******************************************/
 
-#define USBCOMPOSITE_TRACEERR_REQRESULT              0x0001
-#define USBCOMPOSITE_TRACEERR_ALLOCCTRLREQ           0x0002
-#define USBCOMPOSITE_TRACEERR_INVALIDARG             0x0003
-#define USBCOMPOSITE_TRACEERR_EP0NOTBOUND            0x0004
-#define COMPOSITE_TRACEERR_SETUPINVALIDARGS          0x0005
-#define COMPOSITE_TRACEERR_EP0NOTBOUND2              0x0006
-#define COMPOSITE_TRACEERR_GETUNKNOWNDESC            0x0007
-#define COMPOSITE_TRACEERR_UNSUPPORTEDSTDREQ         0x0008
-#define COMPOSITE_TRACEERR_EPRESPQ                   0x0009
-#define USBCOMPOSITE_TRACEERR_ALLOCDEVSTRUCT         0x000a
-#define USBCOMPOSITE_TRACEERR_CLASSOBJECT            0x000b
-#define USBCOMPOSITE_TRACEERR_DEVREGISTER            0x000c
+#define USBCOMPOSITE_TRACEERR_REQRESULT              0x0041
+#define USBCOMPOSITE_TRACEERR_ALLOCCTRLREQ           0x0042
+#define USBCOMPOSITE_TRACEERR_INVALIDARG             0x0043
+#define USBCOMPOSITE_TRACEERR_EP0NOTBOUND            0x0044
+#define USBCOMPOSITE_TRACEERR_SETUPINVALIDARGS       0x0045
+#define USBCOMPOSITE_TRACEERR_EP0NOTBOUND2           0x0046
+#define USBCOMPOSITE_TRACEERR_GETUNKNOWNDESC         0x0047
+#define USBCOMPOSITE_TRACEERR_UNSUPPORTEDSTDREQ      0x0048
+#define USBCOMPOSITE_TRACEERR_EPRESPQ                0x0049
+#define USBCOMPOSITE_TRACEERR_ALLOCDEVSTRUCT         0x004a
+#define USBCOMPOSITE_TRACEERR_CLASSOBJECT            0x004b
+#define USBCOMPOSITE_TRACEERR_DEVREGISTER            0x004c
 
 /* USB Storage driver class events ******************************************/
 
 /* State transitions */
 
-#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
+#define USBMSC_CLASSSTATE_IDLECMDPARSE               0x0081
+#define USBMSC_CLASSSTATE_CMDPARSECMDFINISH          0x0082
+#define USBMSC_CLASSSTATE_CMDPARSECMDREAD6           0x0083
+#define USBMSC_CLASSSTATE_CMDPARSECMDREAD10          0x0084
+#define USBMSC_CLASSSTATE_CMDPARSECMDREAD12          0x0085
+#define USBMSC_CLASSSTATE_CMDPARSECMDWRITE6          0x0086
+#define USBMSC_CLASSSTATE_CMDPARSECMDWRITE10         0x0087
+#define USBMSC_CLASSSTATE_CMDPARSECMDWRITE12         0x0088
+#define USBMSC_CLASSSTATE_CMDREAD                    0x0089
+#define USBMSC_CLASSSTATE_CMDREADCMDFINISH           0x008a
+#define USBMSC_CLASSSTATE_CMDWRITE                   0x008b
+#define USBMSC_CLASSSTATE_CMDWRITECMDFINISH          0x008c
+#define USBMSC_CLASSSTATE_CMDFINISHCMDSTATUS         0x008d
+#define USBMSC_CLASSSTATE_CMDSTATUSIDLE              0x008e
 
 /* Values of the class error ID used by the USB storage driver */
 
-#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_WRCOMPLETEINVALIDARGS        0x0069
-#define USBMSC_TRACEERR_WRITE10FLAGS                 0x006a
-#define USBMSC_TRACEERR_WRITE10LBARANGE              0x006b
-#define USBMSC_TRACEERR_WRITE10MEDIANOTPRESENT       0x006c
-#define USBMSC_TRACEERR_WRITE10READONLY              0x006d
-#define USBMSC_TRACEERR_WRITE12FLAGS                 0x006e
-#define USBMSC_TRACEERR_WRITE12LBARANGE              0x006f
-#define USBMSC_TRACEERR_WRITE12MEDIANOTPRESENT       0x0070
-#define USBMSC_TRACEERR_WRITE12READONLY              0x0071
-#define USBMSC_TRACEERR_WRITE6LBARANGE               0x0072
-#define USBMSC_TRACEERR_WRITE6MEDIANOTPRESENT        0x0073
-#define USBMSC_TRACEERR_WRITE6READONLY               0x0074
-#define USBMSC_TRACEERR_WRSHUTDOWN                   0x0075
-#define USBMSC_TRACEERR_WRUNEXPECTED                 0x0076
-#define USBMSC_TRACEERR_UNSUPPORTEDTYPE              0x0077
+#define USBMSC_TRACEERR_ALLOCCTRLREQ                 0x0081
+#define USBMSC_TRACEERR_ALLOCDEVSTRUCT               0x0082
+#define USBMSC_TRACEERR_ALLOCIOBUFFER                0x0083
+#define USBMSC_TRACEERR_ALREADYCONFIGURED            0x0084
+#define USBMSC_TRACEERR_ALREADYUNINIT                0x0085
+#define USBMSC_TRACEERR_BADREQUEST                   0x0086
+#define USBMSC_TRACEERR_BINDLUNINVALIDARGS2          0x0087
+#define USBMSC_TRACEERR_BINDLUNINVALIDARGS3          0x0088
+#define USBMSC_TRACEERR_BINDLUNINVALIDARGS4          0x0089
+#define USBMSC_TRACEERR_BINLUNINVALIDARGS1           0x008a
+#define USBMSC_TRACEERR_BLKDRVEOPEN                  0x008b
+#define USBMSC_TRACEERR_CMDBADLUN                    0x008c
+#define USBMSC_TRACEERR_CMDFINISHRESIDUE             0x008d
+#define USBMSC_TRACEERR_CMDFINISHRQEMPTY             0x008e
+#define USBMSC_TRACEERR_CMDFINISHSHORTPKT            0x008f
+#define USBMSC_TRACEERR_CMDFINISHSUBMIT              0x0090
+#define USBMSC_TRACEERR_CMDFINSHDIR                  0x0091
+#define USBMSC_TRACEERR_CMDFINSHSUBMIT               0x0092
+#define USBMSC_TRACEERR_CMDPARSEWRREQLISTEMPTY       0x0093
+#define USBMSC_TRACEERR_CMDREADREADFAIL              0x0094
+#define USBMSC_TRACEERR_CMDREADSUBMIT                0x0095
+#define USBMSC_TRACEERR_CMDREADWRRQEMPTY             0x0096
+#define USBMSC_TRACEERR_CMDSTATUSRDREQLISTEMPTY      0x0097
+#define USBMSC_TRACEERR_CMDUNEVIOLATION              0x0098
+#define USBMSC_TRACEERR_CMDWRITERDSUBMIT             0x0099
+#define USBMSC_TRACEERR_CMDWRITERDRQEMPTY            0x009a
+#define USBMSC_TRACEERR_CMDWRITEWRITEFAIL            0x009b
+#define USBMSC_TRACEERR_CONFIGIDBAD                  0x009c
+#define USBMSC_TRACEERR_CONFIGNONE                   0x009d
+#define USBMSC_TRACEERR_DEFERREDRESPINVALIDARGS      0x009e
+#define USBMSC_TRACEERR_DEFERREDRESPSTALLED          0x009f
+#define USBMSC_TRACEERR_DEFERREDRESPSUBMIT           0x00a0
+#define USBMSC_TRACEERR_DEVREGISTER                  0x00a1
+#define USBMSC_TRACEERR_DISCONNECTINVALIDARGS        0x00a2
+#define USBMSC_TRACEERR_EP0NOTBOUND1                 0x00a3
+#define USBMSC_TRACEERR_EP0NOTBOUND2                 0x00a4
+#define USBMSC_TRACEERR_EP0NOTBOUND3                 0x00a5
+#define USBMSC_TRACEERR_EPBULKINALLOCFAIL            0x00a6
+#define USBMSC_TRACEERR_EPBULKINCONFIGFAIL           0x00a7
+#define USBMSC_TRACEERR_EPBULKOUTALLOCFAIL           0x00a8
+#define USBMSC_TRACEERR_EPBULKOUTCONFIGFAIL          0x00a9
+#define USBMSC_TRACEERR_EPRESPQ                      0x00aa
+#define USBMSC_TRACEERR_EXPORTLUNSINVALIDARGS        0x00ab
+#define USBMSC_TRACEERR_GETMAXLUNNDX                 0x00ac
+#define USBMSC_TRACEERR_GETUNKNOWNDESC               0x00ad
+#define USBMSC_TRACEERR_IDLERDREQLISTEMPTY           0x00ae
+#define USBMSC_TRACEERR_IDLERDSUBMIT                 0x00af
+#define USBMSC_TRACEERR_INQUIRYFLAGS                 0x00b0
+#define USBMSC_TRACEERR_INTERNALCONFUSION1           0x00b1
+#define USBMSC_TRACEERR_INTERNALCONFUSION2           0x00b2
+#define USBMSC_TRACEERR_INVALIDCBWCONTENT            0x00b3
+#define USBMSC_TRACEERR_INVALIDCBWSIGNATURE          0x00b4
+#define USBMSC_TRACEERR_INVALIDSTATE                 0x00b5
+#define USBMSC_TRACEERR_LUNALREADYBOUND              0x00b6
+#define USBMSC_TRACEERR_LUNNOTBOUND                  0x00b7
+#define USBMSC_TRACEERR_MODEPAGEFLAGS                0x00b8
+#define USBMSC_TRACEERR_MODESENSE10FLAGS             0x00b9
+#define USBMSC_TRACEERR_MODESENSE6FLAGS              0x00ba
+#define USBMSC_TRACEERR_MSRESETNDX                   0x00bb
+#define USBMSC_TRACEERR_NOGEOMETRY                   0x00bc
+#define USBMSC_TRACEERR_NOTCONFIGURED                0x00bd
+#define USBMSC_TRACEERR_NOTREMOVABLE                 0x00be
+#define USBMSC_TRACEERR_PCSAVED                      0x00bf
+#define USBMSC_TRACEERR_PHASEERROR1                  0x00c0
+#define USBMSC_TRACEERR_PHASEERROR2                  0x00c1
+#define USBMSC_TRACEERR_PHASEERROR3                  0x00c2
+#define USBMSC_TRACEERR_PREVENTMEDIUMREMOVALPREVENT  0x00c3
+#define USBMSC_TRACEERR_RDALLOCREQ                   0x00c4
+#define USBMSC_TRACEERR_RDCOMPLETEINVALIDARGS        0x00c5
+#define USBMSC_TRACEERR_RDCOMPLETERDSUBMIT           0x00c6
+#define USBMSC_TRACEERR_RDSHUTDOWN                   0x00c7
+#define USBMSC_TRACEERR_RDSUBMIT                     0x00c8
+#define USBMSC_TRACEERR_RDUNEXPECTED                 0x00c9
+#define USBMSC_TRACEERR_READ10FLAGS                  0x00ca
+#define USBMSC_TRACEERR_READ10LBARANGE               0x00cb
+#define USBMSC_TRACEERR_READ10MEDIANOTPRESENT        0x00cc
+#define USBMSC_TRACEERR_READ12FLAGS                  0x00cd
+#define USBMSC_TRACEERR_READ12LBARANGE               0x00ce
+#define USBMSC_TRACEERR_READ12MEDIANOTPRESENT        0x00cf
+#define USBMSC_TRACEERR_READ6LBARANGE                0x00d0
+#define USBMSC_TRACEERR_READ6MEDIANOTPRESENT         0x00d1
+#define USBMSC_TRACEERR_READCAPACITYFLAGS            0x00d2
+#define USBMSC_TRACEERR_REALLOCIOBUFFER              0x00d3
+#define USBMSC_TRACEERR_REQRESULT                    0x00d4
+#define USBMSC_TRACEERR_SCSICMDCONTROL               0x00d5
+#define USBMSC_TRACEERR_SETCONFIGINVALIDARGS         0x00d6
+#define USBMSC_TRACEERR_SETUPINVALIDARGS             0x00d7
+#define USBMSC_TRACEERR_SNDCSWFAIL                   0x00d8
+#define USBMSC_TRACEERR_SNDPHERROR                   0x00d9
+#define USBMSC_TRACEERR_SNDSTATUSSUBMIT              0x00da
+#define USBMSC_TRACEERR_SYNCCACHEMEDIANOTPRESENT     0x00db
+#define USBMSC_TRACEERR_THREADCREATE                 0x00dc
+#define USBMSC_TRACEERR_TOOMANYLUNS                  0x00dd
+#define USBMSC_TRACEERR_UNBINDINVALIDARGS            0x00de
+#define USBMSC_TRACEERR_UNBINDLUNINVALIDARGS1        0x00df
+#define USBMSC_TRACEERR_UNBINDLUNINVALIDARGS2        0x00e0
+#define USBMSC_TRACEERR_UNINITIALIZEINVALIDARGS      0x00e1
+#define USBMSC_TRACEERR_UNSUPPORTEDSTDREQ            0x00e2
+#define USBMSC_TRACEERR_VERIFY10FLAGS                0x00e3
+#define USBMSC_TRACEERR_VERIFY10LBARANGE             0x00e4
+#define USBMSC_TRACEERR_VERIFY10MEDIANOTPRESENT      0x00e5
+#define USBMSC_TRACEERR_VERIFY10NOBLOCKS             0x00e6
+#define USBMSC_TRACEERR_VERIFY10READFAIL             0x00e7
+#define USBMSC_TRACEERR_WRALLOCREQ                   0x00e8
+#define USBMSC_TRACEERR_WRCOMPLETEINVALIDARGS        0x00e9
+#define USBMSC_TRACEERR_WRITE10FLAGS                 0x00ea
+#define USBMSC_TRACEERR_WRITE10LBARANGE              0x00eb
+#define USBMSC_TRACEERR_WRITE10MEDIANOTPRESENT       0x00ec
+#define USBMSC_TRACEERR_WRITE10READONLY              0x00ed
+#define USBMSC_TRACEERR_WRITE12FLAGS                 0x00ee
+#define USBMSC_TRACEERR_WRITE12LBARANGE              0x00ef
+#define USBMSC_TRACEERR_WRITE12MEDIANOTPRESENT       0x00f0
+#define USBMSC_TRACEERR_WRITE12READONLY              0x00f1
+#define USBMSC_TRACEERR_WRITE6LBARANGE               0x00f2
+#define USBMSC_TRACEERR_WRITE6MEDIANOTPRESENT        0x00f3
+#define USBMSC_TRACEERR_WRITE6READONLY               0x00f4
+#define USBMSC_TRACEERR_WRSHUTDOWN                   0x00f5
+#define USBMSC_TRACEERR_WRUNEXPECTED                 0x00f6
+#define USBMSC_TRACEERR_UNSUPPORTEDTYPE              0x00f7
 
 /****************************************************************************
  * Public Types
@@ -412,8 +412,8 @@ struct usbtrace_s
 #ifdef CONFIG_USBDEV_TRACE_STRINGS
 struct trace_msg_t
 {
-  int id;
-  const char *str;
+  uint16_t        id;   /* 8-bit ID value */
+  FAR const char *str;  /* String assoiciated with the ID */
 };
 #endif
 
@@ -444,12 +444,15 @@ extern "C"
 # define EXTERN extern
 #endif
 
-/* If CONFIG_USBDEV_TRACE_STRINGS is defined, then the USB device controller
- * driver must provide these strings to support decoding of device-specific
- * trace events.
+/* If CONFIG_USBDEV_TRACE_STRINGS is defined, then the USB class driver and
+ * the USB device controller driver must provide these strings to support
+ * decoding of class- and device-specific trace events.
  */
 
 #ifdef CONFIG_USBDEV_TRACE_STRINGS
+EXTERN const struct trace_msg_t g_usb_trace_strings_clsapi[];
+EXTERN const struct trace_msg_t g_usb_trace_strings_clsstate[];
+EXTERN const struct trace_msg_t g_usb_trace_strings_clserror[];
 EXTERN const struct trace_msg_t g_usb_trace_strings_deverror[];
 EXTERN const struct trace_msg_t g_usb_trace_strings_intdecode[];
 #endif