remove the revision number from the spc symbols

change all spc2 and spc3 to spc



svn path=/trunk/; revision=20779

7 files changed, 357 insertions, 349 deletions

diff --git a/epan/dissectors/packet-scsi-mmc.c b/epan/dissectors/packet-scsi-mmc.c
index 55fe276167..c0793fb3c0 100644
--- a/epan/dissectors/packet-scsi-mmc.c
+++ b/epan/dissectors/packet-scsi-mmc.c
@@ -1028,10 +1028,10 @@ const value_string scsi_mmc_vals[] = {
     {SCSI_MMC4_GETCONFIGURATION      , "Get Configuraion"},
     {SCSI_MMC4_GETEVENTSTATUSNOTIFY  , "Get Event Status Notification"},
     {SCSI_MMC4_GETPERFORMANCE        , "Get Performance"},
-    {SCSI_SPC2_INQUIRY               , "Inquiry"},
-    {SCSI_SPC2_MODESELECT10          , "Mode Select(10)"},
-    {SCSI_SPC2_MODESENSE10           , "Mode Sense(10)"},
-    {SCSI_SPC2_PREVMEDREMOVAL        , "Prevent/Allow Medium Removal"},
+    {SCSI_SPC_INQUIRY               , "Inquiry"},
+    {SCSI_SPC_MODESELECT10          , "Mode Select(10)"},
+    {SCSI_SPC_MODESENSE10           , "Mode Sense(10)"},
+    {SCSI_SPC_PREVMEDREMOVAL        , "Prevent/Allow Medium Removal"},
     {SCSI_MMC4_READ10                , "Read(10)"},
     {SCSI_MMC4_READ12                , "Read(12)"},
     {SCSI_MMC4_READBUFFERCAPACITY    , "Read Buffer Capacity"},
@@ -1041,26 +1041,26 @@ const value_string scsi_mmc_vals[] = {
     {SCSI_MMC4_READTOCPMAATIP        , "Read TOC/PMA/ATIP"},
     {SCSI_MMC4_READTRACKINFORMATION  , "Read Track Information"},
     {SCSI_MMC4_REPORTKEY             , "Report Key"},
-    {SCSI_SPC2_REPORTLUNS            , "Report LUNs"},
-    {SCSI_SPC2_REQSENSE              , "Request Sense"},
+    {SCSI_SPC_REPORTLUNS            , "Report LUNs"},
+    {SCSI_SPC_REQSENSE              , "Request Sense"},
     {SCSI_MMC4_RESERVETRACK          , "Reserve Track"},
     {SCSI_MMC4_SETCDSPEED            , "Set CD Speed"},
     {SCSI_MMC4_SETSTREAMING          , "Set Streaming"},
     {SCSI_SBC_STARTSTOPUNIT          , "Start Stop Unit"},
     {SCSI_MMC4_SYNCHRONIZECACHE      , "Synchronize Cache"},
-    {SCSI_SPC2_TESTUNITRDY           , "Test Unit Ready"},
+    {SCSI_SPC_TESTUNITRDY           , "Test Unit Ready"},
     {SCSI_MMC4_WRITE10               , "Write(10)"},
     {SCSI_MMC4_WRITE12               , "Write(12)"},
-    {SCSI_SPC2_WRITEBUFFER           , "Write Buffer"},
+    {SCSI_SPC_WRITEBUFFER           , "Write Buffer"},
     {0, NULL},
 };
 
 
 scsi_cdb_table_t scsi_mmc_table[256] = {
-/*SPC 0x00*/{dissect_spc3_testunitready},
+/*SPC 0x00*/{dissect_spc_testunitready},
 /*MMC 0x01*/{NULL},
 /*MMC 0x02*/{NULL},
-/*SPC 0x03*/{dissect_spc3_requestsense},
+/*SPC 0x03*/{dissect_spc_requestsense},
 /*MMC 0x04*/{NULL},
 /*MMC 0x05*/{NULL},
 /*MMC 0x06*/{NULL},
@@ -1075,7 +1075,7 @@ scsi_cdb_table_t scsi_mmc_table[256] = {
 /*MMC 0x0f*/{NULL},
 /*MMC 0x10*/{NULL},
 /*MMC 0x11*/{NULL},
-/*SPC 0x12*/{dissect_spc3_inquiry},
+/*SPC 0x12*/{dissect_spc_inquiry},
 /*MMC 0x13*/{NULL},
 /*MMC 0x14*/{NULL},
 /*MMC 0x15*/{NULL},
@@ -1087,7 +1087,7 @@ scsi_cdb_table_t scsi_mmc_table[256] = {
 /*MMC 0x1b*/{dissect_sbc_startstopunit},
 /*MMC 0x1c*/{NULL},
 /*MMC 0x1d*/{NULL},
-/*MMC 0x1e*/{dissect_spc3_preventallowmediaremoval},
+/*MMC 0x1e*/{dissect_spc_preventallowmediaremoval},
 /*MMC 0x1f*/{NULL},
 /*MMC 0x20*/{NULL},
 /*MMC 0x21*/{NULL},
@@ -1116,7 +1116,7 @@ scsi_cdb_table_t scsi_mmc_table[256] = {
 /*MMC 0x38*/{NULL},
 /*MMC 0x39*/{NULL},
 /*MMC 0x3a*/{NULL},
-/*SPC 0x3b*/{dissect_spc3_writebuffer},
+/*SPC 0x3b*/{dissect_spc_writebuffer},
 /*MMC 0x3c*/{NULL},
 /*MMC 0x3d*/{NULL},
 /*MMC 0x3e*/{NULL},
@@ -1142,12 +1142,12 @@ scsi_cdb_table_t scsi_mmc_table[256] = {
 /*MMC 0x52*/{dissect_mmc4_readtrackinformation},
 /*MMC 0x53*/{dissect_mmc4_reservetrack},
 /*MMC 0x54*/{NULL},
-/*SPC 0x55*/{dissect_spc3_modeselect10},
+/*SPC 0x55*/{dissect_spc_modeselect10},
 /*MMC 0x56*/{NULL},
 /*MMC 0x57*/{NULL},
 /*MMC 0x58*/{NULL},
 /*MMC 0x59*/{NULL},
-/*SPC 0x5a*/{dissect_spc3_modesense10},
+/*SPC 0x5a*/{dissect_spc_modesense10},
 /*MMC 0x5b*/{NULL},
 /*MMC 0x5c*/{dissect_mmc4_readbuffercapacity},
 /*MMC 0x5d*/{NULL},
@@ -1217,7 +1217,7 @@ scsi_cdb_table_t scsi_mmc_table[256] = {
 /*MMC 0x9d*/{NULL},
 /*MMC 0x9e*/{NULL},
 /*MMC 0x9f*/{NULL},
-/*SPC 0xa0*/{dissect_spc3_reportluns},
+/*SPC 0xa0*/{dissect_spc_reportluns},
 /*MMC 0xa1*/{NULL},
 /*MMC 0xa2*/{NULL},
 /*MMC 0xa3*/{NULL},
diff --git a/epan/dissectors/packet-scsi-osd.c b/epan/dissectors/packet-scsi-osd.c
index 7320f5b638..5d98028070 100644
--- a/epan/dissectors/packet-scsi-osd.c
+++ b/epan/dissectors/packet-scsi-osd.c
@@ -2671,14 +2671,14 @@ dissect_osd_opcode(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
 /* OSD Commands */
 const value_string scsi_osd_vals[] = {
-    {SCSI_SPC2_INQUIRY			, "Inquiry"},
-    {SCSI_SPC2_LOGSELECT		, "Log Select"},
-    {SCSI_SPC2_LOGSENSE			, "Log Sense"},
-    {SCSI_SPC2_MODESELECT10		, "Mode Select(10)"},
-    {SCSI_SPC2_MODESENSE10		, "Mode Sense(10)"},
-    {SCSI_SPC2_PERSRESVIN		, "Persistent Reserve In"},
-    {SCSI_SPC2_PERSRESVOUT		, "Persistent Reserve Out"},
-    {SCSI_SPC2_REPORTLUNS		, "Report LUNs"},
+    {SCSI_SPC_INQUIRY			, "Inquiry"},
+    {SCSI_SPC_LOGSELECT			, "Log Select"},
+    {SCSI_SPC_LOGSENSE			, "Log Sense"},
+    {SCSI_SPC_MODESELECT10		, "Mode Select(10)"},
+    {SCSI_SPC_MODESENSE10		, "Mode Sense(10)"},
+    {SCSI_SPC_PERSRESVIN		, "Persistent Reserve In"},
+    {SCSI_SPC_PERSRESVOUT		, "Persistent Reserve Out"},
+    {SCSI_SPC_REPORTLUNS		, "Report LUNs"},
     {SCSI_OSD_OPCODE			, "OSD Command" },
     {0, NULL},
 };
@@ -2704,7 +2704,7 @@ scsi_cdb_table_t scsi_osd_table[256] = {
 /*OSD 0x0f*/{NULL},
 /*OSD 0x10*/{NULL},
 /*OSD 0x11*/{NULL},
-/*OSD 0x12*/{dissect_spc3_inquiry},
+/*OSD 0x12*/{dissect_spc_inquiry},
 /*OSD 0x13*/{NULL},
 /*OSD 0x14*/{NULL},
 /*OSD 0x15*/{NULL},
@@ -2762,8 +2762,8 @@ scsi_cdb_table_t scsi_osd_table[256] = {
 /*OSD 0x49*/{NULL},
 /*OSD 0x4a*/{NULL},
 /*OSD 0x4b*/{NULL},
-/*OSD 0x4c*/{dissect_spc3_logselect},
-/*OSD 0x4d*/{dissect_spc3_logsense},
+/*OSD 0x4c*/{dissect_spc_logselect},
+/*OSD 0x4d*/{dissect_spc_logsense},
 /*OSD 0x4e*/{NULL},
 /*OSD 0x4f*/{NULL},
 /*OSD 0x50*/{NULL},
@@ -2771,17 +2771,17 @@ scsi_cdb_table_t scsi_osd_table[256] = {
 /*OSD 0x52*/{NULL},
 /*OSD 0x53*/{NULL},
 /*OSD 0x54*/{NULL},
-/*OSD 0x55*/{dissect_spc3_modeselect10},
+/*OSD 0x55*/{dissect_spc_modeselect10},
 /*OSD 0x56*/{NULL},
 /*OSD 0x57*/{NULL},
 /*OSD 0x58*/{NULL},
 /*OSD 0x59*/{NULL},
-/*OSD 0x5a*/{dissect_spc3_modesense10},
+/*OSD 0x5a*/{dissect_spc_modesense10},
 /*OSD 0x5b*/{NULL},
 /*OSD 0x5c*/{NULL},
 /*OSD 0x5d*/{NULL},
-/*OSD 0x5e*/{dissect_spc3_persistentreservein},
-/*OSD 0x5f*/{dissect_spc3_persistentreserveout},
+/*OSD 0x5e*/{dissect_spc_persistentreservein},
+/*OSD 0x5f*/{dissect_spc_persistentreserveout},
 /*OSD 0x60*/{NULL},
 /*OSD 0x61*/{NULL},
 /*OSD 0x62*/{NULL},
@@ -2846,7 +2846,7 @@ scsi_cdb_table_t scsi_osd_table[256] = {
 /*OSD 0x9d*/{NULL},
 /*OSD 0x9e*/{NULL},
 /*OSD 0x9f*/{NULL},
-/*OSD 0xa0*/{dissect_spc3_reportluns},
+/*OSD 0xa0*/{dissect_spc_reportluns},
 /*OSD 0xa1*/{NULL},
 /*OSD 0xa2*/{NULL},
 /*OSD 0xa3*/{NULL},
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},
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},
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},
diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c
index d7515a0a27..842695a2ac 100644
--- a/epan/dissectors/packet-scsi.c
+++ b/epan/dissectors/packet-scsi.c
@@ -331,36 +331,38 @@ typedef guint32 scsi_device_type;
 #define SCSI_CMND_MMC                    5
 
 /* SPC and SPC-2 Commands */
-static const value_string scsi_spc2_vals[] = {
+static const value_string scsi_spc_vals[] = {
+    {SCSI_SPC_ACCESS_CONTROL_IN  , "Access Control In"},
+    {SCSI_SPC_ACCESS_CONTROL_OUT , "Access Control Out"},
     {SCSI_SPC_CHANGE_DEFINITION  , "Change Definition"},
     {SCSI_SPC_COMPARE            , "Compare"},
     {SCSI_SPC_COPY               , "Copy"},
     {SCSI_SPC_COPY_AND_VERIFY    , "Copy And Verify"},
-    {SCSI_SPC2_EXTCOPY           , "Extended Copy"},
-    {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_SPC2_PERSRESVIN        , "Persistent Reserve In"},
-    {SCSI_SPC2_PERSRESVOUT       , "Persistent Reserve Out"},
-    {SCSI_SPC2_PREVMEDREMOVAL    , "Prevent/Allow Medium Removal"},
-    {SCSI_SPC2_RCVCOPYRESULTS    , "Receive Copy Results"},
-    {SCSI_SPC2_RCVDIAGRESULTS    , "Receive Diagnostics Results"},
-    {SCSI_SPC2_READBUFFER        , "Read Buffer"},
-    {SCSI_SPC2_RELEASE6          , "Release(6)"},
-    {SCSI_SPC2_RELEASE10         , "Release(10)"},
-    {SCSI_SPC2_REPORTDEVICEID    , "Report Device ID"},
-    {SCSI_SPC2_REPORTLUNS        , "Report LUNs"},
-    {SCSI_SPC2_REQSENSE          , "Request Sense"},
-    {SCSI_SPC2_RESERVE6          , "Reserve(6)"},
-    {SCSI_SPC2_RESERVE10         , "Reserve(10)"},
-    {SCSI_SPC2_SENDDIAG          , "Send Diagnostic"},
-    {SCSI_SPC2_TESTUNITRDY       , "Test Unit Ready"},
-    {SCSI_SPC2_WRITEBUFFER       , "Write Buffer"},
-    {SCSI_SPC2_VARLENCDB         , "Variable Length CDB"},
+    {SCSI_SPC_EXTCOPY            , "Extended Copy"},
+    {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_SPC_PERSRESVIN         , "Persistent Reserve In"},
+    {SCSI_SPC_PERSRESVOUT        , "Persistent Reserve Out"},
+    {SCSI_SPC_PREVMEDREMOVAL     , "Prevent/Allow Medium Removal"},
+    {SCSI_SPC_RCVCOPYRESULTS     , "Receive Copy Results"},
+    {SCSI_SPC_RCVDIAGRESULTS     , "Receive Diagnostics Results"},
+    {SCSI_SPC_READBUFFER         , "Read Buffer"},
+    {SCSI_SPC_RELEASE6           , "Release(6)"},
+    {SCSI_SPC_RELEASE10          , "Release(10)"},
+    {SCSI_SPC_REPORTDEVICEID     , "Report Device ID"},
+    {SCSI_SPC_REPORTLUNS         , "Report LUNs"},
+    {SCSI_SPC_REQSENSE           , "Request Sense"},
+    {SCSI_SPC_RESERVE6           , "Reserve(6)"},
+    {SCSI_SPC_RESERVE10          , "Reserve(10)"},
+    {SCSI_SPC_SENDDIAG           , "Send Diagnostic"},
+    {SCSI_SPC_TESTUNITRDY        , "Test Unit Ready"},
+    {SCSI_SPC_WRITEBUFFER        , "Write Buffer"},
+    {SCSI_SPC_VARLENCDB          , "Variable Length CDB"},
     {0, NULL},
 };
 
@@ -870,25 +872,25 @@ static const value_string scsi_modesns_pc_val[] = {
     {0, NULL},
 };
 
-#define SCSI_SPC2_MODEPAGE_CTL      0x0A
-#define SCSI_SPC2_MODEPAGE_DISCON   0x02
+#define SCSI_SPC_MODEPAGE_CTL      0x0A
+#define SCSI_SPC_MODEPAGE_DISCON   0x02
 #define SCSI_SCSI2_MODEPAGE_PERDEV  0x09  /* Obsolete in SPC-2; generic in SCSI-2 */
-#define SCSI_SPC2_MODEPAGE_INFOEXCP 0x1C
-#define SCSI_SPC2_MODEPAGE_PWR      0x1A
-#define SCSI_SPC2_MODEPAGE_LUN      0x18
-#define SCSI_SPC2_MODEPAGE_PORT     0x19
-#define SCSI_SPC2_MODEPAGE_VEND     0x00
-
-static const value_string scsi_spc2_modepage_val[] = {
-    {SCSI_SPC2_MODEPAGE_CTL,      "Control"},
-    {SCSI_SPC2_MODEPAGE_DISCON,   "Disconnect-Reconnect"},
-    {SCSI_SCSI2_MODEPAGE_PERDEV,  "Peripheral Device"},
-    {SCSI_SPC2_MODEPAGE_INFOEXCP, "Informational Exceptions Control"},
-    {SCSI_SPC2_MODEPAGE_PWR,      "Power Condition"},
-    {SCSI_SPC2_MODEPAGE_LUN,      "Protocol Specific LUN"},
-    {SCSI_SPC2_MODEPAGE_PORT,     "Protocol-Specific Port"},
-    {SCSI_SPC2_MODEPAGE_VEND,     "Vendor Specific Page"},
-    {0x3F,                        "Return All Mode Pages"},
+#define SCSI_SPC_MODEPAGE_INFOEXCP 0x1C
+#define SCSI_SPC_MODEPAGE_PWR      0x1A
+#define SCSI_SPC_MODEPAGE_LUN      0x18
+#define SCSI_SPC_MODEPAGE_PORT     0x19
+#define SCSI_SPC_MODEPAGE_VEND     0x00
+
+static const value_string scsi_spc_modepage_val[] = {
+    {SCSI_SPC_MODEPAGE_CTL,      "Control"},
+    {SCSI_SPC_MODEPAGE_DISCON,   "Disconnect-Reconnect"},
+    {SCSI_SCSI2_MODEPAGE_PERDEV, "Peripheral Device"},
+    {SCSI_SPC_MODEPAGE_INFOEXCP, "Informational Exceptions Control"},
+    {SCSI_SPC_MODEPAGE_PWR,      "Power Condition"},
+    {SCSI_SPC_MODEPAGE_LUN,      "Protocol Specific LUN"},
+    {SCSI_SPC_MODEPAGE_PORT,     "Protocol-Specific Port"},
+    {SCSI_SPC_MODEPAGE_VEND,     "Vendor Specific Page"},
+    {0x3F,                       "Return All Mode Pages"},
     {0, NULL},
 };
 
@@ -958,12 +960,12 @@ static const value_string scsi_mmc5_modepage_val[] = {
     {0, NULL},
 };
 
-#define SCSI_SPC2_RESVIN_SVCA_RDKEYS 0
-#define SCSI_SPC2_RESVIN_SVCA_RDRESV 1
+#define SCSI_SPC_RESVIN_SVCA_RDKEYS 0
+#define SCSI_SPC_RESVIN_SVCA_RDRESV 1
 
 static const value_string scsi_persresvin_svcaction_val[] = {
-    {SCSI_SPC2_RESVIN_SVCA_RDKEYS, "Read Keys"},
-    {SCSI_SPC2_RESVIN_SVCA_RDRESV, "Read Reservation"},
+    {SCSI_SPC_RESVIN_SVCA_RDKEYS, "Read Keys"},
+    {SCSI_SPC_RESVIN_SVCA_RDRESV, "Read Reservation"},
     {0, NULL},
 };
 
@@ -1879,7 +1881,7 @@ static const value_string inq_tpgs_vals[] = {
 
 /* This dissects byte 5 of the SPC-3 standard INQ data (SPC-3 6.4.2) */
 static int
-dissect_spc3_inq_sccsflags(tvbuff_t *tvb, int offset, proto_tree *parent_tree)
+dissect_spc_inq_sccsflags(tvbuff_t *tvb, int offset, proto_tree *parent_tree)
 {
 	guint8 flags;
 	proto_item *item=NULL;
@@ -1937,7 +1939,7 @@ dissect_spc3_inq_sccsflags(tvbuff_t *tvb, int offset, proto_tree *parent_tree)
 
 /* This dissects byte 6 of the SPC-3 standard INQ data (SPC-3 6.4.2) */
 static int
-dissect_spc3_inq_bqueflags(tvbuff_t *tvb, int offset, proto_tree *parent_tree)
+dissect_spc_inq_bqueflags(tvbuff_t *tvb, int offset, proto_tree *parent_tree)
 {
 	guint8 flags;
 	proto_item *item=NULL;
@@ -1990,7 +1992,7 @@ dissect_spc3_inq_bqueflags(tvbuff_t *tvb, int offset, proto_tree *parent_tree)
 
 /* This dissects byte 7 of the SPC-3 standard INQ data (SPC-3 6.4.2) */
 static int
-dissect_spc3_inq_reladrflags(tvbuff_t *tvb, int offset, proto_tree *parent_tree)
+dissect_spc_inq_reladrflags(tvbuff_t *tvb, int offset, proto_tree *parent_tree)
 {
 	guint8 flags;
 	proto_item *item=NULL;
@@ -2037,7 +2039,7 @@ dissect_spc3_inq_reladrflags(tvbuff_t *tvb, int offset, proto_tree *parent_tree)
 }
 
 void
-dissect_spc3_inquiry (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
+dissect_spc_inquiry (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
                       guint offset, gboolean isreq, gboolean iscdb,
                       guint32 payload_len, scsi_task_data_t *cdata)
 {
@@ -2142,13 +2144,13 @@ dissect_spc3_inquiry (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 	offset+=1;
 
 	/* sccs flags */
-	offset=dissect_spc3_inq_sccsflags(tvb, offset, tree);
+	offset=dissect_spc_inq_sccsflags(tvb, offset, tree);
 
 	/* bque flags */
-	offset=dissect_spc3_inq_bqueflags(tvb, offset, tree);
+	offset=dissect_spc_inq_bqueflags(tvb, offset, tree);
 
 	/* reladdr flags */
-	offset=dissect_spc3_inq_reladrflags(tvb, offset, tree);
+	offset=dissect_spc_inq_reladrflags(tvb, offset, tree);
 
 	/* vendor id */
 	proto_tree_add_item(tree, hf_scsi_inq_vendor_id, tvb, offset, 8, 0);
@@ -2182,7 +2184,7 @@ dissect_spc3_inquiry (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 }
 
 void
-dissect_spc3_extcopy (tvbuff_t *tvb _U_, packet_info *pinfo _U_,
+dissect_spc_extcopy (tvbuff_t *tvb _U_, packet_info *pinfo _U_,
 		      proto_tree *tree _U_, guint offset _U_,
 		      gboolean isreq _U_, gboolean iscdb _U_,
                       guint payload_len _U_, scsi_task_data_t *cdata _U_)
@@ -2300,7 +2302,7 @@ dissect_scsi_log_page (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
 }
 
 void
-dissect_spc3_logselect (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
+dissect_spc_logselect (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
                         guint offset, gboolean isreq, gboolean iscdb,
                         guint payload_len _U_, scsi_task_data_t *cdata _U_)
 {
@@ -2349,7 +2351,7 @@ static const true_false_string scsi_log_sp_tfs = {
 };
 
 void
-dissect_spc3_logsense (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
+dissect_spc_logsense (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
                        guint offset, gboolean isreq, gboolean iscdb,
                        guint payload_len _U_, scsi_task_data_t *cdata _U_)
 {
@@ -2464,13 +2466,13 @@ dissect_scsi_blockdescs (tvbuff_t *tvb, packet_info *pinfo _U_,
 }
 
 static gboolean
-dissect_scsi_spc2_modepage (tvbuff_t *tvb, packet_info *pinfo _U_,
+dissect_scsi_spc_modepage (tvbuff_t *tvb, packet_info *pinfo _U_,
 		            proto_tree *tree, guint offset, guint8 pcode)
 {
     guint8 flags, proto;
 
     switch (pcode) {
-    case SCSI_SPC2_MODEPAGE_CTL:
+    case SCSI_SPC_MODEPAGE_CTL:
         flags = tvb_get_guint8 (tvb, offset+2);
         proto_tree_add_item (tree, hf_scsi_modesns_tst, tvb, offset+2, 1, 0);
         proto_tree_add_text (tree, tvb, offset+2, 1,
@@ -2500,7 +2502,7 @@ dissect_scsi_spc2_modepage (tvbuff_t *tvb, packet_info *pinfo _U_,
                              "Extended Self-Test Completion Time: %u",
                              tvb_get_ntohs (tvb, offset+10));
         break;
-    case SCSI_SPC2_MODEPAGE_DISCON:
+    case SCSI_SPC_MODEPAGE_DISCON:
         proto_tree_add_text (tree, tvb, offset+2, 1, "Buffer Full Ratio: %u",
                              tvb_get_guint8 (tvb, offset+2));
         proto_tree_add_text (tree, tvb, offset+3, 1, "Buffer Empty Ratio: %u",
@@ -2523,7 +2525,7 @@ dissect_scsi_spc2_modepage (tvbuff_t *tvb, packet_info *pinfo _U_,
                              "First Burst Size: %u bytes",
                              tvb_get_ntohs (tvb, offset+14)*512);
         break;
-    case SCSI_SPC2_MODEPAGE_INFOEXCP:
+    case SCSI_SPC_MODEPAGE_INFOEXCP:
         flags = tvb_get_guint8 (tvb, offset+2);
         proto_tree_add_text (tree, tvb, offset+2, 1,
                              "Perf: %u, EBF: %u, EWasc: %u, DExcpt: %u, Test: %u, LogErr: %u",
@@ -2542,7 +2544,7 @@ dissect_scsi_spc2_modepage (tvbuff_t *tvb, packet_info *pinfo _U_,
         proto_tree_add_text (tree, tvb, offset+8, 4, "Report Count: %u",
                              tvb_get_ntohl (tvb, offset+8));
         break;
-    case SCSI_SPC2_MODEPAGE_PWR:
+    case SCSI_SPC_MODEPAGE_PWR:
         flags = tvb_get_guint8 (tvb, offset+3);
         proto_tree_add_text (tree, tvb, offset+3, 1, "Idle: %u, Standby: %u",
                              (flags & 0x2) >> 1, (flags & 0x1));
@@ -2553,9 +2555,9 @@ dissect_scsi_spc2_modepage (tvbuff_t *tvb, packet_info *pinfo _U_,
                              "Standby Condition Timer: %u ms",
                              tvb_get_ntohs (tvb, offset+6) * 100);
         break;
-    case SCSI_SPC2_MODEPAGE_LUN:
+    case SCSI_SPC_MODEPAGE_LUN:
         return FALSE;
-    case SCSI_SPC2_MODEPAGE_PORT:
+    case SCSI_SPC_MODEPAGE_PORT:
         proto = tvb_get_guint8 (tvb, offset+2) & 0x0F;
         proto_tree_add_item (tree, hf_scsi_protocol, tvb, offset+2, 1, 0);
         if (proto == SCSI_PROTO_FCP) {
@@ -3108,7 +3110,7 @@ dissect_scsi_modepage (tvbuff_t *tvb, packet_info *pinfo,
     plen = tvb_get_guint8 (tvb, offset+1);
 
     if (match_strval (pcode & SCSI_MS_PCODE_BITS,
-                      scsi_spc2_modepage_val) == NULL) {
+                      scsi_spc_modepage_val) == NULL) {
         /*
          * This isn't a generic mode page that applies to all SCSI
          * device types; try to interpret it based on what we deduced,
@@ -3145,15 +3147,15 @@ dissect_scsi_modepage (tvbuff_t *tvb, packet_info *pinfo,
              * (it failed in "match_strval()"), so it'll return
              * "Unknown (XXX)", which is what we want.
              */
-            modepage_val = scsi_spc2_modepage_val;
+            modepage_val = scsi_spc_modepage_val;
             hf_pagecode = hf_scsi_spcpagecode;
-            dissect_modepage = dissect_scsi_spc2_modepage;
+            dissect_modepage = dissect_scsi_spc_modepage;
             break;
 	}
     } else {
-        modepage_val = scsi_spc2_modepage_val;
+        modepage_val = scsi_spc_modepage_val;
         hf_pagecode = hf_scsi_spcpagecode;
-        dissect_modepage = dissect_scsi_spc2_modepage;
+        dissect_modepage = dissect_scsi_spc_modepage;
     }
     ti = proto_tree_add_text (scsi_tree, tvb, offset, plen+2, "%s Mode Page",
                               val_to_str (pcode & SCSI_MS_PCODE_BITS,
@@ -3179,7 +3181,7 @@ dissect_scsi_modepage (tvbuff_t *tvb, packet_info *pinfo,
 }
 
 void
-dissect_spc3_modeselect6 (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
+dissect_spc_modeselect6 (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
                           guint offset, gboolean isreq, gboolean iscdb,
                           guint payload_len, scsi_task_data_t *cdata)
 {
@@ -3277,7 +3279,7 @@ dissect_spc3_modeselect6 (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 }
 
 void
-dissect_spc3_modeselect10 (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
+dissect_spc_modeselect10 (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
                            guint offset, gboolean isreq, gboolean iscdb,
                            guint payload_len, scsi_task_data_t *cdata)
 {
@@ -3399,7 +3401,7 @@ dissect_scsi_pagecode (tvbuff_t *tvb, packet_info *pinfo _U_,
 
     pcode = tvb_get_guint8 (tvb, offset);
     if ((valstr = match_strval (pcode & SCSI_MS_PCODE_BITS,
-                                scsi_spc2_modepage_val)) == NULL) {
+                                scsi_spc_modepage_val)) == NULL) {
         /*
          * This isn't a generic mode page that applies to all SCSI
          * device types; try to interpret it based on what we deduced,
@@ -3433,7 +3435,7 @@ dissect_scsi_pagecode (tvbuff_t *tvb, packet_info *pinfo _U_,
 }
 
 void
-dissect_spc3_modesense6 (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
+dissect_spc_modesense6 (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
                          guint offset, gboolean isreq, gboolean iscdb,
                          guint payload_len, scsi_task_data_t *cdata)
 {
@@ -3526,7 +3528,7 @@ dissect_spc3_modesense6 (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 }
 
 void
-dissect_spc3_modesense10 (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
+dissect_spc_modesense10 (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
                           guint offset, gboolean isreq, gboolean iscdb,
                           guint payload_len, scsi_task_data_t *cdata)
 {
@@ -3626,7 +3628,7 @@ dissect_spc3_modesense10 (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 }
 
 void
-dissect_spc3_preventallowmediaremoval (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
+dissect_spc_preventallowmediaremoval (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
                           guint offset, gboolean isreq, gboolean iscdb,
                           guint payload_len _U_, scsi_task_data_t *cdata _U_)
 {
@@ -3650,7 +3652,7 @@ dissect_spc3_preventallowmediaremoval (tvbuff_t *tvb, packet_info *pinfo _U_, pr
 }
 
 void
-dissect_spc3_persistentreservein (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
+dissect_spc_persistentreservein (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
                          guint offset, gboolean isreq, gboolean iscdb,
                          guint payload_len, scsi_task_data_t *cdata)
 {
@@ -3688,7 +3690,7 @@ dissect_spc3_persistentreservein (tvbuff_t *tvb, packet_info *pinfo _U_, proto_t
                              len);
         len = (payload_len > len) ? len : payload_len;
 
-        if ((flags & 0x1F) == SCSI_SPC2_RESVIN_SVCA_RDKEYS) {
+        if ((flags & 0x1F) == SCSI_SPC_RESVIN_SVCA_RDKEYS) {
 	    /* XXX - what if len is < 8?  That may be illegal, but
 	       that doesn't make it impossible.... */
             numrec = len / 8;
@@ -3700,7 +3702,7 @@ dissect_spc3_persistentreservein (tvbuff_t *tvb, packet_info *pinfo _U_, proto_t
                 offset += 8;
             }
         }
-        else if ((flags & 0x1F) == SCSI_SPC2_RESVIN_SVCA_RDRESV) {
+        else if ((flags & 0x1F) == SCSI_SPC_RESVIN_SVCA_RDRESV) {
             proto_tree_add_item (tree, hf_scsi_persresv_key, tvb, offset+8,
                                  8, 0);
             proto_tree_add_item (tree, hf_scsi_persresv_scopeaddr, tvb,
@@ -3714,7 +3716,7 @@ dissect_spc3_persistentreservein (tvbuff_t *tvb, packet_info *pinfo _U_, proto_t
 }
 
 void
-dissect_spc3_persistentreserveout (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
+dissect_spc_persistentreserveout (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
                           guint offset, gboolean isreq, gboolean iscdb,
                           guint payload_len _U_, scsi_task_data_t *cdata _U_)
 {
@@ -3741,7 +3743,7 @@ dissect_spc3_persistentreserveout (tvbuff_t *tvb, packet_info *pinfo _U_, proto_
 }
 
 void
-dissect_spc2_release6 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
+dissect_spc_release6 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
                        guint offset, gboolean isreq, gboolean iscdb,
                        guint payload_len _U_, scsi_task_data_t *cdata _U_)
 {
@@ -3760,7 +3762,7 @@ dissect_spc2_release6 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
 }
 
 void
-dissect_spc2_release10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
+dissect_spc_release10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
                         guint offset, gboolean isreq, gboolean iscdb,
                         guint payload_len _U_, scsi_task_data_t *cdata _U_)
 {
@@ -3791,7 +3793,7 @@ dissect_spc2_release10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
 }
 
 static void
-dissect_spc3_reportdeviceidentifier (tvbuff_t *tvb _U_, packet_info *pinfo _U_,
+dissect_spc_reportdeviceidentifier (tvbuff_t *tvb _U_, packet_info *pinfo _U_,
 proto_tree *tree _U_,
                   guint offset _U_, gboolean isreq _U_, gboolean iscdb _U_,
                   guint payload_len _U_, scsi_task_data_t *cdata _U_)
@@ -3800,7 +3802,7 @@ proto_tree *tree _U_,
 }
 
 void
-dissect_spc3_reportluns (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
+dissect_spc_reportluns (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
                          guint offset, gboolean isreq, gboolean iscdb,
                          guint payload_len _U_, scsi_task_data_t *cdata _U_)
 {
@@ -3877,7 +3879,7 @@ dissect_scsi_fix_snsinfo (tvbuff_t *tvb, proto_tree *sns_tree, guint offset)
 }
 
 void
-dissect_spc3_requestsense (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
+dissect_spc_requestsense (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
                        guint offset, gboolean isreq, gboolean iscdb,
                        guint payload_len _U_, scsi_task_data_t *cdata _U_)
 {
@@ -3900,7 +3902,7 @@ dissect_spc3_requestsense (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
 }
 
 void
-dissect_spc2_reserve6 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
+dissect_spc_reserve6 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
                        guint offset, gboolean isreq, gboolean iscdb,
                        guint payload_len _U_, scsi_task_data_t *cdata _U_)
 {
@@ -3919,7 +3921,7 @@ dissect_spc2_reserve6 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
 }
 
 void
-dissect_spc2_reserve10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
+dissect_spc_reserve10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
                         guint offset, gboolean isreq, gboolean iscdb,
                         guint payload_len _U_, scsi_task_data_t *cdata _U_)
 {
@@ -3950,7 +3952,7 @@ dissect_spc2_reserve10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
 }
 
 void
-dissect_spc3_testunitready (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
+dissect_spc_testunitready (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
                           guint offset, gboolean isreq, gboolean iscdb,
                           guint payload_len _U_, scsi_task_data_t *cdata _U_)
 {
@@ -3974,7 +3976,7 @@ dissect_spc3_testunitready (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t
 
 
 void
-dissect_spc3_senddiagnostic (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
+dissect_spc_senddiagnostic (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
                           guint offset, gboolean isreq, gboolean iscdb _U_,
                           guint payload_len _U_, scsi_task_data_t *cdata _U_)
 {
@@ -3998,7 +4000,7 @@ dissect_spc3_senddiagnostic (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
 }
 
 void
-dissect_spc3_writebuffer (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
+dissect_spc_writebuffer (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
                           guint offset, gboolean isreq, gboolean iscdb _U_,
                           guint payload_len _U_, scsi_task_data_t *cdata _U_)
 {
@@ -4144,10 +4146,10 @@ dissect_scsi_snsinfo (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
 
 static scsi_cdb_table_t spc[256] = {
-/*SPC 0x00*/{dissect_spc3_testunitready},
+/*SPC 0x00*/{dissect_spc_testunitready},
 /*SPC 0x01*/{NULL},
 /*SPC 0x02*/{NULL},
-/*SPC 0x03*/{dissect_spc3_requestsense},
+/*SPC 0x03*/{dissect_spc_requestsense},
 /*SPC 0x04*/{NULL},
 /*SPC 0x05*/{NULL},
 /*SPC 0x06*/{NULL},
@@ -4162,19 +4164,19 @@ static scsi_cdb_table_t spc[256] = {
 /*SPC 0x0f*/{NULL},
 /*SPC 0x10*/{NULL},
 /*SPC 0x11*/{NULL},
-/*SPC 0x12*/{dissect_spc3_inquiry},
+/*SPC 0x12*/{dissect_spc_inquiry},
 /*SPC 0x13*/{NULL},
 /*SPC 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},
 /*SPC 0x18*/{NULL},
 /*SPC 0x19*/{NULL},
-/*SPC 0x1a*/{dissect_spc3_modesense6},
+/*SPC 0x1a*/{dissect_spc_modesense6},
 /*SPC 0x1b*/{NULL},
 /*SPC 0x1c*/{NULL},
-/*SPC 0x1d*/{dissect_spc3_senddiagnostic},
-/*SPC 0x1e*/{dissect_spc3_preventallowmediaremoval},
+/*SPC 0x1d*/{dissect_spc_senddiagnostic},
+/*SPC 0x1e*/{dissect_spc_preventallowmediaremoval},
 /*SPC 0x1f*/{NULL},
 /*SPC 0x20*/{NULL},
 /*SPC 0x21*/{NULL},
@@ -4203,7 +4205,7 @@ static scsi_cdb_table_t spc[256] = {
 /*SPC 0x38*/{NULL},
 /*SPC 0x39*/{NULL},
 /*SPC 0x3a*/{NULL},
-/*SPC 0x3b*/{dissect_spc3_writebuffer},
+/*SPC 0x3b*/{dissect_spc_writebuffer},
 /*SPC 0x3c*/{NULL},
 /*SPC 0x3d*/{NULL},
 /*SPC 0x3e*/{NULL},
@@ -4220,8 +4222,8 @@ static scsi_cdb_table_t spc[256] = {
 /*SPC 0x49*/{NULL},
 /*SPC 0x4a*/{NULL},
 /*SPC 0x4b*/{NULL},
-/*SPC 0x4c*/{dissect_spc3_logselect},
-/*SPC 0x4d*/{dissect_spc3_logsense},
+/*SPC 0x4c*/{dissect_spc_logselect},
+/*SPC 0x4d*/{dissect_spc_logsense},
 /*SPC 0x4e*/{NULL},
 /*SPC 0x4f*/{NULL},
 /*SPC 0x50*/{NULL},
@@ -4229,17 +4231,17 @@ static scsi_cdb_table_t spc[256] = {
 /*SPC 0x52*/{NULL},
 /*SPC 0x53*/{NULL},
 /*SPC 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},
 /*SPC 0x58*/{NULL},
 /*SPC 0x59*/{NULL},
-/*SPC 0x5a*/{dissect_spc3_modesense10},
+/*SPC 0x5a*/{dissect_spc_modesense10},
 /*SPC 0x5b*/{NULL},
 /*SPC 0x5c*/{NULL},
 /*SPC 0x5d*/{NULL},
-/*SPC 0x5e*/{dissect_spc3_persistentreservein},
-/*SPC 0x5f*/{dissect_spc3_persistentreserveout},
+/*SPC 0x5e*/{dissect_spc_persistentreservein},
+/*SPC 0x5f*/{dissect_spc_persistentreserveout},
 /*SPC 0x60*/{NULL},
 /*SPC 0x61*/{NULL},
 /*SPC 0x62*/{NULL},
@@ -4275,7 +4277,7 @@ static scsi_cdb_table_t spc[256] = {
 /*SPC 0x80*/{NULL},
 /*SPC 0x81*/{NULL},
 /*SPC 0x82*/{NULL},
-/*SPC 0x83*/{dissect_spc3_extcopy},
+/*SPC 0x83*/{dissect_spc_extcopy},
 /*SPC 0x84*/{NULL},
 /*SPC 0x85*/{NULL},
 /*SPC 0x86*/{NULL},
@@ -4304,10 +4306,10 @@ static scsi_cdb_table_t spc[256] = {
 /*SPC 0x9d*/{NULL},
 /*SPC 0x9e*/{NULL},
 /*SPC 0x9f*/{NULL},
-/*SPC 0xa0*/{dissect_spc3_reportluns},
+/*SPC 0xa0*/{dissect_spc_reportluns},
 /*SPC 0xa1*/{NULL},
 /*SPC 0xa2*/{NULL},
-/*SPC 0xa3*/{dissect_spc3_reportdeviceidentifier},
+/*SPC 0xa3*/{dissect_spc_reportdeviceidentifier},
 /*SPC 0xa4*/{NULL},
 /*SPC 0xa5*/{NULL},
 /*SPC 0xa6*/{NULL},
@@ -4443,7 +4445,7 @@ dissect_scsi_cdb (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
         }
     }
 
-    if ((valstr = match_strval (opcode, scsi_spc2_vals)) == NULL) {
+    if ((valstr = match_strval (opcode, scsi_spc_vals)) == NULL) {
         valstr = match_strval(opcode, csdata->cdb_vals);
     }
 
@@ -4694,8 +4696,8 @@ dissect_the_payload:
 	 * We assume opcode 0x12 is always INQUIRY regardless of the
 	 * commandset used.
 	 */
-        if (opcode == SCSI_SPC2_INQUIRY) {
-            dissect_spc3_inquiry (next_tvb, pinfo, scsi_tree, offset, isreq,
+        if (opcode == SCSI_SPC_INQUIRY) {
+            dissect_spc_inquiry (next_tvb, pinfo, scsi_tree, offset, isreq,
                                   FALSE, payload_len, cdata);
         }
     } else {
@@ -4767,7 +4769,7 @@ get_cmdset_data(itlq_nexus_t *itlq, itl_nexus_t *itl)
         break;
     default:
         csdata->hf_opcode=hf_scsi_spcopcode;
-        csdata->cdb_vals=scsi_spc2_vals;
+        csdata->cdb_vals=scsi_spc_vals;
         csdata->cdb_table=spc;
         break;
     }
@@ -4791,7 +4793,7 @@ proto_register_scsi (void)
 	   VALS(scsi_status_val), 0, "SCSI command status value", HFILL }},
         { &hf_scsi_spcopcode,
           {"SPC-2 Opcode", "scsi.spc.opcode", FT_UINT8, BASE_HEX,
-           VALS (scsi_spc2_vals), 0x0, "", HFILL}},
+           VALS (scsi_spc_vals), 0x0, "", HFILL}},
         { &hf_scsi_control,
           {"Control", "scsi.cdb.control", FT_UINT8, BASE_HEX, NULL, 0x0, "",
            HFILL}},
@@ -4830,7 +4832,7 @@ proto_register_scsi (void)
            VALS (scsi_modesns_pc_val), 0xC0, "", HFILL}},
         { &hf_scsi_spcpagecode,
           {"SPC-2 Page Code", "scsi.mode.spc.pagecode", FT_UINT8, BASE_HEX,
-           VALS (scsi_spc2_modepage_val), 0x3F, "", HFILL}},
+           VALS (scsi_spc_modepage_val), 0x3F, "", HFILL}},
         { &hf_scsi_sbcpagecode,
           {"SBC-2 Page Code", "scsi.mode.sbc.pagecode", FT_UINT8, BASE_HEX,
            VALS (scsi_sbc_modepage_val), 0x3F, "", HFILL}},
@@ -5021,46 +5023,46 @@ proto_register_scsi (void)
           {"SKSV", "scsi.sns.sksv", FT_BOOLEAN, BASE_HEX, NULL, 0x80, "",
            HFILL}},
         { &hf_scsi_persresv_key,
-          {"Reservation Key", "scsi.spc2.resv.key", FT_BYTES, BASE_HEX, NULL,
+          {"Reservation Key", "scsi.spc.resv.key", FT_BYTES, BASE_HEX, NULL,
            0x0, "", HFILL}},
         { &hf_scsi_persresv_scopeaddr,
-          {"Scope Address", "scsi.spc2.resv.scopeaddr", FT_BYTES, BASE_HEX, NULL,
+          {"Scope Address", "scsi.spc.resv.scopeaddr", FT_BYTES, BASE_HEX, NULL,
            0x0, "", HFILL}},
         { &hf_scsi_add_cdblen,
-          {"Additional CDB Length", "scsi.spc2.addcdblen", FT_UINT8, BASE_DEC,
+          {"Additional CDB Length", "scsi.spc.addcdblen", FT_UINT8, BASE_DEC,
            NULL, 0x0, "", HFILL}},
         { &hf_scsi_svcaction,
-          {"Service Action", "scsi.spc2.svcaction", FT_UINT16, BASE_HEX, NULL,
+          {"Service Action", "scsi.spc.svcaction", FT_UINT16, BASE_HEX, NULL,
            0x0, "", HFILL}},
         { &hf_scsi_wb_mode,
-          {"Mode", "scsi.spc2.wb.mode", FT_UINT8, BASE_HEX,
+          {"Mode", "scsi.spc.wb.mode", FT_UINT8, BASE_HEX,
            VALS (scsi_wb_mode_val), 0xF, "", HFILL}},
         { &hf_scsi_wb_bufferid,
-          {"Buffer ID", "scsi.spc2.sb.bufid", FT_UINT8, BASE_DEC, NULL, 0x0,
+          {"Buffer ID", "scsi.spc.sb.bufid", FT_UINT8, BASE_DEC, NULL, 0x0,
            "", HFILL}},
         { &hf_scsi_wb_bufoffset,
-          {"Buffer Offset", "scsi.spc2.wb.bufoff", FT_UINT24, BASE_HEX, NULL,
+          {"Buffer Offset", "scsi.spc.wb.bufoff", FT_UINT24, BASE_HEX, NULL,
            0x0, "", HFILL}},
         { &hf_scsi_paramlen24,
           {"Paremeter List Length", "scsi.cdb.paramlen24", FT_UINT24, BASE_HEX,
            NULL, 0x0, "", HFILL}},
         { &hf_scsi_senddiag_st_code,
-          {"Self-Test Code", "scsi.spc2.senddiag.code", FT_UINT8, BASE_HEX,
+          {"Self-Test Code", "scsi.spc.senddiag.code", FT_UINT8, BASE_HEX,
            VALS (scsi_senddiag_st_code_val), 0xE0, "", HFILL}},
         { &hf_scsi_select_report,
-          {"Select Report", "scsi.spc2.select_report", FT_UINT8, BASE_HEX,
+          {"Select Report", "scsi.spc.select_report", FT_UINT8, BASE_HEX,
            VALS (scsi_select_report_val), 0x00, "", HFILL}},
         { &hf_scsi_senddiag_pf,
-          {"PF", "scsi.spc2.senddiag.pf", FT_BOOLEAN, BASE_HEX,
+          {"PF", "scsi.spc.senddiag.pf", FT_BOOLEAN, BASE_HEX,
            TFS (&scsi_senddiag_pf_val), 0x10, "", HFILL}},
         { &hf_scsi_senddiag_st,
-          {"Self Test", "scsi.spc2.senddiag.st", FT_BOOLEAN, BASE_HEX, NULL,
+          {"Self Test", "scsi.spc.senddiag.st", FT_BOOLEAN, BASE_HEX, NULL,
            0x4, "", HFILL}},
         { &hf_scsi_senddiag_devoff,
-          {"Device Offline", "scsi.spc2.senddiag.devoff", FT_BOOLEAN, BASE_HEX,
+          {"Device Offline", "scsi.spc.senddiag.devoff", FT_BOOLEAN, BASE_HEX,
            NULL, 0x2, "", HFILL}},
         { &hf_scsi_senddiag_unitoff,
-          {"Unit Offline", "scsi.spc2.senddiag.unitoff", FT_BOOLEAN, BASE_HEX,
+          {"Unit Offline", "scsi.spc.senddiag.unitoff", FT_BOOLEAN, BASE_HEX,
            NULL, 0x1, "", HFILL}},
 	{ &hf_scsi_request_frame,
 	  { "Request in", "scsi.request_frame", FT_FRAMENUM, BASE_NONE, NULL, 0,
diff --git a/epan/dissectors/packet-scsi.h b/epan/dissectors/packet-scsi.h
index f042febc3c..41257a6f4a 100644
--- a/epan/dissectors/packet-scsi.h
+++ b/epan/dissectors/packet-scsi.h
@@ -106,58 +106,60 @@ typedef struct _scsi_cdb_table_t {
 } scsi_cdb_table_t;
 
 
-/* SPC and SPC-2 Commands */
+/* SPC Commands */
+#define SCSI_SPC_ACCESS_CONTROL_IN	 0x85
+#define SCSI_SPC_ACCESS_CONTROL_OUT	 0x87
 #define SCSI_SPC_CHANGE_DEFINITION       0x40
 #define SCSI_SPC_COMPARE                 0x39
 #define SCSI_SPC_COPY                    0x18
 #define SCSI_SPC_COPY_AND_VERIFY         0x3A
-#define SCSI_SPC2_INQUIRY                0x12
-#define SCSI_SPC2_EXTCOPY                0x83
-#define SCSI_SPC2_LOGSELECT              0x4C
-#define SCSI_SPC2_LOGSENSE               0x4D
-#define SCSI_SPC2_MODESELECT6            0x15
-#define SCSI_SPC2_MODESELECT10           0x55
-#define SCSI_SPC2_MODESENSE6             0x1A
-#define SCSI_SPC2_MODESENSE10            0x5A
-#define SCSI_SPC2_PERSRESVIN             0x5E
-#define SCSI_SPC2_PERSRESVOUT            0x5F
-#define SCSI_SPC2_PREVMEDREMOVAL         0x1E
-#define SCSI_SPC2_READBUFFER             0x3C
-#define SCSI_SPC2_RCVCOPYRESULTS         0x84
-#define SCSI_SPC2_RCVDIAGRESULTS         0x1C
-#define SCSI_SPC2_RELEASE6               0x17
-#define SCSI_SPC2_RELEASE10              0x57
-#define SCSI_SPC2_REPORTDEVICEID         0xA3
-#define SCSI_SPC2_REPORTLUNS             0xA0
-#define SCSI_SPC2_REQSENSE               0x03
-#define SCSI_SPC2_RESERVE6               0x16
-#define SCSI_SPC2_RESERVE10              0x56
-#define SCSI_SPC2_SENDDIAG               0x1D
-#define SCSI_SPC2_SETDEVICEID            0xA4
-#define SCSI_SPC2_TESTUNITRDY            0x00
-#define SCSI_SPC2_WRITEBUFFER            0x3B
-#define SCSI_SPC2_VARLENCDB              0x7F
-
-void dissect_spc3_inquiry(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint32 payload_len, scsi_task_data_t *cdata);
-void dissect_spc3_logselect(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_);
-void dissect_spc3_logsense(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_);
-void dissect_spc3_modeselect6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len, scsi_task_data_t *cdata);
-void dissect_spc3_modesense6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len, scsi_task_data_t *cdata);
-void dissect_spc3_modeselect10(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len, scsi_task_data_t *cdata);
-void dissect_spc3_modesense10(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len, scsi_task_data_t *cdata);
-void dissect_spc3_persistentreservein(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len, scsi_task_data_t *cdata);
-void dissect_spc3_persistentreserveout(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_);
-void dissect_spc3_reportluns(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_);
-void dissect_spc3_testunitready (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_);
-void dissect_spc3_requestsense (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_);
-void dissect_spc3_preventallowmediaremoval (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_);
-void dissect_spc3_writebuffer (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb _U_, guint payload_len _U_, scsi_task_data_t *cdata _U_);
-void dissect_spc2_reserve6 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_);
-void dissect_spc2_release6 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_);
-void dissect_spc2_reserve10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_);
-void dissect_spc2_release10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_);
-void dissect_spc3_senddiagnostic (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_);
-void dissect_spc3_extcopy (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_);
+#define SCSI_SPC_INQUIRY                 0x12
+#define SCSI_SPC_EXTCOPY                 0x83
+#define SCSI_SPC_LOGSELECT               0x4C
+#define SCSI_SPC_LOGSENSE                0x4D
+#define SCSI_SPC_MODESELECT6             0x15
+#define SCSI_SPC_MODESELECT10            0x55
+#define SCSI_SPC_MODESENSE6              0x1A
+#define SCSI_SPC_MODESENSE10             0x5A
+#define SCSI_SPC_PERSRESVIN              0x5E
+#define SCSI_SPC_PERSRESVOUT             0x5F
+#define SCSI_SPC_PREVMEDREMOVAL          0x1E
+#define SCSI_SPC_READBUFFER              0x3C
+#define SCSI_SPC_RCVCOPYRESULTS          0x84
+#define SCSI_SPC_RCVDIAGRESULTS          0x1C
+#define SCSI_SPC_RELEASE6                0x17
+#define SCSI_SPC_RELEASE10               0x57
+#define SCSI_SPC_REPORTDEVICEID          0xA3
+#define SCSI_SPC_REPORTLUNS              0xA0
+#define SCSI_SPC_REQSENSE                0x03
+#define SCSI_SPC_RESERVE6                0x16
+#define SCSI_SPC_RESERVE10               0x56
+#define SCSI_SPC_SENDDIAG                0x1D
+#define SCSI_SPC_SETDEVICEID             0xA4
+#define SCSI_SPC_TESTUNITRDY             0x00
+#define SCSI_SPC_WRITEBUFFER             0x3B
+#define SCSI_SPC_VARLENCDB               0x7F
+
+void dissect_spc_inquiry(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint32 payload_len, scsi_task_data_t *cdata);
+void dissect_spc_logselect(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_);
+void dissect_spc_logsense(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_);
+void dissect_spc_modeselect6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len, scsi_task_data_t *cdata);
+void dissect_spc_modesense6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len, scsi_task_data_t *cdata);
+void dissect_spc_modeselect10(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len, scsi_task_data_t *cdata);
+void dissect_spc_modesense10(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len, scsi_task_data_t *cdata);
+void dissect_spc_persistentreservein(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len, scsi_task_data_t *cdata);
+void dissect_spc_persistentreserveout(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_);
+void dissect_spc_reportluns(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_);
+void dissect_spc_testunitready (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_);
+void dissect_spc_requestsense (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_);
+void dissect_spc_preventallowmediaremoval (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_);
+void dissect_spc_writebuffer (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb _U_, guint payload_len _U_, scsi_task_data_t *cdata _U_);
+void dissect_spc_reserve6 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_);
+void dissect_spc_release6 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_);
+void dissect_spc_reserve10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_);
+void dissect_spc_release10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_);
+void dissect_spc_senddiagnostic (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_);
+void dissect_spc_extcopy (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_);
 
 
 
@@ -234,7 +236,7 @@ extern const value_string scsi_devid_idtype_val[];
  * and if a ReportedBoundsError is generated we will instead throw
  * ScsiBoundsError
  *
- * Please see dissect_spc3_inquiry() for an example how to use these
+ * Please see dissect_spc_inquiry() for an example how to use these
  * macros.
  */
 #define TRY_SCSI_CDB_ALLOC_LEN(pinfo, tvb, offset, length)		\