diff options
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-btrfcomm.c | 10 | ||||
| -rw-r--r-- | epan/dissectors/packet-cemi.c | 30 | ||||
| -rw-r--r-- | epan/dissectors/packet-cip.c | 12 | ||||
| -rw-r--r-- | epan/dissectors/packet-dis.c | 54 | ||||
| -rw-r--r-- | epan/dissectors/packet-docsis-tlv.c | 30 | ||||
| -rw-r--r-- | epan/dissectors/packet-lapsat.c | 12 |
6 files changed, 42 insertions, 106 deletions
diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c index 8d46c8fb37..6e90c9e38a 100644 --- a/epan/dissectors/packet-btrfcomm.c +++ b/epan/dissectors/packet-btrfcomm.c @@ -237,12 +237,6 @@ static const value_string vs_ea[] = { {0, NULL} }; -static const value_string vs_cr[] = { - {1, "Command"}, - {0, "Response"}, - {0, NULL} -}; - void proto_register_btrfcomm(void); void proto_reg_handoff_btrfcomm(void); void proto_register_btdun(void); @@ -941,7 +935,7 @@ proto_register_btrfcomm(void) }, { &hf_cr, { "C/R Flag", "btrfcomm.cr", - FT_UINT8, BASE_HEX, VALS(vs_cr), 0x02, + FT_BOOLEAN, 8, TFS(&tfs_command_response), 0x02, "Command/Response flag", HFILL} }, { &hf_mcc, @@ -966,7 +960,7 @@ proto_register_btrfcomm(void) }, { &hf_mcc_cr, { "C/R Flag", "btrfcomm.mcc.cr", - FT_UINT8, BASE_HEX, VALS(vs_cr), 0x02, + FT_BOOLEAN, 8, TFS(&tfs_command_response), 0x02, "Command/Response flag", HFILL} }, { &hf_mcc_const_1, diff --git a/epan/dissectors/packet-cemi.c b/epan/dissectors/packet-cemi.c index 0ac82c0ac2..2717c94300 100644 --- a/epan/dissectors/packet-cemi.c +++ b/epan/dissectors/packet-cemi.c @@ -268,14 +268,6 @@ static const value_string ft_vals[] = { { 0, NULL } }; -/* Repeat on error? -*/ -static const value_string rep_vals[] = { - { 0, "Yes" }, - { 1, "No" }, - { 0, NULL } -}; - /* Broadcast Type */ static const value_string bt_vals[] = { @@ -294,22 +286,6 @@ static const value_string prio_vals[] = { { 0, NULL } }; -/* Ack requested? -*/ -static const value_string ack_vals[] = { - { 0, "No" }, - { 1, "Yes" }, - { 0, NULL } -}; - -/* Confirmation Error? -*/ -static const value_string ce_vals[] = { - { 0, "No" }, - { 1, "Yes" }, - { 0, NULL } -}; - /* Address Type */ static const value_string at_vals[] = { @@ -3417,11 +3393,11 @@ void proto_register_cemi( void ) { &hf_cemi_ne, { "Count", "cemi.n", FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL } }, { &hf_cemi_sx, { "Index", "cemi.x", FT_UINT16, BASE_DEC, NULL, 0x0FFF, NULL, HFILL } }, { &hf_cemi_ft, { "Frame Type", "cemi.ft", FT_UINT8, BASE_DEC, VALS( ft_vals ), 0x80, NULL, HFILL } }, - { &hf_cemi_rep, { "Repeat On Error", "cemi.rep", FT_UINT8, BASE_DEC, VALS( rep_vals ), 0x20, NULL, HFILL } }, + { &hf_cemi_rep, { "Repeat On Error", "cemi.rep", FT_BOOLEAN, 8, TFS(&tfs_no_yes), 0x20, NULL, HFILL } }, { &hf_cemi_bt, { "Broadcast Type", "cemi.bt", FT_UINT8, BASE_DEC, VALS( bt_vals ), 0x10, NULL, HFILL } }, { &hf_cemi_prio, { "Priority", "cemi.prio", FT_UINT8, BASE_DEC, VALS( prio_vals ), 0x0C, NULL, HFILL } }, - { &hf_cemi_ack, { "Ack Wanted", "cemi.ack", FT_UINT8, BASE_DEC, VALS( ack_vals ), 0x02, NULL, HFILL } }, - { &hf_cemi_ce, { "Confirmation Error", "cemi.ce", FT_UINT8, BASE_DEC, VALS( ce_vals ), 0x01, NULL, HFILL } }, + { &hf_cemi_ack, { "Ack Wanted", "cemi.ack", FT_BOOLEAN, 8, TFS(&tfs_no_yes), 0x02, NULL, HFILL } }, + { &hf_cemi_ce, { "Confirmation Error", "cemi.ce", FT_BOOLEAN, 8, TFS(&tfs_no_yes), 0x01, NULL, HFILL } }, { &hf_cemi_at, { "Address Type", "cemi.at", FT_UINT8, BASE_DEC, VALS( at_vals ), 0x80, NULL, HFILL } }, { &hf_cemi_hc, { "Hop Count", "cemi.hc", FT_UINT8, BASE_DEC, NULL, 0x70, NULL, HFILL } }, { &hf_cemi_eff, { "Extended Frame Format", "cemi.eff", FT_UINT8, BASE_HEX, NULL, 0x0F, NULL, HFILL } }, diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c index da692a3bde..b3e222bf77 100644 --- a/epan/dissectors/packet-cip.c +++ b/epan/dissectors/packet-cip.c @@ -802,14 +802,6 @@ static const value_string cip_con_owner_vals[] = { { 0, NULL } }; -/* Translate function to string - Connection direction */ -static const value_string cip_con_dir_vals[] = { - { 0, "Client" }, - { 1, "Server" }, - - { 0, NULL } -}; - /* Translate function to string - Connection type*/ static const value_string cip_con_vals[] = { { 0, "Originator" }, @@ -9608,7 +9600,7 @@ proto_register_cip(void) { &hf_cip_cm_lfwo_typ, { "Connection Type", "cip.cm.fwo.type", FT_UINT32, BASE_DEC, VALS(cip_con_type_vals), 0x60000000, "Large Fwd Open: Connection type", HFILL }}, { &hf_cip_cm_fwo_own, { "Redundant Owner", "cip.cm.fwo.owner", FT_UINT16, BASE_DEC, VALS(cip_con_owner_vals), 0x8000, "Fwd Open: Redundant owner bit", HFILL }}, { &hf_cip_cm_lfwo_own, { "Redundant Owner", "cip.cm.fwo.owner", FT_UINT32, BASE_DEC, VALS(cip_con_owner_vals), 0x80000000, "Large Fwd Open: Redundant owner bit", HFILL }}, - { &hf_cip_cm_fwo_dir, { "Direction", "cip.cm.fwo.dir", FT_UINT8, BASE_DEC, VALS(cip_con_dir_vals), CI_PRODUCTION_DIR_MASK, "Fwd Open: Direction", HFILL }}, + { &hf_cip_cm_fwo_dir, { "Direction", "cip.cm.fwo.dir", FT_BOOLEAN, 8, TFS(&tfs_server_client), CI_PRODUCTION_DIR_MASK, "Fwd Open: Direction", HFILL }}, { &hf_cip_cm_fwo_trigg, { "Trigger", "cip.cm.fwo.trigger", FT_UINT8, BASE_DEC, VALS(cip_con_trigg_vals), CI_PRODUCTION_TRIGGER_MASK, "Fwd Open: Production trigger", HFILL }}, { &hf_cip_cm_fwo_class, { "Class", "cip.cm.fwo.transport", FT_UINT8, BASE_DEC, VALS(cip_con_class_vals), CI_TRANSPORT_CLASS_MASK, "Fwd Open: Transport Class", HFILL }}, { &hf_cip_cm_gco_conn, { "Number of Connections", "cip.cm.gco.conn", FT_UINT8, BASE_DEC, NULL, 0, "GetConnOwner: Number of Connections", HFILL }}, @@ -9719,7 +9711,7 @@ proto_register_cip(void) { &hf_cip_cco_lfwo_typ, { "Connection Type", "cip.cco.type", FT_UINT32, BASE_DEC, VALS(cip_con_type_vals), 0x60000000, NULL, HFILL }}, { &hf_cip_cco_fwo_own, { "Redundant Owner", "cip.cco.owner", FT_UINT16, BASE_DEC, VALS(cip_con_owner_vals), 0x8000, NULL, HFILL }}, { &hf_cip_cco_lfwo_own, { "Redundant Owner", "cip.cco.owner", FT_UINT32, BASE_DEC, VALS(cip_con_owner_vals), 0x80000000, NULL, HFILL }}, - { &hf_cip_cco_fwo_dir, { "Direction", "cip.cco.dir", FT_UINT8, BASE_DEC, VALS(cip_con_dir_vals), CI_PRODUCTION_DIR_MASK, NULL, HFILL }}, + { &hf_cip_cco_fwo_dir, { "Direction", "cip.cco.dir", FT_BOOLEAN, 8, TFS(&tfs_server_client), CI_PRODUCTION_DIR_MASK, NULL, HFILL }}, { &hf_cip_cco_fwo_trigger, { "Trigger", "cip.cco.trigger", FT_UINT8, BASE_DEC, VALS(cip_con_trigg_vals), CI_PRODUCTION_TRIGGER_MASK, NULL, HFILL }}, { &hf_cip_cco_fwo_class, { "Class", "cip.cco.transport", FT_UINT8, BASE_DEC, VALS(cip_con_class_vals), CI_TRANSPORT_CLASS_MASK, NULL, HFILL }}, { &hf_cip_cco_conn_path_size, { "Connection Path Size", "cip.cco.connpath_size", FT_UINT8, BASE_DEC|BASE_UNIT_STRING, &units_word_words, 0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-dis.c b/epan/dissectors/packet-dis.c index 66f9a76673..f68ceb8b09 100644 --- a/epan/dissectors/packet-dis.c +++ b/epan/dissectors/packet-dis.c @@ -4193,13 +4193,6 @@ static const value_string DIS_PDU_IffChangeIndicator_Strings[] = { 0, NULL } }; -static const value_string DIS_PDU_IffNoYes_Strings[] = -{ - { 0, "No" }, - { 1, "Yes" }, - { 0, NULL } -}; - static const value_string DIS_PDU_IffHeartbeat_Strings[] = { { 0, "No Heartbeat" }, @@ -4223,13 +4216,6 @@ static const value_string DIS_PDU_IffSimulation_Mode_Strings[] = { 0, NULL } }; -static const value_string DIS_PDU_IffOffOn_Strings[] = -{ - { 0, "Off" }, - { 1, "On" }, - { 0, NULL } -}; - /* SISO-REF-010 [UID 348] */ typedef enum { @@ -9514,17 +9500,17 @@ void proto_register_dis(void) }, { &hf_appearance_landform_head_lights, { "Head Lights", "dis.appearance.landform.head_lights", - FT_UINT32, BASE_DEC, VALS(DIS_PDU_IffOffOn_Strings), 0x00001000, + FT_BOOLEAN, 32, TFS(&tfs_on_off), 0x00001000, NULL, HFILL} }, { &hf_appearance_landform_tail_lights, { "Tail Lights", "dis.appearance.landform.tail_lights", - FT_UINT32, BASE_DEC, VALS(DIS_PDU_IffOffOn_Strings), 0x00002000, + FT_BOOLEAN, 32, TFS(&tfs_on_off), 0x00002000, NULL, HFILL} }, { &hf_appearance_landform_brake_lights, { "Brake Lights", "dis.appearance.landform.brake_lights", - FT_UINT32, BASE_DEC, VALS(DIS_PDU_IffOffOn_Strings), 0x00004000, + FT_BOOLEAN, 32, TFS(&tfs_on_off), 0x00004000, NULL, HFILL} }, { &hf_appearance_landform_flaming, @@ -9574,22 +9560,22 @@ void proto_register_dis(void) }, { &hf_appearance_landform_blackout_lights, { "Blackout Lights", "dis.appearance.landform.blackout_lights", - FT_UINT32, BASE_DEC, VALS(DIS_PDU_IffOffOn_Strings), 0x04000000, + FT_BOOLEAN, 32, TFS(&tfs_on_off), 0x04000000, NULL, HFILL} }, { &hf_appearance_landform_blackout_brake_lights, { "Blackout Brake Lights", "dis.appearance.landform.blackout_brake_lights", - FT_UINT32, BASE_DEC, VALS(DIS_PDU_IffOffOn_Strings), 0x08000000, + FT_BOOLEAN, 32, TFS(&tfs_on_off), 0x08000000, NULL, HFILL} }, { &hf_appearance_landform_spot_lights, { "Spot_lights", "dis.appearance.landform.spot_lights", - FT_UINT32, BASE_DEC, VALS(DIS_PDU_IffOffOn_Strings), 0x10000000, + FT_BOOLEAN, 32, TFS(&tfs_on_off), 0x10000000, NULL, HFILL} }, { &hf_appearance_landform_interior_lights, { "Interior_lights", "dis.appearance.landform.interior_lights", - FT_UINT32, BASE_DEC, VALS(DIS_PDU_IffOffOn_Strings), 0x20000000, + FT_BOOLEAN, 32, TFS(&tfs_on_off), 0x20000000, NULL, HFILL} }, { &hf_appearance_landform_surrender_state, @@ -9824,7 +9810,7 @@ void proto_register_dis(void) }, { &hf_appearance_lifeform_flash_lights, {"Flash Lights", "dis.appearance.lifeform.flash_lights", - FT_UINT32, BASE_DEC, VALS(DIS_PDU_IffOffOn_Strings), 0x00001000, + FT_BOOLEAN, 32, TFS(&tfs_on_off), 0x00001000, NULL, HFILL} }, { &hf_appearance_lifeform_state, @@ -10640,17 +10626,17 @@ void proto_register_dis(void) }, { &hf_dis_iff_change_indicator, { "Change Indicator", "dis.iff.change_indicator", - FT_UINT8, BASE_DEC, VALS(DIS_PDU_IffChangeIndicator_Strings), 0x1, + FT_UINT8, BASE_DEC, VALS(DIS_PDU_IffChangeIndicator_Strings), 0x01, NULL, HFILL } }, { &hf_dis_iff_alternate_mode_4, { "Alternate Mode 4", "dis.iff.alternate_mode_4", - FT_UINT8, BASE_DEC, VALS(DIS_PDU_IffNoYes_Strings), 0x2, + FT_BOOLEAN, 8, TFS(&tfs_yes_no), 0x02, NULL, HFILL } }, { &hf_dis_iff_alternate_mode_c, { "Alternate Mode C", "dis.iff.alternate_mode_c", - FT_UINT8, BASE_DEC, VALS(DIS_PDU_IffNoYes_Strings), 0x4, + FT_BOOLEAN, 8, TFS(&tfs_yes_no), 0x04, NULL, HFILL } }, { &hf_dis_iff_heartbeat_indicator, @@ -10675,7 +10661,7 @@ void proto_register_dis(void) }, { &hf_dis_iff_test_mode, { "Test Mode", "dis.iff.test_mode", - FT_UINT8, BASE_DEC, VALS(DIS_PDU_IffOffOn_Strings), 0x80, + FT_BOOLEAN, 8, TFS(&tfs_on_off), 0x80, NULL, HFILL } }, { &hf_dis_iff_system_designator, @@ -10695,7 +10681,7 @@ void proto_register_dis(void) }, { &hf_dis_iff_system_status_system_onoff, { "System On/Off", "dis.iff.system_status.system_onoff", - FT_UINT8, BASE_DEC, VALS(DIS_PDU_IffOffOn_Strings), 0x1, + FT_BOOLEAN, 8, TFS(&tfs_on_off), 0x01, NULL, HFILL } }, { &hf_dis_iff_system_status_parameter_1, @@ -10785,22 +10771,22 @@ void proto_register_dis(void) }, { &hf_dis_iff_modifier_emergency, { "Military Emergency", "dis.iff.modifier.emergency", - FT_UINT8, BASE_DEC, VALS(DIS_PDU_IffOffOn_Strings), 0x2, + FT_BOOLEAN, 8, TFS(&tfs_on_off), 0x02, NULL, HFILL } }, { &hf_dis_iff_modifier_ident, { "Ident/Squawk Flash", "dis.iff.modifier_ident", - FT_UINT8, BASE_DEC, VALS(DIS_PDU_IffOffOn_Strings), 0x4, + FT_BOOLEAN, 8, TFS(&tfs_on_off), 0x04, NULL, HFILL } }, { &hf_dis_iff_modifier_sti, { "STI", "dis.iff.modifier_sti", - FT_UINT8, BASE_DEC, VALS(DIS_PDU_IffOffOn_Strings), 0x8, + FT_BOOLEAN, 8, TFS(&tfs_on_off), 0x08, NULL, HFILL } }, { &hf_dis_iff_modifier_unmanned_aircraft, { "Unmanned Aircraft", "dis.iff.modifier_unmanned_aircraft", - FT_UINT8, BASE_DEC, VALS(DIS_PDU_IffOffOn_Strings), 0x10, + FT_BOOLEAN, 8, TFS(&tfs_on_off), 0x10, NULL, HFILL } }, { &hf_dis_iff_parameter_1, @@ -10865,12 +10851,12 @@ void proto_register_dis(void) }, { &hf_dis_iff_rrb_power_reduction_indicator, { "Power Reduction Indicator", "dis.iff.rrb.power_reduction_indicator", - FT_UINT16, BASE_DEC, VALS(DIS_PDU_IffOffOn_Strings), 0x0800, + FT_BOOLEAN, 16, TFS(&tfs_on_off), 0x0800, NULL, HFILL } }, { &hf_dis_iff_rrb_radar_enhancement_indicator, { "Radar Enhancement Indicator", "dis.iff.rrb.radar_enhancement_indicator", - FT_UINT16, BASE_DEC, VALS(DIS_PDU_IffOffOn_Strings), 0x1000, + FT_BOOLEAN, 16, TFS(&tfs_on_off), 0x1000, NULL, HFILL } }, { &hf_dis_iff_mode_s_interrogator_identifier, @@ -10945,7 +10931,7 @@ void proto_register_dis(void) }, { &hf_dis_iff_mode_status, { "Status", "dis.iff.mode_status", - FT_UINT16, BASE_DEC, VALS(DIS_PDU_IffOffOn_Strings), 0x2000, + FT_BOOLEAN, 16, TFS(&tfs_on_off), 0x2000, NULL, HFILL } }, { &hf_dis_iff_mode_damage, diff --git a/epan/dissectors/packet-docsis-tlv.c b/epan/dissectors/packet-docsis-tlv.c index f2487f1fba..b43c3a517f 100644 --- a/epan/dissectors/packet-docsis-tlv.c +++ b/epan/dissectors/packet-docsis-tlv.c @@ -569,12 +569,6 @@ static expert_field ei_docsis_tlv_tlvlen_bad = EI_INIT; static expert_field ei_docsis_tlv_tlvval_bad = EI_INIT; -static const value_string on_off_vals[] = { - {0, "Off"}, - {1, "On"}, - {0, NULL}, -}; - static const true_false_string ena_dis_tfs = { "Enable", "Disable" @@ -5688,12 +5682,12 @@ proto_register_docsis_tlv (void) }, {&hf_docsis_tlv_mcap_8021P_filter, {".9 802.1P Filtering Support", "docsis_tlv.mcap.dot1pfiltering", - FT_UINT8, BASE_DEC, VALS (on_off_vals), 0x80, + FT_BOOLEAN, 8, TFS(&tfs_on_off), 0x80, "802.1P Filtering Support", HFILL} }, {&hf_docsis_tlv_mcap_8021Q_filter, {".9 802.1Q Filtering Support", "docsis_tlv.mcap.dot1qfilt", - FT_UINT8, BASE_DEC, VALS (on_off_vals), 0x40, + FT_BOOLEAN, 8, TFS(&tfs_on_off), 0x40, "802.1Q Filtering Support", HFILL} }, {&hf_docsis_tlv_mcap_xmit_eq_taps_per_sym, @@ -5728,25 +5722,25 @@ proto_register_docsis_tlv (void) }, {&hf_docsis_tlv_mcap_rnghoff_cm, {".16 Ranging Hold-Off (CM)","docsis_tlv.mcap.rnghoffcm", - FT_UINT32, BASE_DEC, VALS (on_off_vals), 0x1, + FT_BOOLEAN, 32, TFS(&tfs_on_off), 0x00000001, "Ranging Hold-Off (CM)", HFILL} }, {&hf_docsis_tlv_mcap_rnghoff_erouter, {".16 Ranging Hold-Off (ePS or eRouter)", "docsis_tlv.mcap.rnghofferouter", - FT_UINT32, BASE_DEC, VALS (on_off_vals), 0x2, + FT_BOOLEAN, 32, TFS(&tfs_on_off), 0x00000002, "Ranging Hold-Off (ePS or eRouter)", HFILL} }, {&hf_docsis_tlv_mcap_rnghoff_emta, {".16 Ranging Hold-Off (eMTA or EDVA)", "docsis_tlv.mcap.rnghoffemta", - FT_UINT32, BASE_DEC, VALS (on_off_vals), 0x4, + FT_BOOLEAN, 32, TFS(&tfs_on_off), 0x00000004, "Ranging Hold-Off (eMTA or EDVA)", HFILL} }, {&hf_docsis_tlv_mcap_rnghoff_estb, {".16 Ranging Hold-Off (DSG/eSTB)", "docsis_tlv.mcap.rnghoffestb", - FT_UINT32, BASE_DEC, VALS (on_off_vals), 0x8, + FT_BOOLEAN, 32, TFS(&tfs_on_off), 0x00000008, "Ranging Hold-Off (DSG/eSTB)", HFILL} }, {&hf_docsis_tlv_mcap_l2vpn, @@ -5774,37 +5768,37 @@ proto_register_docsis_tlv (void) {&hf_docsis_tlv_mcap_us_srate_160, {".21 Upstream Symbol Rate 160ksps supported", "docsis_tlv.mcap.srate160", - FT_UINT8, BASE_DEC, VALS (on_off_vals), 0x1, + FT_BOOLEAN, 8, TFS(&tfs_on_off), 0x01, "Upstream Symbol Rate 160ksps supported", HFILL} }, {&hf_docsis_tlv_mcap_us_srate_320, {".21 Upstream Symbol Rate 320ksps supported", "docsis_tlv.mcap.srate320", - FT_UINT8, BASE_DEC, VALS (on_off_vals), 0x2, + FT_BOOLEAN, 8, TFS(&tfs_on_off), 0x02, "Upstream Symbol Rate 320ksps supported", HFILL} }, {&hf_docsis_tlv_mcap_us_srate_640, {".21 Upstream Symbol Rate 640ksps supported", "docsis_tlv.mcap.srate640", - FT_UINT8, BASE_DEC, VALS (on_off_vals), 0x4, + FT_BOOLEAN, 8, TFS(&tfs_on_off), 0x04, "Upstream Symbol Rate 640ksps supported", HFILL} }, {&hf_docsis_tlv_mcap_us_srate_1280, {".21 Upstream Symbol Rate 1280ksps supported", "docsis_tlv.mcap.srate1280", - FT_UINT8, BASE_DEC, VALS (on_off_vals), 0x8, + FT_BOOLEAN, 8, TFS(&tfs_on_off), 0x08, "Upstream Symbol Rate 1280ksps supported", HFILL} }, {&hf_docsis_tlv_mcap_us_srate_2560, {".21 Upstream Symbol Rate 2560ksps supported", "docsis_tlv.mcap.srate2560", - FT_UINT8, BASE_DEC, VALS (on_off_vals), 0x10, + FT_BOOLEAN, 8, TFS(&tfs_on_off), 0x10, "Upstream Symbol Rate 2560ksps supported", HFILL} }, {&hf_docsis_tlv_mcap_us_srate_5120, {".21 Upstream Symbol Rate 5120ksps supported", "docsis_tlv.mcap.srate5120", - FT_UINT8, BASE_DEC, VALS (on_off_vals), 0x20, + FT_BOOLEAN, 8, TFS(&tfs_on_off), 0x20, "Upstream Symbol Rate 5120ksps supported", HFILL} }, {&hf_docsis_tlv_mcap_sac, diff --git a/epan/dissectors/packet-lapsat.c b/epan/dissectors/packet-lapsat.c index df6c1babb0..8e309f4069 100644 --- a/epan/dissectors/packet-lapsat.c +++ b/epan/dissectors/packet-lapsat.c @@ -203,12 +203,6 @@ static const value_string lapsat_ctl_u_modifier_vals_resp[] = { * Fragment stuff */ -static const value_string true_false_vals[] = { - { 0, "False" }, - { 1, "True" }, - { 0, NULL }, -}; - static const fragment_items lapsat_frag_items = { /* Fragment subtrees */ @@ -634,17 +628,17 @@ proto_register_lapsat(void) }, { &hf_lapsat_ctl_p, { "Poll", "lapsat.control.p", - FT_UINT16, BASE_DEC, VALS(true_false_vals), LAPSAT_CTL_P_F << 4, + FT_BOOLEAN, 16, TFS(&tfs_true_false), LAPSAT_CTL_P_F << 4, NULL, HFILL } }, { &hf_lapsat_ctl_f, { "Final", "lapsat.control.f", - FT_UINT16, BASE_DEC, VALS(true_false_vals), LAPSAT_CTL_P_F << 4, + FT_BOOLEAN, 16, TFS(&tfs_true_false), LAPSAT_CTL_P_F << 4, NULL, HFILL } }, { &hf_lapsat_ctl_mii, { "MII", "lapsat.control.mii", - FT_UINT16, BASE_DEC, VALS(true_false_vals), LAPSAT_CTL_MII << 4, + FT_BOOLEAN, 16, TFS(&tfs_true_false), LAPSAT_CTL_MII << 4, "Mobile Identity Indicator", HFILL } }, |