SCSI: use BASE_DEC_HEX for counts/lengths/etc..

Show values that are sequence numbers, counts, lengths, and the like in
decimal, with the hex value after it in parentheses for the benefit of
those who count to 16 rather than 10.

4 files changed, 8 insertions, 8 deletions

diff --git a/epan/dissectors/packet-scsi-mmc.c b/epan/dissectors/packet-scsi-mmc.c
index 1863b9167a..68e075fa3c 100644
--- a/epan/dissectors/packet-scsi-mmc.c
+++ b/epan/dissectors/packet-scsi-mmc.c
@@ -1958,7 +1958,7 @@ proto_register_scsi_mmc(void)
           { "Version", "scsi_mmc.book.version", FT_UINT8, BASE_HEX,
             NULL, 0x0f, NULL, HFILL}},
         { &hf_scsi_mmc_disc_size_size,
-          { "Size", "scsi_mmc.disc.size", FT_UINT8, BASE_HEX,
+          { "Size", "scsi_mmc.disc.size", FT_UINT8, BASE_DEC_HEX,
             VALS(scsi_disc_size), 0xf0, NULL, HFILL}},
         { &hf_scsi_mmc_disc_size_rate,
           { "Rate", "scsi_mmc.disc.rate", FT_UINT8, BASE_HEX,
diff --git a/epan/dissectors/packet-scsi-osd.c b/epan/dissectors/packet-scsi-osd.c
index aeb9bae86f..7b8c879ac8 100644
--- a/epan/dissectors/packet-scsi-osd.c
+++ b/epan/dissectors/packet-scsi-osd.c
@@ -3712,19 +3712,19 @@ proto_register_scsi_osd(void)
           {"Get Attributes Page", "scsi_osd.get_attributes_page", FT_UINT32, BASE_HEX,
            NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_osd_get_attributes_list_length,
-          {"Get Attributes List Length", "scsi_osd.get_attributes_list_length", FT_UINT32, BASE_HEX,
+          {"Get Attributes List Length", "scsi_osd.get_attributes_list_length", FT_UINT32, BASE_DEC_HEX,
            NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_osd_get_attributes_list_offset,
           {"Get Attributes List Offset", "scsi_osd.get_attributes_list_offset", FT_UINT32, BASE_HEX,
            NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_osd_set_attributes_list_length,
-          {"Set Attributes List Length", "scsi_osd.set_attributes_list_length", FT_UINT32, BASE_HEX,
+          {"Set Attributes List Length", "scsi_osd.set_attributes_list_length", FT_UINT32, BASE_DEC_HEX,
            NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_osd_set_attributes_list_offset,
           {"Set Attributes List Offset", "scsi_osd.set_attributes_list_offset", FT_UINT32, BASE_HEX,
            NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_osd_get_attributes_allocation_length,
-          {"Get Attributes Allocation Length", "scsi_osd.get_attributes_allocation_length", FT_UINT32, BASE_HEX,
+          {"Get Attributes Allocation Length", "scsi_osd.get_attributes_allocation_length", FT_UINT32, BASE_DEC_HEX,
            NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_osd_retrieved_attributes_offset,
           {"Retrieved Attributes Offset", "scsi_osd.retrieved_attributes_offset", FT_UINT32, BASE_HEX,
@@ -3733,7 +3733,7 @@ proto_register_scsi_osd(void)
           {"Set Attributes Page", "scsi_osd.set_attributes_page", FT_UINT32, BASE_HEX,
            NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_osd_set_attribute_length,
-          {"Set Attribute Length", "scsi_osd.set_attribute_length", FT_UINT32, BASE_HEX,
+          {"Set Attribute Length", "scsi_osd.set_attribute_length", FT_UINT32, BASE_DEC_HEX,
            NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_osd_set_attribute_number,
           {"Set Attribute Number", "scsi_osd.set_attribute_number", FT_UINT32, BASE_HEX,
diff --git a/epan/dissectors/packet-scsi-sbc.c b/epan/dissectors/packet-scsi-sbc.c
index b34c3e3a78..71dc0f9345 100644
--- a/epan/dissectors/packet-scsi-sbc.c
+++ b/epan/dissectors/packet-scsi-sbc.c
@@ -2231,7 +2231,7 @@ proto_register_scsi_sbc(void)
           {"TEST", "scsi_sbc.sanitize.test", FT_UINT8, BASE_HEX, NULL,
            0x60, NULL, HFILL}},
         { &hf_scsi_sbc_sanitize_owcount,
-          {"Overwrite Count", "scsi_sbc.sanitize.overwrite_count", FT_UINT8, BASE_HEX, NULL,
+          {"Overwrite Count", "scsi_sbc.sanitize.overwrite_count", FT_UINT8, BASE_DEC_HEX, NULL,
            0x1f, NULL, HFILL}},
         { &hf_scsi_sbc_sanitize_pattern_length,
           {"Initialization Pattern Length", "scsi_sbc.sanitize.pattern_length", FT_UINT16, BASE_DEC, NULL,
diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c
index 4d4c9e7f36..e1c9954e51 100644
--- a/epan/dissectors/packet-scsi.c
+++ b/epan/dissectors/packet-scsi.c
@@ -6865,7 +6865,7 @@ proto_register_scsi(void)
           {"Buffer Offset", "scsi.spc.wb.bufoff", FT_UINT24, BASE_HEX, NULL,
            0x0, NULL, HFILL}},
         { &hf_scsi_paramlen24,
-          {"Parameter List Length", "scsi.cdb.paramlen24", FT_UINT24, BASE_HEX,
+          {"Parameter List Length", "scsi.cdb.paramlen24", FT_UINT24, BASE_DEC_HEX,
            NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_senddiag_st_code,
           {"Self-Test Code", "scsi.spc.senddiag.code", FT_UINT8, BASE_HEX,
@@ -7239,7 +7239,7 @@ proto_register_scsi(void)
           { "Address Mode", "scsi.lun.address_mode", FT_UINT8, BASE_HEX,
           VALS(scsi_lun_address_mode_vals), 0xc0, "Addressing mode for the LUN", HFILL }},
         { &hf_scsi_extended_add_method_len,
-          { "Extended Address Method Length", "scsi.lun.extended_address_method.len", FT_UINT8, BASE_HEX,
+          { "Extended Address Method Length", "scsi.lun.extended_address_method.len", FT_UINT8, BASE_DEC_HEX,
           NULL, 0x30, "Extended Address Method Specific Field", HFILL }},
         { &hf_scsi_extended_add_method,
           { "Extended Address Method", "scsi.lun.extended_address_method", FT_UINT8, BASE_HEX,