remove the revision number from the spc symbols

change all spc2 and spc3 to spc



svn path=/trunk/; revision=20779

1 files changed, 41 insertions, 41 deletions

diff --git a/epan/dissectors/packet-scsi-sbc.c b/epan/dissectors/packet-scsi-sbc.c
index 5527606238..6660f69331 100644
--- a/epan/dissectors/packet-scsi-sbc.c
+++ b/epan/dissectors/packet-scsi-sbc.c
@@ -1399,29 +1399,29 @@ dissect_sbc_serviceactionin16 (tvbuff_t *tvb, packet_info *pinfo _U_,
 
 /* SBC Commands */
 const value_string scsi_sbc_vals[] = {
-    {SCSI_SPC2_EXTCOPY           , "Extended Copy"},
-    {SCSI_SPC2_INQUIRY           , "Inquiry"},
+    {SCSI_SPC_EXTCOPY           , "Extended Copy"},
+    {SCSI_SPC_INQUIRY           , "Inquiry"},
     {SCSI_SBC_FORMATUNIT        , "Format Unit"},
     {SCSI_SBC_LOCKUNLKCACHE10   , "Lock Unlock Cache(10)"},
     {SCSI_SBC_LOCKUNLKCACHE16   , "Lock Unlock Cache(16)"},
-    {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_SPC2_PERSRESVIN        , "Persistent Reserve In"},
-    {SCSI_SPC2_PERSRESVOUT       , "Persistent Reserve Out"},
+    {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_SPC_PERSRESVIN        , "Persistent Reserve In"},
+    {SCSI_SPC_PERSRESVOUT       , "Persistent Reserve Out"},
     {SCSI_SBC_PREFETCH10        , "Pre-Fetch(10)"},
     {SCSI_SBC_PREFETCH16        , "Pre-Fetch(16)"},
-    {SCSI_SPC2_PREVMEDREMOVAL    , "Prevent/Allow Medium Removal"},
+    {SCSI_SPC_PREVMEDREMOVAL    , "Prevent/Allow Medium Removal"},
     {SCSI_SBC_READ6             , "Read(6)"},
     {SCSI_SBC_READ10            , "Read(10)"},
     {SCSI_SBC_READ12            , "Read(12)"},
     {SCSI_SBC_READ16            , "Read(16)"},
     {SCSI_SBC_READCAPACITY10    , "Read Capacity(10)"},
-    {SCSI_SPC2_REPORTLUNS        , "Report LUNs"},
-    {SCSI_SPC2_REQSENSE          , "Request Sense"},
+    {SCSI_SPC_REPORTLUNS        , "Report LUNs"},
+    {SCSI_SPC_REQSENSE          , "Request Sense"},
     {SCSI_SBC_SERVICEACTIONIN16 , "Service Action In(16)"},
     {SCSI_SBC_READDEFDATA10     , "Read Defect Data(10)"},
     {SCSI_SBC_READDEFDATA12     , "Read Defect Data(12)"},
@@ -1431,18 +1431,18 @@ const value_string scsi_sbc_vals[] = {
     {SCSI_SBC_REBUILD32         , "Rebuild(32)"},
     {SCSI_SBC_REGENERATE16      , "Regenerate(16)"},
     {SCSI_SBC_REGENERATE32      , "Regenerate(32)"},
-    {SCSI_SPC2_RELEASE6          , "Release(6)"}, /* obsolete in SBC2 and later */
-    {SCSI_SPC2_RELEASE10         , "Release(10)"},/* obsolete in SBC2 and later */
-    {SCSI_SPC2_RESERVE6          , "Reserve(6)"}, /* obsolete in SBC2 and later */
-    {SCSI_SPC2_RESERVE10         , "Reserve(10)"},/* obsolete in SBC2 and later */
+    {SCSI_SPC_RELEASE6          , "Release(6)"}, /* obsolete in SBC2 and later */
+    {SCSI_SPC_RELEASE10         , "Release(10)"},/* obsolete in SBC2 and later */
+    {SCSI_SPC_RESERVE6          , "Reserve(6)"}, /* obsolete in SBC2 and later */
+    {SCSI_SPC_RESERVE10         , "Reserve(10)"},/* obsolete in SBC2 and later */
     {SCSI_SBC_SEEK10            , "Seek(10)"},
-    {SCSI_SPC2_SENDDIAG          , "Send Diagnostic"},
+    {SCSI_SPC_SENDDIAG          , "Send Diagnostic"},
     {SCSI_SBC_SETLIMITS10       , "Set Limits(10)"},
     {SCSI_SBC_SETLIMITS12       , "Set Limits(12)"},
     {SCSI_SBC_STARTSTOPUNIT     , "Start Stop Unit"},
     {SCSI_SBC_SYNCCACHE10       , "Synchronize Cache(10)"},
     {SCSI_SBC_SYNCCACHE16       , "Synchronize Cache(16)"},
-    {SCSI_SPC2_TESTUNITRDY       , "Test Unit Ready"},
+    {SCSI_SPC_TESTUNITRDY       , "Test Unit Ready"},
     {SCSI_SBC_VERIFY10          , "Verify(10)"},
     {SCSI_SBC_VERIFY12          , "Verify(12)"},
     {SCSI_SBC_VERIFY16          , "Verify(16)"},
@@ -1450,7 +1450,7 @@ const value_string scsi_sbc_vals[] = {
     {SCSI_SBC_WRITE10           , "Write(10)"},
     {SCSI_SBC_WRITE12           , "Write(12)"},
     {SCSI_SBC_WRITE16           , "Write(16)"},
-    {SCSI_SPC2_WRITEBUFFER       , "Write Buffer"},
+    {SCSI_SPC_WRITEBUFFER       , "Write Buffer"},
     {SCSI_SBC_WRITENVERIFY10    , "Write & Verify(10)"},
     {SCSI_SBC_WRITENVERIFY12    , "Write & Verify(12)"},
     {SCSI_SBC_WRITENVERIFY16    , "Write & Verify(16)"},
@@ -1467,14 +1467,14 @@ const value_string scsi_sbc_vals[] = {
     {SCSI_SBC_XDWRITEEXTD32     , "XdWrite Extended(32)"},
     {SCSI_SBC_XPWRITE10         , "XpWrite(10)"},
     {SCSI_SBC_XPWRITE32         , "XpWrite(32)"},
-    {0, NULL},
+    {0, NULL}
 };
 
 scsi_cdb_table_t scsi_sbc_table[256] = {
-/*SPC 0x00*/{dissect_spc3_testunitready},
+/*SPC 0x00*/{dissect_spc_testunitready},
 /*SBC 0x01*/{NULL},
 /*SBC 0x02*/{NULL},
-/*SPC 0x03*/{dissect_spc3_requestsense},
+/*SPC 0x03*/{dissect_spc_requestsense},
 /*SBC 0x04*/{dissect_sbc_formatunit},
 /*SBC 0x05*/{NULL},
 /*SBC 0x06*/{NULL},
@@ -1489,19 +1489,19 @@ scsi_cdb_table_t scsi_sbc_table[256] = {
 /*SBC 0x0f*/{NULL},
 /*SBC 0x10*/{NULL},
 /*SBC 0x11*/{NULL},
-/*SPC 0x12*/{dissect_spc3_inquiry},
+/*SPC 0x12*/{dissect_spc_inquiry},
 /*SBC 0x13*/{NULL},
 /*SBC 0x14*/{NULL},
-/*SPC 0x15*/{dissect_spc3_modeselect6},
-/*SBC 0x16*/{dissect_spc2_reserve6}, /* obsolete in SBC2 and later */
-/*SBC 0x17*/{dissect_spc2_release6}, /* obsolete in SBC2 and later */
+/*SPC 0x15*/{dissect_spc_modeselect6},
+/*SBC 0x16*/{dissect_spc_reserve6}, /* obsolete in SBC2 and later */
+/*SBC 0x17*/{dissect_spc_release6}, /* obsolete in SBC2 and later */
 /*SBC 0x18*/{NULL},
 /*SBC 0x19*/{NULL},
-/*SPC 0x1a*/{dissect_spc3_modesense6},
+/*SPC 0x1a*/{dissect_spc_modesense6},
 /*SBC 0x1b*/{dissect_sbc_startstopunit},
 /*SBC 0x1c*/{NULL},
-/*SPC 0x1d*/{dissect_spc3_senddiagnostic},
-/*SBC 0x1e*/{dissect_spc3_preventallowmediaremoval},
+/*SPC 0x1d*/{dissect_spc_senddiagnostic},
+/*SBC 0x1e*/{dissect_spc_preventallowmediaremoval},
 /*SBC 0x1f*/{NULL},
 /*SBC 0x20*/{NULL},
 /*SBC 0x21*/{NULL},
@@ -1530,7 +1530,7 @@ scsi_cdb_table_t scsi_sbc_table[256] = {
 /*SBC 0x38*/{NULL},
 /*SBC 0x39*/{NULL},
 /*SBC 0x3a*/{NULL},
-/*SPC 0x3b*/{dissect_spc3_writebuffer},
+/*SPC 0x3b*/{dissect_spc_writebuffer},
 /*SBC 0x3c*/{NULL},
 /*SBC 0x3d*/{NULL},
 /*SBC 0x3e*/{dissect_sbc_readlong10},
@@ -1547,8 +1547,8 @@ scsi_cdb_table_t scsi_sbc_table[256] = {
 /*SBC 0x49*/{NULL},
 /*SBC 0x4a*/{NULL},
 /*SBC 0x4b*/{NULL},
-/*SPC 0x4c*/{dissect_spc3_logselect},
-/*SPC 0x4d*/{dissect_spc3_logsense},
+/*SPC 0x4c*/{dissect_spc_logselect},
+/*SPC 0x4d*/{dissect_spc_logsense},
 /*SBC 0x4e*/{NULL},
 /*SBC 0x4f*/{NULL},
 /*SBC 0x50*/{dissect_sbc_xdwrite10},
@@ -1556,17 +1556,17 @@ scsi_cdb_table_t scsi_sbc_table[256] = {
 /*SBC 0x52*/{dissect_sbc_xdread10},
 /*SBC 0x53*/{dissect_sbc_xdwriteread10},
 /*SBC 0x54*/{NULL},
-/*SPC 0x55*/{dissect_spc3_modeselect10},
-/*SPC 0x56*/{dissect_spc2_reserve10},/* obsolete in SBC2 and later */
-/*SPC 0x57*/{dissect_spc2_release10},/* obsolete in SBC2 and later */
+/*SPC 0x55*/{dissect_spc_modeselect10},
+/*SPC 0x56*/{dissect_spc_reserve10},/* obsolete in SBC2 and later */
+/*SPC 0x57*/{dissect_spc_release10},/* obsolete in SBC2 and later */
 /*SBC 0x58*/{NULL},
 /*SBC 0x59*/{NULL},
-/*SPC 0x5a*/{dissect_spc3_modesense10},
+/*SPC 0x5a*/{dissect_spc_modesense10},
 /*SBC 0x5b*/{NULL},
 /*SBC 0x5c*/{NULL},
 /*SBC 0x5d*/{NULL},
-/*SPC 0x5e*/{dissect_spc3_persistentreservein},
-/*SPC 0x5f*/{dissect_spc3_persistentreserveout},
+/*SPC 0x5e*/{dissect_spc_persistentreservein},
+/*SPC 0x5f*/{dissect_spc_persistentreserveout},
 /*SBC 0x60*/{NULL},
 /*SBC 0x61*/{NULL},
 /*SBC 0x62*/{NULL},
@@ -1602,7 +1602,7 @@ scsi_cdb_table_t scsi_sbc_table[256] = {
 /*SBC 0x80*/{NULL},
 /*SBC 0x81*/{NULL},
 /*SBC 0x82*/{NULL},
-/*SPC 0x83*/{dissect_spc3_extcopy},
+/*SPC 0x83*/{dissect_spc_extcopy},
 /*SBC 0x84*/{NULL},
 /*SBC 0x85*/{NULL},
 /*SBC 0x86*/{NULL},
@@ -1631,7 +1631,7 @@ scsi_cdb_table_t scsi_sbc_table[256] = {
 /*SBC 0x9d*/{NULL},
 /*SBC 0x9e*/{dissect_sbc_serviceactionin16},
 /*SBC 0x9f*/{NULL},
-/*SPC 0xa0*/{dissect_spc3_reportluns},
+/*SPC 0xa0*/{dissect_spc_reportluns},
 /*SBC 0xa1*/{NULL},
 /*SBC 0xa2*/{NULL},
 /*SBC 0xa3*/{NULL},