remove the revision number from the spc symbols

change all spc2 and spc3 to spc



svn path=/trunk/; revision=20779

1 files changed, 59 insertions, 59 deletions

diff --git a/epan/dissectors/packet-scsi-ssc.c b/epan/dissectors/packet-scsi-ssc.c
index 46b70a0cde..2b650e3b85 100644
--- a/epan/dissectors/packet-scsi-ssc.c
+++ b/epan/dissectors/packet-scsi-ssc.c
@@ -1045,61 +1045,61 @@ dissect_ssc_readposition (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre
 
 /* SSC Commands */
 const value_string scsi_ssc_vals[] = {
-    {SCSI_SSC_ERASE_6                     , "Erase(6)"},
+    {SCSI_SSC_ERASE_6                      , "Erase(6)"},
     {SCSI_SSC_ERASE_16                     , "Erase(16)"},
-    {SCSI_SPC2_EXTCOPY                     , "Extended Copy"},
+    {SCSI_SPC_EXTCOPY                      , "Extended Copy"},
     {SCSI_SSC_FORMAT_MEDIUM                , "Format Medium"},
-    {SCSI_SPC2_INQUIRY                     , "Inquiry"},
-    {SCSI_SSC_LOAD_UNLOAD                 , "Load Unload"},
-    {SCSI_SSC_LOCATE_10                   , "Locate(10)"},
-    {SCSI_SSC_LOCATE_16                   , "Locate(16)"},
-    {SCSI_SPC2_LOGSELECT                   , "Log Select"},
-    {SCSI_SPC2_LOGSENSE                    , "Log Sense"},
-    {SCSI_SPC2_MODESELECT6                 , "Mode Select(6)"},
-    {SCSI_SPC2_RESERVE6                    , "Reserve(6)"},
-    {SCSI_SPC2_RELEASE6                    , "Release(6)"},
-    {SCSI_SPC2_MODESELECT10                , "Mode Select(10)"},
-    {SCSI_SPC2_MODESENSE6                  , "Mode Sense(6)"},
-    {SCSI_SPC2_MODESENSE10                 , "Mode Sense(10)"},
+    {SCSI_SPC_INQUIRY                      , "Inquiry"},
+    {SCSI_SSC_LOAD_UNLOAD                  , "Load Unload"},
+    {SCSI_SSC_LOCATE_10                    , "Locate(10)"},
+    {SCSI_SSC_LOCATE_16                    , "Locate(16)"},
+    {SCSI_SPC_LOGSELECT                    , "Log Select"},
+    {SCSI_SPC_LOGSENSE                     , "Log Sense"},
+    {SCSI_SPC_MODESELECT6                  , "Mode Select(6)"},
+    {SCSI_SPC_RESERVE6                     , "Reserve(6)"},
+    {SCSI_SPC_RELEASE6                     , "Release(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_SPC2_PERSRESVIN                  , "Persistent Reserve In"},
-    {SCSI_SPC2_PERSRESVOUT                 , "Persistent Reserve Out"},
-    {SCSI_SPC2_PREVMEDREMOVAL              , "Prevent/Allow Medium Removal"},
-    {SCSI_SSC_READ6                       , "Read(6)"},
-    {SCSI_SSC_READ_16                     , "Read(16)"},
-    {SCSI_SSC_READ_BLOCK_LIMITS           , "Read Block Limits"},
+    {SCSI_SPC_PERSRESVIN                   , "Persistent Reserve In"},
+    {SCSI_SPC_PERSRESVOUT                  , "Persistent Reserve Out"},
+    {SCSI_SPC_PREVMEDREMOVAL               , "Prevent/Allow Medium Removal"},
+    {SCSI_SSC_READ6                        , "Read(6)"},
+    {SCSI_SSC_READ_16                      , "Read(16)"},
+    {SCSI_SSC_READ_BLOCK_LIMITS            , "Read Block Limits"},
     {SCSI_SMC_READ_ELEMENT_STATUS          , "Read Element Status"},
     {SCSI_SMC_READ_ELEMENT_STATUS_ATTACHED , "Read Element Status Attached"},
-    {SCSI_SSC_READ_POSITION               , "Read Position"},
-    {SCSI_SSC_READ_REVERSE_6              , "Read Reverse(6)"},
-    {SCSI_SSC_READ_REVERSE_16             , "Read Reverse(16)"},
-    {SCSI_SSC_RECOVER_BUFFERED_DATA       , "Recover Buffered Data"},
-    {SCSI_SSC_REPORT_DENSITY_SUPPORT      , "Report Density Support"},
-    {SCSI_SPC2_REPORTLUNS                  , "Report LUNs"},
-    {SCSI_SPC2_REQSENSE                    , "Request Sense"},
-    {SCSI_SSC_REWIND                      , "Rewind"},
-    {SCSI_SPC2_SENDDIAG                    , "Send Diagnostic"},
-    {SCSI_SSC_SET_CAPACITY                , "Set Capacity"},
-    {SCSI_SSC_SPACE_6                     , "Space(6)"},
-    {SCSI_SSC_SPACE_16                    , "Space(16)"},
-    {SCSI_SPC2_TESTUNITRDY                 , "Test Unit Ready"},
-    {SCSI_SSC_VERIFY_6                    , "Verify(6)"},
-    {SCSI_SSC_VERIFY_16                   , "Verify(16)"},
-    {SCSI_SSC_WRITE6                      , "Write(6)"},
-    {SCSI_SSC_WRITE_16                    , "Write(16)"},
-    {SCSI_SPC2_WRITEBUFFER                 , "Write Buffer"},
-    {SCSI_SSC_WRITE_FILEMARKS_16          , "Write Filemarks(16)"},
-    {SCSI_SSC_WRITE_FILEMARKS_6           , "Write Filemarks(6)"},
-    {0, NULL},
+    {SCSI_SSC_READ_POSITION                , "Read Position"},
+    {SCSI_SSC_READ_REVERSE_6               , "Read Reverse(6)"},
+    {SCSI_SSC_READ_REVERSE_16              , "Read Reverse(16)"},
+    {SCSI_SSC_RECOVER_BUFFERED_DATA        , "Recover Buffered Data"},
+    {SCSI_SSC_REPORT_DENSITY_SUPPORT       , "Report Density Support"},
+    {SCSI_SPC_REPORTLUNS                   , "Report LUNs"},
+    {SCSI_SPC_REQSENSE                     , "Request Sense"},
+    {SCSI_SSC_REWIND                       , "Rewind"},
+    {SCSI_SPC_SENDDIAG                     , "Send Diagnostic"},
+    {SCSI_SSC_SET_CAPACITY                 , "Set Capacity"},
+    {SCSI_SSC_SPACE_6                      , "Space(6)"},
+    {SCSI_SSC_SPACE_16                     , "Space(16)"},
+    {SCSI_SPC_TESTUNITRDY                  , "Test Unit Ready"},
+    {SCSI_SSC_VERIFY_6                     , "Verify(6)"},
+    {SCSI_SSC_VERIFY_16                    , "Verify(16)"},
+    {SCSI_SSC_WRITE6                       , "Write(6)"},
+    {SCSI_SSC_WRITE_16                     , "Write(16)"},
+    {SCSI_SPC_WRITEBUFFER                  , "Write Buffer"},
+    {SCSI_SSC_WRITE_FILEMARKS_16           , "Write Filemarks(16)"},
+    {SCSI_SSC_WRITE_FILEMARKS_6            , "Write Filemarks(6)"},
+    {0, NULL}
 };
 
 
 scsi_cdb_table_t scsi_ssc_table[256] = {
-/*SPC 0x00*/{dissect_spc3_testunitready},
+/*SPC 0x00*/{dissect_spc_testunitready},
 /*SSC 0x01*/{dissect_ssc_rewind},
 /*SSC 0x02*/{NULL},
-/*SPC 0x03*/{dissect_spc3_requestsense},
+/*SPC 0x03*/{dissect_spc_requestsense},
 /*SSC 0x04*/{dissect_ssc_formatmedium},
 /*SSC 0x05*/{dissect_ssc_readblocklimits},
 /*SSC 0x06*/{NULL},
@@ -1114,19 +1114,19 @@ scsi_cdb_table_t scsi_ssc_table[256] = {
 /*SSC 0x0f*/{dissect_ssc_readreverse6},
 /*SSC 0x10*/{dissect_ssc_writefilemarks6},
 /*SSC 0x11*/{dissect_ssc_space6},
-/*SPC 0x12*/{dissect_spc3_inquiry},
+/*SPC 0x12*/{dissect_spc_inquiry},
 /*SSC 0x13*/{dissect_ssc_verify6},
 /*SSC 0x14*/{dissect_ssc_recoverbuffereddata},
-/*SPC 0x15*/{dissect_spc3_modeselect6},
-/*SSC 0x16*/{dissect_spc2_reserve6},
-/*SSC 0x17*/{dissect_spc2_release6},
+/*SPC 0x15*/{dissect_spc_modeselect6},
+/*SSC 0x16*/{dissect_spc_reserve6},
+/*SSC 0x17*/{dissect_spc_release6},
 /*SSC 0x18*/{NULL},
 /*SSC 0x19*/{dissect_ssc_erase6},
-/*SPC 0x1a*/{dissect_spc3_modesense6},
+/*SPC 0x1a*/{dissect_spc_modesense6},
 /*SSC 0x1b*/{dissect_ssc_loadunload},
 /*SSC 0x1c*/{NULL},
-/*SPC 0x1d*/{dissect_spc3_senddiagnostic},
-/*SSC 0x1e*/{dissect_spc3_preventallowmediaremoval},
+/*SPC 0x1d*/{dissect_spc_senddiagnostic},
+/*SSC 0x1e*/{dissect_spc_preventallowmediaremoval},
 /*SSC 0x1f*/{NULL},
 /*SSC 0x20*/{NULL},
 /*SSC 0x21*/{NULL},
@@ -1155,7 +1155,7 @@ scsi_cdb_table_t scsi_ssc_table[256] = {
 /*SSC 0x38*/{NULL},
 /*SSC 0x39*/{NULL},
 /*SSC 0x3a*/{NULL},
-/*SPC 0x3b*/{dissect_spc3_writebuffer},
+/*SPC 0x3b*/{dissect_spc_writebuffer},
 /*SSC 0x3c*/{NULL},
 /*SSC 0x3d*/{NULL},
 /*SSC 0x3e*/{NULL},
@@ -1172,8 +1172,8 @@ scsi_cdb_table_t scsi_ssc_table[256] = {
 /*SSC 0x49*/{NULL},
 /*SSC 0x4a*/{NULL},
 /*SSC 0x4b*/{NULL},
-/*SPC 0x4c*/{dissect_spc3_logselect},
-/*SPC 0x4d*/{dissect_spc3_logsense},
+/*SPC 0x4c*/{dissect_spc_logselect},
+/*SPC 0x4d*/{dissect_spc_logsense},
 /*SSC 0x4e*/{NULL},
 /*SSC 0x4f*/{NULL},
 /*SSC 0x50*/{NULL},
@@ -1181,17 +1181,17 @@ scsi_cdb_table_t scsi_ssc_table[256] = {
 /*SSC 0x52*/{NULL},
 /*SSC 0x53*/{NULL},
 /*SSC 0x54*/{NULL},
-/*SPC 0x55*/{dissect_spc3_modeselect10},
+/*SPC 0x55*/{dissect_spc_modeselect10},
 /*SSC 0x56*/{NULL},
 /*SSC 0x57*/{NULL},
 /*SSC 0x58*/{NULL},
 /*SSC 0x59*/{NULL},
-/*SPC 0x5a*/{dissect_spc3_modesense10},
+/*SPC 0x5a*/{dissect_spc_modesense10},
 /*SSC 0x5b*/{NULL},
 /*SSC 0x5c*/{NULL},
 /*SSC 0x5d*/{NULL},
-/*SPC 0x5e*/{dissect_spc3_persistentreservein},
-/*SPC 0x5f*/{dissect_spc3_persistentreserveout},
+/*SPC 0x5e*/{dissect_spc_persistentreservein},
+/*SPC 0x5f*/{dissect_spc_persistentreserveout},
 /*SSC 0x60*/{NULL},
 /*SSC 0x61*/{NULL},
 /*SSC 0x62*/{NULL},
@@ -1227,7 +1227,7 @@ scsi_cdb_table_t scsi_ssc_table[256] = {
 /*SSC 0x80*/{dissect_ssc_writefilemarks16},
 /*SSC 0x81*/{dissect_ssc_readreverse16},
 /*SSC 0x82*/{NULL},
-/*SPC 0x83*/{dissect_spc3_extcopy},
+/*SPC 0x83*/{dissect_spc_extcopy},
 /*SSC 0x84*/{NULL},
 /*SSC 0x85*/{NULL},
 /*SSC 0x86*/{NULL},
@@ -1256,7 +1256,7 @@ scsi_cdb_table_t scsi_ssc_table[256] = {
 /*SSC 0x9d*/{NULL},
 /*SSC 0x9e*/{NULL},
 /*SSC 0x9f*/{NULL},
-/*SPC 0xa0*/{dissect_spc3_reportluns},
+/*SPC 0xa0*/{dissect_spc_reportluns},
 /*SSC 0xa1*/{NULL},
 /*SSC 0xa2*/{NULL},
 /*SSC 0xa3*/{NULL},