change all sbc2 references into sbc

svn path=/trunk/; revision=20100

1 files changed, 58 insertions, 58 deletions

diff --git a/epan/dissectors/packet-scsi-sbc.c b/epan/dissectors/packet-scsi-sbc.c
index ab00f3636b..b52439c257 100644
--- a/epan/dissectors/packet-scsi-sbc.c
+++ b/epan/dissectors/packet-scsi-sbc.c
@@ -762,7 +762,7 @@ static const value_string scsi_ssu_pwrcnd_val[] = {
 };
 
 void
-dissect_sbc2_startstopunit (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
+dissect_sbc_startstopunit (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
                             guint offset, gboolean isreq _U_, gboolean iscdb,
                             guint payload_len _U_, scsi_task_data_t *cdata _U_)
 {
@@ -1020,7 +1020,7 @@ dissect_sbc_wrverify16 (tvbuff_t *tvb, packet_info *pinfo _U_,
 
 
 void
-dissect_sbc2_readcapacity10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
+dissect_sbc_readcapacity10 (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_)
 {
@@ -1062,7 +1062,7 @@ dissect_sbc2_readcapacity10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
 }
 
 static void
-dissect_sbc2_readdefectdata10 (tvbuff_t *tvb, packet_info *pinfo _U_,
+dissect_sbc_readdefectdata10 (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_)
@@ -1211,7 +1211,7 @@ dissect_sbc_writesame16 (tvbuff_t *tvb, packet_info *pinfo _U_,
 
 
 static void
-dissect_sbc2_readdefectdata12 (tvbuff_t *tvb, packet_info *pinfo _U_,
+dissect_sbc_readdefectdata12 (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_)
@@ -1284,7 +1284,7 @@ const value_string service_action_vals[] = {
    action is set to.
 */
 static void
-dissect_sbc2_serviceactionin16 (tvbuff_t *tvb, packet_info *pinfo _U_,
+dissect_sbc_serviceactionin16 (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_)
@@ -1392,9 +1392,9 @@ dissect_sbc2_serviceactionin16 (tvbuff_t *tvb, packet_info *pinfo _U_,
 const value_string scsi_sbc_vals[] = {
     {SCSI_SPC2_EXTCOPY           , "Extended Copy"},
     {SCSI_SPC2_INQUIRY           , "Inquiry"},
-    {SCSI_SBC2_FORMATUNIT        , "Format Unit"},
-    {SCSI_SBC2_LOCKUNLKCACHE10   , "Lock Unlock Cache(10)"},
-    {SCSI_SBC2_LOCKUNLKCACHE16   , "Lock Unlock Cache(16)"},
+    {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)"},
@@ -1403,57 +1403,57 @@ const value_string scsi_sbc_vals[] = {
     {SCSI_SPC2_MODESENSE10       , "Mode Sense(10)"},
     {SCSI_SPC2_PERSRESVIN        , "Persistent Reserve In"},
     {SCSI_SPC2_PERSRESVOUT       , "Persistent Reserve Out"},
-    {SCSI_SBC2_PREFETCH10        , "Pre-Fetch(10)"},
-    {SCSI_SBC2_PREFETCH16        , "Pre-Fetch(16)"},
+    {SCSI_SBC_PREFETCH10        , "Pre-Fetch(10)"},
+    {SCSI_SBC_PREFETCH16        , "Pre-Fetch(16)"},
     {SCSI_SPC2_PREVMEDREMOVAL    , "Prevent/Allow Medium Removal"},
-    {SCSI_SBC2_READ6             , "Read(6)"},
-    {SCSI_SBC2_READ10            , "Read(10)"},
-    {SCSI_SBC2_READ12            , "Read(12)"},
-    {SCSI_SBC2_READ16            , "Read(16)"},
-    {SCSI_SBC2_READCAPACITY10    , "Read Capacity(10)"},
+    {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_SBC2_SERVICEACTIONIN16 , "Service Action In(16)"},
-    {SCSI_SBC2_READDEFDATA10     , "Read Defect Data(10)"},
-    {SCSI_SBC2_READDEFDATA12     , "Read Defect Data(12)"},
-    {SCSI_SBC2_READLONG          , "Read Long(10)"},
-    {SCSI_SBC2_REASSIGNBLKS      , "Reassign Blocks"},
-    {SCSI_SBC2_REBUILD16         , "Rebuild(16)"},
-    {SCSI_SBC2_REBUILD32         , "Rebuild(32)"},
-    {SCSI_SBC2_REGENERATE16      , "Regenerate(16)"},
-    {SCSI_SBC2_REGENERATE32      , "Regenerate(32)"},
-    {SCSI_SBC2_SEEK10            , "Seek(10)"},
+    {SCSI_SBC_SERVICEACTIONIN16 , "Service Action In(16)"},
+    {SCSI_SBC_READDEFDATA10     , "Read Defect Data(10)"},
+    {SCSI_SBC_READDEFDATA12     , "Read Defect Data(12)"},
+    {SCSI_SBC_READLONG          , "Read Long(10)"},
+    {SCSI_SBC_REASSIGNBLKS      , "Reassign Blocks"},
+    {SCSI_SBC_REBUILD16         , "Rebuild(16)"},
+    {SCSI_SBC_REBUILD32         , "Rebuild(32)"},
+    {SCSI_SBC_REGENERATE16      , "Regenerate(16)"},
+    {SCSI_SBC_REGENERATE32      , "Regenerate(32)"},
+    {SCSI_SBC_SEEK10            , "Seek(10)"},
     {SCSI_SPC2_SENDDIAG          , "Send Diagnostic"},
-    {SCSI_SBC2_SETLIMITS10       , "Set Limits(10)"},
-    {SCSI_SBC2_SETLIMITS12       , "Set Limits(12)"},
-    {SCSI_SBC2_STARTSTOPUNIT     , "Start Stop Unit"},
-    {SCSI_SBC2_SYNCCACHE10       , "Synchronize Cache(10)"},
-    {SCSI_SBC2_SYNCCACHE16       , "Synchronize Cache(16)"},
+    {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_SBC2_VERIFY10          , "Verify(10)"},
-    {SCSI_SBC2_VERIFY12          , "Verify(12)"},
-    {SCSI_SBC2_VERIFY16          , "Verify(16)"},
-    {SCSI_SBC2_WRITE6            , "Write(6)"},
-    {SCSI_SBC2_WRITE10           , "Write(10)"},
-    {SCSI_SBC2_WRITE12           , "Write(12)"},
-    {SCSI_SBC2_WRITE16           , "Write(16)"},
+    {SCSI_SBC_VERIFY10          , "Verify(10)"},
+    {SCSI_SBC_VERIFY12          , "Verify(12)"},
+    {SCSI_SBC_VERIFY16          , "Verify(16)"},
+    {SCSI_SBC_WRITE6            , "Write(6)"},
+    {SCSI_SBC_WRITE10           , "Write(10)"},
+    {SCSI_SBC_WRITE12           , "Write(12)"},
+    {SCSI_SBC_WRITE16           , "Write(16)"},
     {SCSI_SPC2_WRITEBUFFER       , "Write Buffer"},
-    {SCSI_SBC2_WRITENVERIFY10    , "Write & Verify(10)"},
-    {SCSI_SBC2_WRITENVERIFY12    , "Write & Verify(12)"},
-    {SCSI_SBC2_WRITENVERIFY16    , "Write & Verify(16)"},
-    {SCSI_SBC2_WRITELONG         , "Write Long"},
-    {SCSI_SBC2_WRITESAME10       , "Write Same(10)"},
-    {SCSI_SBC2_WRITESAME16       , "Write Same(16)"},
-    {SCSI_SBC2_XDREAD10          , "XdRead(10)"},
-    {SCSI_SBC2_XDREAD32          , "XdRead(32)"},
-    {SCSI_SBC2_XDWRITE10         , "XdWrite(10)"},
-    {SCSI_SBC2_XDWRITE32         , "XdWrite(32)"},
-    {SCSI_SBC2_XDWRITEREAD10     , "XdWriteRead(10)"},
-    {SCSI_SBC2_XDWRITEREAD32     , "XdWriteRead(32)"},
-    {SCSI_SBC2_XDWRITEEXTD16     , "XdWrite Extended(16)"},
-    {SCSI_SBC2_XDWRITEEXTD32     , "XdWrite Extended(32)"},
-    {SCSI_SBC2_XPWRITE10         , "XpWrite(10)"},
-    {SCSI_SBC2_XPWRITE32         , "XpWrite(32)"},
+    {SCSI_SBC_WRITENVERIFY10    , "Write & Verify(10)"},
+    {SCSI_SBC_WRITENVERIFY12    , "Write & Verify(12)"},
+    {SCSI_SBC_WRITENVERIFY16    , "Write & Verify(16)"},
+    {SCSI_SBC_WRITELONG         , "Write Long"},
+    {SCSI_SBC_WRITESAME10       , "Write Same(10)"},
+    {SCSI_SBC_WRITESAME16       , "Write Same(16)"},
+    {SCSI_SBC_XDREAD10          , "XdRead(10)"},
+    {SCSI_SBC_XDREAD32          , "XdRead(32)"},
+    {SCSI_SBC_XDWRITE10         , "XdWrite(10)"},
+    {SCSI_SBC_XDWRITE32         , "XdWrite(32)"},
+    {SCSI_SBC_XDWRITEREAD10     , "XdWriteRead(10)"},
+    {SCSI_SBC_XDWRITEREAD32     , "XdWriteRead(32)"},
+    {SCSI_SBC_XDWRITEEXTD16     , "XdWrite Extended(16)"},
+    {SCSI_SBC_XDWRITEEXTD32     , "XdWrite Extended(32)"},
+    {SCSI_SBC_XPWRITE10         , "XpWrite(10)"},
+    {SCSI_SBC_XPWRITE32         , "XpWrite(32)"},
     {0, NULL},
 };
 
@@ -1485,7 +1485,7 @@ scsi_cdb_table_t scsi_sbc_table[256] = {
 /*SBC 0x18*/{NULL},
 /*SBC 0x19*/{NULL},
 /*SPC 0x1a*/{dissect_spc3_modesense6},
-/*SBC 0x1b*/{dissect_sbc2_startstopunit},
+/*SBC 0x1b*/{dissect_sbc_startstopunit},
 /*SBC 0x1c*/{NULL},
 /*SPC 0x1d*/{dissect_spc3_senddiagnostic},
 /*SBC 0x1e*/{dissect_spc3_preventallowmediaremoval},
@@ -1495,7 +1495,7 @@ scsi_cdb_table_t scsi_sbc_table[256] = {
 /*SBC 0x22*/{NULL},
 /*SBC 0x23*/{NULL},
 /*SBC 0x24*/{NULL},
-/*SBC 0x25*/{dissect_sbc2_readcapacity10},
+/*SBC 0x25*/{dissect_sbc_readcapacity10},
 /*SBC 0x26*/{NULL},
 /*SBC 0x27*/{NULL},
 /*SBC 0x28*/{dissect_sbc_read10},
@@ -1513,7 +1513,7 @@ scsi_cdb_table_t scsi_sbc_table[256] = {
 /*SBC 0x34*/{dissect_sbc_prefetch10},
 /*SBC 0x35*/{dissect_sbc_synchronizecache10},
 /*SBC 0x36*/{NULL},
-/*SBC 0x37*/{dissect_sbc2_readdefectdata10},
+/*SBC 0x37*/{dissect_sbc_readdefectdata10},
 /*SBC 0x38*/{NULL},
 /*SBC 0x39*/{NULL},
 /*SBC 0x3a*/{NULL},
@@ -1616,7 +1616,7 @@ scsi_cdb_table_t scsi_sbc_table[256] = {
 /*SBC 0x9b*/{NULL},
 /*SBC 0x9c*/{NULL},
 /*SBC 0x9d*/{NULL},
-/*SBC 0x9e*/{dissect_sbc2_serviceactionin16},
+/*SBC 0x9e*/{dissect_sbc_serviceactionin16},
 /*SBC 0x9f*/{NULL},
 /*SPC 0xa0*/{dissect_spc3_reportluns},
 /*SBC 0xa1*/{NULL},
@@ -1641,7 +1641,7 @@ scsi_cdb_table_t scsi_sbc_table[256] = {
 /*SBC 0xb4*/{NULL},
 /*SBC 0xb5*/{NULL},
 /*SBC 0xb6*/{NULL},
-/*SBC 0xb7*/{dissect_sbc2_readdefectdata12},
+/*SBC 0xb7*/{dissect_sbc_readdefectdata12},
 /*SBC 0xb8*/{NULL},
 /*SBC 0xb9*/{NULL},
 /*SBC 0xba*/{NULL},