break the SCSI SMC commandset out into its own dissector

svn path=/trunk/; revision=19964

1 files changed, 9 insertions, 699 deletions

diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c
index f11c75918a..09fb73a1c4 100644
--- a/epan/dissectors/packet-scsi.c
+++ b/epan/dissectors/packet-scsi.c
@@ -98,6 +98,7 @@
 #include "packet-scsi-osd.h"
 #include "packet-scsi-mmc.h"
 #include "packet-scsi-ssc.h"
+#include "packet-scsi-smc.h"
 
 static int proto_scsi                    = -1;
        int hf_scsi_control               = -1;
@@ -109,7 +110,6 @@ static int hf_scsi_lun                   = -1;
 static int hf_scsi_status                = -1;
 static int hf_scsi_spcopcode             = -1;
 static int hf_scsi_sbcopcode             = -1;
-static int hf_scsi_smcopcode             = -1;
 static int hf_scsi_inquiry_flags         = -1;
 static int hf_scsi_inquiry_evpd_page     = -1;
 static int hf_scsi_inquiry_cmdt_page     = -1;
@@ -443,40 +443,6 @@ const value_string scsi_sbc2_vals[] = {
     {0, NULL},
 };
 
-static const value_string scsi_smc2_vals[] = {
-    {SCSI_SMC2_EXCHANGE_MEDIUM                , "Exchange Medium"},
-    {SCSI_SMC2_INITIALIZE_ELEMENT_STATUS      , "Initialize Element Status"},
-    {SCSI_SMC2_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_SMC2_MOVE_MEDIUM                    , "Move Medium"},
-    {SCSI_SMC2_MOVE_MEDIUM_ATTACHED           , "Move Medium Attached"},
-    {SCSI_SPC2_PERSRESVIN                     , "Persistent Reserve In"},
-    {SCSI_SPC2_PERSRESVOUT                    , "Persistent Reserve Out"},
-    {SCSI_SMC2_POSITION_TO_ELEMENT            , "Position To Element"},
-    {SCSI_SPC2_PREVMEDREMOVAL                 , "Prevent/Allow Medium Removal"},
-    {SCSI_SMC2_READ_ATTRIBUTE                 , "Read Attribute"},
-    {SCSI_SMC2_READ_ELEMENT_STATUS            , "Read Element Status"},
-    {SCSI_SMC2_READ_ELEMENT_STATUS_ATTACHED   , "Read Element Status Attached"},
-    {SCSI_SPC2_RELEASE6                       , "Release(6)"},
-    {SCSI_SPC2_RELEASE10                      , "Release(10)"},
-    {SCSI_SPC2_REPORTLUNS                     , "Report LUNs"},
-    {SCSI_SPC2_REQSENSE                       , "Request Sense"},
-    {SCSI_SMC2_REQUEST_VOLUME_ELEMENT_ADDRESS , "Request Volume Element Address"},
-    {SCSI_SPC2_RESERVE6                       , "Reserve(6)"},
-    {SCSI_SPC2_RESERVE10                      , "Reserve(10)"},
-    {SCSI_SMC2_SEND_VOLUME_TAG                , "Send Volume Tag"},
-    {SCSI_SPC2_SENDDIAG                       , "Send Diagnostic"},
-    {SCSI_SPC2_TESTUNITRDY                    , "Test Unit Ready"},
-    {SCSI_SMC2_WRITE_ATTRIBUTE                , "Write Attribute"},
-    {SCSI_SPC2_WRITEBUFFER                    , "Write Buffer"},
-    {0, NULL},
-};
 
 
 
@@ -805,7 +771,7 @@ static const value_string scsi_cmdt_supp_val[] = {
 #define CODESET_BINARY	1
 #define CODESET_ASCII	2
 
-static const value_string scsi_devid_codeset_val[] = {
+const value_string scsi_devid_codeset_val[] = {
     {0,              "Reserved"},
     {CODESET_BINARY, "Identifier field contains binary values"},
     {CODESET_ASCII,  "Identifier field contains ASCII graphic codes"},
@@ -818,7 +784,7 @@ static const value_string scsi_devid_assoc_val[] = {
     {0, NULL},
 };
 
-static const value_string scsi_devid_idtype_val[] = {
+const value_string scsi_devid_idtype_val[] = {
     {0, "Vendor-specific ID (non-globally unique)"},
     {1, "Vendor-ID + vendor-specific ID (globally unique)"},
     {2, "EUI-64 ID"},
@@ -997,7 +963,7 @@ static const value_string scsi_sns_errtype_val[] = {
     {0, NULL},
 };
 
-static const value_string scsi_asc_val[] = {
+const value_string scsi_asc_val[] = {
     {0x0000,  "No Additional Sense Information"},
     {0x0001,  "Filemark Detected"},
     {0x0002,  "End Of Partition/Medium Detected"},
@@ -3356,7 +3322,7 @@ dissect_spc2_release6 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
     }
 }
 
-static void
+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_)
@@ -3515,7 +3481,7 @@ dissect_spc2_reserve6 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
     }
 }
 
-static void
+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_)
@@ -4193,400 +4159,6 @@ dissect_scsi_varlencdb (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
 
 
 
-void
-dissect_smc2_movemedium (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_)
-{
-    guint8 flags;
-
-    if (tree && isreq && iscdb) {
-        proto_tree_add_text (tree, tvb, offset+1, 2,
-                             "Medium Transport Address: %u",
-                             tvb_get_ntohs (tvb, offset+1));
-        proto_tree_add_text (tree, tvb, offset+3, 2,
-                             "Source Address: %u",
-                             tvb_get_ntohs (tvb, offset+3));
-        proto_tree_add_text (tree, tvb, offset+5, 2,
-                             "Destination Address: %u",
-                             tvb_get_ntohs (tvb, offset+5));
-        flags = tvb_get_guint8 (tvb, offset+9);
-        proto_tree_add_text (tree, tvb, offset+9, 1,
-                             "INV: %u", flags & 0x01);
-        flags = tvb_get_guint8 (tvb, offset+10);
-        proto_tree_add_uint_format (tree, hf_scsi_control, tvb, offset+10, 1,
-                                    flags,
-                                    "Vendor Unique = %u, NACA = %u, Link = %u",
-                                    flags & 0xC0, flags & 0x4, flags & 0x1);
-    }
-}
-
-#define MT_ELEM  0x1
-#define ST_ELEM  0x2
-#define I_E_ELEM 0x3
-#define DT_ELEM  0x4
-
-static const value_string element_type_code_vals[] = {
-    {0x0,      "All element types"},
-    {MT_ELEM,  "Medium transport element"},
-    {ST_ELEM,  "Storage element"},
-    {I_E_ELEM, "Import/export element"},
-    {DT_ELEM,  "Data transfer element"},
-    {0, NULL}
-};
-
-#define PVOLTAG 0x80
-#define AVOLTAG 0x40
-
-#define EXCEPT 0x04
-
-#define ID_VALID 0x20
-#define LU_VALID 0x10
-
-#define SVALID 0x80
-
-static void
-dissect_scsi_smc2_volume_tag (tvbuff_t *tvb, packet_info *pinfo _U_,
-                              proto_tree *tree, guint offset,
-                              const char *name)
-{
-    char volid[32+1];
-    char *p;
-
-    tvb_memcpy (tvb, (guint8 *)volid, offset, 32);
-    p = &volid[32];
-    for (;;) {
-    	*p = '\0';
-        if (p == volid)
-            break;
-        if (*(p - 1) != ' ')
-            break;
-        p--;
-    }
-    proto_tree_add_text (tree, tvb, offset, 36,
-                         "%s: Volume Identification = \"%s\", Volume Sequence Number = %u",
-	                 name, volid, tvb_get_ntohs (tvb, offset+34));
-}
-
-static void
-dissect_scsi_smc2_element (tvbuff_t *tvb, packet_info *pinfo _U_,
-                         proto_tree *tree, guint offset,
-                         guint elem_bytecnt, guint8 elem_type,
-                         guint8 voltag_flags)
-{
-    guint8 flags;
-    guint8 ident_len;
-
-    if (elem_bytecnt < 2)
-        return;
-    proto_tree_add_text (tree, tvb, offset, 2,
-                         "Element Address: %u",
-                         tvb_get_ntohs (tvb, offset));
-    offset += 2;
-    elem_bytecnt -= 2;
-
-    if (elem_bytecnt < 1)
-        return;
-    flags = tvb_get_guint8 (tvb, offset);
-    switch (elem_type) {
-
-    case MT_ELEM:
-        proto_tree_add_text (tree, tvb, offset, 1,
-                            "EXCEPT: %u, FULL: %u",
-                             (flags & EXCEPT) >> 2, flags & 0x01);
-        break;
-
-    case ST_ELEM:
-    case DT_ELEM:
-        proto_tree_add_text (tree, tvb, offset, 1,
-                             "ACCESS: %u, EXCEPT: %u, FULL: %u",
-                             (flags & 0x08) >> 3,
-                             (flags & EXCEPT) >> 2, flags & 0x01);
-        break;
-
-    case I_E_ELEM:
-        proto_tree_add_text (tree, tvb, offset, 1,
-                             "cmc: %u, INENAB: %u, EXENAB: %u, ACCESS: %u, EXCEPT: %u, IMPEXP: %u, FULL: %u",
-                             (flags & 0x40) >> 6,
-                             (flags & 0x20) >> 5,
-                             (flags & 0x10) >> 4,
-                             (flags & 0x08) >> 3,
-                             (flags & EXCEPT) >> 2,
-                             (flags & 0x02) >> 1,
-                             flags & 0x01);
-        break;
-    }
-    offset += 1;
-    elem_bytecnt -= 1;
-
-    if (elem_bytecnt < 1)
-        return;
-    offset += 1; /* reserved */
-    elem_bytecnt -= 1;
-
-    if (elem_bytecnt < 2)
-        return;
-    if (flags & EXCEPT) {
-        proto_tree_add_text (tree, tvb, offset, 2,
-                             "Additional Sense Code+Qualifier: %s",
-                             val_to_str (tvb_get_ntohs (tvb, offset),
-                                         scsi_asc_val, "Unknown (0x%04x)"));
-    }
-    offset += 2;
-    elem_bytecnt -= 2;
-
-    if (elem_bytecnt < 3)
-        return;
-    switch (elem_type) {
-
-    case DT_ELEM:
-        flags = tvb_get_guint8 (tvb, offset);
-        if (flags & LU_VALID) {
-            proto_tree_add_text (tree, tvb, offset, 1,
-                                 "NOT BUS: %u, ID VALID: %u, LU VALID: 1, LUN: %u",
-                                 (flags & 0x80) >> 7,
-                                 (flags & ID_VALID) >> 5,
-                                 flags & 0x07);
-        } else if (flags & ID_VALID) {
-            proto_tree_add_text (tree, tvb, offset, 1,
-                                 "ID VALID: 1, LU VALID: 0");
-        } else {
-            proto_tree_add_text (tree, tvb, offset, 1,
-                                 "ID VALID: 0, LU VALID: 0");
-        }
-        offset += 1;
-        if (flags & ID_VALID) {
-            proto_tree_add_text (tree, tvb, offset, 1,
-                                 "SCSI Bus Address: %u",
-                                 tvb_get_guint8 (tvb, offset));
-        }
-        offset += 1;
-        offset += 1; /* reserved */
-        break;
-
-    default:
-        offset += 3; /* reserved */
-        break;
-    }
-    elem_bytecnt -= 3;
-
-    if (elem_bytecnt < 3)
-        return;
-    flags = tvb_get_guint8 (tvb, offset);
-    if (flags & SVALID) {
-        proto_tree_add_text (tree, tvb, offset, 1,
-                             "SVALID: 1, INVERT: %u",
-                             (flags & 0x40) >> 6);
-        offset += 1;
-        proto_tree_add_text (tree, tvb, offset, 2,
-                             "Source Storage Element Address: %u",
-                             tvb_get_ntohs (tvb, offset));
-        offset += 2;
-    } else {
-        proto_tree_add_text (tree, tvb, offset, 1,
-                             "SVALID: 0");
-        offset += 3;
-    }
-    elem_bytecnt -= 3;
-
-    if (voltag_flags & PVOLTAG) {
-        if (elem_bytecnt < 36)
-            return;
-        dissect_scsi_smc2_volume_tag (tvb, pinfo, tree, offset,
-                                      "Primary Volume Tag Information");
-        offset += 36;
-        elem_bytecnt -= 36;
-    }
-
-    if (voltag_flags & AVOLTAG) {
-        if (elem_bytecnt < 36)
-            return;
-        dissect_scsi_smc2_volume_tag (tvb, pinfo, tree, offset,
-                                      "Alternate Volume Tag Information");
-        offset += 36;
-        elem_bytecnt -= 36;
-    }
-
-    if (elem_bytecnt < 1)
-        return;
-    flags = tvb_get_guint8 (tvb, offset);
-    proto_tree_add_text (tree, tvb, offset, 1,
-                         "Code Set: %s",
-                         val_to_str (flags & 0x0F,
-                                     scsi_devid_codeset_val,
-                                     "Unknown (0x%02x)"));
-    offset += 1;
-    elem_bytecnt -= 1;
-
-    if (elem_bytecnt < 1)
-        return;
-    flags = tvb_get_guint8 (tvb, offset);
-    proto_tree_add_text (tree, tvb, offset, 1,
-                         "Identifier Type: %s",
-                         val_to_str ((flags & 0x0F),
-                                     scsi_devid_idtype_val,
-                                     "Unknown (0x%02x)"));
-    offset += 1;
-    elem_bytecnt -= 1;
-
-    if (elem_bytecnt < 1)
-        return;
-    offset += 1; /* reserved */
-    elem_bytecnt -= 1;
-
-    if (elem_bytecnt < 1)
-        return;
-    ident_len = tvb_get_guint8 (tvb, offset);
-    proto_tree_add_text (tree, tvb, offset, 1,
-                         "Identifier Length: %u",
-                         ident_len);
-    offset += 1;
-    elem_bytecnt -= 1;
-
-    if (ident_len != 0) {
-        if (elem_bytecnt < ident_len)
-            return;
-        proto_tree_add_text (tree, tvb, offset, ident_len,
-                             "Identifier: %s",
-                             tvb_bytes_to_str (tvb, offset, ident_len));
-        offset += ident_len;
-        elem_bytecnt -= ident_len;
-    }
-    if (elem_bytecnt != 0) {
-        proto_tree_add_text (tree, tvb, offset, elem_bytecnt,
-                             "Vendor-specific Data: %s",
-                             tvb_bytes_to_str (tvb, offset, elem_bytecnt));
-    }
-}
-
-static void
-dissect_scsi_smc2_elements (tvbuff_t *tvb, packet_info *pinfo,
-                            proto_tree *tree, guint offset,
-                            guint desc_bytecnt, guint8 elem_type,
-                            guint8 voltag_flags, guint16 elem_desc_len)
-{
-    guint elem_bytecnt;
-
-    while (desc_bytecnt != 0) {
-        elem_bytecnt = elem_desc_len;
-        if (elem_bytecnt > desc_bytecnt)
-            elem_bytecnt = desc_bytecnt;
-        dissect_scsi_smc2_element (tvb, pinfo, tree, offset, elem_bytecnt,
-                                   elem_type, voltag_flags);
-        offset += elem_bytecnt;
-        desc_bytecnt -= elem_bytecnt;
-    }
-}
-
-void
-dissect_smc2_readelementstatus (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_)
-{
-    guint8 flags;
-    guint numelem, bytecnt, desc_bytecnt;
-    guint8 elem_type;
-    guint8 voltag_flags;
-    guint16 elem_desc_len;
-
-    if (!tree)
-        return;
-
-    if (isreq && iscdb) {
-        flags = tvb_get_guint8 (tvb, offset);
-        proto_tree_add_text (tree, tvb, offset, 1,
-                             "VOLTAG: %u, Element Type Code: %s",
-                             (flags & 0x10) >> 4,
-                             val_to_str (flags & 0xF, element_type_code_vals,
-                                         "Unknown (0x%x)"));
-        proto_tree_add_text (tree, tvb, offset+1, 2,
-                             "Starting Element Address: %u",
-                             tvb_get_ntohs (tvb, offset+1));
-        proto_tree_add_text (tree, tvb, offset+3, 2,
-                             "Number of Elements: %u",
-                             tvb_get_ntohs (tvb, offset+3));
-        flags = tvb_get_guint8 (tvb, offset+4);
-        proto_tree_add_text (tree, tvb, offset+4, 1,
-                             "CURDATA: %u, DVCID: %u",
-                             (flags & 0x02) >> 1, flags & 0x01);
-        proto_tree_add_text (tree, tvb, offset+6, 3,
-                             "Allocation Length: %u",
-                             tvb_get_ntoh24 (tvb, offset+6));
-        flags = tvb_get_guint8 (tvb, offset+10);
-        proto_tree_add_uint_format (tree, hf_scsi_control, tvb, offset+10, 1,
-                                    flags,
-                                    "Vendor Unique = %u, NACA = %u, Link = %u",
-                                    flags & 0xC0, flags & 0x4, flags & 0x1);
-    }
-    else if (!isreq) {
-        proto_tree_add_text (tree, tvb, offset, 2,
-                             "First Element Address Reported: %u",
-                             tvb_get_ntohs (tvb, offset));
-        offset += 2;
-        numelem = tvb_get_ntohs (tvb, offset);
-        proto_tree_add_text (tree, tvb, offset, 2,
-                             "Number of Elements Available: %u", numelem);
-        offset += 2;
-        offset += 1; /* reserved */
-        bytecnt = tvb_get_ntoh24 (tvb, offset);
-        proto_tree_add_text (tree, tvb, offset, 3,
-                             "Byte Count of Report Available: %u", bytecnt);
-        offset += 3;
-        while (bytecnt != 0) {
-            if (bytecnt < 1)
-                break;
-            elem_type = tvb_get_guint8 (tvb, offset);
-            proto_tree_add_text (tree, tvb, offset, 1,
-                                 "Element Type Code: %s",
-                                 val_to_str (elem_type, element_type_code_vals,
-                                             "Unknown (0x%x)"));
-            offset += 1;
-            bytecnt -= 1;
-
-            if (bytecnt < 1)
-                break;
-            voltag_flags = tvb_get_guint8 (tvb, offset);
-            proto_tree_add_text (tree, tvb, offset, 1,
-                                 "PVOLTAG: %u, AVOLTAG: %u",
-                                 (voltag_flags & PVOLTAG) >> 7,
-                                 (voltag_flags & AVOLTAG) >> 6);
-            offset += 1;
-            bytecnt -= 1;
-
-            if (bytecnt < 2)
-                break;
-            elem_desc_len = tvb_get_ntohs (tvb, offset);
-            proto_tree_add_text (tree, tvb, offset, 2,
-                                 "Element Descriptor Length: %u",
-                                 elem_desc_len);
-            offset += 2;
-            bytecnt -= 2;
-
-            if (bytecnt < 1)
-                break;
-            offset += 1; /* reserved */
-            bytecnt -= 1;
-
-            if (bytecnt < 3)
-                break;
-            desc_bytecnt = tvb_get_ntoh24 (tvb, offset);
-            proto_tree_add_text (tree, tvb, offset, 3,
-                                 "Byte Count Of Descriptor Data Available: %u",
-                                 desc_bytecnt);
-            offset += 3;
-            bytecnt -= 3;
-
-            if (desc_bytecnt > bytecnt)
-                desc_bytecnt = bytecnt;
-            dissect_scsi_smc2_elements (tvb, pinfo, tree, offset,
-                                        desc_bytecnt, elem_type,
-                                        voltag_flags, elem_desc_len);
-            offset += desc_bytecnt;
-            bytecnt -= desc_bytecnt;
-        }
-    }
-}
 
 void
 dissect_scsi_rsp (tvbuff_t *tvb, packet_info *pinfo,
@@ -5211,265 +4783,6 @@ static scsi_cdb_table_t sbc[256] = {
 };
 
 
-static scsi_cdb_table_t smc[256] = {
-/*SPC 0x00*/{dissect_spc3_testunitready},
-/*SMC 0x01*/{NULL},
-/*SMC 0x02*/{NULL},
-/*SPC 0x03*/{dissect_spc3_requestsense},
-/*SMC 0x04*/{NULL},
-/*SMC 0x05*/{NULL},
-/*SMC 0x06*/{NULL},
-/*SMC 0x07*/{NULL},
-/*SMC 0x08*/{NULL},
-/*SMC 0x09*/{NULL},
-/*SMC 0x0a*/{NULL},
-/*SMC 0x0b*/{NULL},
-/*SMC 0x0c*/{NULL},
-/*SMC 0x0d*/{NULL},
-/*SMC 0x0e*/{NULL},
-/*SMC 0x0f*/{NULL},
-/*SMC 0x10*/{NULL},
-/*SMC 0x11*/{NULL},
-/*SPC 0x12*/{dissect_spc3_inquiry},
-/*SMC 0x13*/{NULL},
-/*SMC 0x14*/{NULL},
-/*SPC 0x15*/{dissect_spc3_modeselect6},
-/*SPC 0x16*/{dissect_spc2_reserve6},
-/*SPC 0x17*/{dissect_spc2_release6},
-/*SMC 0x18*/{NULL},
-/*SMC 0x19*/{NULL},
-/*SPC 0x1a*/{dissect_spc3_modesense6},
-/*SMC 0x1b*/{NULL},
-/*SMC 0x1c*/{NULL},
-/*SPC 0x1d*/{dissect_spc3_senddiagnostic},
-/*SMC 0x1e*/{dissect_spc3_preventallowmediaremoval},
-/*SMC 0x1f*/{NULL},
-/*SMC 0x20*/{NULL},
-/*SMC 0x21*/{NULL},
-/*SMC 0x22*/{NULL},
-/*SMC 0x23*/{NULL},
-/*SMC 0x24*/{NULL},
-/*SMC 0x25*/{NULL},
-/*SMC 0x26*/{NULL},
-/*SMC 0x27*/{NULL},
-/*SMC 0x28*/{NULL},
-/*SMC 0x29*/{NULL},
-/*SMC 0x2a*/{NULL},
-/*SMC 0x2b*/{NULL},
-/*SMC 0x2c*/{NULL},
-/*SMC 0x2d*/{NULL},
-/*SMC 0x2e*/{NULL},
-/*SMC 0x2f*/{NULL},
-/*SMC 0x30*/{NULL},
-/*SMC 0x31*/{NULL},
-/*SMC 0x32*/{NULL},
-/*SMC 0x33*/{NULL},
-/*SMC 0x34*/{NULL},
-/*SMC 0x35*/{NULL},
-/*SMC 0x36*/{NULL},
-/*SMC 0x37*/{NULL},
-/*SMC 0x38*/{NULL},
-/*SMC 0x39*/{NULL},
-/*SMC 0x3a*/{NULL},
-/*SPC 0x3b*/{dissect_spc3_writebuffer},
-/*SMC 0x3c*/{NULL},
-/*SMC 0x3d*/{NULL},
-/*SMC 0x3e*/{NULL},
-/*SMC 0x3f*/{NULL},
-/*SMC 0x40*/{NULL},
-/*SMC 0x41*/{NULL},
-/*SMC 0x42*/{NULL},
-/*SMC 0x43*/{NULL},
-/*SMC 0x44*/{NULL},
-/*SMC 0x45*/{NULL},
-/*SMC 0x46*/{NULL},
-/*SMC 0x47*/{NULL},
-/*SMC 0x48*/{NULL},
-/*SMC 0x49*/{NULL},
-/*SMC 0x4a*/{NULL},
-/*SMC 0x4b*/{NULL},
-/*SPC 0x4c*/{dissect_spc3_logselect},
-/*SPC 0x4d*/{dissect_spc3_logsense},
-/*SMC 0x4e*/{NULL},
-/*SMC 0x4f*/{NULL},
-/*SMC 0x50*/{NULL},
-/*SMC 0x51*/{NULL},
-/*SMC 0x52*/{NULL},
-/*SMC 0x53*/{NULL},
-/*SMC 0x54*/{NULL},
-/*SPC 0x55*/{dissect_spc3_modeselect10},
-/*SPC 0x56*/{dissect_spc2_reserve10},
-/*SPC 0x57*/{dissect_spc2_release10},
-/*SMC 0x58*/{NULL},
-/*SMC 0x59*/{NULL},
-/*SPC 0x5a*/{dissect_spc3_modesense10},
-/*SMC 0x5b*/{NULL},
-/*SMC 0x5c*/{NULL},
-/*SMC 0x5d*/{NULL},
-/*SPC 0x5e*/{dissect_spc3_persistentreservein},
-/*SPC 0x5f*/{dissect_spc3_persistentreserveout},
-/*SMC 0x60*/{NULL},
-/*SMC 0x61*/{NULL},
-/*SMC 0x62*/{NULL},
-/*SMC 0x63*/{NULL},
-/*SMC 0x64*/{NULL},
-/*SMC 0x65*/{NULL},
-/*SMC 0x66*/{NULL},
-/*SMC 0x67*/{NULL},
-/*SMC 0x68*/{NULL},
-/*SMC 0x69*/{NULL},
-/*SMC 0x6a*/{NULL},
-/*SMC 0x6b*/{NULL},
-/*SMC 0x6c*/{NULL},
-/*SMC 0x6d*/{NULL},
-/*SMC 0x6e*/{NULL},
-/*SMC 0x6f*/{NULL},
-/*SMC 0x70*/{NULL},
-/*SMC 0x71*/{NULL},
-/*SMC 0x72*/{NULL},
-/*SMC 0x73*/{NULL},
-/*SMC 0x74*/{NULL},
-/*SMC 0x75*/{NULL},
-/*SMC 0x76*/{NULL},
-/*SMC 0x77*/{NULL},
-/*SMC 0x78*/{NULL},
-/*SMC 0x79*/{NULL},
-/*SMC 0x7a*/{NULL},
-/*SMC 0x7b*/{NULL},
-/*SMC 0x7c*/{NULL},
-/*SMC 0x7d*/{NULL},
-/*SMC 0x7e*/{NULL},
-/*SMC 0x7f*/{NULL},
-/*SMC 0x80*/{NULL},
-/*SMC 0x81*/{NULL},
-/*SMC 0x82*/{NULL},
-/*SMC 0x83*/{NULL},
-/*SMC 0x84*/{NULL},
-/*SMC 0x85*/{NULL},
-/*SMC 0x86*/{NULL},
-/*SMC 0x87*/{NULL},
-/*SMC 0x88*/{NULL},
-/*SMC 0x89*/{NULL},
-/*SMC 0x8a*/{NULL},
-/*SMC 0x8b*/{NULL},
-/*SMC 0x8c*/{NULL},
-/*SMC 0x8d*/{NULL},
-/*SMC 0x8e*/{NULL},
-/*SMC 0x8f*/{NULL},
-/*SMC 0x90*/{NULL},
-/*SMC 0x91*/{NULL},
-/*SMC 0x92*/{NULL},
-/*SMC 0x93*/{NULL},
-/*SMC 0x94*/{NULL},
-/*SMC 0x95*/{NULL},
-/*SMC 0x96*/{NULL},
-/*SMC 0x97*/{NULL},
-/*SMC 0x98*/{NULL},
-/*SMC 0x99*/{NULL},
-/*SMC 0x9a*/{NULL},
-/*SMC 0x9b*/{NULL},
-/*SMC 0x9c*/{NULL},
-/*SMC 0x9d*/{NULL},
-/*SMC 0x9e*/{NULL},
-/*SMC 0x9f*/{NULL},
-/*SPC 0xa0*/{dissect_spc3_reportluns},
-/*SMC 0xa1*/{NULL},
-/*SMC 0xa2*/{NULL},
-/*SMC 0xa3*/{NULL},
-/*SMC 0xa4*/{NULL},
-/*SMC 0xa5*/{dissect_smc2_movemedium},
-/*SMC 0xa6*/{NULL},
-/*SMC 0xa7*/{dissect_smc2_movemedium},
-/*SMC 0xa8*/{NULL},
-/*SMC 0xa9*/{NULL},
-/*SMC 0xaa*/{NULL},
-/*SMC 0xab*/{NULL},
-/*SMC 0xac*/{NULL},
-/*SMC 0xad*/{NULL},
-/*SMC 0xae*/{NULL},
-/*SMC 0xaf*/{NULL},
-/*SMC 0xb0*/{NULL},
-/*SMC 0xb1*/{NULL},
-/*SMC 0xb2*/{NULL},
-/*SMC 0xb3*/{NULL},
-/*SMC 0xb4*/{dissect_smc2_readelementstatus},
-/*SMC 0xb5*/{NULL},
-/*SMC 0xb6*/{NULL},
-/*SMC 0xb7*/{NULL},
-/*SMC 0xb8*/{dissect_smc2_readelementstatus},
-/*SMC 0xb9*/{NULL},
-/*SMC 0xba*/{NULL},
-/*SMC 0xbb*/{NULL},
-/*SMC 0xbc*/{NULL},
-/*SMC 0xbd*/{NULL},
-/*SMC 0xbe*/{NULL},
-/*SMC 0xbf*/{NULL},
-/*SMC 0xc0*/{NULL},
-/*SMC 0xc1*/{NULL},
-/*SMC 0xc2*/{NULL},
-/*SMC 0xc3*/{NULL},
-/*SMC 0xc4*/{NULL},
-/*SMC 0xc5*/{NULL},
-/*SMC 0xc6*/{NULL},
-/*SMC 0xc7*/{NULL},
-/*SMC 0xc8*/{NULL},
-/*SMC 0xc9*/{NULL},
-/*SMC 0xca*/{NULL},
-/*SMC 0xcb*/{NULL},
-/*SMC 0xcc*/{NULL},
-/*SMC 0xcd*/{NULL},
-/*SMC 0xce*/{NULL},
-/*SMC 0xcf*/{NULL},
-/*SMC 0xd0*/{NULL},
-/*SMC 0xd1*/{NULL},
-/*SMC 0xd2*/{NULL},
-/*SMC 0xd3*/{NULL},
-/*SMC 0xd4*/{NULL},
-/*SMC 0xd5*/{NULL},
-/*SMC 0xd6*/{NULL},
-/*SMC 0xd7*/{NULL},
-/*SMC 0xd8*/{NULL},
-/*SMC 0xd9*/{NULL},
-/*SMC 0xda*/{NULL},
-/*SMC 0xdb*/{NULL},
-/*SMC 0xdc*/{NULL},
-/*SMC 0xdd*/{NULL},
-/*SMC 0xde*/{NULL},
-/*SMC 0xdf*/{NULL},
-/*SMC 0xe0*/{NULL},
-/*SMC 0xe1*/{NULL},
-/*SMC 0xe2*/{NULL},
-/*SMC 0xe3*/{NULL},
-/*SMC 0xe4*/{NULL},
-/*SMC 0xe5*/{NULL},
-/*SMC 0xe6*/{NULL},
-/*SMC 0xe7*/{NULL},
-/*SMC 0xe8*/{NULL},
-/*SMC 0xe9*/{NULL},
-/*SMC 0xea*/{NULL},
-/*SMC 0xeb*/{NULL},
-/*SMC 0xec*/{NULL},
-/*SMC 0xed*/{NULL},
-/*SMC 0xee*/{NULL},
-/*SMC 0xef*/{NULL},
-/*SMC 0xf0*/{NULL},
-/*SMC 0xf1*/{NULL},
-/*SMC 0xf2*/{NULL},
-/*SMC 0xf3*/{NULL},
-/*SMC 0xf4*/{NULL},
-/*SMC 0xf5*/{NULL},
-/*SMC 0xf6*/{NULL},
-/*SMC 0xf7*/{NULL},
-/*SMC 0xf8*/{NULL},
-/*SMC 0xf9*/{NULL},
-/*SMC 0xfa*/{NULL},
-/*SMC 0xfb*/{NULL},
-/*SMC 0xfc*/{NULL},
-/*SMC 0xfd*/{NULL},
-/*SMC 0xfe*/{NULL},
-/*SMC 0xff*/{NULL}
-};
-
 
 /* This function must be called with walid pointers for both itlq and itl */
 void
@@ -5822,9 +5135,9 @@ get_cmdset_data(itlq_nexus_t *itlq, itl_nexus_t *itl)
         csdata->cdb_table=scsi_ssc_table;
         break;
     case SCSI_DEV_SMC:
-        csdata->hf_opcode=hf_scsi_smcopcode;
-        csdata->cdb_vals=scsi_smc2_vals;
-        csdata->cdb_table=smc;
+        csdata->hf_opcode=hf_scsi_smc_opcode;
+        csdata->cdb_vals=scsi_smc_vals;
+        csdata->cdb_table=scsi_smc_table;
         break;
     case SCSI_DEV_OSD:
         csdata->hf_opcode=hf_scsi_osd_opcode;
@@ -5861,9 +5174,6 @@ proto_register_scsi (void)
         { &hf_scsi_sbcopcode,
           {"SBC-2 Opcode", "scsi.sbc.opcode", FT_UINT8, BASE_HEX,
            VALS (scsi_sbc2_vals), 0x0, "", HFILL}},
-        { &hf_scsi_smcopcode,
-          {"SMC-2 Opcode", "scsi.smc.opcode", FT_UINT8, BASE_HEX,
-           VALS (scsi_smc2_vals), 0x0, "", HFILL}},
         { &hf_scsi_control,
           {"Control", "scsi.cdb.control", FT_UINT8, BASE_HEX, NULL, 0x0, "",
            HFILL}},