Converted scsi dissectors display filter format from scsi.<protocol> to scsi_<protocol> (matching their registered filter name)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@43993 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 145 insertions, 145 deletions

diff --git a/epan/dissectors/packet-scsi-mmc.c b/epan/dissectors/packet-scsi-mmc.c
index 67e41aace2..7f06397a99 100644
--- a/epan/dissectors/packet-scsi-mmc.c
+++ b/epan/dissectors/packet-scsi-mmc.c
@@ -1479,439 +1479,439 @@ proto_register_scsi_mmc(void)
 {
     static hf_register_info hf[] = {
         { &hf_scsi_mmc_opcode,
-          {"MMC Opcode", "scsi.mmc.opcode", FT_UINT8, BASE_HEX,
+          {"MMC Opcode", "scsi_mmc.opcode", FT_UINT8, BASE_HEX,
            VALS (scsi_mmc_vals), 0x0, NULL, HFILL}},
         { &hf_scsi_mmc_setstreaming_type,
-          {"Type", "scsi.mmc.setstreaming.type", FT_UINT8, BASE_DEC,
+          {"Type", "scsi_mmc.setstreaming.type", FT_UINT8, BASE_DEC,
            VALS(scsi_setstreaming_type_val), 0, NULL, HFILL}},
         { &hf_scsi_mmc_setstreaming_param_len,
-          {"Parameter Length", "scsi.mmc.setstreaming.param_len", FT_UINT16, BASE_DEC,
+          {"Parameter Length", "scsi_mmc.setstreaming.param_len", FT_UINT16, BASE_DEC,
            NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_setstreaming_wrc,
-          {"WRC", "scsi.mmc.setstreaming.wrc", FT_UINT8, BASE_HEX,
+          {"WRC", "scsi_mmc.setstreaming.wrc", FT_UINT8, BASE_HEX,
            NULL, 0x18, NULL, HFILL}},
         { &hf_scsi_mmc_setstreaming_rdd,
-          {"RDD", "scsi.mmc.setstreaming.rdd", FT_BOOLEAN, 8,
+          {"RDD", "scsi_mmc.setstreaming.rdd", FT_BOOLEAN, 8,
            NULL, 0x04, NULL, HFILL}},
         { &hf_scsi_mmc_setstreaming_exact,
-          {"Exact", "scsi.mmc.setstreaming.exact", FT_BOOLEAN, 8,
+          {"Exact", "scsi_mmc.setstreaming.exact", FT_BOOLEAN, 8,
            NULL, 0x02, NULL, HFILL}},
         { &hf_scsi_mmc_setstreaming_ra,
-          {"RA", "scsi.mmc.setstreaming.ra", FT_BOOLEAN, 8,
+          {"RA", "scsi_mmc.setstreaming.ra", FT_BOOLEAN, 8,
            NULL, 0x01, NULL, HFILL}},
         { &hf_scsi_mmc_setstreaming_start_lba,
-          {"Start LBA", "scsi.mmc.setstreaming.start_lbs", FT_UINT32, BASE_DEC,
+          {"Start LBA", "scsi_mmc.setstreaming.start_lbs", FT_UINT32, BASE_DEC,
            NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_setstreaming_end_lba,
-          {"End LBA", "scsi.mmc.setstreaming.end_lba", FT_UINT32, BASE_DEC,
+          {"End LBA", "scsi_mmc.setstreaming.end_lba", FT_UINT32, BASE_DEC,
            NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_setstreaming_read_size,
-          {"Read Size", "scsi.mmc.setstreaming.read_size", FT_UINT32, BASE_DEC,
+          {"Read Size", "scsi_mmc.setstreaming.read_size", FT_UINT32, BASE_DEC,
            NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_setstreaming_read_time,
-          {"Read Time", "scsi.mmc.setstreaming.read_time", FT_UINT32, BASE_DEC,
+          {"Read Time", "scsi_mmc.setstreaming.read_time", FT_UINT32, BASE_DEC,
            NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_setstreaming_write_size,
-          {"Write Size", "scsi.mmc.setstreaming.write_size", FT_UINT32, BASE_DEC,
+          {"Write Size", "scsi_mmc.setstreaming.write_size", FT_UINT32, BASE_DEC,
            NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_setstreaming_write_time,
-          {"Write Time", "scsi.mmc.setstreaming.write_time", FT_UINT32, BASE_DEC,
+          {"Write Time", "scsi_mmc.setstreaming.write_time", FT_UINT32, BASE_DEC,
            NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_setcdspeed_rc,
-          {"Rotational Control", "scsi.mmc.setcdspeed.rc", FT_UINT8, BASE_HEX,
+          {"Rotational Control", "scsi_mmc.setcdspeed.rc", FT_UINT8, BASE_HEX,
            VALS(scsi_setcdspeed_rc_val), 0x03, NULL, HFILL}},
         { &hf_scsi_mmc_rbc_block,
-          {"BLOCK", "scsi.mmc.rbc.block", FT_BOOLEAN, 8,
+          {"BLOCK", "scsi_mmc.rbc.block", FT_BOOLEAN, 8,
            NULL, 0x01, NULL, HFILL}},
         { &hf_scsi_mmc_rbc_lob_blocks,
-          {"Buffer Len (blocks)", "scsi.mmc.rbc.lob_blocks", FT_UINT32, BASE_DEC,
+          {"Buffer Len (blocks)", "scsi_mmc.rbc.lob_blocks", FT_UINT32, BASE_DEC,
            NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_rbc_alob_blocks,
-          {"Available Buffer Len (blocks)", "scsi.mmc.rbc.alob_blocks", FT_UINT32, BASE_DEC,
+          {"Available Buffer Len (blocks)", "scsi_mmc.rbc.alob_blocks", FT_UINT32, BASE_DEC,
            NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_rbc_lob_bytes,
-          {"Buffer Len (bytes)", "scsi.mmc.rbc.lob_bytes", FT_UINT32, BASE_DEC,
+          {"Buffer Len (bytes)", "scsi_mmc.rbc.lob_bytes", FT_UINT32, BASE_DEC,
            NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_rbc_alob_bytes,
-          {"Available Buffer Len (bytes)", "scsi.mmc.rbc.alob_bytes", FT_UINT32, BASE_DEC,
+          {"Available Buffer Len (bytes)", "scsi_mmc.rbc.alob_bytes", FT_UINT32, BASE_DEC,
            NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_rti_address_type,
-          {"Address Type", "scsi.mmc.rti.address_type", FT_UINT8, BASE_HEX,
+          {"Address Type", "scsi_mmc.rti.address_type", FT_UINT8, BASE_HEX,
            VALS(scsi_rti_address_type_val), 0x03, NULL, HFILL}},
         { &hf_scsi_mmc_rti_damage,
-          {"Damage", "scsi.mmc.rti.damage", FT_BOOLEAN, 8,
+          {"Damage", "scsi_mmc.rti.damage", FT_BOOLEAN, 8,
            NULL, 0x20, NULL, HFILL}},
         { &hf_scsi_mmc_rti_copy,
-          {"Copy", "scsi.mmc.rti.copy", FT_BOOLEAN, 8,
+          {"Copy", "scsi_mmc.rti.copy", FT_BOOLEAN, 8,
            NULL, 0x10, NULL, HFILL}},
         { &hf_scsi_mmc_rti_track_mode,
-          {"Track Mode", "scsi.mmc.rti.track_mode", FT_UINT8, BASE_HEX,
+          {"Track Mode", "scsi_mmc.rti.track_mode", FT_UINT8, BASE_HEX,
            NULL, 0x0f, NULL, HFILL}},
         { &hf_scsi_mmc_rti_rt,
-          {"RT", "scsi.mmc.rti.rt", FT_BOOLEAN, 8,
+          {"RT", "scsi_mmc.rti.rt", FT_BOOLEAN, 8,
            NULL, 0x80, NULL, HFILL}},
         { &hf_scsi_mmc_rti_blank,
-          {"Blank", "scsi.mmc.rti.blank", FT_BOOLEAN, 8,
+          {"Blank", "scsi_mmc.rti.blank", FT_BOOLEAN, 8,
            NULL, 0x40, NULL, HFILL}},
         { &hf_scsi_mmc_rti_packet,
-          {"Packet/Inc", "scsi.mmc.rti.packet", FT_BOOLEAN, 8,
+          {"Packet/Inc", "scsi_mmc.rti.packet", FT_BOOLEAN, 8,
            NULL, 0x20, NULL, HFILL}},
         { &hf_scsi_mmc_rti_fp,
-          {"FP", "scsi.mmc.rti.fp", FT_BOOLEAN, 8,
+          {"FP", "scsi_mmc.rti.fp", FT_BOOLEAN, 8,
            NULL, 0x10, NULL, HFILL}},
         { &hf_scsi_mmc_rti_data_mode,
-          {"Data Mode", "scsi.mmc.rti.data_mode", FT_UINT8, BASE_HEX,
+          {"Data Mode", "scsi_mmc.rti.data_mode", FT_UINT8, BASE_HEX,
            NULL, 0x0f, NULL, HFILL}},
         { &hf_scsi_mmc_rti_lra_v,
-          {"LRA_V", "scsi.mmc.rti.lra_v", FT_BOOLEAN, 8,
+          {"LRA_V", "scsi_mmc.rti.lra_v", FT_BOOLEAN, 8,
            NULL, 0x02, NULL, HFILL}},
         { &hf_scsi_mmc_rti_nwa_v,
-          {"NWA_V", "scsi.mmc.rti.nwa_v", FT_BOOLEAN, 8,
+          {"NWA_V", "scsi_mmc.rti.nwa_v", FT_BOOLEAN, 8,
            NULL, 0x01, NULL, HFILL}},
         { &hf_scsi_mmc_report_key_type_code,
-          {"Type Code", "scsi.mmc.report_key.type_code", FT_UINT8, BASE_HEX,
+          {"Type Code", "scsi_mmc.report_key.type_code", FT_UINT8, BASE_HEX,
            VALS(scsi_report_key_type_code_val), 0xc0, NULL, HFILL}},
         { &hf_scsi_mmc_report_key_vendor_resets,
-          {"Vendor Resets", "scsi.mmc.report_key.vendor_resets", FT_UINT8, BASE_HEX,
+          {"Vendor Resets", "scsi_mmc.report_key.vendor_resets", FT_UINT8, BASE_HEX,
            NULL, 0x38, NULL, HFILL}},
         { &hf_scsi_mmc_report_key_user_changes,
-          {"User Changes", "scsi.mmc.report_key.user_changes", FT_UINT8, BASE_HEX,
+          {"User Changes", "scsi_mmc.report_key.user_changes", FT_UINT8, BASE_HEX,
            NULL, 0x07, NULL, HFILL}},
         { &hf_scsi_mmc_report_key_region_mask,
-          {"Region Mask", "scsi.mmc.report_key.region_mask", FT_UINT8, BASE_HEX,
+          {"Region Mask", "scsi_mmc.report_key.region_mask", FT_UINT8, BASE_HEX,
            NULL, 0xff, NULL, HFILL}},
         { &hf_scsi_mmc_report_key_rpc_scheme,
-          {"RPC Scheme", "scsi.mmc.report_key.rpc_scheme", FT_UINT8, BASE_HEX,
+          {"RPC Scheme", "scsi_mmc.report_key.rpc_scheme", FT_UINT8, BASE_HEX,
            VALS(scsi_report_key_rpc_scheme_val), 0, NULL, HFILL}},
         { &hf_scsi_mmc_key_class,
-          {"Key Class", "scsi.mmc.key_class", FT_UINT8, BASE_HEX,
+          {"Key Class", "scsi_mmc.key_class", FT_UINT8, BASE_HEX,
            VALS (scsi_key_class_val), 0x00, NULL, HFILL}},
         { &hf_scsi_mmc_key_format,
-          {"Key Format", "scsi.mmc.key_format", FT_UINT8, BASE_HEX,
+          {"Key Format", "scsi_mmc.key_format", FT_UINT8, BASE_HEX,
            VALS (scsi_key_format_val), 0x3f, NULL, HFILL}},
         { &hf_scsi_mmc_disc_info_erasable,
-          {"Erasable", "scsi.mmc.disc_info.erasable", FT_BOOLEAN, 8,
+          {"Erasable", "scsi_mmc.disc_info.erasable", FT_BOOLEAN, 8,
            NULL, 0x10, NULL, HFILL}},
         { &hf_scsi_mmc_disc_info_state_of_last_session,
-          {"State Of Last Session", "scsi.mmc.disc_info.state_of_last_session", FT_UINT8, BASE_HEX,
+          {"State Of Last Session", "scsi_mmc.disc_info.state_of_last_session", FT_UINT8, BASE_HEX,
            VALS(scsi_disc_info_sols_val), 0x0c, NULL, HFILL}},
         { &hf_scsi_mmc_disc_info_disk_status,
-          {"Disk Status", "scsi.mmc.disc_info.disk_status", FT_UINT8, BASE_HEX,
+          {"Disk Status", "scsi_mmc.disc_info.disk_status", FT_UINT8, BASE_HEX,
            VALS(scsi_disc_info_disc_status_val), 0x03, NULL, HFILL}},
         { &hf_scsi_mmc_disc_info_number_of_sessions,
-          {"Number Of Sessions", "scsi.mmc.disc_info.number_of_sessions", FT_UINT16, BASE_DEC,
+          {"Number Of Sessions", "scsi_mmc.disc_info.number_of_sessions", FT_UINT16, BASE_DEC,
            NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_disc_info_first_track_in_last_session,
-          {"First Track In Last Session", "scsi.mmc.disc_info.first_track_in_last_session", FT_UINT16, BASE_DEC,
+          {"First Track In Last Session", "scsi_mmc.disc_info.first_track_in_last_session", FT_UINT16, BASE_DEC,
            NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_disc_info_last_track_in_last_session,
-          {"Last Track In Last Session", "scsi.mmc.disc_info.last_track_in_last_session", FT_UINT16, BASE_DEC,
+          {"Last Track In Last Session", "scsi_mmc.disc_info.last_track_in_last_session", FT_UINT16, BASE_DEC,
            NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_disc_info_did_v,
-          {"DID_V", "scsi.mmc.disc_info.did_v", FT_BOOLEAN, 8,
+          {"DID_V", "scsi_mmc.disc_info.did_v", FT_BOOLEAN, 8,
            NULL, 0x80, NULL, HFILL}},
         { &hf_scsi_mmc_disc_info_dbc_v,
-          {"DBC_V", "scsi.mmc.disc_info.dbc_v", FT_BOOLEAN, 8,
+          {"DBC_V", "scsi_mmc.disc_info.dbc_v", FT_BOOLEAN, 8,
            NULL, 0x40, NULL, HFILL}},
         { &hf_scsi_mmc_disc_info_uru,
-          {"URU", "scsi.mmc.disc_info.uru", FT_BOOLEAN, 8,
+          {"URU", "scsi_mmc.disc_info.uru", FT_BOOLEAN, 8,
            NULL, 0x20, NULL, HFILL}},
         { &hf_scsi_mmc_disc_info_dac_v,
-          {"DAC_V", "scsi.mmc.disc_info.dac_v", FT_BOOLEAN, 8,
+          {"DAC_V", "scsi_mmc.disc_info.dac_v", FT_BOOLEAN, 8,
            NULL, 0x10, NULL, HFILL}},
         { &hf_scsi_mmc_disc_info_dbit,
-          {"Dbit", "scsi.mmc.disc_info.dbit", FT_BOOLEAN, 8,
+          {"Dbit", "scsi_mmc.disc_info.dbit", FT_BOOLEAN, 8,
            NULL, 0x04, NULL, HFILL}},
         { &hf_scsi_mmc_disc_info_bgfs,
-          {"BG Format Status", "scsi.mmc.disc_info.bgfs", FT_UINT8, BASE_HEX,
+          {"BG Format Status", "scsi_mmc.disc_info.bgfs", FT_UINT8, BASE_HEX,
            VALS(scsi_disc_info_bgfs_val), 0x03, NULL, HFILL}},
         { &hf_scsi_mmc_disc_info_disc_type,
-          {"Disc Type", "scsi.mmc.disc_info.disc_type", FT_UINT8, BASE_HEX,
+          {"Disc Type", "scsi_mmc.disc_info.disc_type", FT_UINT8, BASE_HEX,
            VALS(scsi_disc_info_disc_type_val), 0, NULL, HFILL}},
         { &hf_scsi_mmc_disc_info_disc_identification,
-          {"Disc Identification", "scsi.mmc.disc_info.disc_identification", FT_UINT32, BASE_HEX,
+          {"Disc Identification", "scsi_mmc.disc_info.disc_identification", FT_UINT32, BASE_HEX,
            NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_disc_info_last_session_lead_in_start_address,
-          {"Last Session Lead-In Start Address", "scsi.mmc.disc_info.last_session_lead_in_start_address", FT_UINT32, BASE_DEC,
+          {"Last Session Lead-In Start Address", "scsi_mmc.disc_info.last_session_lead_in_start_address", FT_UINT32, BASE_DEC,
            NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_disc_info_last_possible_lead_out_start_address,
-          {"Last Possible Lead-Out Start Address", "scsi.mmc.disc_info.last_possible_lead_out_start_address", FT_UINT32, BASE_DEC,
+          {"Last Possible Lead-Out Start Address", "scsi_mmc.disc_info.last_possible_lead_out_start_address", FT_UINT32, BASE_DEC,
            NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_disc_info_disc_bar_code,
-          {"Disc Bar Code", "scsi.mmc.disc_info.disc_bar_code", FT_UINT64, BASE_HEX,
+          {"Disc Bar Code", "scsi_mmc.disc_info.disc_bar_code", FT_UINT64, BASE_HEX,
            NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_readtoc_time,
-          {"Time", "scsi.mmc.readtoc.time", FT_BOOLEAN, 8,
+          {"Time", "scsi_mmc.readtoc.time", FT_BOOLEAN, 8,
            NULL, 0x02, NULL, HFILL}},
         { &hf_scsi_mmc_readtoc_format,
-          {"Format", "scsi.mmc.readtoc.format", FT_UINT8, BASE_HEX,
+          {"Format", "scsi_mmc.readtoc.format", FT_UINT8, BASE_HEX,
            NULL, 0x0f, NULL, HFILL}},
         { &hf_scsi_mmc_readtoc_first_session,
-          {"First Session", "scsi.mmc.readtoc.first_session", FT_UINT8, BASE_DEC,
+          {"First Session", "scsi_mmc.readtoc.first_session", FT_UINT8, BASE_DEC,
            NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_readtoc_last_track,
-          {"Last Track", "scsi.mmc.readtoc.last_track", FT_UINT8, BASE_DEC,
+          {"Last Track", "scsi_mmc.readtoc.last_track", FT_UINT8, BASE_DEC,
            NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_readtoc_last_session,
-          {"Last Session", "scsi.mmc.readtoc.last_session", FT_UINT8, BASE_DEC,
+          {"Last Session", "scsi_mmc.readtoc.last_session", FT_UINT8, BASE_DEC,
            NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_q_subchannel_adr,
-          {"Q Subchannel ADR", "scsi.mmc.q.subchannel.adr", FT_UINT8, BASE_HEX,
+          {"Q Subchannel ADR", "scsi_mmc.q.subchannel.adr", FT_UINT8, BASE_HEX,
            VALS(scsi_q_subchannel_adr_val), 0xf0, NULL, HFILL}},
         { &hf_scsi_mmc_q_subchannel_control,
-          {"Q Subchannel Control", "scsi.mmc.q.subchannel.control", FT_UINT8, BASE_HEX,
+          {"Q Subchannel Control", "scsi_mmc.q.subchannel.control", FT_UINT8, BASE_HEX,
            VALS(scsi_q_subchannel_control_val), 0x0f, NULL, HFILL}},
         { &hf_scsi_mmc_agid,
-          {"AGID", "scsi.mmc.agid", FT_UINT8, BASE_HEX,
+          {"AGID", "scsi_mmc.agid", FT_UINT8, BASE_HEX,
            NULL, 0xc0, NULL, HFILL}},
         { &hf_scsi_mmc_track,
-          {"Track", "scsi.mmc.track", FT_UINT32, BASE_DEC,
+          {"Track", "scsi_mmc.track", FT_UINT32, BASE_DEC,
            NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_track_size,
-          {"Track Size", "scsi.mmc.track_size", FT_UINT32, BASE_DEC,
+          {"Track Size", "scsi_mmc.track_size", FT_UINT32, BASE_DEC,
            NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_track_start_address,
-          {"Track Start Address", "scsi.mmc.track_start_address", FT_UINT32, BASE_DEC,
+          {"Track Start Address", "scsi_mmc.track_start_address", FT_UINT32, BASE_DEC,
            NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_track_start_time,
-          {"Track Start Time", "scsi.mmc.track_start_time", FT_UINT32, BASE_DEC,
+          {"Track Start Time", "scsi_mmc.track_start_time", FT_UINT32, BASE_DEC,
            NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_lba,
-          {"Logical Block Address", "scsi.mmc.lba", FT_UINT32, BASE_DEC,
+          {"Logical Block Address", "scsi_mmc.lba", FT_UINT32, BASE_DEC,
            NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_mmc_session,
-          {"Session", "scsi.mmc.session", FT_UINT32, BASE_DEC,
+          {"Session", "scsi_mmc.session", FT_UINT32, BASE_DEC,
            NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_data_length,
-          {"Data Length", "scsi.mmc.data_length", FT_UINT32, BASE_DEC,
+          {"Data Length", "scsi_mmc.data_length", FT_UINT32, BASE_DEC,
            NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_mmc_getconf_rt,
-          {"RT", "scsi.mmc.getconf.rt", FT_UINT8, BASE_HEX,
+          {"RT", "scsi_mmc.getconf.rt", FT_UINT8, BASE_HEX,
            VALS(scsi_getconf_rt_val), 0x03, NULL, HFILL}},
         { &hf_scsi_mmc_getconf_current_profile,
-          {"Current Profile", "scsi.mmc.getconf.current_profile", FT_UINT16, BASE_HEX,
+          {"Current Profile", "scsi_mmc.getconf.current_profile", FT_UINT16, BASE_HEX,
            VALS(scsi_getconf_current_profile_val), 0, NULL, HFILL}},
         { &hf_scsi_mmc_getconf_starting_feature,
-          {"Starting Feature", "scsi.mmc.getconf.starting_feature", FT_UINT16, BASE_HEX,
+          {"Starting Feature", "scsi_mmc.getconf.starting_feature", FT_UINT16, BASE_HEX,
            VALS(scsi_feature_val), 0, NULL, HFILL}},
         { &hf_scsi_mmc_feature,
-          {"Feature", "scsi.mmc.feature", FT_UINT16, BASE_HEX,
+          {"Feature", "scsi_mmc.feature", FT_UINT16, BASE_HEX,
            VALS(scsi_feature_val), 0, NULL, HFILL}},
         { &hf_scsi_mmc_feature_version,
-          {"Version", "scsi.mmc.feature.version", FT_UINT8, BASE_DEC,
+          {"Version", "scsi_mmc.feature.version", FT_UINT8, BASE_DEC,
            NULL, 0x3c, NULL, HFILL}},
         { &hf_scsi_mmc_feature_persistent,
-          {"Persistent", "scsi.mmc.feature.persistent", FT_UINT8, BASE_HEX,
+          {"Persistent", "scsi_mmc.feature.persistent", FT_UINT8, BASE_HEX,
            NULL, 0x02, NULL, HFILL}},
         { &hf_scsi_mmc_feature_current,
-          {"Current", "scsi.mmc.feature.current", FT_UINT8, BASE_HEX,
+          {"Current", "scsi_mmc.feature.current", FT_UINT8, BASE_HEX,
            NULL, 001, NULL, HFILL}},
         { &hf_scsi_mmc_feature_additional_length,
-          {"Additional Length", "scsi.mmc.feature.additional_length", FT_UINT8, BASE_DEC,
+          {"Additional Length", "scsi_mmc.feature.additional_length", FT_UINT8, BASE_DEC,
            NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_feature_lun_sn,
-          {"LUN Serial Number", "scsi.mmc.feature.lun_sn", FT_STRING, BASE_NONE,
+          {"LUN Serial Number", "scsi_mmc.feature.lun_sn", FT_STRING, BASE_NONE,
            NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_feature_cdread_dap,
-          {"DAP", "scsi.mmc.feature.cdread.dap", FT_BOOLEAN, 8,
+          {"DAP", "scsi_mmc.feature.cdread.dap", FT_BOOLEAN, 8,
            NULL, 0x80, NULL, HFILL}},
         { &hf_scsi_mmc_feature_cdread_c2flag,
-          {"C2 Flag", "scsi.mmc.feature.cdread.c2flag", FT_BOOLEAN, 8,
+          {"C2 Flag", "scsi_mmc.feature.cdread.c2flag", FT_BOOLEAN, 8,
            NULL, 0x02, NULL, HFILL}},
         { &hf_scsi_mmc_feature_cdread_cdtext,
-          {"CD-Text", "scsi.mmc.feature.cdread.cdtext", FT_BOOLEAN, 8,
+          {"CD-Text", "scsi_mmc.feature.cdread.cdtext", FT_BOOLEAN, 8,
            NULL, 0x01, NULL, HFILL}},
         { &hf_scsi_mmc_feature_dvdrw_write,
-          {"Write", "scsi.mmc.feature.dvdrw.write", FT_BOOLEAN, 8,
+          {"Write", "scsi_mmc.feature.dvdrw.write", FT_BOOLEAN, 8,
            NULL, 0x01, NULL, HFILL}},
         { &hf_scsi_mmc_feature_dvdrw_quickstart,
-          {"Quick Start", "scsi.mmc.feature.dvdrw.quickstart", FT_BOOLEAN, 8,
+          {"Quick Start", "scsi_mmc.feature.dvdrw.quickstart", FT_BOOLEAN, 8,
            NULL, 0x02, NULL, HFILL}},
         { &hf_scsi_mmc_feature_dvdrw_closeonly,
-          {"Close Only", "scsi.mmc.feature.dvdrw.closeonly", FT_BOOLEAN, 8,
+          {"Close Only", "scsi_mmc.feature.dvdrw.closeonly", FT_BOOLEAN, 8,
            NULL, 0x01, NULL, HFILL}},
         { &hf_scsi_mmc_feature_dvdr_write,
-          {"Write", "scsi.mmc.feature.dvdr.write", FT_BOOLEAN, 8,
+          {"Write", "scsi_mmc.feature.dvdr.write", FT_BOOLEAN, 8,
            NULL, 0x01, NULL, HFILL}},
         { &hf_scsi_mmc_feature_tao_buf,
-          {"BUF", "scsi.mmc.feature.tao.buf", FT_BOOLEAN, 8,
+          {"BUF", "scsi_mmc.feature.tao.buf", FT_BOOLEAN, 8,
            NULL, 0x40, NULL, HFILL}},
         { &hf_scsi_mmc_feature_tao_rwraw,
-          {"R-W Raw", "scsi.mmc.feature.tao.rwraw", FT_BOOLEAN, 8,
+          {"R-W Raw", "scsi_mmc.feature.tao.rwraw", FT_BOOLEAN, 8,
            NULL, 0x10, NULL, HFILL}},
         { &hf_scsi_mmc_feature_tao_rwpack,
-          {"R-W Pack", "scsi.mmc.feature.tao.rwpack", FT_BOOLEAN, 8,
+          {"R-W Pack", "scsi_mmc.feature.tao.rwpack", FT_BOOLEAN, 8,
            NULL, 0x08, NULL, HFILL}},
         { &hf_scsi_mmc_feature_tao_testwrite,
-          {"Test Write", "scsi.mmc.feature.tao.testwrite", FT_BOOLEAN, 8,
+          {"Test Write", "scsi_mmc.feature.tao.testwrite", FT_BOOLEAN, 8,
            NULL, 0x04, NULL, HFILL}},
         { &hf_scsi_mmc_feature_tao_cdrw,
-          {"CD-RW", "scsi.mmc.feature.tao.cdrw", FT_BOOLEAN, 8,
+          {"CD-RW", "scsi_mmc.feature.tao.cdrw", FT_BOOLEAN, 8,
            NULL, 0x02, NULL, HFILL}},
         { &hf_scsi_mmc_feature_tao_rwsubcode,
-          {"R-W Subcode", "scsi.mmc.feature.tao.rwsubcode", FT_BOOLEAN, 8,
+          {"R-W Subcode", "scsi_mmc.feature.tao.rwsubcode", FT_BOOLEAN, 8,
            NULL, 0x01, NULL, HFILL}},
         { &hf_scsi_mmc_feature_dts,
-          {"Data Type Supported", "scsi.mmc.feature.dts", FT_UINT16, BASE_HEX,
+          {"Data Type Supported", "scsi_mmc.feature.dts", FT_UINT16, BASE_HEX,
            NULL, 0xffff, NULL, HFILL}},
         { &hf_scsi_mmc_feature_sao_buf,
-          {"BUF", "scsi.mmc.feature.sao.buf", FT_BOOLEAN, 8,
+          {"BUF", "scsi_mmc.feature.sao.buf", FT_BOOLEAN, 8,
            NULL, 0x40, NULL, HFILL}},
         { &hf_scsi_mmc_feature_sao_sao,
-          {"SAO", "scsi.mmc.feature.sao.sao", FT_BOOLEAN, 8,
+          {"SAO", "scsi_mmc.feature.sao.sao", FT_BOOLEAN, 8,
            NULL, 0x20, NULL, HFILL}},
         { &hf_scsi_mmc_feature_sao_rawms,
-          {"Raw MS", "scsi.mmc.feature.sao.rawms", FT_BOOLEAN, 8,
+          {"Raw MS", "scsi_mmc.feature.sao.rawms", FT_BOOLEAN, 8,
            NULL, 0x10, NULL, HFILL}},
         { &hf_scsi_mmc_feature_sao_raw,
-          {"Raw", "scsi.mmc.feature.sao.raw", FT_BOOLEAN, 8,
+          {"Raw", "scsi_mmc.feature.sao.raw", FT_BOOLEAN, 8,
            NULL, 0x08, NULL, HFILL}},
         { &hf_scsi_mmc_feature_sao_testwrite,
-          {"Test Write", "scsi.mmc.feature.sao.testwrite", FT_BOOLEAN, 8,
+          {"Test Write", "scsi_mmc.feature.sao.testwrite", FT_BOOLEAN, 8,
            NULL, 0x04, NULL, HFILL}},
         { &hf_scsi_mmc_feature_sao_cdrw,
-          {"CD-RW", "scsi.mmc.feature.sao.cdrw", FT_BOOLEAN, 8,
+          {"CD-RW", "scsi_mmc.feature.sao.cdrw", FT_BOOLEAN, 8,
            NULL, 0x02, NULL, HFILL}},
         { &hf_scsi_mmc_feature_sao_rw,
-          {"R-W", "scsi.mmc.feature.sao.rw", FT_BOOLEAN, 8,
+          {"R-W", "scsi_mmc.feature.sao.rw", FT_BOOLEAN, 8,
            NULL, 0x01, NULL, HFILL}},
         { &hf_scsi_mmc_feature_sao_mcsl,
-          {"Maximum Cue Sheet Length", "scsi.mmc.feature.sao.mcsl", FT_UINT24, BASE_DEC,
+          {"Maximum Cue Sheet Length", "scsi_mmc.feature.sao.mcsl", FT_UINT24, BASE_DEC,
            NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_feature_dvdr_buf,
-          {"BUF", "scsi.mmc.feature.dvdr.buf", FT_BOOLEAN, 8,
+          {"BUF", "scsi_mmc.feature.dvdr.buf", FT_BOOLEAN, 8,
            NULL, 0x40, NULL, HFILL}},
         { &hf_scsi_mmc_feature_dvdr_testwrite,
-          {"Test Write", "scsi.mmc.feature.dvdr.testwrite", FT_BOOLEAN, 8,
+          {"Test Write", "scsi_mmc.feature.dvdr.testwrite", FT_BOOLEAN, 8,
            NULL, 0x04, NULL, HFILL}},
         { &hf_scsi_mmc_feature_dvdr_dvdrw,
-          {"DVD-RW", "scsi.mmc.feature.dvdr.dvdrw", FT_BOOLEAN, 8,
+          {"DVD-RW", "scsi_mmc.feature.dvdr.dvdrw", FT_BOOLEAN, 8,
            NULL, 0x02, NULL, HFILL}},
         { &hf_scsi_mmc_feature_profile,
-          {"Profile", "scsi.mmc.feature.profile", FT_UINT16, BASE_HEX,
+          {"Profile", "scsi_mmc.feature.profile", FT_UINT16, BASE_HEX,
            VALS(scsi_getconf_current_profile_val), 0, NULL, HFILL}},
         { &hf_scsi_mmc_feature_profile_current,
-          {"Current", "scsi.mmc.feature.profile.current", FT_BOOLEAN, 8,
+          {"Current", "scsi_mmc.feature.profile.current", FT_BOOLEAN, 8,
            NULL, 0x01, NULL, HFILL}},
         { &hf_scsi_mmc_feature_isw_buf,
-          {"BUF", "scsi.mmc.feature.isw.buf", FT_BOOLEAN, 8,
+          {"BUF", "scsi_mmc.feature.isw.buf", FT_BOOLEAN, 8,
            NULL, 0x01, NULL, HFILL}},
         { &hf_scsi_mmc_feature_isw_num_linksize,
-          {"Number of Link Sizes", "scsi.mmc.feature.isw.num_linksize", FT_UINT8, BASE_DEC,
+          {"Number of Link Sizes", "scsi_mmc.feature.isw.num_linksize", FT_UINT8, BASE_DEC,
            NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_feature_isw_linksize,
-          {"Link Size", "scsi.mmc.feature.isw.linksize", FT_UINT8, BASE_DEC,
+          {"Link Size", "scsi_mmc.feature.isw.linksize", FT_UINT8, BASE_DEC,
            NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_read_compatibility_lba,
-          {"Read Compatibility LBA", "scsi.mmc.read_compatibility_lba", FT_UINT32, BASE_DEC,
+          {"Read Compatibility LBA", "scsi_mmc.read_compatibility_lba", FT_UINT32, BASE_DEC,
            NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_reservation_size,
-          {"Reservation Size", "scsi.mmc.reservation_size", FT_UINT32, BASE_DEC,
+          {"Reservation Size", "scsi_mmc.reservation_size", FT_UINT32, BASE_DEC,
            NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_last_recorded_address,
-          {"Last Recorded Address", "scsi.mmc.last_recorded_address", FT_UINT32, BASE_DEC,
+          {"Last Recorded Address", "scsi_mmc.last_recorded_address", FT_UINT32, BASE_DEC,
            NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_first_track,
-          {"First Track", "scsi.mmc.first_track", FT_UINT8, BASE_DEC,
+          {"First Track", "scsi_mmc.first_track", FT_UINT8, BASE_DEC,
            NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_fixed_packet_size,
-          {"Fixed Packet Size", "scsi.mmc.fixed_packet_size", FT_UINT32, BASE_DEC,
+          {"Fixed Packet Size", "scsi_mmc.fixed_packet_size", FT_UINT32, BASE_DEC,
            NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_closetrack_immed,
-          {"IMMED", "scsi.mmc.closetrack.immed", FT_BOOLEAN, 8,
+          {"IMMED", "scsi_mmc.closetrack.immed", FT_BOOLEAN, 8,
            NULL, 0x01, NULL, HFILL}},
         { &hf_scsi_mmc_closetrack_func,
-          {"Close Function", "scsi.mmc.closetrack.func", FT_UINT8, BASE_HEX,
+          {"Close Function", "scsi_mmc.closetrack.func", FT_UINT8, BASE_HEX,
            VALS(scsi_closetrack_func_val), 0x07, NULL, HFILL}},
         { &hf_scsi_mmc_synccache_immed,
-          {"IMMED", "scsi.mmc.synccache.immed", FT_BOOLEAN, 8,
+          {"IMMED", "scsi_mmc.synccache.immed", FT_BOOLEAN, 8,
            NULL, 0x02, NULL, HFILL}},
         { &hf_scsi_mmc_synccache_reladr,
-          {"RelAdr", "scsi.mmc.synccache.reladr", FT_BOOLEAN, 8,
+          {"RelAdr", "scsi_mmc.synccache.reladr", FT_BOOLEAN, 8,
            NULL, 0x01, NULL, HFILL}},
         { &hf_scsi_mmc_num_blocks,
-          {"Number of Blocks", "scsi.mmc.num_blocks", FT_UINT32, BASE_DEC,
+          {"Number of Blocks", "scsi_mmc.num_blocks", FT_UINT32, BASE_DEC,
            NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_mmc_next_writable_address,
-          {"Next Writable Address", "scsi.mmc.next_writable_address", FT_UINT32, BASE_DEC,
+          {"Next Writable Address", "scsi_mmc.next_writable_address", FT_UINT32, BASE_DEC,
            NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_free_blocks,
-          {"Free Blocks", "scsi.mmc.free_blocks", FT_UINT32, BASE_DEC,
+          {"Free Blocks", "scsi_mmc.free_blocks", FT_UINT32, BASE_DEC,
            NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_read_dvd_format,
-          { "Format Code", "scsi.mmc.read_dvd.format", FT_UINT8, BASE_HEX,
+          { "Format Code", "scsi_mmc.read_dvd.format", FT_UINT8, BASE_HEX,
             VALS(scsi_read_dvd_formats), 0x0, NULL, HFILL}},
         { &hf_scsi_mmc_disc_book_type,
-          { "Type", "scsi.mmc.book.type", FT_UINT8, BASE_HEX,
+          { "Type", "scsi_mmc.book.type", FT_UINT8, BASE_HEX,
             VALS(scsi_disc_category_type), 0xf0, NULL, HFILL}},
         { &hf_scsi_mmc_disc_book_version,
-          { "Version", "scsi.mmc.book.version", FT_UINT8, BASE_HEX,
+          { "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_HEX,
             VALS(scsi_disc_size), 0xf0, NULL, HFILL}},
         { &hf_scsi_mmc_disc_size_rate,
-          { "Rate", "scsi.mmc.disc.rate", FT_UINT8, BASE_HEX,
+          { "Rate", "scsi_mmc.disc.rate", FT_UINT8, BASE_HEX,
             VALS(scsi_disc_rate), 0x0f, NULL, HFILL}},
         { &hf_scsi_mmc_disc_structure_layer,
-          { "Structure", "scsi.mmc.disc.structure", FT_UINT8, BASE_HEX,
+          { "Structure", "scsi_mmc.disc.structure", FT_UINT8, BASE_HEX,
             VALS(scsi_disc_structure), 0x0f, NULL, HFILL}},
 	{ &hf_scsi_mmc_disc_density_length,
-          { "Channel bith length", "scsi.mmc.density.channel_bit_length", FT_UINT8, BASE_HEX,
+          { "Channel bith length", "scsi_mmc.density.channel_bit_length", FT_UINT8, BASE_HEX,
             VALS(scsi_density_length), 0xf0, NULL, HFILL}},
 	{ &hf_scsi_mmc_disc_density_pitch,
-          { "Average Track Pitch", "scsi.mmc.density.average_track_pitch", FT_UINT8, BASE_HEX,
+          { "Average Track Pitch", "scsi_mmc.density.average_track_pitch", FT_UINT8, BASE_HEX,
             VALS(scsi_density_pitch), 0x0f, NULL, HFILL}},
 	{ &hf_scsi_mmc_disc_first_physical,
-          { "First physical sector of data zone", "scsi.mmc.first_physical", FT_UINT24, BASE_HEX,
+          { "First physical sector of data zone", "scsi_mmc.first_physical", FT_UINT24, BASE_HEX,
             NULL, 0, NULL, HFILL}},
 	{ &hf_scsi_mmc_disc_last_physical,
-          { "Last physical sector of data zone", "scsi.mmc.last_physical", FT_UINT24, BASE_HEX,
+          { "Last physical sector of data zone", "scsi_mmc.last_physical", FT_UINT24, BASE_HEX,
             NULL, 0, NULL, HFILL}},
 	{ &hf_scsi_mmc_disc_last_physical_layer0,
-          { "Last physical sector of layer 0", "scsi.mmc.last_physical_layer0", FT_UINT24, BASE_HEX,
+          { "Last physical sector of layer 0", "scsi_mmc.last_physical_layer0", FT_UINT24, BASE_HEX,
             NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_disc_extended_format_info,
-          { "Extended Format Info", "scsi.mmc.adip.extended_format_info", FT_BOOLEAN, 8,
+          { "Extended Format Info", "scsi_mmc.adip.extended_format_info", FT_BOOLEAN, 8,
             TFS(&scsi_adip_extended_format_info), 0x40, NULL, HFILL}},
         { &hf_scsi_mmc_disc_application_code,
-          { "Disk Application Code", "scsi.mmc.disk_application_code", FT_UINT8, BASE_HEX,
+          { "Disk Application Code", "scsi_mmc.disk_application_code", FT_UINT8, BASE_HEX,
             VALS(scsi_disk_application_code), 0x0, NULL, HFILL}},
         { &hf_scsi_mmc_adip_eib0,
-          { "Extended Format Block 0", "scsi.mmc.adip.extended_format_block.0", FT_BOOLEAN, 8,
+          { "Extended Format Block 0", "scsi_mmc.adip.extended_format_block.0", FT_BOOLEAN, 8,
             NULL, 0x01, NULL, HFILL}},
         { &hf_scsi_mmc_adip_eib1,
-          { "Extended Format Block 1", "scsi.mmc.adip.extended_format_block.1", FT_BOOLEAN, 8,
+          { "Extended Format Block 1", "scsi_mmc.adip.extended_format_block.1", FT_BOOLEAN, 8,
             NULL, 0x02, NULL, HFILL}},
         { &hf_scsi_mmc_adip_eib2,
-          { "Extended Format Block 2", "scsi.mmc.adip.extended_format_block.2", FT_BOOLEAN, 8,
+          { "Extended Format Block 2", "scsi_mmc.adip.extended_format_block.2", FT_BOOLEAN, 8,
             NULL, 0x04, NULL, HFILL}},
         { &hf_scsi_mmc_adip_eib3,
-          { "Extended Format Block 3", "scsi.mmc.adip.extended_format_block.3", FT_BOOLEAN, 8,
+          { "Extended Format Block 3", "scsi_mmc.adip.extended_format_block.3", FT_BOOLEAN, 8,
             NULL, 0x08, NULL, HFILL}},
         { &hf_scsi_mmc_adip_eib4,
-          { "Extended Format Block 4", "scsi.mmc.adip.extended_format_block.4", FT_BOOLEAN, 8,
+          { "Extended Format Block 4", "scsi_mmc.adip.extended_format_block.4", FT_BOOLEAN, 8,
             NULL, 0x10, NULL, HFILL}},
         { &hf_scsi_mmc_adip_eib5,
-          { "Extended Format Block 5", "scsi.mmc.adip.extended_format_block.5", FT_BOOLEAN, 8,
+          { "Extended Format Block 5", "scsi_mmc.adip.extended_format_block.5", FT_BOOLEAN, 8,
             NULL, 0x20, NULL, HFILL}},
         { &hf_scsi_mmc_adip_device_manuf_id,
-          { "Device Manufacturer Id", "scsi.mmc.adip.device_manufacturer_id", FT_STRING, BASE_NONE,
+          { "Device Manufacturer Id", "scsi_mmc.adip.device_manufacturer_id", FT_STRING, BASE_NONE,
             NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_mmc_adip_media_type_id,
-          { "Media Type Id", "scsi.mmc.adip.media_type_id", FT_STRING, BASE_NONE,
+          { "Media Type Id", "scsi_mmc.adip.media_type_id", FT_STRING, BASE_NONE,
             NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_mmc_adip_product_revision_number,
-          { "Product Revision Number", "scsi.mmc.adip.product_revision_number", FT_UINT8, BASE_HEX,
+          { "Product Revision Number", "scsi_mmc.adip.product_revision_number", FT_UINT8, BASE_HEX,
             NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_mmc_adip_number_of_physical_info,
-          { "Number of bytes of physical info", "scsi.mmc.adip.number_of_physical_info", FT_UINT8, BASE_HEX,
+          { "Number of bytes of physical info", "scsi_mmc.adip.number_of_physical_info", FT_UINT8, BASE_HEX,
             NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_mmc_disc_num_layers,
-          { "Number of Layers", "scsi.mmc.disk.num_layers", FT_UINT8, BASE_DEC,
+          { "Number of Layers", "scsi_mmc.disk.num_layers", FT_UINT8, BASE_DEC,
             VALS(scsi_num_layers), 0x60, NULL, HFILL}},
         { &hf_scsi_mmc_disc_track_path,
-          { "Track Path", "scsi.mmc.disk.track_path", FT_BOOLEAN, 8,
+          { "Track Path", "scsi_mmc.disk.track_path", FT_BOOLEAN, 8,
             TFS(&scsi_track_path), 0x10, NULL, HFILL}},
 
     };