diff options
author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2007-02-11 00:45:15 +0000 |
---|---|---|
committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2007-02-11 00:45:15 +0000 |
commit | f6f95ea6a0cc10d74296fab15376b406f3216470 (patch) | |
tree | 32cf927c8ae45d7a734139dc769d5d66987745ef /epan/dissectors/packet-scsi-smc.c | |
parent | 9535fb5e4211c3ea13c16b2ef4c4b25549517040 (diff) |
remove the revision number from the spc symbols
change all spc2 and spc3 to spc
svn path=/trunk/; revision=20779
Diffstat (limited to 'epan/dissectors/packet-scsi-smc.c')
-rw-r--r-- | epan/dissectors/packet-scsi-smc.c | 80 |
1 files changed, 42 insertions, 38 deletions
diff --git a/epan/dissectors/packet-scsi-smc.c b/epan/dissectors/packet-scsi-smc.c index 0903720860..7b82fe13fe 100644 --- a/epan/dissectors/packet-scsi-smc.c +++ b/epan/dissectors/packet-scsi-smc.c @@ -451,47 +451,51 @@ dissect_smc_readelementstatus (tvbuff_t *tvb, packet_info *pinfo, /* SMC Commands */ const value_string scsi_smc_vals[] = { + {SCSI_SPC_ACCESS_CONTROL_IN , "Access Control In"}, + {SCSI_SPC_ACCESS_CONTROL_OUT , "Access Control Out"}, {SCSI_SMC_EXCHANGE_MEDIUM , "Exchange Medium"}, {SCSI_SMC_INITIALIZE_ELEMENT_STATUS , "Initialize Element Status"}, {SCSI_SMC_INITIALIZE_ELEMENT_STATUS_RANGE , "Initialize Element Status With Range"}, - {SCSI_SPC2_INQUIRY , "Inquiry"}, - {SCSI_SPC2_LOGSELECT , "Log Select"}, - {SCSI_SPC2_LOGSENSE , "Log Sense"}, - {SCSI_SPC2_MODESELECT6 , "Mode Select(6)"}, - {SCSI_SPC2_MODESELECT10 , "Mode Select(10)"}, - {SCSI_SPC2_MODESENSE6 , "Mode Sense(6)"}, - {SCSI_SPC2_MODESENSE10 , "Mode Sense(10)"}, + {SCSI_SPC_INQUIRY , "Inquiry"}, + {SCSI_SPC_LOGSELECT , "Log Select"}, + {SCSI_SPC_LOGSENSE , "Log Sense"}, + {SCSI_SPC_MODESELECT6 , "Mode Select(6)"}, + {SCSI_SPC_MODESELECT10 , "Mode Select(10)"}, + {SCSI_SPC_MODESENSE6 , "Mode Sense(6)"}, + {SCSI_SPC_MODESENSE10 , "Mode Sense(10)"}, {SCSI_SMC_MOVE_MEDIUM , "Move Medium"}, {SCSI_SMC_MOVE_MEDIUM_ATTACHED , "Move Medium Attached"}, {SCSI_SMC_OPENCLOSE_ELEMENT , "Open/Close Import/Export Element"}, - {SCSI_SPC2_PERSRESVIN , "Persistent Reserve In"}, - {SCSI_SPC2_PERSRESVOUT , "Persistent Reserve Out"}, + {SCSI_SPC_PERSRESVIN , "Persistent Reserve In"}, + {SCSI_SPC_PERSRESVOUT , "Persistent Reserve Out"}, {SCSI_SMC_POSITION_TO_ELEMENT , "Position To Element"}, - {SCSI_SPC2_PREVMEDREMOVAL , "Prevent/Allow Medium Removal"}, + {SCSI_SPC_PREVMEDREMOVAL , "Prevent/Allow Medium Removal"}, {SCSI_SMC_READ_ATTRIBUTE , "Read Attribute"}, + {SCSI_SPC_READBUFFER , "Read Buffer"}, {SCSI_SMC_READ_ELEMENT_STATUS , "Read Element Status"}, {SCSI_SMC_READ_ELEMENT_STATUS_ATTACHED , "Read Element Status Attached"}, - {SCSI_SPC2_RELEASE6 , "Release(6)"}, - {SCSI_SPC2_RELEASE10 , "Release(10)"}, - {SCSI_SPC2_REPORTLUNS , "Report LUNs"}, + {SCSI_SPC_RCVDIAGRESULTS , "Receive Diagnostics Results"}, + {SCSI_SPC_RELEASE6 , "Release(6)"}, + {SCSI_SPC_RELEASE10 , "Release(10)"}, + {SCSI_SPC_REPORTLUNS , "Report LUNs"}, {SCSI_SMC_REPORT_VOLUME_TYPES_SUPPORTED , "Report Volume Types Supported"}, - {SCSI_SPC2_REQSENSE , "Request Sense"}, + {SCSI_SPC_REQSENSE , "Request Sense"}, {SCSI_SMC_REQUEST_VOLUME_ELEMENT_ADDRESS , "Request Volume Element Address"}, - {SCSI_SPC2_RESERVE6 , "Reserve(6)"}, - {SCSI_SPC2_RESERVE10 , "Reserve(10)"}, + {SCSI_SPC_RESERVE6 , "Reserve(6)"}, + {SCSI_SPC_RESERVE10 , "Reserve(10)"}, {SCSI_SMC_SEND_VOLUME_TAG , "Send Volume Tag"}, - {SCSI_SPC2_SENDDIAG , "Send Diagnostic"}, - {SCSI_SPC2_TESTUNITRDY , "Test Unit Ready"}, + {SCSI_SPC_SENDDIAG , "Send Diagnostic"}, + {SCSI_SPC_TESTUNITRDY , "Test Unit Ready"}, {SCSI_SMC_WRITE_ATTRIBUTE , "Write Attribute"}, - {SCSI_SPC2_WRITEBUFFER , "Write Buffer"}, + {SCSI_SPC_WRITEBUFFER , "Write Buffer"}, {0, NULL}, }; scsi_cdb_table_t scsi_smc_table[256] = { -/*SPC 0x00*/{dissect_spc3_testunitready}, +/*SPC 0x00*/{dissect_spc_testunitready}, /*SMC 0x01*/{NULL}, /*SMC 0x02*/{NULL}, -/*SPC 0x03*/{dissect_spc3_requestsense}, +/*SPC 0x03*/{dissect_spc_requestsense}, /*SMC 0x04*/{NULL}, /*SMC 0x05*/{NULL}, /*SMC 0x06*/{NULL}, @@ -506,19 +510,19 @@ scsi_cdb_table_t scsi_smc_table[256] = { /*SMC 0x0f*/{NULL}, /*SMC 0x10*/{NULL}, /*SMC 0x11*/{NULL}, -/*SPC 0x12*/{dissect_spc3_inquiry}, +/*SPC 0x12*/{dissect_spc_inquiry}, /*SMC 0x13*/{NULL}, /*SMC 0x14*/{NULL}, -/*SPC 0x15*/{dissect_spc3_modeselect6}, -/*SPC 0x16*/{dissect_spc2_reserve6}, -/*SPC 0x17*/{dissect_spc2_release6}, +/*SPC 0x15*/{dissect_spc_modeselect6}, +/*SPC 0x16*/{dissect_spc_reserve6}, +/*SPC 0x17*/{dissect_spc_release6}, /*SMC 0x18*/{NULL}, /*SMC 0x19*/{NULL}, -/*SPC 0x1a*/{dissect_spc3_modesense6}, +/*SPC 0x1a*/{dissect_spc_modesense6}, /*SMC 0x1b*/{NULL}, /*SMC 0x1c*/{NULL}, -/*SPC 0x1d*/{dissect_spc3_senddiagnostic}, -/*SMC 0x1e*/{dissect_spc3_preventallowmediaremoval}, +/*SPC 0x1d*/{dissect_spc_senddiagnostic}, +/*SMC 0x1e*/{dissect_spc_preventallowmediaremoval}, /*SMC 0x1f*/{NULL}, /*SMC 0x20*/{NULL}, /*SMC 0x21*/{NULL}, @@ -547,7 +551,7 @@ scsi_cdb_table_t scsi_smc_table[256] = { /*SMC 0x38*/{NULL}, /*SMC 0x39*/{NULL}, /*SMC 0x3a*/{NULL}, -/*SPC 0x3b*/{dissect_spc3_writebuffer}, +/*SPC 0x3b*/{dissect_spc_writebuffer}, /*SMC 0x3c*/{NULL}, /*SMC 0x3d*/{NULL}, /*SMC 0x3e*/{NULL}, @@ -564,8 +568,8 @@ scsi_cdb_table_t scsi_smc_table[256] = { /*SMC 0x49*/{NULL}, /*SMC 0x4a*/{NULL}, /*SMC 0x4b*/{NULL}, -/*SPC 0x4c*/{dissect_spc3_logselect}, -/*SPC 0x4d*/{dissect_spc3_logsense}, +/*SPC 0x4c*/{dissect_spc_logselect}, +/*SPC 0x4d*/{dissect_spc_logsense}, /*SMC 0x4e*/{NULL}, /*SMC 0x4f*/{NULL}, /*SMC 0x50*/{NULL}, @@ -573,17 +577,17 @@ scsi_cdb_table_t scsi_smc_table[256] = { /*SMC 0x52*/{NULL}, /*SMC 0x53*/{NULL}, /*SMC 0x54*/{NULL}, -/*SPC 0x55*/{dissect_spc3_modeselect10}, -/*SPC 0x56*/{dissect_spc2_reserve10}, -/*SPC 0x57*/{dissect_spc2_release10}, +/*SPC 0x55*/{dissect_spc_modeselect10}, +/*SPC 0x56*/{dissect_spc_reserve10}, +/*SPC 0x57*/{dissect_spc_release10}, /*SMC 0x58*/{NULL}, /*SMC 0x59*/{NULL}, -/*SPC 0x5a*/{dissect_spc3_modesense10}, +/*SPC 0x5a*/{dissect_spc_modesense10}, /*SMC 0x5b*/{NULL}, /*SMC 0x5c*/{NULL}, /*SMC 0x5d*/{NULL}, -/*SPC 0x5e*/{dissect_spc3_persistentreservein}, -/*SPC 0x5f*/{dissect_spc3_persistentreserveout}, +/*SPC 0x5e*/{dissect_spc_persistentreservein}, +/*SPC 0x5f*/{dissect_spc_persistentreserveout}, /*SMC 0x60*/{NULL}, /*SMC 0x61*/{NULL}, /*SMC 0x62*/{NULL}, @@ -648,7 +652,7 @@ scsi_cdb_table_t scsi_smc_table[256] = { /*SMC 0x9d*/{NULL}, /*SMC 0x9e*/{NULL}, /*SMC 0x9f*/{NULL}, -/*SPC 0xa0*/{dissect_spc3_reportluns}, +/*SPC 0xa0*/{dissect_spc_reportluns}, /*SMC 0xa1*/{NULL}, /*SMC 0xa2*/{NULL}, /*SMC 0xa3*/{NULL}, |