summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--epan/dissectors/packet-ehdlc.c4
-rw-r--r--epan/dissectors/packet-gsm_a_bssmap.c44
-rw-r--r--epan/dissectors/packet-gsm_a_dtap.c112
-rw-r--r--epan/dissectors/packet-gsm_a_gm.c230
-rw-r--r--epan/dissectors/packet-gsm_a_rr.c698
-rw-r--r--epan/dissectors/packet-gsm_abis_om2000.c144
-rw-r--r--epan/dissectors/packet-gsm_abis_oml.c132
-rw-r--r--epan/dissectors/packet-gsm_bssmap_le.c6
-rw-r--r--epan/dissectors/packet-gsm_cbch.c8
-rw-r--r--epan/dissectors/packet-gsm_ipa.c14
-rw-r--r--epan/dissectors/packet-gsm_rlcmac.c2080
-rw-r--r--epan/dissectors/packet-gsm_sim.c228
-rw-r--r--epan/dissectors/packet-gsm_sms.c10
-rw-r--r--epan/dissectors/packet-gsm_sms_ud.c44
-rw-r--r--epan/dissectors/packet-rsl.c178
-rw-r--r--epan/dissectors/packet-smpp.c4
-rw-r--r--epan/dissectors/packet-wsp.c8
-rw-r--r--epan/dissectors/packet-wtp.c4
18 files changed, 1974 insertions, 1974 deletions
diff --git a/epan/dissectors/packet-ehdlc.c b/epan/dissectors/packet-ehdlc.c
index c8109ebac7..6046b52387 100644
--- a/epan/dissectors/packet-ehdlc.c
+++ b/epan/dissectors/packet-ehdlc.c
@@ -319,7 +319,7 @@ proto_register_ehdlc(void)
void
proto_reg_handoff_ehdlc(void)
{
- sub_handles[SUB_RSL] = find_dissector("gsm_abis_rsl");
- sub_handles[SUB_OML] = find_dissector("gsm_abis_oml");
+ sub_handles[SUB_RSL] = find_dissector("gsm_a_rsl");
+ sub_handles[SUB_OML] = find_dissector("gsm_a_oml");
sub_handles[SUB_DATA] = find_dissector("data");
}
diff --git a/epan/dissectors/packet-gsm_a_bssmap.c b/epan/dissectors/packet-gsm_a_bssmap.c
index 0fa914612a..6c964e832e 100644
--- a/epan/dissectors/packet-gsm_a_bssmap.c
+++ b/epan/dissectors/packet-gsm_a_bssmap.c
@@ -6958,7 +6958,7 @@ proto_register_gsm_a_bssmap(void)
static hf_register_info hf[] =
{
{ &hf_gsm_a_bssmap_msg_type,
- { "BSSMAP Message Type", "gsm_a.bssmap_msgtype",
+ { "BSSMAP Message Type", "gsm_a_bssmap.msgtype",
FT_UINT8, BASE_HEX|BASE_EXT_STRING, &gsm_a_bssmap_msg_strings_ext, 0x0,
NULL, HFILL }
},
@@ -7103,7 +7103,7 @@ proto_register_gsm_a_bssmap(void)
NULL, HFILL }
},
{ &hf_gsm_a_bssmap_cur_ch_mode,
- { "Channel Mode", "fe_cur_chan_type2.chan_mode",
+ { "Channel Mode", "gsm_a_bssmap.fe_cur_chan_type2.chan_mode",
FT_UINT8, BASE_HEX, VALS(chan_mode_vals), 0xf0,
NULL, HFILL }
},
@@ -7520,102 +7520,102 @@ proto_register_gsm_a_bssmap(void)
},
{ &hf_fe_extra_info_prec,
- { "Pre-emption Recommendation", "fe_extra_info.prec",
+ { "Pre-emption Recommendation", "gsm_a_bssmap.fe_extra_info.prec",
FT_UINT8, BASE_DEC, VALS(fe_extra_info_prec_vals), 0x01,
NULL, HFILL }
},
{ &hf_fe_extra_info_lcs,
- { "LCS Information", "fe_extra_info.lcs",
+ { "LCS Information", "gsm_a_bssmap.fe_extra_info.lcs",
FT_UINT8, BASE_DEC, VALS(fe_extra_info_lcs_vals), 0x02,
NULL, HFILL }
},
{ &hf_fe_extra_info_ue_prob,
- { "UE support of UMTS", "fe_extra_info.ue_prob",
+ { "UE support of UMTS", "gsm_a_bssmap.fe_extra_info.ue_prob",
FT_UINT8, BASE_DEC, VALS(fe_extra_info_ue_prob_vals), 0x04,
NULL, HFILL }
},
{ &hf_fe_extra_info_spare,
- { "Extra Information Spare bits", "fe_extra_info.spare",
+ { "Extra Information Spare bits", "gsm_a_bssmap.fe_extra_info.spare",
FT_UINT8, BASE_HEX, NULL, 0xf8,
NULL, HFILL }
},
{ &hf_fe_cur_chan_type2_chan_mode,
- { "Channel Mode", "fe_cur_chan_type2.chan_mode",
+ { "Channel Mode", "gsm_a_bssmap.fe_cur_chan_type2.chan_mode",
FT_UINT8, BASE_HEX, VALS(chan_mode_vals), 0x0f,
NULL, HFILL }
},
{ &hf_fe_cur_chan_type2_chan_mode_spare,
- { "Channel Mode Spare bits", "fe_cur_chan_type2_chan_mode.spare",
+ { "Channel Mode Spare bits", "gsm_a_bssmap.fe_cur_chan_type2_chan_mode.spare",
FT_UINT8, BASE_HEX, NULL, 0xf0,
NULL, HFILL }
},
{ &hf_fe_cur_chan_type2_chan_field,
- { "Channel Field", "fe_cur_chan_type2.chan_field",
+ { "Channel Field", "gsm_a_bssmap.fe_cur_chan_type2.chan_field",
FT_UINT8, BASE_HEX, VALS(fe_cur_chan_type2_chan_field_vals),0x0f,
NULL, HFILL }
},
{ &hf_fe_cur_chan_type2_chan_field_spare,
- { "Channel field Spare bits", "fe_cur_chan_type2_chan_field.spare",
+ { "Channel field Spare bits", "gsm_a_bssmap.fe_cur_chan_type2_chan_field.spare",
FT_UINT8, BASE_HEX, NULL, 0xf0,
NULL, HFILL }
},
{ &hf_fe_target_radio_cell_info_rxlev_ncell,
- { "RXLEV-NCELL", "fe_target_radio_cell_info.rxlev_ncell",
+ { "RXLEV-NCELL", "gsm_a_bssmap.fe_target_radio_cell_info.rxlev_ncell",
FT_UINT8, BASE_HEX|BASE_EXT_STRING, &gsm_a_rr_rxlev_vals_ext, 0x3f,
NULL, HFILL }
},
{ &hf_fe_target_radio_cell_info_rxlev_ncell_spare,
- { "RXLEV-NCELL Spare bits", "fe_target_radio_cell_info.rxlev_ncell_spare",
+ { "RXLEV-NCELL Spare bits", "gsm_a_bssmap.fe_target_radio_cell_info.rxlev_ncell_spare",
FT_UINT8, BASE_HEX, NULL, 0xc0,
NULL, HFILL }
},
{ &hf_fe_dtm_info_dtm_ind,
- { "DTM indicator", "fe_dtm_info.dtm_ind",
+ { "DTM indicator", "gsm_a_bssmap.fe_dtm_info.dtm_ind",
FT_UINT8, BASE_HEX, VALS(gsm_a_bssmap_dtm_info_dtm_ind_vals), 0x01,
NULL, HFILL }
},
{ &hf_fe_dtm_info_sto_ind,
- { "Time Slot Operation indicator", "fe_dtm_info.sto_ind",
+ { "Time Slot Operation indicator", "gsm_a_bssmap.fe_dtm_info.sto_ind",
FT_UINT8, BASE_HEX, VALS(gsm_a_bssmap_dtm_info_sto_ind_vals), 0x02,
NULL, HFILL }
},
{ &hf_fe_dtm_info_egprs_ind,
- { "EGPRS indicator", "fe_dtm_info.egprs_ind",
+ { "EGPRS indicator", "gsm_a_bssmap.fe_dtm_info.egprs_ind",
FT_UINT8, BASE_HEX, VALS(gsm_a_bssmap_dtm_info_egprs_ind_vals), 0x04,
NULL, HFILL }
},
{ &hf_fe_dtm_info_spare_bits,
- { "DTM Info Spare bits", "fe_dtm_info.spare_bits",
+ { "DTM Info Spare bits", "gsm_a_bssmap.fe_dtm_info.spare_bits",
FT_UINT8, BASE_HEX, NULL, 0xf8,
NULL, HFILL }
},
{ &hf_fe_cell_load_info_cell_capacity_class,
- { "Cell capacity class", "fe_cell_load_info.cell_capacity_class",
+ { "Cell capacity class", "gsm_a_bssmap.fe_cell_load_info.cell_capacity_class",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }
},
{ &hf_fe_cell_load_info_load_value,
- { "Load value", "fe_cell_load_info.load_info",
+ { "Load value", "gsm_a_bssmap.fe_cell_load_info.load_info",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }
},
{ &hf_fe_cell_load_info_rt_load_value,
- { "Realtime load value", "fe_cell_load_info.rt_load_value",
+ { "Realtime load value", "gsm_a_bssmap.fe_cell_load_info.rt_load_value",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }
},
{ &hf_fe_cell_load_info_nrt_load_information_value,
- { "Non-Realtime load information value", "fe_cell_load_info.nrt_load_info_value",
+ { "Non-Realtime load information value", "gsm_a_bssmap.fe_cell_load_info.nrt_load_info_value",
FT_UINT8, BASE_HEX, VALS(gsm_a_bssmap_cell_load_nrt_vals), 0,
NULL, HFILL }
},
{ &hf_fe_ps_indication,
- { "PS Indication", "fe_ps_indication.value",
+ { "PS Indication", "gsm_a_bssmap.fe_ps_indication.value",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }
},
{ &hf_fe_dtm_ho_command_ind_spare,
- { "Spare octet", "fe_dtm_ho_command_ind.spare",
+ { "Spare octet", "gsm_a_bssmap.fe_dtm_ho_command_ind.spare",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }
},
diff --git a/epan/dissectors/packet-gsm_a_dtap.c b/epan/dissectors/packet-gsm_a_dtap.c
index 0adea7cbf5..1a5430d5e4 100644
--- a/epan/dissectors/packet-gsm_a_dtap.c
+++ b/epan/dissectors/packet-gsm_a_dtap.c
@@ -6548,32 +6548,32 @@ proto_register_gsm_a_dtap(void)
static hf_register_info hf[] =
{
{ &hf_gsm_a_seq_no,
- { "Sequence number", "gsm_a.dtap_seq_no",
+ { "Sequence number", "gsm_a_dtap.seq_no",
FT_UINT8, BASE_DEC, NULL, 0xc0,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_msg_mm_type,
- { "DTAP Mobility Management Message Type", "gsm_a.dtap_msg_mm_type",
+ { "DTAP Mobility Management Message Type", "gsm_a_dtap.msg_mm_type",
FT_UINT8, BASE_HEX, VALS(gsm_a_dtap_msg_mm_strings), 0x3f,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_msg_cc_type,
- { "DTAP Call Control Message Type", "gsm_a.dtap_msg_cc_type",
+ { "DTAP Call Control Message Type", "gsm_a_dtap.msg_cc_type",
FT_UINT8, BASE_HEX, VALS(gsm_a_dtap_msg_cc_strings), 0x3f,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_msg_sms_type,
- { "DTAP Short Message Service Message Type", "gsm_a.dtap_msg_sms_type",
+ { "DTAP Short Message Service Message Type", "gsm_a_dtap.msg_sms_type",
FT_UINT8, BASE_HEX, VALS(gsm_a_dtap_msg_sms_strings), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_msg_ss_type,
- { "DTAP Non call Supplementary Service Message Type", "gsm_a.dtap_msg_ss_type",
+ { "DTAP Non call Supplementary Service Message Type", "gsm_a_dtap.msg_ss_type",
FT_UINT8, BASE_HEX, VALS(gsm_a_dtap_msg_ss_strings), 0x3f,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_msg_tp_type,
- { "DTAP Tests Procedures Message Type", "gsm_a.dtap_msg_tp_type",
+ { "DTAP Tests Procedures Message Type", "gsm_a_dtap.msg_tp_type",
FT_UINT8, BASE_HEX, VALS(gsm_a_dtap_msg_tp_strings), 0x0,
NULL, HFILL }
},
@@ -6668,87 +6668,87 @@ proto_register_gsm_a_dtap(void)
NULL, HFILL }
},
{ &hf_gsm_a_dtap_serv_cat_b7,
- { "Automatically initiated eCall", "gsm_a.dtap.serv_cat_b7",
+ { "Automatically initiated eCall", "gsm_a_dtap.serv_cat_b7",
FT_BOOLEAN, 8, NULL, 0x40,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_serv_cat_b6,
- { "Manually initiated eCall", "gsm_a.dtap.serv_cat_b6",
+ { "Manually initiated eCall", "gsm_a_dtap.serv_cat_b6",
FT_BOOLEAN, 8, NULL, 0x20,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_serv_cat_b5,
- { "Mountain Rescue", "gsm_a.dtap.serv_cat_b5",
+ { "Mountain Rescue", "gsm_a_dtap.serv_cat_b5",
FT_BOOLEAN, 8, NULL, 0x10,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_serv_cat_b4,
- { "Marine Guard", "gsm_a.dtap.serv_cat_b4",
+ { "Marine Guard", "gsm_a_dtap.serv_cat_b4",
FT_BOOLEAN, 8, NULL, 0x08,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_serv_cat_b3,
- { "Fire Brigade", "gsm_a.dtap.serv_cat_b3",
+ { "Fire Brigade", "gsm_a_dtap.serv_cat_b3",
FT_BOOLEAN, 8, NULL, 0x04,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_serv_cat_b2,
- { "Ambulance", "gsm_a.dtap.serv_cat_b2",
+ { "Ambulance", "gsm_a_dtap.serv_cat_b2",
FT_BOOLEAN, 8, NULL, 0x02,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_serv_cat_b1,
- { "Police", "gsm_a.dtap.serv_cat_b1",
+ { "Police", "gsm_a_dtap.serv_cat_b1",
FT_BOOLEAN, 8, NULL, 0x01,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_csmo,
- { "CSMO", "gsm_a.dtap.csmo",
+ { "CSMO", "gsm_a_dtap.csmo",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_dtap_csmo_value), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_csmt,
- { "CSMT", "gsm_a.dtap.csmt",
+ { "CSMT", "gsm_a_dtap.csmt",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_dtap_csmt_value), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_mm_timer_unit,
- { "Unit", "gsm_a.dtap.mm_timer_unit",
+ { "Unit", "gsm_a_dtap.mm_timer_unit",
FT_UINT8, BASE_DEC, VALS(gsm_a_dtap_mm_timer_unit_vals), 0xe0,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_mm_timer_value,
- { "Timer value", "gsm_a.dtap.mm_timer_value",
+ { "Timer value", "gsm_a_dtap.mm_timer_value",
FT_UINT8, BASE_DEC, NULL, 0x1f,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_alerting_pattern,
- { "Alerting Pattern", "gsm_a.dtap.alerting_pattern",
+ { "Alerting Pattern", "gsm_a_dtap.alerting_pattern",
FT_UINT8, BASE_DEC, VALS(gsm_a_alerting_pattern_vals), 0x0f,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_ccbs_activation,
- { "CCBS Activation", "gsm_a.dtap.ccbs_activation",
+ { "CCBS Activation", "gsm_a_dtap.ccbs_activation",
FT_BOOLEAN, 8, TFS(&gsm_a_ccbs_activation_value), 0x80,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_stream_identifier,
- { "Stream Identifier", "gsm_a.dtap.stream_identifier",
+ { "Stream Identifier", "gsm_a_dtap.stream_identifier",
FT_UINT8, BASE_HEX, 0, 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_mcs,
- { "MCS", "gsm_a.dtap.mcs",
+ { "MCS", "gsm_a_dtap.mcs",
FT_BOOLEAN, 8, TFS(&gsm_a_mcs_value), 0x01,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_cause_of_no_cli,
- { "Cause of no CLI", "gsm_a.dtap.cause_of_no_cli",
+ { "Cause of no CLI", "gsm_a_dtap.cause_of_no_cli",
FT_UINT8, BASE_HEX, 0, 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_cause_ss_diagnostics,
- { "Supplementary Services Diagnostics", "gsm_a.dtap.cause_ss_diagnostics",
+ { "Supplementary Services Diagnostics", "gsm_a_dtap.cause_ss_diagnostics",
FT_UINT8, BASE_HEX, VALS(gsm_a_dtap_cause_ss_diagnostics_vals), 0x7f,
NULL, HFILL }
},
@@ -6828,167 +6828,167 @@ proto_register_gsm_a_dtap(void)
NULL, HFILL }
},
{ &hf_gsm_a_dtap_emerg_num_info_length,
- { "Emergency Number Info length", "gsm_a.dtap.emerg_num_info_length",
+ { "Emergency Number Info length", "gsm_a_dtap.emerg_num_info_length",
FT_UINT8, BASE_DEC, 0, 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_emergency_bcd_num,
- { "Emergency BCD Number", "gsm_a.dtap.emergency_bcd_num",
+ { "Emergency BCD Number", "gsm_a_dtap.emergency_bcd_num",
FT_STRING, BASE_NONE, 0, 0,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_signal_value,
- { "Signal value", "gsm_a.dtap.signal_value",
+ { "Signal value", "gsm_a_dtap.signal_value",
FT_UINT8, BASE_HEX, VALS(gsm_a_dtap_signal_value_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_recall_type,
- { "Recall type", "gsm_a.dtap.recall_type",
+ { "Recall type", "gsm_a_dtap.recall_type",
FT_UINT8, BASE_HEX|BASE_RANGE_STRING, RVALS(gsm_a_dtap_recall_type_vals), 0x07,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_coding_standard,
- { "Coding standard", "gsm_a.dtap.coding_standard",
+ { "Coding standard", "gsm_a_dtap.coding_standard",
FT_UINT8, BASE_HEX, VALS(gsm_a_dtap_coding_standard_vals), 0xc0,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_call_state,
- { "Call state", "gsm_a.dtap.call_state",
+ { "Call state", "gsm_a_dtap.call_state",
FT_UINT8, BASE_DEC, NULL, 0x3f,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_prog_coding_standard,
- { "Coding standard", "gsm_a.dtap.coding_standard",
+ { "Coding standard", "gsm_a_dtap.coding_standard",
FT_UINT8, BASE_HEX, VALS(gsm_a_dtap_coding_standard_vals), 0x60,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_location,
- { "Location", "gsm_a.dtap.location",
+ { "Location", "gsm_a_dtap.location",
FT_UINT8, BASE_HEX, VALS(gsm_a_dtap_location_vals), 0x0f,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_progress_description,
- { "Progress description", "gsm_a.dtap.progress_description",
+ { "Progress description", "gsm_a_dtap.progress_description",
FT_UINT8, BASE_DEC, NULL, 0x7f,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_afi,
- { "Authority and Format Identifier", "gsm_a.dtap.afi",
+ { "Authority and Format Identifier", "gsm_a_dtap.afi",
FT_UINT8, BASE_HEX|BASE_EXT_STRING, &x213_afi_value_ext, 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_rej_cause,
- { "Reject cause", "gsm_a.dtap.rej_cause",
+ { "Reject cause", "gsm_a_dtap.rej_cause",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_u2u_prot_discr,
- { "User-user protocol discriminator", "gsm_a.dtap.u2u_prot_discr",
+ { "User-user protocol discriminator", "gsm_a_dtap.u2u_prot_discr",
FT_UINT8, BASE_HEX|BASE_RANGE_STRING, RVALS(gsm_a_dtap_u2u_prot_discr_vals), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_mcat,
- { "MCAT", "gsm_a.dtap.mcat",
+ { "MCAT", "gsm_a_dtap.mcat",
FT_BOOLEAN, 8, TFS(&gsm_a_dtap_mcat_value), 0x08,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_enicm,
- { "ENICM", "gsm_a.dtap.mcat",
+ { "ENICM", "gsm_a_dtap.mcat",
FT_BOOLEAN, 8, TFS(&gsm_a_dtap_enicm_value), 0x04,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_rand,
- { "RAND value", "gsm_a.dtap.rand",
+ { "RAND value", "gsm_a_dtap.rand",
FT_BYTES, FT_NONE, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_autn,
- { "AUTN value", "gsm_a.dtap.autn",
+ { "AUTN value", "gsm_a_dtap.autn",
FT_BYTES, FT_NONE, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_sres,
- { "SRES value", "gsm_a.dtap.sres",
+ { "SRES value", "gsm_a_dtap.sres",
FT_BYTES, FT_NONE, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_xres,
- { "XRES value", "gsm_a.dtap.xres",
+ { "XRES value", "gsm_a_dtap.xres",
FT_BYTES, FT_NONE, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_auts,
- { "AUTS value", "gsm_a.dtap.auts",
+ { "AUTS value", "gsm_a_dtap.auts",
FT_BYTES, FT_NONE, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_autn_sqn_xor_ak,
- { "SQN xor AK", "gsm_a.dtap.autn.sqn_xor_ak",
+ { "SQN xor AK", "gsm_a_dtap.autn.sqn_xor_ak",
FT_BYTES, FT_NONE, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_autn_amf,
- { "AMF", "gsm_a.dtap.autn.amf",
+ { "AMF", "gsm_a_dtap.autn.amf",
FT_BYTES, FT_NONE, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_autn_mac,
- { "MAC", "gsm_a.dtap.autn.mac",
+ { "MAC", "gsm_a_dtap.autn.mac",
FT_BYTES, FT_NONE, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_auts_sqn_ms_xor_ak,
- { "SQN_MS xor AK", "gsm_a.dtap.auts.sqn_ms_xor_ak",
+ { "SQN_MS xor AK", "gsm_a_dtap.auts.sqn_ms_xor_ak",
FT_BYTES, FT_NONE, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_auts_mac_s,
- { "MAC-S", "gsm_a.dtap.auts.mac_s",
+ { "MAC-S", "gsm_a_dtap.auts.mac_s",
FT_BYTES, FT_NONE, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_epc_ue_tl_mode,
- { "UE test loop mode","gsm_a.dtap.epc.ue_tl_mode",
+ { "UE test loop mode","gsm_a_dtap.epc.ue_tl_mode",
FT_UINT8,BASE_DEC, VALS(epc_ue_test_loop_mode_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_epc_ue_tl_a_ul_sdu_size,
- { "Uplink PDCP SDU size in bits","gsm_a.dtap.epc.ue_tl_a_ul_sdu_size",
+ { "Uplink PDCP SDU size in bits","gsm_a_dtap.epc.ue_tl_a_ul_sdu_size",
FT_UINT16,BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_epc_ue_tl_a_drb,
- { "Data Radio Bearer identity number","gsm_a.dtap.epc.ue_tl_a_drb",
+ { "Data Radio Bearer identity number","gsm_a_dtap.epc.ue_tl_a_drb",
FT_UINT8,BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_epc_ue_tl_b_ip_pdu_delay,
- { "IP PDU delay in seconds","gsm_a.dtap.epc.ue_tl_b_ip_pdu_delay",
+ { "IP PDU delay in seconds","gsm_a_dtap.epc.ue_tl_b_ip_pdu_delay",
FT_UINT8,BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_epc_ue_tl_c_mbsfn_area_id,
- { "MBSFN area identity","gsm_a.dtap.epc.ue_tl_c_mbsfn_area_id",
+ { "MBSFN area identity","gsm_a_dtap.epc.ue_tl_c_mbsfn_area_id",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_epc_ue_tl_c_mch_id,
- { "MCH identity","gsm_a.dtap.epc.ue_tl_c_mch_id",
+ { "MCH identity","gsm_a_dtap.epc.ue_tl_c_mch_id",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_epc_ue_tl_c_lcid,
- { "Logical channel identity","gsm_a.dtap.epc.ue_tl_c_lcid",
+ { "Logical channel identity","gsm_a_dtap.epc.ue_tl_c_lcid",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_epc_ue_positioning_technology,
- { "UE positioning technology","gsm_a.dtap.epc.ue_positioning_technology",
+ { "UE positioning technology","gsm_a_dtap.epc.ue_positioning_technology",
FT_UINT8, BASE_DEC, VALS(epc_ue_positioning_technology_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_epc_mbms_packet_counter_value,
- { "MBMS packet counter value","gsm_a.dtap.epc.mbms_packet_counter_value",
+ { "MBMS packet counter value","gsm_a_dtap.epc.mbms_packet_counter_value",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
diff --git a/epan/dissectors/packet-gsm_a_gm.c b/epan/dissectors/packet-gsm_a_gm.c
index d3f002740f..d5afe2e329 100644
--- a/epan/dissectors/packet-gsm_a_gm.c
+++ b/epan/dissectors/packet-gsm_a_gm.c
@@ -6903,12 +6903,12 @@ proto_register_gsm_a_gm(void)
static hf_register_info hf[] = {
{ &hf_gsm_a_dtap_msg_gmm_type,
- { "DTAP GPRS Mobility Management Message Type", "gsm_a.dtap_msg_gmm_type",
+ { "DTAP GPRS Mobility Management Message Type", "gsm_a_dtap.msg_gmm_type",
FT_UINT8, BASE_HEX, VALS(gsm_a_dtap_msg_gmm_strings), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_dtap_msg_sm_type,
- { "DTAP GPRS Session Management Message Type", "gsm_a.dtap_msg_sm_type",
+ { "DTAP GPRS Session Management Message Type", "gsm_a_dtap.msg_sm_type",
FT_UINT8, BASE_HEX, VALS(gsm_a_dtap_msg_sm_strings), 0x0,
NULL, HFILL }
},
@@ -7073,282 +7073,282 @@ proto_register_gsm_a_gm(void)
NULL, HFILL }
},
{ &hf_gsm_a_gm_acc_tech_type,
- { "Access Technology Type", "gsm_a.gm.acc_tech_type",
+ { "Access Technology Type", "gsm_a_gm.acc_tech_type",
FT_UINT8, BASE_DEC, VALS(gsm_a_gm_acc_tech_type_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_acc_cap_struct_len,
- { "Length in bits", "gsm_a.gm.acc_cap_struct_len",
+ { "Length in bits", "gsm_a_gm.acc_cap_struct_len",
FT_UINT8, BASE_HEX_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_sms_value,
- { "SMS_VALUE (Switch-Measure-Switch)", "gsm_a.gm.sms",
+ { "SMS_VALUE (Switch-Measure-Switch)", "gsm_a_gm.sms",
FT_UINT8, BASE_DEC, VALS(gsm_a_sms_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_sm_value,
- { "(SM_VALUE) Switch-Measure", "gsm_a.gm.sm",
+ { "(SM_VALUE) Switch-Measure", "gsm_a_gm.sm",
FT_UINT8, BASE_DEC, VALS(gsm_a_sms_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_sm_ext,
- { "Ext", "gsm_a.gm.sm.ext",
+ { "Ext", "gsm_a_gm.sm.ext",
FT_UINT8, BASE_HEX, NULL, 0x80,
NULL, HFILL }
},
{ &hf_gsm_a_gm_link_dir,
- { "Link direction", "gsm_a.gm.link_dir",
+ { "Link direction", "gsm_a_gm.link_dir",
FT_INT32, BASE_DEC, VALS(gsm_a_gm_link_dir_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_cause,
- { "gmm Cause", "gsm_a.gm.cause",
+ { "gmm Cause", "gsm_a_gm.cause",
FT_UINT8, BASE_DEC|BASE_RANGE_STRING, RVALS(gmm_cause_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_fop,
- { "Follow-on proceed", "gsm_a.gm.fop",
+ { "Follow-on proceed", "gsm_a_gm.fop",
FT_BOOLEAN, 8, NULL, 0x08,
NULL, HFILL }
},
{ &hf_gsm_a_gm_res_of_attach,
- { "Result of attach", "gsm_a.gm.res_of_attach",
+ { "Result of attach", "gsm_a_gm.res_of_attach",
FT_UINT8, BASE_DEC, VALS(gsm_a_gm_res_of_attach_vals), 0x07,
NULL, HFILL }
},
{ &hf_gsm_a_gm_type_of_ciph_alg,
- { "Type of ciphering algorithm", "gsm_a.gm.type_of_ciph_alg",
+ { "Type of ciphering algorithm", "gsm_a_gm.type_of_ciph_alg",
FT_UINT8, BASE_DEC, VALS(gsm_a_gm_type_of_ciph_alg_vals), 0x07,
NULL, HFILL }
},
{ &hf_gsm_a_gm_imeisv_req,
- { "IMEISV request", "gsm_a.gm.imeisv_req",
+ { "IMEISV request", "gsm_a_gm.imeisv_req",
FT_UINT8, BASE_DEC|BASE_RANGE_STRING, RVALS(gsm_a_gm_imeisv_req_vals), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_gm_ac_ref_nr,
- { "A&C reference number", "gsm_a.gm.ac_ref_nr",
+ { "A&C reference number", "gsm_a_gm.ac_ref_nr",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_force_to_standby,
- { "Force to standby", "gsm_a.gm.force_to_standby",
+ { "Force to standby", "gsm_a_gm.force_to_standby",
FT_UINT8, BASE_DEC|BASE_RANGE_STRING, RVALS(gsm_a_gm_force_to_standby_vals), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_gm_ciph_key_seq_num,
- { "Ciphering key sequence number", "gsm_a.gm.ciph_key_seq_num",
+ { "Ciphering key sequence number", "gsm_a_gm.ciph_key_seq_num",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_gm_serv_type,
- { "Service type", "gsm_a.gm.serv_type",
+ { "Service type", "gsm_a_gm.serv_type",
FT_UINT8, BASE_DEC, VALS(gsm_a_gm_serv_type_vals), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_gm_for,
- { "Follow-on request pending", "gsm_a.gm.for",
+ { "Follow-on request pending", "gsm_a_gm.for",
FT_BOOLEAN, 8, NULL, 0x08,
NULL, HFILL }
},
{ &hf_gsm_a_gm_type_of_attach,
- { "Type of attach", "gsm_a.gm.type_of_attach",
+ { "Type of attach", "gsm_a_gm.type_of_attach",
FT_UINT8, BASE_DEC, VALS(gsm_a_gm_type_of_attach_vals), 0x07,
NULL, HFILL }
},
{ &hf_gsm_a_gm_tmsi_flag,
- { "TMSI flag", "gsm_a.gm.tmsi_flag",
+ { "TMSI flag", "gsm_a_gm.tmsi_flag",
FT_BOOLEAN, 8, TFS(&gsm_a_gm_tmsi_flag_value), 0x01,
NULL, HFILL }
},
{ &hf_gsm_a_gm_update_type,
- { "Update type", "gsm_a.gm.update_type",
+ { "Update type", "gsm_a_gm.update_type",
FT_UINT8, BASE_DEC, VALS(gsm_a_gm_update_type_vals), 0x07,
NULL, HFILL }
},
{ &hf_gsm_a_gm_gprs_timer_unit,
- { "Unit", "gsm_a.gm.gprs_timer_unit",
+ { "Unit", "gsm_a_gm.gprs_timer_unit",
FT_UINT8, BASE_DEC, VALS(gsm_a_gm_gprs_timer_unit_vals), 0xe0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_gprs_timer_value,
- { "Timer value", "gsm_a.gm.gprs_timer_value",
+ { "Timer value", "gsm_a_gm.gprs_timer_value",
FT_UINT8, BASE_DEC, NULL, 0x1f,
NULL, HFILL }
},
{ &hf_gsm_a_gm_gprs_timer2_unit,
- { "Unit", "gsm_a.gm.gprs_timer2_unit",
+ { "Unit", "gsm_a_gm.gprs_timer2_unit",
FT_UINT8, BASE_DEC, VALS(gsm_a_gm_gprs_timer_unit_vals), 0xe0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_gprs_timer2_value,
- { "Timer value", "gsm_a.gm.gprs_timer2_value",
+ { "Timer value", "gsm_a_gm.gprs_timer2_value",
FT_UINT8, BASE_DEC, NULL, 0x1f,
NULL, HFILL }
},
{ &hf_gsm_a_gm_gprs_timer3_unit,
- { "Unit", "gsm_a.gm.gprs_timer3_unit",
+ { "Unit", "gsm_a_gm.gprs_timer3_unit",
FT_UINT8, BASE_DEC, VALS(gsm_a_gm_gprs_timer3_unit_vals), 0xe0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_gprs_timer3_value,
- { "Timer value", "gsm_a.gm.gprs_timer3_value",
+ { "Timer value", "gsm_a_gm.gprs_timer3_value",
FT_UINT8, BASE_DEC, NULL, 0x1f,
NULL, HFILL }
},
{ &hf_gsm_a_gm_nsapi_5_ul_stat,
- { "NSAPI(5) uplink status", "gsm_a.gm.nsapi_5_ul_stat",
+ { "NSAPI(5) uplink status", "gsm_a_gm.nsapi_5_ul_stat",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_nsapi_ul_stat_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_nsapi_6_ul_stat,
- { "NSAPI(6) uplink status", "gsm_a.gm.nsapi_6_ul_stat",
+ { "NSAPI(6) uplink status", "gsm_a_gm.nsapi_6_ul_stat",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_nsapi_ul_stat_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_nsapi_7_ul_stat,
- { "NSAPI(7) uplink status", "gsm_a.gm.nsapi_7_ul_stat",
+ { "NSAPI(7) uplink status", "gsm_a_gm.nsapi_7_ul_stat",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_nsapi_ul_stat_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_nsapi_8_ul_stat,
- { "NSAPI(8) uplink status", "gsm_a.gm.nsapi_8_ul_stat",
+ { "NSAPI(8) uplink status", "gsm_a_gm.nsapi_8_ul_stat",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_nsapi_ul_stat_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_nsapi_9_ul_stat,
- { "NSAPI(9) uplink status", "gsm_a.gm.nsapi_9_ul_stat",
+ { "NSAPI(9) uplink status", "gsm_a_gm.nsapi_9_ul_stat",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_nsapi_ul_stat_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_nsapi_10_ul_stat,
- { "NSAPI(10) uplink status", "gsm_a.gm.nsapi_10_ul_stat",
+ { "NSAPI(10) uplink status", "gsm_a_gm.nsapi_10_ul_stat",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_nsapi_ul_stat_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_nsapi_11_ul_stat,
- { "NSAPI(11) uplink status", "gsm_a.gm.nsapi_11_ul_stat",
+ { "NSAPI(11) uplink status", "gsm_a_gm.nsapi_11_ul_stat",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_nsapi_ul_stat_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_nsapi_12_ul_stat,
- { "NSAPI(12) uplink status", "gsm_a.gm.nsapi_12_ul_stat",
+ { "NSAPI(12) uplink status", "gsm_a_gm.nsapi_12_ul_stat",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_nsapi_ul_stat_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_nsapi_13_ul_stat,
- { "NSAPI(13) uplink status", "gsm_a.gm.nsapi_13_ul_stat",
+ { "NSAPI(13) uplink status", "gsm_a_gm.nsapi_13_ul_stat",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_nsapi_ul_stat_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_nsapi_14_ul_stat,
- { "NSAPI(14) uplink status", "gsm_a.gm.nsapi_14_ul_stat",
+ { "NSAPI(14) uplink status", "gsm_a_gm.nsapi_14_ul_stat",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_nsapi_ul_stat_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_nsapi_15_ul_stat,
- { "NSAPI(15) uplink status", "gsm_a.gm.nsapi_15_ul_stat",
+ { "NSAPI(15) uplink status", "gsm_a_gm.nsapi_15_ul_stat",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_nsapi_ul_stat_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_device_prop_low_prio,
- { "Low priority", "gsm_a.gm.device_prop_low_prio",
+ { "Low priority", "gsm_a_gm.device_prop_low_prio",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_device_prop_low_prio_value), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_pco_pid,
- { "Protocol or Container ID", "gsm_a.gm.pco_pid",
+ { "Protocol or Container ID", "gsm_a_gm.pco_pid",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_pco_app_spec_info,
- { "Application specific information", "gsm_a.gm.app_spec_info",
+ { "Application specific information", "gsm_a_gm.app_spec_info",
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_type_of_identity,
- { "Type of identity", "gsm_a.gm.type_of_identity",
+ { "Type of identity", "gsm_a_gm.type_of_identity",
FT_UINT8, BASE_DEC, VALS(gsm_a_gm_type_of_identity_vals), 0x07,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac,
- { "Routing Area Code (RAC)", "gsm_a.gm.rac",
+ { "Routing Area Code (RAC)", "gsm_a_gm.rac",
FT_UINT8, BASE_HEX_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_gm_apc,
- { "APC", "gsm_a.gm.apc",
+ { "APC", "gsm_a_gm.apc",
FT_BOOLEAN, 8, TFS(&gsm_a_gm_apc_vals), 0x20,
NULL, HFILL }
},
{ &hf_gsm_a_gm_otd_a,
- { "OTD-A", "gsm_a.gm.otd_a",
+ { "OTD-A", "gsm_a_gm.otd_a",
FT_BOOLEAN, 8, TFS(&gsm_a_gm_otd_a_vals), 0x10,
NULL, HFILL }
},
{ &hf_gsm_a_gm_otd_b,
- { "OTD-B", "gsm_a.gm.otd_b",
+ { "OTD-B", "gsm_a_gm.otd_b",
FT_BOOLEAN, 8, TFS(&gsm_a_gm_otd_b_vals), 0x08,
NULL, HFILL }
},
{ &hf_gsm_a_gm_gps_a,
- { "GPS-A", "gsm_a.gm.gps_a",
+ { "GPS-A", "gsm_a_gm.gps_a",
FT_BOOLEAN, 8, TFS(&gsm_a_gm_gps_a_vals), 0x04,
NULL, HFILL }
},
{ &hf_gsm_a_gm_gps_b,
- { "GPS-B", "gsm_a.gm.gps_b",
+ { "GPS-B", "gsm_a_gm.gps_b",
FT_BOOLEAN, 8, TFS(&gsm_a_gm_gps_b_vals), 0x02,
NULL, HFILL }
},
{ &hf_gsm_a_gm_gps_c,
- { "GPS-C", "gsm_a.gm.gps_c",
+ { "GPS-C", "gsm_a_gm.gps_c",
FT_BOOLEAN, 8, TFS(&gsm_a_gm_gps_c_vals), 0x01,
NULL, HFILL }
},
{ &hf_gsm_a_gm_lcs_molr,
- { "LCS-MOLR", "gsm_a.gm.lcs_molr",
+ { "LCS-MOLR", "gsm_a_gm.lcs_molr",
FT_BOOLEAN, 8, TFS(&gsm_a_gm_lcs_molr_value), 0x08,
NULL, HFILL }
},
{ &hf_gsm_a_gm_mbms,
- { "MBMS", "gsm_a.gm.mbms",
+ { "MBMS", "gsm_a_gm.mbms",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x04,
NULL, HFILL }
},
{ &hf_gsm_a_gm_ims_vops,
- { "IMS VoPS", "gsm_a.gm.ims_vops",
+ { "IMS VoPS", "gsm_a_gm.ims_vops",
FT_BOOLEAN, 8, TFS(&gsm_a_gm_ims_vops_value), 0x02,
"IMS voice over PS session indicator", HFILL }
},
{ &hf_gsm_a_gm_emc_bs,
- { "EMC BS", "gsm_a.gm.emc_bs",
+ { "EMC BS", "gsm_a_gm.emc_bs",
FT_BOOLEAN, 8, TFS(&gsm_a_gm_emc_bs_value), 0x01,
"Emergency bearer services indicator", HFILL }
},
{ &hf_gsm_a_gm_req_ms_info_irat,
- { "I-RAT", "gsm_a.gm.req_ms_info_irat",
+ { "I-RAT", "gsm_a_gm.req_ms_info_irat",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_req_ms_info_irat_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_req_ms_info_irat2,
- { "I-RAT2", "gsm_a.gm.req_ms_info_irat2",
+ { "I-RAT2", "gsm_a_gm.req_ms_info_irat2",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_req_ms_info_irat2_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_ue_usage_setting,
- { "UE's usage setting", "gsm_a.gm.ue_usage_setting",
+ { "UE's usage setting", "gsm_a_gm.ue_usage_setting",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_ue_usage_setting_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_voice_domain_pref_for_eutran,
- { "Voice domain preference for E-UTRAN", "gsm_a.gm.voice_domain_pref_for_eutran",
+ { "Voice domain preference for E-UTRAN", "gsm_a_gm.voice_domain_pref_for_eutran",
FT_UINT8, BASE_DEC, VALS(gsm_a_gm_voice_domain_pref_for_eutran_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_ptmsi_type,
- { "P-TMSI type", "gsm_a.gm.ptmsi_type",
+ { "P-TMSI type", "gsm_a_gm.ptmsi_type",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_ptmsi_type_value), 0x0,
NULL, HFILL }
},
@@ -7593,287 +7593,287 @@ proto_register_gsm_a_gm(void)
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_ctrled_early_cm_sending,
- { "Controlled early Classmark Sending", "gsm_a.gm.rac.ctrled_early_cm_sending",
+ { "Controlled early Classmark Sending", "gsm_a_gm.rac.ctrled_early_cm_sending",
FT_BOOLEAN, BASE_NONE, TFS(&tfs_implemented_not_implemented), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_pseudo_sync,
- { "Pseudo Synchronisation", "gsm_a.gm.rac.pseudo_sync",
+ { "Pseudo Synchronisation", "gsm_a_gm.rac.pseudo_sync",
FT_BOOLEAN, BASE_NONE, TFS(&tfs_present_not_present), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_vgcs,
- { "Voice Group Call Service", "gsm_a.gm.rac.vgcs",
+ { "Voice Group Call Service", "gsm_a_gm.rac.vgcs",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_vgcs), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_vbs,
- { "Voice Broadcast Service", "gsm_a.gm.rac.vbs",
+ { "Voice Broadcast Service", "gsm_a_gm.rac.vbs",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_vbs), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_multislot_capability,
- { "Multislot capability struct", "gsm_a.gm.rac.multislot_capability",
+ { "Multislot capability struct", "gsm_a_gm.rac.multislot_capability",
FT_BOOLEAN, BASE_NONE, TFS(&tfs_present_not_present), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_hscsd_multi_slot_class,
- { "HSCSD multislot class", "gsm_a.gm.rac.hscsd_multi_slot_class",
+ { "HSCSD multislot class", "gsm_a_gm.rac.hscsd_multi_slot_class",
FT_UINT8, BASE_DEC, VALS(gsm_a_gm_multi_slot_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_gprs_multi_slot_class,
- { "GPRS multislot class", "gsm_a.gm.rac.gprs_multi_slot_class",
+ { "GPRS multislot class", "gsm_a_gm.rac.gprs_multi_slot_class",
FT_UINT8, BASE_DEC, VALS(gsm_a_gm_multi_slot_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_gprs_ext_dyn_alloc_cap,
- { "GPRS Extended Dynamic Allocation Capability", "gsm_a.gm.rac.gprs_ext_dyn_alloc_cap",
+ { "GPRS Extended Dynamic Allocation Capability", "gsm_a_gm.rac.gprs_ext_dyn_alloc_cap",
FT_BOOLEAN, BASE_NONE, TFS(&tfs_implemented_not_implemented), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_ecsd_multi_slot_class,
- { "ECSD multislot class", "gsm_a.gm.rac.ecsd_multi_slot_class",
+ { "ECSD multislot class", "gsm_a_gm.rac.ecsd_multi_slot_class",
FT_UINT8, BASE_DEC, VALS(gsm_a_gm_multi_slot_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_egprs_multi_slot_class,
- { "EGPRS multislot class", "gsm_a.gm.rac.egprs_multi_slot_class",
+ { "EGPRS multislot class", "gsm_a_gm.rac.egprs_multi_slot_class",
FT_UINT8, BASE_DEC, VALS(gsm_a_gm_multi_slot_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_egprs_ext_dyn_alloc_cap,
- { "EGPRS Extended Dynamic Allocation Capability", "gsm_a.gm.rac.egprs_ext_dyn_alloc_cap",
+ { "EGPRS Extended Dynamic Allocation Capability", "gsm_a_gm.rac.egprs_ext_dyn_alloc_cap",
FT_BOOLEAN, BASE_NONE, TFS(&tfs_implemented_not_implemented), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_dtm_gprs_multi_slot_class,
- { "DTM GPRS Multi Slot Class", "gsm_a.gm.rac.dtm_gprs_multi_slot_class",
+ { "DTM GPRS Multi Slot Class", "gsm_a_gm.rac.dtm_gprs_multi_slot_class",
FT_UINT8, BASE_DEC, VALS(gsm_a_gm_dtm_gprs_multi_slot_class_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_single_slt_dtm,
- { "Single Slot DTM", "gsm_a.gm.rac.single_slt_dtm",
+ { "Single Slot DTM", "gsm_a_gm.rac.single_slt_dtm",
FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_dtm_egprs_multi_slot_cls_pres,
- { "DTM EGPRS Multi Slot Class", "gsm_a.gm.rac.dtm_egprs_multi_slot_cls_pres",
+ { "DTM EGPRS Multi Slot Class", "gsm_a_gm.rac.dtm_egprs_multi_slot_cls_pres",
FT_BOOLEAN, BASE_NONE, TFS(&tfs_present_not_present), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_dtm_egprs_multi_slot_class,
- { "DTM EGPRS Multi Slot Class", "gsm_a.gm.rac.dtm_egprs_multi_slot_class",
+ { "DTM EGPRS Multi Slot Class", "gsm_a_gm.rac.dtm_egprs_multi_slot_class",
FT_UINT8, BASE_DEC, VALS(gsm_a_gm_dtm_gprs_multi_slot_class_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_8psk_pow_cap_pres,
- { "8PSK Power Capability Bits", "gsm_a.gm.rac.8psk_pow_cap_pres",
+ { "8PSK Power Capability Bits", "gsm_a_gm.rac.8psk_pow_cap_pres",
FT_BOOLEAN, BASE_NONE, TFS(&tfs_present_not_present), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_comp_int_meas_cap,
- { "COMPACT Interference Measurement Capability", "gsm_a.gm.rac.comp_int_meas_cap",
+ { "COMPACT Interference Measurement Capability", "gsm_a_gm.rac.comp_int_meas_cap",
FT_BOOLEAN, BASE_NONE, TFS(&tfs_implemented_not_implemented), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rel_lev_ind,
- { "Revision Level Indicator", "gsm_a.gm.rel_lev_ind",
+ { "Revision Level Indicator", "gsm_a_gm.rel_lev_ind",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_revision_level_indicator), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_umts_fdd_cap,
- { "UMTS FDD Radio Access Technology Capability", "gsm_a.gm.rac.umts_fdd_cap",
+ { "UMTS FDD Radio Access Technology Capability", "gsm_a_gm.rac.umts_fdd_cap",
FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_umts_384_tdd_ra_cap,
- { "UMTS 3.84 Mcps TDD Radio Access Technology Capability", "gsm_a.gm.rac.umts_384_tdd_ra_cap",
+ { "UMTS 3.84 Mcps TDD Radio Access Technology Capability", "gsm_a_gm.rac.umts_384_tdd_ra_cap",
FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_cdma2000_cap,
- { "CDMA 2000 Radio Access Technology Capability", "gsm_a.gm.rac.cdma2000_cap",
+ { "CDMA 2000 Radio Access Technology Capability", "gsm_a_gm.rac.cdma2000_cap",
FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_umts_128_tdd_ra_cap,
- { "UMTS 1.28 Mcps TDD Radio Access Technology Capability", "gsm_a.gm.rac.umts_128_tdd_ra_cap",
+ { "UMTS 1.28 Mcps TDD Radio Access Technology Capability", "gsm_a_gm.rac.umts_128_tdd_ra_cap",
FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_geran_feat_pkg,
- { "GERAN Feature Package 1", "gsm_a.gm.rac.geran_feat_pkg",
+ { "GERAN Feature Package 1", "gsm_a_gm.rac.geran_feat_pkg",
FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_mod_based_multi_slot_class_support,
- { "Modulation based multislot class support", "gsm_a.gm.rac.mod_based_multi_slot_class_support",
+ { "Modulation based multislot class support", "gsm_a_gm.rac.mod_based_multi_slot_class_support",
FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_geran_iu_mode_cap,
- { "GERAN Iu mode", "gsm_a.gm.rac.geran_iu_mode_cap",
+ { "GERAN Iu mode", "gsm_a_gm.rac.geran_iu_mode_cap",
FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_flo_iu_cap,
- { "FLO Iu Capability", "gsm_a.gm.rac.flo_iu_cap",
+ { "FLO Iu Capability", "gsm_a_gm.rac.flo_iu_cap",
FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_mult_tbf_cap,
- { "Multiple TBF Capability", "gsm_a.gm.rac.mult_tbf_cap",
+ { "Multiple TBF Capability", "gsm_a_gm.rac.mult_tbf_cap",
FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_down_adv_rec_perf,
- { "Downlink Advanced Receiver Performance", "gsm_a.gm.rac.down_adv_rec_perf",
+ { "Downlink Advanced Receiver Performance", "gsm_a_gm.rac.down_adv_rec_perf",
FT_UINT8, BASE_DEC, VALS(gsm_a_gm_down_adv_rec_perf_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_ext_rlc_mac_ctrl_msg_seg_cap,
- { "Extended RLC/MAC Control Message Segmentation Capability", "gsm_a.gm.rac.ext_rlc_mac_ctrl_msg_seg_cap",
+ { "Extended RLC/MAC Control Message Segmentation Capability", "gsm_a_gm.rac.ext_rlc_mac_ctrl_msg_seg_cap",
FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_dtm_enh_cap,
- { "DTM Enhancements Capability", "gsm_a.gm.rac.dtm_enh_cap",
+ { "DTM Enhancements Capability", "gsm_a_gm.rac.dtm_enh_cap",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_dtm_enh_cap), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_dtm_gprs_high_multi_slot_class,
- { "DTM GPRS High Multi Slot Class", "gsm_a.gm.rac.dtm_gprs_high_multi_slot_class",
+ { "DTM GPRS High Multi Slot Class", "gsm_a_gm.rac.dtm_gprs_high_multi_slot_class",
FT_UINT8, BASE_DEC, VALS(gsm_a_gm_dtm_gprs_high_multi_slot_class_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_dtm_egprs_high_multi_slot_class,
- { "DTM EGPRS High Multi Slot Class", "gsm_a.gm.rac.dtm_egprs_high_multi_slot_class",
+ { "DTM EGPRS High Multi Slot Class", "gsm_a_gm.rac.dtm_egprs_high_multi_slot_class",
FT_UINT8, BASE_DEC, VALS(gsm_a_gm_dtm_gprs_high_multi_slot_class_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_ps_ho_cap,
- { "PS Handover Capability", "gsm_a.gm.rac.ps_ho_cap",
+ { "PS Handover Capability", "gsm_a_gm.rac.ps_ho_cap",
FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_dtm_ho_cap,
- { "DTM Handover Capability", "gsm_a.gm.rac.dtm_ho_cap",
+ { "DTM Handover Capability", "gsm_a_gm.rac.dtm_ho_cap",
FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_multi_slot_cap_red_down_dual_carrier,
- { "Multislot Capability Reduction for Downlink Dual Carrier", "gsm_a.gm.rac.multi_slot_cap_red_down_dual_carrier",
+ { "Multislot Capability Reduction for Downlink Dual Carrier", "gsm_a_gm.rac.multi_slot_cap_red_down_dual_carrier",
FT_UINT8, BASE_DEC, VALS(gsm_a_gm_multi_slot_cap_red_down_dual_carrier_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_down_dual_carrier_dtm_cap,
- { "Downlink Dual Carrier for DTM Capability", "gsm_a.gm.rac.down_dual_carrier_dtm_cap",
+ { "Downlink Dual Carrier for DTM Capability", "gsm_a_gm.rac.down_dual_carrier_dtm_cap",
FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_flex_ts_assign,
- { "Flexible Timeslot Assignment", "gsm_a.gm.rac.flex_ts_assign",
+ { "Flexible Timeslot Assignment", "gsm_a_gm.rac.flex_ts_assign",
FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_gan_ps_ho_cap,
- { "GAN PS Handover Capability", "gsm_a.gm.rac.gan_ps_ho_cap",
+ { "GAN PS Handover Capability", "gsm_a_gm.rac.gan_ps_ho_cap",
FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_rlc_non_pers_mode,
- { "RLC Non-persistent Mode", "gsm_a.gm.rac.rlc_non_pers_mode",
+ { "RLC Non-persistent Mode", "gsm_a_gm.rac.rlc_non_pers_mode",
FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_reduced_lat_cap,
- { "Reduced Latency Capability", "gsm_a.gm.rac.reduced_lat_cap",
+ { "Reduced Latency Capability", "gsm_a_gm.rac.reduced_lat_cap",
FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_ul_egprs2,
- { "Uplink EGPRS2", "gsm_a.gm.rac.ul_egprs2",
+ { "Uplink EGPRS2", "gsm_a_gm.rac.ul_egprs2",
FT_UINT8, BASE_DEC, VALS(gsm_a_gm_ul_egprs2_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_dl_egprs2,
- { "Downlink EGPRS2", "gsm_a.gm.rac.dl_egprs2",
+ { "Downlink EGPRS2", "gsm_a_gm.rac.dl_egprs2",
FT_UINT8, BASE_DEC, VALS(gsm_a_gm_dl_egprs2_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_eutra_fdd_support,
- { "E-UTRA FDD support", "gsm_a.gm.rac.eutra_fdd_support",
+ { "E-UTRA FDD support", "gsm_a_gm.rac.eutra_fdd_support",
FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_eutra_tdd_support,
- { "E-UTRA TDD support", "gsm_a.gm.rac.eutra_tdd_support",
+ { "E-UTRA TDD support", "gsm_a_gm.rac.eutra_tdd_support",
FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_geran_to_eutra_support_in_geran_ptm,
- { "GERAN to E-UTRA support in GERAN packet transfer mode", "gsm_a.gm.rac.geran_to_eutra_support_in_geran_ptm",
+ { "GERAN to E-UTRA support in GERAN packet transfer mode", "gsm_a_gm.rac.geran_to_eutra_support_in_geran_ptm",
FT_UINT8, BASE_DEC, VALS(gsm_a_gm_geran_to_eutra_support_in_geran_ptm_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_prio_based_resel_support,
- { "Priority-based reselection support", "gsm_a.gm.rac.prio_based_resel_support",
+ { "Priority-based reselection support", "gsm_a_gm.rac.prio_based_resel_support",
FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_alt_efta_multi_slot_class,
- { "Alternative EFTA Multislot Class", "gsm_a.gm.rac.alt_efta_multi_slot_class",
+ { "Alternative EFTA Multislot Class", "gsm_a_gm.rac.alt_efta_multi_slot_class",
FT_UINT8, BASE_DEC, VALS(gsm_a_gm_alt_efta_multi_slot_class_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_efta_multi_slot_cap_red_down_dual_carrier,
- { "EFTA Multislot Capability Reduction for Downlink Dual Carrier", "gsm_a.gm.rac.efta_multi_slot_cap_red_down_dual_carrier",
+ { "EFTA Multislot Capability Reduction for Downlink Dual Carrier", "gsm_a_gm.rac.efta_multi_slot_cap_red_down_dual_carrier",
FT_UINT8, BASE_DEC, VALS(gsm_a_gm_multi_slot_cap_red_down_dual_carrier_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_ind_up_layer_pdu_start_cap_for_rlc_um,
- { "Indication of Upper Layer PDU Start Capability for RLC UM", "gsm_a.gm.rac.ind_up_layer_pdu_start_cap_for_rlc_um",
+ { "Indication of Upper Layer PDU Start Capability for RLC UM", "gsm_a_gm.rac.ind_up_layer_pdu_start_cap_for_rlc_um",
FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_emst_cap,
- { "Enhanced Multiplexing for Single TBF Capability", "gsm_a.gm.rac.emst_cap",
+ { "Enhanced Multiplexing for Single TBF Capability", "gsm_a_gm.rac.emst_cap",
FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_mtti_cap,
- { "Multiple TTI Capability", "gsm_a.gm.rac.mtti_cap",
+ { "Multiple TTI Capability", "gsm_a_gm.rac.mtti_cap",
FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_utra_csg_cell_report,
- { "Reporting of UTRAN CSG cells in packet transfer mode", "gsm_a.gm.rac.utra_csg_cell_report",
+ { "Reporting of UTRAN CSG cells in packet transfer mode", "gsm_a_gm.rac.utra_csg_cell_report",
FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_eutra_csg_cell_report,
- { "Reporting of E-UTRAN CSG cells in packet transfer mode", "gsm_a.gm.rac.eutra_csg_cell_report",
+ { "Reporting of E-UTRAN CSG cells in packet transfer mode", "gsm_a_gm.rac.eutra_csg_cell_report",
FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_dtr_cap,
- { "Dynamic Timeslot Reduction Capability", "gsm_a.gm.rac.dtr_cap",
+ { "Dynamic Timeslot Reduction Capability", "gsm_a_gm.rac.dtr_cap",
FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_emsr_cap,
- { "Enhanced Multiplexing for Single RLC Entity Capability", "gsm_a.gm.rac.emsr_cap",
+ { "Enhanced Multiplexing for Single RLC Entity Capability", "gsm_a_gm.rac.emsr_cap",
FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_fast_down_freq_switch_cap,
- { "Fast Downlink Frequency Switching Capability", "gsm_a.gm.rac.fast_down_freq_switch_cap",
+ { "Fast Downlink Frequency Switching Capability", "gsm_a_gm.rac.fast_down_freq_switch_cap",
FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_tighter_cap,
- { "TIGHTER Capability", "gsm_a.gm.rac.tighter_cap",
+ { "TIGHTER Capability", "gsm_a_gm.rac.tighter_cap",
FT_UINT8, BASE_DEC, VALS(tighter_cap_level_vals), 0x0,
NULL, HFILL }
},
diff --git a/epan/dissectors/packet-gsm_a_rr.c b/epan/dissectors/packet-gsm_a_rr.c
index f7e9c0a223..6bb26a8aa8 100644
--- a/epan/dissectors/packet-gsm_a_rr.c
+++ b/epan/dissectors/packet-gsm_a_rr.c
@@ -10464,7 +10464,7 @@ proto_register_gsm_a_rr(void)
static hf_register_info hf[] =
{
{ &hf_gsm_a_dtap_msg_rr_type,
- { "DTAP Radio Resources Management Message Type", "gsm_a.dtap_msg_rr_type",
+ { "DTAP Radio Resources Management Message Type", "gsm_a_dtap.msg_rr_type",
FT_UINT8, BASE_HEX, VALS(gsm_a_dtap_msg_rr_strings), 0x0,
NULL, HFILL }
},
@@ -10489,177 +10489,177 @@ proto_register_gsm_a_rr(void)
NULL, HFILL }
},
{ &hf_gsm_a_rr_range_nb,
- { "Number of Ranges","gsm_a.rr.range_nb",
+ { "Number of Ranges","gsm_a_ccch.range_nb",
FT_UINT8, BASE_DEC, NULL, 0xff,
NULL, HFILL }
},
{ &hf_gsm_a_rr_range_lower,
- { "Range Lower","gsm_a.rr.range_lower",
+ { "Range Lower","gsm_a_ccch.range_lower",
FT_UINT16, BASE_DEC, NULL, 0x0000,
"ARFCN used as the lower limit of a range of frequencies to be used by the mobile station in cell selection (Range Lower)", HFILL }
},
{ &hf_gsm_a_rr_range_higher,
- { "Range Higher","gsm_a.rr.range_higher",
+ { "Range Higher","gsm_a_ccch.range_higher",
FT_UINT16, BASE_DEC, NULL, 0x0000,
"ARFCN used as the higher limit of a range of frequencies to be used by the mobile station in cell selection (Range Higher)", HFILL }
},
{ &hf_gsm_a_rr_ba_list_pref_length,
- { "Length of BA List Pref","gsm_a.rr.ba_list_pref_length",
+ { "Length of BA List Pref","gsm_a_ccch.ba_list_pref_length",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_ba_freq,
- { "BA Freq","gsm_a.rr.ba_freq",
+ { "BA Freq","gsm_a_ccch.ba_freq",
FT_UINT16, BASE_DEC, NULL, 0x0000,
"ARFCN indicating a single frequency to be used by the mobile station in cell selection and reselection (BA Freq)", HFILL }
},
{ &hf_gsm_a_rr_utran_freq_list_length,
- { "Length of UTRAN freq list","gsm_a.rr.utran_freq_length",
+ { "Length of UTRAN freq list","gsm_a_ccch.utran_freq_length",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_ho_ref_val,
- { "Handover reference value","gsm_a.rr.ho_ref_val",
+ { "Handover reference value","gsm_a_ccch.ho_ref_val",
FT_UINT8,BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_L2_pseudo_len,
- { "L2 Pseudo Length value","gsm_a.rr.rr_2_pseudo_len",
+ { "L2 Pseudo Length value","gsm_a_ccch.rr_2_pseudo_len",
FT_UINT8, BASE_DEC, NULL, 0xfc,
NULL, HFILL }
},
{ &hf_gsm_a_rr_ba_used,
- { "BA-USED","gsm_a.rr.ba_used",
+ { "BA-USED","gsm_a_ccch.ba_used",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_dtx_used,
- { "DTX-USED","gsm_a.rr.dtx_used",
+ { "DTX-USED","gsm_a_ccch.dtx_used",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_dtx_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_3g_ba_used,
- { "3G-BA-USED","gsm_a.rr.3g_ba_used",
+ { "3G-BA-USED","gsm_a_ccch.3g_ba_used",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_meas_valid,
- { "MEAS-VALID","gsm_a.rr.meas_valid",
+ { "MEAS-VALID","gsm_a_ccch.meas_valid",
FT_BOOLEAN,8, TFS(&gsm_a_rr_mv_vals), 0x40,
NULL, HFILL }
},
{ &hf_gsm_a_rr_rxlev_full_serv_cell,
- { "RXLEV-FULL-SERVING-CELL","gsm_a.rr.rxlev_full_serv_cell",
+ { "RXLEV-FULL-SERVING-CELL","gsm_a_ccch.rxlev_full_serv_cell",
FT_UINT8,BASE_DEC|BASE_EXT_STRING, &gsm_a_rr_rxlev_vals_ext, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_rxlev_sub_serv_cell,
- { "RXLEV-SUB-SERVING-CELL","gsm_a.rr.rxlev_sub_serv_cell",
+ { "RXLEV-SUB-SERVING-CELL","gsm_a_ccch.rxlev_sub_serv_cell",
FT_UINT8,BASE_DEC|BASE_EXT_STRING, &gsm_a_rr_rxlev_vals_ext, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_rxqual_full_serv_cell,
- { "RXQUAL-FULL-SERVING-CELL","gsm_a.rr.rxqual_full_serv_cell",
+ { "RXQUAL-FULL-SERVING-CELL","gsm_a_ccch.rxqual_full_serv_cell",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_rxqual_vals), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_rxqual_sub_serv_cell,
- { "RXQUAL-SUB-SERVING-CELL","gsm_a.rr.rxqual_sub_serv_cell",
+ { "RXQUAL-SUB-SERVING-CELL","gsm_a_ccch.rxqual_sub_serv_cell",
FT_UINT8,BASE_DEC, VALS(gsm_a_rr_rxqual_vals), 0x0e,
NULL, HFILL }
},
{ &hf_gsm_a_rr_no_ncell_m,
- { "NO-NCELL-M","gsm_a.rr.no_ncell_m",
+ { "NO-NCELL-M","gsm_a_ccch.no_ncell_m",
FT_UINT8,BASE_DEC, VALS(gsm_a_rr_ncell_vals), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_rxlev_ncell,
- { "RXLEV-NCELL","gsm_a.rr.rxlev_ncell",
+ { "RXLEV-NCELL","gsm_a_ccch.rxlev_ncell",
FT_UINT8,BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_bcch_freq_ncell,
- { "BCCH-FREQ-NCELL","gsm_a.rr.bcch_freq_ncell",
+ { "BCCH-FREQ-NCELL","gsm_a_ccch.bcch_freq_ncell",
FT_UINT8,BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_bsic_ncell,
- { "BSIC-NCELL","gsm_a.rr.bsic_ncell",
+ { "BSIC-NCELL","gsm_a_ccch.bsic_ncell",
FT_UINT8,BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_mobile_time_difference,
- { "Mobile Timing Difference value (in half bit periods)","gsm_a.rr.mobile_time_difference",
+ { "Mobile Timing Difference value (in half bit periods)","gsm_a_ccch.mobile_time_difference",
FT_UINT32,BASE_DEC, NULL, 0xFFFFF8,
NULL, HFILL }
},
{ &hf_gsm_a_rr_pow_cmd_atc,
- { "ATC","gsm_a.rr.pow_cmd_atc",
+ { "ATC","gsm_a_ccch.pow_cmd_atc",
FT_BOOLEAN,8, TFS(&gsm_a_rr_pow_cmd_atc_value), 0x80,
NULL, HFILL }
},
{ &hf_gsm_a_rr_page_mode,
- { "Page Mode","gsm_a.rr.page_mode",
+ { "Page Mode","gsm_a_ccch.page_mode",
FT_UINT8,BASE_DEC, VALS(gsm_a_rr_page_mode_vals), 0x0F,
NULL, HFILL }
},
{ &hf_gsm_a_rr_dedicated_mode_or_tbf,
- { "Dedicated mode or TBF","gsm_a.rr.dedicated_mode_or_tbf",
+ { "Dedicated mode or TBF","gsm_a_ccch.dedicated_mode_or_tbf",
FT_UINT8,BASE_DEC, VALS(gsm_a_rr_dedicated_mode_or_tbf_vals), 0xF0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_pow_cmd_epc,
- { "EPC_mode","gsm_a.rr.pow_cmd_epc",
+ { "EPC_mode","gsm_a_ccch.pow_cmd_epc",
FT_BOOLEAN,8, TFS(&gsm_a_rr_pow_cmd_epc_value), 0x40,
NULL, HFILL }
},
{ &hf_gsm_a_rr_pow_cmd_fpcepc,
- { "FPC_EPC","gsm_a.rr.pow_cmd_fpcepc",
+ { "FPC_EPC","gsm_a_ccch.pow_cmd_fpcepc",
FT_BOOLEAN,8, TFS(&gsm_a_rr_pow_cmd_fpcepc_value), 0x20,
NULL, HFILL }
},
{ &hf_gsm_a_rr_pow_cmd_powlev,
- { "POWER LEVEL","gsm_a.rr.pow_cmd_pow",
+ { "POWER LEVEL","gsm_a_ccch.pow_cmd_pow",
FT_UINT8,BASE_DEC, NULL, 0x1f,
NULL, HFILL }
},
{ &hf_gsm_a_rr_sync_ind_nci,
- { "Normal cell indication(NCI)","gsm_a.rr.sync_ind_nci",
+ { "Normal cell indication(NCI)","gsm_a_ccch.sync_ind_nci",
FT_BOOLEAN,8, TFS(&gsm_a_rr_sync_ind_nci_value), 0x08,
NULL, HFILL }
},
{ &hf_gsm_a_rr_sync_ind_rot,
- { "Report Observed Time Difference(ROT)","gsm_a.rr.sync_ind_rot",
+ { "Report Observed Time Difference(ROT)","gsm_a_ccch.sync_ind_rot",
FT_BOOLEAN,8, TFS(&sm_a_rr_sync_ind_rot_value), 0x04,
NULL, HFILL }
},
{ &hf_gsm_a_rr_sync_ind_si,
- { "Synchronization indication(SI)","gsm_a.rr_sync_ind_si",
+ { "Synchronization indication(SI)","gsm_a_ccch.sync_ind_si",
FT_UINT8,BASE_DEC, VALS(gsm_a_rr_sync_ind_si_vals), 0x03,
NULL, HFILL }
},
{ &hf_gsm_a_rr_format_id,
- { "Format Identifier","gsm_a.rr_format_id",
+ { "Format Identifier","gsm_a_ccch.format_id",
FT_UINT8,BASE_HEX, VALS(gsm_a_rr_freq_list_format_id_vals), 0xce,
NULL, HFILL }
},
{ &hf_gsm_a_rr_format_id2,
- { "Format Identifier","gsm_a.rr_format_id",
+ { "Format Identifier","gsm_a_ccch.format_id",
FT_UINT8,BASE_HEX, VALS(gsm_a_rr_freq_list_format_id_vals), 0x8e,
NULL, HFILL }
},
{ &hf_gsm_a_rr_channel_mode,
- { "Channel Mode","gsm_a.rr.channel_mode",
+ { "Channel Mode","gsm_a_ccch.channel_mode",
FT_UINT8,BASE_DEC, VALS(gsm_a_rr_channel_mode_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_channel_mode2,
- { "Channel Mode 2","gsm_a.rr.channel_mode2",
+ { "Channel Mode 2","gsm_a_ccch.channel_mode2",
FT_UINT8,BASE_DEC, VALS(gsm_a_rr_channel_mode2_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_sc,
- { "SC","gsm_a.rr.SC",
+ { "SC","gsm_a_ccch.SC",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_sc_vals), 0x00,
NULL, HFILL }
},
@@ -10669,1553 +10669,1553 @@ proto_register_gsm_a_rr(void)
NULL, HFILL }
},
{ &hf_gsm_a_rr_cr,
- { "CR","gsm_a.rr.CR",
+ { "CR","gsm_a_ccch.CR",
FT_UINT8,BASE_DEC, VALS(gsm_a_rr_cr_vals), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_multirate_speech_ver,
- { "Multirate speech version","gsm_a.rr.multirate_speech_ver",
+ { "Multirate speech version","gsm_a_ccch.multirate_speech_ver",
FT_UINT8,BASE_DEC, VALS(multirate_speech_ver_vals), 0xe0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_NCSB,
- { "NSCB: Noise Suppression Control Bit","gsm_a.rr.NCSB",
+ { "NSCB: Noise Suppression Control Bit","gsm_a_ccch.NCSB",
FT_UINT8,BASE_DEC, VALS(NSCB_vals), 0x10,
NULL, HFILL }
},
{ &hf_gsm_a_rr_ICMI,
- { "ICMI: Initial Codec Mode Indicator","gsm_a.rr.ICMI",
+ { "ICMI: Initial Codec Mode Indicator","gsm_a_ccch.ICMI",
FT_UINT8,BASE_DEC, VALS(ICMI_vals), 0x8,
NULL, HFILL }
},
{ &hf_gsm_a_rr_start_mode,
- { "Start Mode","gsm_a.rr.start_mode",
+ { "Start Mode","gsm_a_ccch.start_mode",
FT_UINT8,BASE_DEC, NULL, 0x3,
NULL, HFILL }
},
{ &hf_gsm_a_rr_timing_adv,
- { "Timing advance value","gsm_a.rr.timing_adv",
+ { "Timing advance value","gsm_a_ccch.timing_adv",
FT_UINT8,BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_time_diff,
- { "Time difference value","gsm_a.rr.time_diff",
+ { "Time difference value","gsm_a_ccch.time_diff",
FT_UINT8,BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_tlli,
- { "TLLI","gsm_a.rr.tlli",
+ { "TLLI","gsm_a_ccch.tlli",
FT_UINT32,BASE_HEX, NULL, 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_tmsi_ptmsi,
- { "TMSI/P-TMSI Value","gsm_a.rr.tmsi_ptmsi",
+ { "TMSI/P-TMSI Value","gsm_a_ccch.tmsi_ptmsi",
FT_UINT32,BASE_HEX, NULL, 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_target_mode,
- { "Target mode","gsm_a.rr.target_mode",
+ { "Target mode","gsm_a_ccch.target_mode",
FT_UINT8,BASE_DEC, NULL, 0xc0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_wait_indication,
- { "Wait Indication","gsm_a.rr.wait_indication",
+ { "Wait Indication","gsm_a_ccch.wait_indication",
FT_UINT8,BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_seq_code,
- { "Sequence Code","gsm_a.rr.seq_code",
+ { "Sequence Code","gsm_a_ccch.seq_code",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_group_cipher_key_number,
- { "Group cipher key number","gsm_a.rr.Group_cipher_key_number",
+ { "Group cipher key number","gsm_a_ccch.Group_cipher_key_number",
FT_UINT8,BASE_DEC, NULL, 0x3c,
NULL, HFILL }
},
{ &hf_gsm_a_rr_MBMS_broadcast,
- { "MBMS Broadcast","gsm_a.rr.MBMS_broadcast",
+ { "MBMS Broadcast","gsm_a_ccch.MBMS_broadcast",
FT_BOOLEAN,8, TFS(&gsm_a_rr_MBMS_broadcast_value), 0x01,
NULL, HFILL }
},
{ &hf_gsm_a_rr_MBMS_multicast,
- { "MBMS Multicast","gsm_a.rr.MBMS_multicast",
+ { "MBMS Multicast","gsm_a_ccch.MBMS_multicast",
FT_BOOLEAN,8, TFS(&gsm_a_rr_MBMS_multicast_value), 0x02,
NULL, HFILL }
},
{ &hf_gsm_a_rr_last_segment,
- { "Last Segment","gsm_a.rr.last_segment",
+ { "Last Segment","gsm_a_ccch.last_segment",
FT_BOOLEAN,8, TFS(&gsm_a_rr_last_segment_value), 0x01,
NULL, HFILL }
},
{ &hf_gsm_a_rr_carrier_ind,
- { "Carrier Indication","gsm_a.rr.carrier_ind",
+ { "Carrier Indication","gsm_a_ccch.carrier_ind",
FT_BOOLEAN,8, TFS(&gsm_a_rr_carrier_ind_value), 0x01,
NULL, HFILL }
},
{ &hf_gsm_a_rr_ra,
- { "Random Access Information (RA)", "gsm_a_rr_ra",
+ { "Random Access Information (RA)", "gsm_a_ccch.ra",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_T1prim,
- { "T1'", "gsm_a.rr.T1prim",
+ { "T1'", "gsm_a_ccch.T1prim",
FT_UINT8, BASE_DEC, NULL, 0xf8,
NULL, HFILL }
},
{ &hf_gsm_a_rr_T3,
- { "T3", "gsm_a.rr.T3",
+ { "T3", "gsm_a_ccch.T3",
FT_UINT16, BASE_DEC, NULL, 0x07e0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_T2,
- { "T2", "gsm_a.rr.T2",
+ { "T2", "gsm_a_ccch.T2",
FT_UINT8, BASE_DEC, NULL, 0x1f,
NULL, HFILL }
},
{ &hf_gsm_a_rr_tbf_T1prim,
- { "T1' (TBF)", "gsm_a.rr.tbf.T1prim",
+ { "T1' (TBF)", "gsm_a_ccch.tbf.T1prim",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_tbf_T3,
- { "T3 (TBF)", "gsm_a.rr.tbf.T3",
+ { "T3 (TBF)", "gsm_a_ccch.tbf.T3",
FT_UINT16, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_tbf_T2,
- { "T2 (TBF)", "gsm_a.rr.tbf.T2",
+ { "T2 (TBF)", "gsm_a_ccch.tbf.T2",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_rfn,
- { "RFN", "gsm_a.rr.rfn",
+ { "RFN", "gsm_a_ccch.rfn",
FT_UINT16, BASE_DEC, NULL, 0x0,
"Reduced Frame Number", HFILL }
},
{ &hf_gsm_a_rr_RR_cause,
- { "RR cause value","gsm_a.rr.RRcause",
+ { "RR cause value","gsm_a_ccch.RRcause",
FT_UINT8,BASE_DEC, VALS(gsm_a_rr_RR_cause_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_cm_cng_msg_req,
- { "CLASSMARK CHANGE","gsm_a.rr_cm_cng_msg_req",
+ { "CLASSMARK CHANGE","gsm_a_ccch.cm_cng_msg_req",
FT_BOOLEAN,8, TFS(&gsm_a_msg_req_value), 0x80,
NULL, HFILL }
},
{ &hf_gsm_a_rr_utran_cm_cng_msg_req,
- { "UTRAN CLASSMARK CHANGE","gsm_a.rr_utran_cm_cng_msg_req",
+ { "UTRAN CLASSMARK CHANGE","gsm_a_ccch.utran_cm_cng_msg_req",
FT_UINT8,BASE_DEC, VALS(gsm_a_rr_utran_cm_cng_msg_req_vals), 0x70,
NULL, HFILL }
},
{ &hf_gsm_a_rr_cdma200_cm_cng_msg_req,
- { "CDMA2000 CLASSMARK CHANGE","gsm_a.rr_cdma200_cm_cng_msg_req",
+ { "CDMA2000 CLASSMARK CHANGE","gsm_a_ccch.cdma200_cm_cng_msg_req",
FT_BOOLEAN,8, TFS(&gsm_a_msg_req_value), 0x08,
NULL, HFILL }
},
{ &hf_gsm_a_rr_geran_iu_cm_cng_msg_req,
- { "GERAN IU MODE CLASSMARK CHANGE","gsm_a.rr_geran_iu_cm_cng_msg_req",
+ { "GERAN IU MODE CLASSMARK CHANGE","gsm_a_ccch.geran_iu_cm_cng_msg_req",
FT_BOOLEAN,8, TFS(&gsm_a_msg_req_value), 0x04,
NULL, HFILL }
},
{ &hf_gsm_a_rr_chnl_needed_ch1,
- { "Channel 1","gsm_a.rr_chnl_needed_ch1",
+ { "Channel 1","gsm_a_ccch.chnl_needed_ch1",
FT_UINT8,BASE_DEC, VALS(gsm_a_rr_channel_needed_vals), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_chnl_needed_ch2,
- { "Channel 2","gsm_a.rr_chnl_needed_ch2",
+ { "Channel 2","gsm_a_ccch.chnl_needed_ch2",
FT_UINT8,BASE_DEC, VALS(gsm_a_rr_channel_needed_vals), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_chnl_needed_ch3,
- { "Channel 3","gsm_a.rr_chnl_needed_ch3",
+ { "Channel 3","gsm_a_ccch.chnl_needed_ch3",
FT_UINT8,BASE_DEC, VALS(gsm_a_rr_channel_needed_vals), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_chnl_needed_ch4,
- { "Channel 4","gsm_a.rr_chnl_needed_ch4",
+ { "Channel 4","gsm_a_ccch.chnl_needed_ch4",
FT_UINT8,BASE_DEC, VALS(gsm_a_rr_channel_needed_vals), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_suspension_cause,
- { "Suspension cause value","gsm_a.rr.suspension_cause",
+ { "Suspension cause value","gsm_a_ccch.suspension_cause",
FT_UINT8,BASE_DEC, VALS(gsm_a_rr_suspension_cause_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_apdu_id,
- { "APDU ID","gsm_a.rr.apdu_id",
+ { "APDU ID","gsm_a_ccch.apdu_id",
FT_UINT8,BASE_HEX, VALS(gsm_a_rr_apdu_id_vals), 0x0f,
NULL, HFILL }
},
{ &hf_gsm_a_rr_apdu_flags,
- { "APDU Flags","gsm_a.rr.apdu_flags",
+ { "APDU Flags","gsm_a_ccch.apdu_flags",
FT_UINT8,BASE_HEX, VALS(gsm_a_rr_apdu_flags_vals), 0xf0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_set_of_amr_codec_modes_v1_b8,
- { "12,2 kbit/s codec rate", "gsm_a.rr.set_of_amr_codec_modes_v1b8",
+ { "12,2 kbit/s codec rate", "gsm_a_ccch.set_of_amr_codec_modes_v1b8",
FT_BOOLEAN,8, TFS(&gsm_a_rr_set_of_amr_codec_modes), 0x80,
NULL, HFILL }
},
{ &hf_gsm_a_rr_set_of_amr_codec_modes_v1_b7,
- { "10,2 kbit/s codec rate", "gsm_a.rr.set_of_amr_codec_modes_v1b7",
+ { "10,2 kbit/s codec rate", "gsm_a_ccch.set_of_amr_codec_modes_v1b7",
FT_BOOLEAN,8, TFS(&gsm_a_rr_set_of_amr_codec_modes), 0x40,
NULL, HFILL }
},
{ &hf_gsm_a_rr_set_of_amr_codec_modes_v1_b6,
- { "7,95 kbit/s codec rate", "gsm_a.rr.set_of_amr_codec_modes_v1b6",
+ { "7,95 kbit/s codec rate", "gsm_a_ccch.set_of_amr_codec_modes_v1b6",
FT_BOOLEAN,8, TFS(&gsm_a_rr_set_of_amr_codec_modes), 0x20,
NULL, HFILL }
},
{ &hf_gsm_a_rr_set_of_amr_codec_modes_v1_b5,
- { "7,40 kbit/s codec rate", "gsm_a.rr.set_of_amr_codec_modes_v1b5",
+ { "7,40 kbit/s codec rate", "gsm_a_ccch.set_of_amr_codec_modes_v1b5",
FT_BOOLEAN,8, TFS(&gsm_a_rr_set_of_amr_codec_modes), 0x10,
NULL, HFILL }
},
{ &hf_gsm_a_rr_set_of_amr_codec_modes_v1_b4,
- { "6,70 kbit/s codec rate", "gsm_a.rr.set_of_amr_codec_modes_v1b4",
+ { "6,70 kbit/s codec rate", "gsm_a_ccch.set_of_amr_codec_modes_v1b4",
FT_BOOLEAN,8, TFS(&gsm_a_rr_set_of_amr_codec_modes), 0x08,
NULL, HFILL }
},
{ &hf_gsm_a_rr_set_of_amr_codec_modes_v1_b3,
- { "5,90 kbit/s codec rate", "gsm_a.rr.set_of_amr_codec_modes_v1b3",
+ { "5,90 kbit/s codec rate", "gsm_a_ccch.set_of_amr_codec_modes_v1b3",
FT_BOOLEAN,8, TFS(&gsm_a_rr_set_of_amr_codec_modes), 0x04,
NULL, HFILL }
},
{ &hf_gsm_a_rr_set_of_amr_codec_modes_v1_b2,
- { "5,15 kbit/s codec rate", "gsm_a.rr.set_of_amr_codec_modes_v1b2",
+ { "5,15 kbit/s codec rate", "gsm_a_ccch.set_of_amr_codec_modes_v1b2",
FT_BOOLEAN,8, TFS(&gsm_a_rr_set_of_amr_codec_modes), 0x02,
NULL, HFILL }
},
{ &hf_gsm_a_rr_set_of_amr_codec_modes_v1_b1,
- { "4,75 kbit/s codec rate", "gsm_a.rr.set_of_amr_codec_modes_v1b1",
+ { "4,75 kbit/s codec rate", "gsm_a_ccch.set_of_amr_codec_modes_v1b1",
FT_BOOLEAN,8, TFS(&gsm_a_rr_set_of_amr_codec_modes), 0x01,
NULL, HFILL }
},
{ &hf_gsm_a_rr_set_of_amr_codec_modes_v2_b5,
- { "23,85 kbit/s codec rate", "gsm_a.rr.set_of_amr_codec_modes_v2b5",
+ { "23,85 kbit/s codec rate", "gsm_a_ccch.set_of_amr_codec_modes_v2b5",
FT_BOOLEAN,8, TFS(&gsm_a_rr_set_of_amr_codec_modes), 0x10,
NULL, HFILL }
},
{ &hf_gsm_a_rr_set_of_amr_codec_modes_v2_b4,
- { "15,85 kbit/s codec rate", "gsm_a.rr.set_of_amr_codec_modes_v2b4",
+ { "15,85 kbit/s codec rate", "gsm_a_ccch.set_of_amr_codec_modes_v2b4",
FT_BOOLEAN,8, TFS(&gsm_a_rr_set_of_amr_codec_modes), 0x08,
NULL, HFILL }
},
{ &hf_gsm_a_rr_set_of_amr_codec_modes_v2_b3,
- { "12,65 kbit/s codec rate", "gsm_a.rr.set_of_amr_codec_modes_v2b3",
+ { "12,65 kbit/s codec rate", "gsm_a_ccch.set_of_amr_codec_modes_v2b3",
FT_BOOLEAN,8, TFS(&gsm_a_rr_set_of_amr_codec_modes), 0x04,
NULL, HFILL }
},
{ &hf_gsm_a_rr_set_of_amr_codec_modes_v2_b2,
- { "8,85 kbit/s codec rate", "gsm_a.rr.set_of_amr_codec_modes_v2b2",
+ { "8,85 kbit/s codec rate", "gsm_a_ccch.set_of_amr_codec_modes_v2b2",
FT_BOOLEAN,8, TFS(&gsm_a_rr_set_of_amr_codec_modes), 0x02,
NULL, HFILL }
},
{ &hf_gsm_a_rr_set_of_amr_codec_modes_v2_b1,
- { "6,60 kbit/s codec rate", "gsm_a.rr.set_of_amr_codec_modes_v2b1",
+ { "6,60 kbit/s codec rate", "gsm_a_ccch.set_of_amr_codec_modes_v2b1",
FT_BOOLEAN,8, TFS(&gsm_a_rr_set_of_amr_codec_modes), 0x01,
NULL, HFILL }
},
{ &hf_gsm_a_rr_amr_threshold,
- { "AMR Threshold", "gsm_a.rr.amr_threshold",
+ { "AMR Threshold", "gsm_a_ccch.amr_threshold",
FT_UINT8, BASE_DEC|BASE_EXT_STRING, &gsm_a_rr_amr_threshold_vals_ext, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_amr_hysteresis,
- { "AMR Hysteresis", "gsm_a.rr.amr_hysteresis",
+ { "AMR Hysteresis", "gsm_a_ccch.amr_hysteresis",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_amr_hysteresis_vals), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_pwrc,
- { "PWRC", "gsm_a.rr.pwrc",
+ { "PWRC", "gsm_a_ccch.pwrc",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
"Power Control Indicator (PWRC)", HFILL }
},
{ &hf_gsm_a_rr_dtx_bcch,
- { "DTX (BCCH)", "gsm_a.rr.dtx_bcch",
+ { "DTX (BCCH)", "gsm_a_ccch.dtx_bcch",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_dtx_bcch_vals), 0x30,
"Discontinuous Transmission (DTX-BCCH)", HFILL }
},
{ &hf_gsm_a_rr_dtx_sacch,
- { "DTX (SACCH)", "gsm_a.rr.dtx_sacch",
+ { "DTX (SACCH)", "gsm_a_ccch.dtx_sacch",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_dtx_sacch_vals), 0x00,
"Discontinuous Transmission (DTX-SACCH)", HFILL }
},
{ &hf_gsm_a_rr_radio_link_timeout,
- { "Radio Link Timeout", "gsm_a.rr.radio_link_timeout",
+ { "Radio Link Timeout", "gsm_a_ccch.radio_link_timeout",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_radio_link_timeout_vals), 0x0f,
"Radio Link Timeout (s)", HFILL }
},
{ &hf_gsm_a_rr_cell_reselect_hyst,
- { "Cell Reselection Hysteresis", "gsm_a.rr.cell_reselect_hyst",
+ { "Cell Reselection Hysteresis", "gsm_a_ccch.cell_reselect_hyst",
FT_UINT8, BASE_DEC, NULL, 0xe0,
"Cell Reselection Hysteresis (dB)", HFILL }
},
{ &hf_gsm_a_rr_ms_txpwr_max_cch,
- { "MS TXPWR MAX CCH", "gsm_a.rr.ms_txpwr_max_cch",
+ { "MS TXPWR MAX CCH", "gsm_a_ccch.ms_txpwr_max_cch",
FT_UINT8, BASE_DEC, NULL, 0x1f,
NULL, HFILL }
},
{ &hf_gsm_a_rr_acs,
- { "ACS", "gsm_a.rr.acs",
+ { "ACS", "gsm_a_ccch.acs",
FT_BOOLEAN, 8, NULL, 0x80,
"Additional Reselect Param Indicator (ACS)", HFILL }
},
{ &hf_gsm_a_rr_neci,
- { "NECI", "gsm_a.rr.neci",
+ { "NECI", "gsm_a_ccch.neci",
FT_UINT8, BASE_DEC, NULL, 0x40,
"New Establishment Cause Indicator (NECI)", HFILL }
},
{ &hf_gsm_a_rr_rxlev_access_min,
- { "RXLEV-ACCESS-MIN", "gsm_a.rr.rxlev_access_min",
+ { "RXLEV-ACCESS-MIN", "gsm_a_ccch.rxlev_access_min",
FT_UINT8, BASE_DEC|BASE_EXT_STRING, &gsm_a_rr_rxlev_vals_ext, 0x3f,
NULL, HFILL }
},
{ &hf_gsm_a_rr_mscr,
- { "MSCR", "gsm_a.rr.mscr",
+ { "MSCR", "gsm_a_ccch.mscr",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_mscr_vals), 0x80,
"MSC Release Indicator (MSCR)", HFILL }
},
{ &hf_gsm_a_rr_att,
- { "ATT", "gsm_a.rr.att",
+ { "ATT", "gsm_a_ccch.att",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_att_vals), 0x40,
"Attach Indicator (ATT)", HFILL }
},
{ &hf_gsm_a_rr_bs_ag_blks_res,
- { "BS_AG_BLKS_RES", "gsm_a.rr.bs_ag_blks_res",
+ { "BS_AG_BLKS_RES", "gsm_a_ccch.bs_ag_blks_res",
FT_UINT8, BASE_DEC, NULL, 0x38,
"Access Grant Reserved Blocks (BS_AG_BLKS_RES)", HFILL }
},
{ &hf_gsm_a_rr_ccch_conf,
- { "CCCH-CONF", "gsm_a.rr.ccch_conf",
+ { "CCCH-CONF", "gsm_a_ccch.ccch_conf",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_ccch_conf_vals), 0x07,
NULL, HFILL }
},
{ &hf_gsm_a_rr_cbq3,
- { "CBQ3", "gsm_a.rr.cbq3",
+ { "CBQ3", "gsm_a_ccch.cbq3",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_cbq3_vals), 0x00,
"Cell Bar Qualify 3", HFILL }
},
{ &hf_gsm_a_rr_bs_pa_mfrms,
- { "BS-PA-MFRMS", "gsm_a.rr.bs_pa_mfrms",
+ { "BS-PA-MFRMS", "gsm_a_ccch.bs_pa_mfrms",
FT_UINT8, BASE_DEC, NULL, 0x07,
NULL, HFILL }
},
{ &hf_gsm_a_rr_t3212,
- { "T3212", "gsm_a.rr.t3212",
+ { "T3212", "gsm_a_ccch.t3212",
FT_UINT8, BASE_DEC, NULL, 0x00,
"Periodic Update period (T3212) (deci-hours)", HFILL }
},
{ &hf_gsm_a_rr_dyn_arfcn_length,
- { "Length of Dynamic Mapping", "gsm_a.rr.dyn_arfcn_length",
+ { "Length of Dynamic Mapping", "gsm_a_ccch.dyn_arfcn_length",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_gsm_band,
- { "GSM Band", "gsm_a.rr.gsm_band",
+ { "GSM Band", "gsm_a_ccch.gsm_band",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_gsm_band_vals), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_arfcn_first,
- { "ARFCN First", "gsm_a.rr.arfcn_first",
+ { "ARFCN First", "gsm_a_ccch.arfcn_first",
FT_UINT16, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_band_offset,
- { "Band Offset", "gsm_a.rr.band_offset",
+ { "Band Offset", "gsm_a_ccch.band_offset",
FT_UINT16, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_arfcn_range,
- { "ARFCN Range", "gsm_a.rr.arfcn_range",
+ { "ARFCN Range", "gsm_a_ccch.arfcn_range",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_lowest_arfcn,
- { "Lowest ARFCN", "gsm_a.rr.lowest_arfcn",
+ { "Lowest ARFCN", "gsm_a_ccch.lowest_arfcn",
FT_UINT8, BASE_DEC, NULL, 0x7f,
NULL, HFILL }
},
{ &hf_gsm_a_rr_inc_skip_arfcn,
- { "Increment skip ARFCN", "gsm_a.rr.inc_skip_arfcn",
+ { "Increment skip ARFCN", "gsm_a_ccch.inc_skip_arfcn",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_gprs_resumption_ack,
- { "Ack", "gsm_a.rr.gprs_resumption_ack",
+ { "Ack", "gsm_a_ccch.gprs_resumption_ack",
FT_BOOLEAN, 8, TFS(&gsm_a_rr_gprs_resumption_ack_value), 0x01,
"GPRS Resumption Ack bit", HFILL }
},
{ &hf_gsm_a_rr_ext_ind,
- { "EXT-IND", "gsm_a.rr.ext_ind",
+ { "EXT-IND", "gsm_a_ccch.ext_ind",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_ext_ind_vals), 0x20,
"Extension Indication (EXT-IND)", HFILL }
},
{ &hf_gsm_a_rr_ba_ind,
- { "BA-IND", "gsm_a.rr.ba_ind",
+ { "BA-IND", "gsm_a_ccch.ba_ind",
FT_UINT8, BASE_DEC, NULL, 0x00,
"BCCH Allocation Indication (BA-IND)", HFILL }
},
{ &hf_gsm_a_rr_multiband_reporting,
- { "Multiband Reporting", "gsm_a.rr.multiband_reporting",
+ { "Multiband Reporting", "gsm_a_ccch.multiband_reporting",
FT_UINT8, BASE_DEC, NULL, 0x00,
"Number of cells to be reported in each band if Multiband Reporting", HFILL }
},
{ &hf_gsm_a_rr_ncc_permitted,
- { "NCC Permitted", "gsm_a.rr.ncc_permitted",
+ { "NCC Permitted", "gsm_a_ccch.ncc_permitted",
FT_UINT8, BASE_HEX, NULL, 0xff,
NULL, HFILL }
},
{ &hf_gsm_a_rr_max_retrans,
- { "Max retrans", "gsm_a.rr.max_retrans",
+ { "Max retrans", "gsm_a_ccch.max_retrans",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_max_retrans_vals), 0xc0,
"Maximum number of retransmissions", HFILL }
},
{ &hf_gsm_a_rr_tx_integer,
- { "Tx-integer", "gsm_a.rr.tx_integer",
+ { "Tx-integer", "gsm_a_ccch.tx_integer",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_tx_integer_vals), 0x3c,
"Number of Slots to spread Transmission (Tx-integer)", HFILL }
},
{ &hf_gsm_a_rr_cell_barr_access,
- { "CELL_BARR_ACCESS", "gsm_a.rr.cell_barr_access",
+ { "CELL_BARR_ACCESS", "gsm_a_ccch.cell_barr_access",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_cell_barr_access_vals), 0x02,
"Cell Barred for Access (CELL_BARR_ACCESS)", HFILL }
},
{ &hf_gsm_a_rr_re,
- { "RE", "gsm_a.rr.re",
+ { "RE", "gsm_a_ccch.re",
FT_BOOLEAN, 8, NULL, 0x01,
"Call re-establishment allowed (RE)", HFILL }
},
{ &hf_gsm_a_rr_acc,
- { "ACC", "gsm_a.rr.acc",
+ { "ACC", "gsm_a_ccch.acc",
FT_UINT16, BASE_HEX, NULL, 0xffff,
"Access Control Class N barred (ACC)", HFILL }
},
{ &hf_gsm_a_rr_nch_position,
- { "NCH Position", "gsm_a.rr.nch_position",
+ { "NCH Position", "gsm_a_ccch.nch_position",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_nch_position_vals), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_si2ter_mp_change_mark,
- { "SI2ter Measurement Parameter Change Mark", "gsm_a.rr.si2ter_mp_change_mark",
+ { "SI2ter Measurement Parameter Change Mark", "gsm_a_ccch.si2ter_mp_change_mark",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_si2ter_3g_change_mark,
- { "SI2ter 3G Change Mark", "gsm_a.rr.si2ter_3g_change_mark",
+ { "SI2ter 3G Change Mark", "gsm_a_ccch.si2ter_3g_change_mark",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_si2ter_index,
- { "SI2ter Index", "gsm_a.rr.si2ter_index",
+ { "SI2ter Index", "gsm_a_ccch.si2ter_index",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_si2ter_count,
- { "SI2ter Count", "gsm_a.rr.si2ter_count",
+ { "SI2ter Count", "gsm_a_ccch.si2ter_count",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_fdd_uarfcn,
- { "FDD UARFCN", "gsm_a.rr.fdd_uarfcn",
+ { "FDD UARFCN", "gsm_a_ccch.fdd_uarfcn",
FT_UINT16, BASE_DEC, NULL, 0x0000,
NULL, HFILL }
},
{ &hf_gsm_a_rr_bandwidth_fdd,
- { "Bandwidth FDD", "gsm_a.rr.bandwidth_fdd",
+ { "Bandwidth FDD", "gsm_a_ccch.bandwidth_fdd",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_tdd_uarfcn,
- { "TDD UARFCN", "gsm_a.rr.tdd_uarfcn",
+ { "TDD UARFCN", "gsm_a_ccch.tdd_uarfcn",
FT_UINT16, BASE_DEC, NULL, 0x0000,
NULL, HFILL }
},
{ &hf_gsm_a_rr_bandwidth_tdd,
- { "Bandwidth TDD", "gsm_a.rr.bandwidth_tdd",
+ { "Bandwidth TDD", "gsm_a_ccch.bandwidth_tdd",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_arfcn,
- { "ARFCN", "gsm_a.rr.arfcn",
+ { "ARFCN", "gsm_a_ccch.arfcn",
FT_UINT16, BASE_DEC, NULL, 0x0000,
"Absolute Radio Frequency Channel Number (ARFCN)", HFILL }
},
{ &hf_gsm_a_rr_bsic,
- { "BSIC", "gsm_a.rr.bsic",
+ { "BSIC", "gsm_a_ccch.bsic",
FT_UINT8, BASE_DEC, NULL, 0x00,
"Base Station Identify Code (BSIC)", HFILL }
},
{ &hf_gsm_a_rr_qsearch_i,
- { "Qsearch I", "gsm_a.rr.qsearch_i",
+ { "Qsearch I", "gsm_a_ccch.qsearch_i",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_qsearch_x_vals), 0x00,
"Search for 3G cells if signal level is below (0 7) or above (8 15) threshold (Qsearch I)", HFILL }
},
{ &hf_gsm_a_rr_fdd_qoffset,
- { "FDD Qoffset", "gsm_a.rr.fdd_qoffset",
+ { "FDD Qoffset", "gsm_a_ccch.fdd_qoffset",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_xdd_qoffset_vals), 0x00,
"Offset to RLA_C for cell re selection to FDD access technology (FDD Qoffset)", HFILL }
},
{ &hf_gsm_a_rr_fdd_qmin,
- { "FDD Qmin", "gsm_a.rr.fdd_qmin",
+ { "FDD Qmin", "gsm_a_ccch.fdd_qmin",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_fdd_qmin_vals), 0x00,
"Minimum threshold for Ec/No for UTRAN FDD cell re-selection (FDD Qmin)", HFILL }
},
{ &hf_gsm_a_rr_tdd_qoffset,
- { "TDD Qoffset", "gsm_a.rr.tdd_qoffset",
+ { "TDD Qoffset", "gsm_a_ccch.tdd_qoffset",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_xdd_qoffset_vals), 0x00,
"Offset to RLA_C for cell re selection to TDD access technology (TDD Qoffset)", HFILL }
},
{ &hf_gsm_a_rr_fdd_qmin_offset,
- { "FDD Qmin Offset", "gsm_a.rr.fdd_qmin_offset",
+ { "FDD Qmin Offset", "gsm_a_ccch.fdd_qmin_offset",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_fdd_qmin_offset_vals), 0x00,
"Offset to FDD Qmin value (FDD Qmin Offset)", HFILL }
},
{ &hf_gsm_a_rr_fdd_rscpmin,
- { "FDD RSCPmin", "gsm_a.rr.fdd_rscpmin",
+ { "FDD RSCPmin", "gsm_a_ccch.fdd_rscpmin",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_fdd_rscpmin_vals), 0x00,
"Minimum threshold of RSCP for UTRAN FDD cell re-selection (FDD RSCPmin)", HFILL }
},
{ &hf_gsm_a_rr_3g_ba_ind,
- { "3G BA-IND", "gsm_a.rr.3g_ba_ind",
+ { "3G BA-IND", "gsm_a_ccch.3g_ba_ind",
FT_UINT8, BASE_DEC, NULL, 0x00,
"3G BCCH Allocation Indication (3G BA-IND)", HFILL }
},
{ &hf_gsm_a_rr_mp_change_mark,
- { "Measurement Parameter Change Mark", "gsm_a.rr.mp_change_mark",
+ { "Measurement Parameter Change Mark", "gsm_a_ccch.mp_change_mark",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_si2quater_index,
- { "SI2quater Index", "gsm_a.rr.si2quater_index",
+ { "SI2quater Index", "gsm_a_ccch.si2quater_index",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_si2quater_count,
- { "SI2quater Count", "gsm_a.rr.si2quater_count",
+ { "SI2quater Count", "gsm_a_ccch.si2quater_count",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_gsm_report_type,
- { "Report Type", "gsm_a.rr.gsm_report_type",
+ { "Report Type", "gsm_a_ccch.gsm_report_type",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_gsm_report_type_value), 0x0,
"Report type the MS shall use (Report Type)", HFILL }
},
{ &hf_gsm_a_rr_serving_band_reporting,
- { "Serving Band Reporting", "gsm_a.rr.serving_band_reporting",
+ { "Serving Band Reporting", "gsm_a_ccch.serving_band_reporting",
FT_UINT8, BASE_DEC, NULL, 0x00,
"Number of cells reported from the GSM serving frequency band (Serving Band Reporting)", HFILL }
},
{ &hf_gsm_a_rr_frequency_scrolling,
- { "Frequency Scrolling", "gsm_a.rr.frequency_scrolling",
+ { "Frequency Scrolling", "gsm_a_ccch.frequency_scrolling",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_frequency_scrolling_value), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_rep_priority,
- { "Rep Priority", "gsm_a.rr.rep_priority",
+ { "Rep Priority", "gsm_a_ccch.rep_priority",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_rep_priority_value), 0x0,
"Reporting Priority", HFILL }
},
{ &hf_gsm_a_rr_report_type,
- { "Report Type", "gsm_a.rr.report_type",
+ { "Report Type", "gsm_a_ccch.report_type",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_report_type_value), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_reporting_rate,
- { "Reporting Rate", "gsm_a.rr.reporting_rate",
+ { "Reporting Rate", "gsm_a_ccch.reporting_rate",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_reporting_rate_value), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_invalid_bsic_reporting,
- { "Invalid BSIC Reporting", "gsm_a.rr.invalid_bsic_reporting",
+ { "Invalid BSIC Reporting", "gsm_a_ccch.invalid_bsic_reporting",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_invalid_bsic_reporting_value), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_scale_ord,
- { "Scale Ord", "gsm_a.rr.scale_ord",
+ { "Scale Ord", "gsm_a_ccch.scale_ord",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_scale_ord_vals), 0x00,
"Offset used for the reported RXLEV values (Scale Ord)", HFILL }
},
{ &hf_gsm_a_rr_900_reporting_offset,
- { "900 Reporting Offset", "gsm_a.rr.900_reporting_offset",
+ { "900 Reporting Offset", "gsm_a_ccch.900_reporting_offset",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_xxx_reporting_offset_vals), 0x00,
"Offset to the reported value when prioritising the cells for reporting for GSM frequency band 900 (900 Reporting Offset)", HFILL }
},
{ &hf_gsm_a_rr_900_reporting_threshold,
- { "900 Reporting Threshold", "gsm_a.rr.900_reporting_threshold",
+ { "900 Reporting Threshold", "gsm_a_ccch.900_reporting_threshold",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_gsm_reporting_threshold_vals), 0x00,
"Apply priority reporting if the reported value is above threshold for GSM frequency band 900 (900 Reporting Threshold)", HFILL }
},
{ &hf_gsm_a_rr_1800_reporting_offset,
- { "1800 Reporting Offset", "gsm_a.rr.1800_reporting_offset",
+ { "1800 Reporting Offset", "gsm_a_ccch.1800_reporting_offset",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_xxx_reporting_offset_vals), 0x00,
"Offset to the reported value when prioritising the cells for reporting for GSM frequency band 1800 (1800 Reporting Offset)", HFILL }
},
{ &hf_gsm_a_rr_1800_reporting_threshold,
- { "1800 Reporting Threshold", "gsm_a.rr.1800_reporting_threshold",
+ { "1800 Reporting Threshold", "gsm_a_ccch.1800_reporting_threshold",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_gsm_reporting_threshold_vals), 0x00,
"Apply priority reporting if the reported value is above threshold for GSM frequency band 1800 (1800 Reporting Threshold)", HFILL }
},
{ &hf_gsm_a_rr_400_reporting_offset,
- { "400 Reporting Offset", "gsm_a.rr.400_reporting_offset",
+ { "400 Reporting Offset", "gsm_a_ccch.400_reporting_offset",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_xxx_reporting_offset_vals), 0x00,
"Offset to the reported value when prioritising the cells for reporting for GSM frequency band 400 (400 Reporting Offset)", HFILL }
},
{ &hf_gsm_a_rr_400_reporting_threshold,
- { "400 Reporting Threshold", "gsm_a.rr.400_reporting_threshold",
+ { "400 Reporting Threshold", "gsm_a_ccch.400_reporting_threshold",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_gsm_reporting_threshold_vals), 0x00,
"Apply priority reporting if the reported value is above threshold for GSM frequency band 400 (400 Reporting Threshold)", HFILL }
},
{ &hf_gsm_a_rr_1900_reporting_offset,
- { "1900 Reporting Offset", "gsm_a.rr.1900_reporting_offset",
+ { "1900 Reporting Offset", "gsm_a_ccch.1900_reporting_offset",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_xxx_reporting_offset_vals), 0x00,
"Offset to the reported value when prioritising the cells for reporting for GSM frequency band 1900 (1900 Reporting Offset)", HFILL }
},
{ &hf_gsm_a_rr_1900_reporting_threshold,
- { "1900 Reporting Threshold", "gsm_a.rr.1900_reporting_threshold",
+ { "1900 Reporting Threshold", "gsm_a_ccch.1900_reporting_threshold",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_gsm_reporting_threshold_vals), 0x00,
"Apply priority reporting if the reported value is above threshold for GSM frequency band 1900 (1900 Reporting Threshold)", HFILL }
},
{ &hf_gsm_a_rr_850_reporting_offset,
- { "850 Reporting Offset", "gsm_a.rr.850_reporting_offset",
+ { "850 Reporting Offset", "gsm_a_ccch.850_reporting_offset",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_xxx_reporting_offset_vals), 0x00,
"Offset to the reported value when prioritising the cells for reporting for GSM frequency band 850 (850 Reporting Offset)", HFILL }
},
{ &hf_gsm_a_rr_850_reporting_threshold,
- { "850 Reporting Threshold", "gsm_a.rr.900_reporting_threshold",
+ { "850 Reporting Threshold", "gsm_a_ccch.900_reporting_threshold",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_gsm_reporting_threshold_vals), 0x00,
"Apply priority reporting if the reported value is above threshold for GSM frequency band 850 (850 Reporting Threshold)", HFILL }
},
{ &hf_gsm_a_rr_network_control_order,
- { "Network Control Order", "gsm_a.rr.network_control_order",
+ { "Network Control Order", "gsm_a_ccch.network_control_order",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_network_control_order_vals), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_nc_non_drx_period,
- { "NC Non DRX Period", "gsm_a.rr.nc_non_drx_period",
+ { "NC Non DRX Period", "gsm_a_ccch.nc_non_drx_period",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_nc_non_drx_period_vals), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_nc_reporting_period_i,
- { "NC Reporting Period I", "gsm_a.rr.nc_reporting_period_i",
+ { "NC Reporting Period I", "gsm_a_ccch.nc_reporting_period_i",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_nc_reporting_period_x_vals), 0x00,
"NC Reporting Period in Packet Idle mode (NC Reporting Period I)", HFILL }
},
{ &hf_gsm_a_rr_nc_reporting_period_t,
- { "NC Reporting Period T", "gsm_a.rr.nc_reporting_period_t",
+ { "NC Reporting Period T", "gsm_a_ccch.nc_reporting_period_t",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_nc_reporting_period_x_vals), 0x00,
"NC Reporting Period in Packet Transfer mode (NC Reporting Period T)", HFILL }
},
{ &hf_gsm_a_rr_index_start_3g,
- { "Index Start 3G", "gsm_a.rr.index_start_3g",
+ { "Index Start 3G", "gsm_a_ccch.index_start_3g",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_absolute_index_start_emr,
- { "Absolute Index Start EMR", "gsm_a.rr.absolute_index_start_emr",
+ { "Absolute Index Start EMR", "gsm_a_ccch.absolute_index_start_emr",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_qsearch_c_initial,
- { "QSearch C Initial", "gsm_a.rr.qsearch_c_initial",
+ { "QSearch C Initial", "gsm_a_ccch.qsearch_c_initial",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_qsearch_c_initial_value), 0x0,
"Qsearch value to be used in connected mode before Qsearch C is received (QSearch C Initial)", HFILL }
},
{ &hf_gsm_a_rr_fdd_rep_quant,
- { "FDD Rep Quant", "gsm_a.rr.fdd_rep_quant",
+ { "FDD Rep Quant", "gsm_a_ccch.fdd_rep_quant",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_fdd_rep_quant_value), 0x0,
"FDD Reporting Quantity (FDD Rep Quant)", HFILL }
},
{ &hf_gsm_a_rr_fdd_multirat_reporting,
- { "FDD Multirat Reporting", "gsm_a.rr.fdd_multirat_reporting",
+ { "FDD Multirat Reporting", "gsm_a_ccch.fdd_multirat_reporting",
FT_UINT8, BASE_DEC, NULL, 0x00,
"Number of cells from the FDD access technology that shall be included in the list of strongest cells or in the measurement report (FDD Multirat Reporting)", HFILL }
},
{ &hf_gsm_a_rr_tdd_multirat_reporting,
- { "TDD Multirat Reporting", "gsm_a.rr.tdd_multirat_reporting",
+ { "TDD Multirat Reporting", "gsm_a_ccch.tdd_multirat_reporting",
FT_UINT8, BASE_DEC, NULL, 0x00,
"Number of cells from the TDD access technology that shall be included in the list of strongest cells or in the measurement report (TDD Multirat Reporting)", HFILL }
},
{ &hf_gsm_a_rr_qsearch_p,
- { "Qsearch P", "gsm_a.rr.qsearch_p",
+ { "Qsearch P", "gsm_a_ccch.qsearch_p",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_qsearch_x_vals), 0x00,
"Search for 3G cells if signal level below threshold (Qsearch P)", HFILL }
},
{ &hf_gsm_a_rr_3g_search_prio,
- { "3G Search Prio (ignored in Rel-8)", "gsm_a.rr.3g_search_prio",
+ { "3G Search Prio (ignored in Rel-8)", "gsm_a_ccch.3g_search_prio",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_3g_search_prio_value), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_fdd_reporting_offset,
- { "FDD Reporting Offset", "gsm_a.rr.fdd_reporting_offset",
+ { "FDD Reporting Offset", "gsm_a_ccch.fdd_reporting_offset",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_xxx_reporting_offset_vals), 0x00,
"Offset to the reported value when prioritising the cells for reporting for FDD access technology (FDD Reporting Offset)", HFILL }
},
{ &hf_gsm_a_rr_fdd_reporting_threshold_rscp,
- { "FDD Reporting Threshold RSCP", "gsm_a.rr.fdd_reporting_threshold_rscp",
+ { "FDD Reporting Threshold RSCP", "gsm_a_ccch.fdd_reporting_threshold_rscp",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_wcdma_rscp_reporting_threshold_vals), 0x00,
"Apply priority reporting if the reported value is above threshold for FDD access technology (FDD Reporting Threshold)", HFILL }
},
{ &hf_gsm_a_rr_fdd_reporting_threshold_ecn0,
- { "FDD Reporting Threshold EcN0", "gsm_a.rr.fdd_reporting_threshold_ecn0",
+ { "FDD Reporting Threshold EcN0", "gsm_a_ccch.fdd_reporting_threshold_ecn0",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_wcdma_ecn0_reporting_threshold_vals), 0x00,
"Apply priority reporting if the reported value is above threshold for FDD access technology (FDD Reporting Threshold)", HFILL }
},
{ &hf_gsm_a_rr_tdd_reporting_offset,
- { "TDD Reporting Offset", "gsm_a.rr.tdd_reporting_offset",
+ { "TDD Reporting Offset", "gsm_a_ccch.tdd_reporting_offset",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_xxx_reporting_offset_vals), 0x00,
"Offset to the reported value when prioritising the cells for reporting for TDD access technology (TDD Reporting Offset)", HFILL }
},
{ &hf_gsm_a_rr_tdd_reporting_threshold_rscp,
- { "TDD Reporting Threshold RSCP", "gsm_a.rr.tdd_reporting_threshold_rscp",
+ { "TDD Reporting Threshold RSCP", "gsm_a_ccch.tdd_reporting_threshold_rscp",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_wcdma_rscp_reporting_threshold_vals), 0x00,
"Apply priority reporting if the reported value is above threshold for TDD access technology (TDD Reporting Threshold)", HFILL }
},
{ &hf_gsm_a_rr_tdd_reporting_threshold_ecn0,
- { "TDD Reporting Threshold EcN0", "gsm_a.rr.tdd_reporting_threshold_ecn0",
+ { "TDD Reporting Threshold EcN0", "gsm_a_ccch.tdd_reporting_threshold_ecn0",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_wcdma_ecn0_reporting_threshold_vals), 0x00,
"Apply priority reporting if the reported value is above threshold for TDD access technology (TDD Reporting Threshold)", HFILL }
},
{ &hf_gsm_a_rr_fdd_reporting_threshold_2,
- { "FDD Reporting Threshold 2", "gsm_a.rr.fdd_reporting_threshold_2",
+ { "FDD Reporting Threshold 2", "gsm_a_ccch.fdd_reporting_threshold_2",
FT_UINT8, BASE_DEC, NULL, 0x00,
"Reporting threshold for the CPICH parameter (Ec/No or RSCP) that is not reported according to FDD_REP_QUANT (FDD Reporting Threshold 2)", HFILL }
},
{ &hf_gsm_a_rr_3g_ccn_active,
- { "3G CCN Active", "gsm_a.rr.3g_ccn_active",
+ { "3G CCN Active", "gsm_a_ccch.3g_ccn_active",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_3g_ccn_active_value), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_700_reporting_offset,
- { "700 Reporting Offset", "gsm_a.rr.700_reporting_offset",
+ { "700 Reporting Offset", "gsm_a_ccch.700_reporting_offset",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_xxx_reporting_offset_vals), 0x00,
"Offset to the reported value when prioritising the cells for reporting for GSM frequency band 700 (700 Reporting Offset)", HFILL }
},
{ &hf_gsm_a_rr_700_reporting_threshold,
- { "700 Reporting Threshold", "gsm_a.rr.700_reporting_threshold",
+ { "700 Reporting Threshold", "gsm_a_ccch.700_reporting_threshold",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_gsm_reporting_threshold_vals), 0x00,
"Apply priority reporting if the reported value is above threshold for GSM frequency band 700 (700 Reporting Threshold)", HFILL }
},
{ &hf_gsm_a_rr_810_reporting_offset,
- { "810 Reporting Offset", "gsm_a.rr.810_reporting_offset",
+ { "810 Reporting Offset", "gsm_a_ccch.810_reporting_offset",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_xxx_reporting_offset_vals), 0x00,
"Offset to the reported value when prioritising the cells for reporting for GSM frequency band 810 (810 Reporting Offset)", HFILL }
},
{ &hf_gsm_a_rr_810_reporting_threshold,
- { "810 Reporting Threshold", "gsm_a.rr.810_reporting_threshold",
+ { "810 Reporting Threshold", "gsm_a_ccch.810_reporting_threshold",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_gsm_reporting_threshold_vals), 0x00,
"Apply priority reporting if the reported value is above threshold for GSM frequency band 810 (810 Reporting Threshold)", HFILL }
},
{ &hf_gsm_a_rr_cbq,
- { "CBQ", "gsm_a.rr.cbq",
+ { "CBQ", "gsm_a_ccch.cbq",
FT_UINT8, BASE_DEC, NULL, 0x00,
"Cell Bar Qualify", HFILL }
},
{ &hf_gsm_a_rr_cell_reselect_offset,
- { "Cell Reselect Offset", "gsm_a.rr.cell_reselect_offset",
+ { "Cell Reselect Offset", "gsm_a_ccch.cell_reselect_offset",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_cell_reselect_offset_vals), 0x00,
"Offset to the C2 reselection criterion (Cell Reselect Offset)", HFILL }
},
{ &hf_gsm_a_rr_temporary_offset,
- { "Temporary Offset", "gsm_a.rr.temporary_offset",
+ { "Temporary Offset", "gsm_a_ccch.temporary_offset",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_temporary_offset_vals), 0x0,
"Negative offset to C2 for the duration of Penalty Time (Temporary Offset)", HFILL }
},
{ &hf_gsm_a_rr_penalty_time,
- { "Penalty Time", "gsm_a.rr.penalty_time",
+ { "Penalty Time", "gsm_a_ccch.penalty_time",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_penalty_time_vals), 0x0,
"Duration for which the temporary offset is applied (Penalty Time)", HFILL }
},
{ &hf_gsm_a_rr_gprs_ra_colour,
- { "GPRS RA Colour", "gsm_a.rr.gprs_ra_colour",
+ { "GPRS RA Colour", "gsm_a_ccch.gprs_ra_colour",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_si13_position,
- { "SI13 Position", "gsm_a.rr.si13_position",
+ { "SI13 Position", "gsm_a_ccch.si13_position",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_si13_position_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_power_offset,
- { "Power Offset", "gsm_a.rr.power_offset",
+ { "Power Offset", "gsm_a_ccch.power_offset",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_power_offset_vals), 0x0,
"Power offset used in conjunction with the MS TXPWR MAX CCH parameter by the class 3 DCS 1800 MS (Power Offset)", HFILL }
},
{ &hf_gsm_a_rr_si2quater_position,
- { "SI2quater Position", "gsm_a.rr.si2quater_position",
+ { "SI2quater Position", "gsm_a_ccch.si2quater_position",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_si2quater_position_value), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_si13alt_position,
- { "SI13alt Position", "gsm_a.rr.si13alt_position",
+ { "SI13alt Position", "gsm_a_ccch.si13alt_position",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_si13alt_position_value), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_prio_thr,
- { "Prio Thr", "gsm_a.rr.prio_thr",
+ { "Prio Thr", "gsm_a_ccch.prio_thr",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_prio_thr_vals), 0x0,
"Prio signal strength threshold is related to RXLEV ACCESS_MIN (Prio Thr)", HFILL }
},
{ &hf_gsm_a_rr_lsa_offset,
- { "LSA Offset", "gsm_a.rr.lsa_offset",
+ { "LSA Offset", "gsm_a_ccch.lsa_offset",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_lsa_offset_vals), 0x0,
"Offset to be used for LSA cell re selection between cells with the same LSA priorities (LSA Offset)", HFILL }
},
{ &hf_gsm_a_rr_paging_channel_restructuring,
- { "Paging Channel Restructuring", "gsm_a.rr.paging_channel_restructuring",
+ { "Paging Channel Restructuring", "gsm_a_ccch.paging_channel_restructuring",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_paging_channel_restructuring_value), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_nln_sacch,
- { "NLN (SACCH)", "gsm_a.rr.nln_sacch",
+ { "NLN (SACCH)", "gsm_a_ccch.nln_sacch",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_nln_status_sacch,
- { "NLN Status (SACCH)", "gsm_a.rr.nln_status_sacch",
+ { "NLN Status (SACCH)", "gsm_a_ccch.nln_status_sacch",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_nln_pch,
- { "NLN (PCH)", "gsm_a.rr.nln_pch",
+ { "NLN (PCH)", "gsm_a_ccch.nln_pch",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_nln_status_pch,
- { "NLN Status (PCH)", "gsm_a.rr.nln_status_pch",
+ { "NLN Status (PCH)", "gsm_a_ccch.nln_status_pch",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_vbs_vgcs_inband_notifications,
- { "Inband Notifications", "gsm_a.rr.vbs_vgcs_inband_notifications",
+ { "Inband Notifications", "gsm_a_ccch.vbs_vgcs_inband_notifications",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_vbs_vgcs_inband_notifications_value), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_vbs_vgcs_inband_pagings,
- { "Inband Pagings", "gsm_a.rr.vbs_vgcs_inband_pagings",
+ { "Inband Pagings", "gsm_a_ccch.vbs_vgcs_inband_pagings",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_vbs_vgcs_inband_pagings_value), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_rac,
- { "RAC", "gsm_a.rr.rac",
+ { "RAC", "gsm_a_ccch.rac",
FT_UINT8, BASE_DEC, NULL, 0x0,
"Routeing Area Code", HFILL }
},
{ &hf_gsm_a_rr_max_lapdm,
- { "Max LAPDm", "gsm_a.rr.max_lapdm",
+ { "Max LAPDm", "gsm_a_ccch.max_lapdm",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_max_lapdm_vals), 0x0,
"Maximum number of LAPDm frames on which a layer 3 can be segmented into and be sent on the main DCCH (Max LAPDm)", HFILL }
},
{ &hf_gsm_a_rr_gprs_ms_txpwr_max_ccch,
- { "GPRS MS TxPwr Max CCH", "gsm_a.rr.gprs_ms_txpwr_max_cch",
+ { "GPRS MS TxPwr Max CCH", "gsm_a_ccch.gprs_ms_txpwr_max_cch",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_dedicated_mode_mbms_notification_support,
- { "Dedicated Mode MBMS Notification Support", "gsm_a.rr.dedicated_mode_mbms_notification_support",
+ { "Dedicated Mode MBMS Notification Support", "gsm_a_ccch.dedicated_mode_mbms_notification_support",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_dedicated_mode_mbms_notification_support_value), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_mnci_support,
- { "MNCI Support", "gsm_a.rr.mnci_support",
+ { "MNCI Support", "gsm_a_ccch.mnci_support",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_mnci_support_value), 0x0,
"MBMS Neighbouring Cell Information Support (MNCI Support)", HFILL }
},
{ &hf_gsm_a_rr_amr_config,
- { "AMR Configuration", "gsm_a.rr.amr_config",
+ { "AMR Configuration", "gsm_a_ccch.amr_config",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_bcch_change_mark,
- { "BCCH Change Mark", "gsm_a.rr.bcch_change_mark",
+ { "BCCH Change Mark", "gsm_a_ccch.bcch_change_mark",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_si_change_field,
- { "SI Change Field", "gsm_a.rr.si_change_field",
+ { "SI Change Field", "gsm_a_ccch.si_change_field",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_si_change_field_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_si13_change_mark,
- { "SI13 Change Mark", "gsm_a.rr.si13_change_mark",
+ { "SI13 Change Mark", "gsm_a_ccch.si13_change_mark",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_hsn,
- { "HSN", "gsm_a.rr.hsn",
+ { "HSN", "gsm_a_ccch.hsn",
FT_UINT8, BASE_DEC, NULL, 0x0,
"Hopping Sequence Number (HSN)", HFILL }
},
{ &hf_gsm_a_rr_rfl_number,
- { "RFL Number", "gsm_a.rr.rfl_number",
+ { "RFL Number", "gsm_a_ccch.rfl_number",
FT_UINT8, BASE_DEC, NULL, 0x0,
"Radio Frequency List Number (RFL Number)", HFILL }
},
{ &hf_gsm_a_rr_arfcn_index,
- { "ARFCN Index", "gsm_a.rr.arfcn_index",
+ { "ARFCN Index", "gsm_a_ccch.arfcn_index",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_ma_length,
- { "MA Length", "gsm_a.rr.ma_length",
+ { "MA Length", "gsm_a_ccch.ma_length",
FT_UINT8, BASE_DEC, NULL, 0x0,
"Mobile Allocation Length (MA Length)", HFILL }
},
{ &hf_gsm_a_rr_psi1_repeat_period,
- { "PSI1 Repeat Period", "gsm_a.rr.psi1_repeat_period",
+ { "PSI1 Repeat Period", "gsm_a_ccch.psi1_repeat_period",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_psi1_repeat_period_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_pbcch_pb,
- { "Pb", "gsm_a.rr.pbcch_pb",
+ { "Pb", "gsm_a_ccch.pbcch_pb",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_pbcch_pb_vals), 0x0,
"Power reduction on PBCCH/PCCCH (Pb)", HFILL }
},
{ &hf_gsm_a_rr_pbcch_tsc,
- { "TSC", "gsm_a.rr.pbcch_tsc",
+ { "TSC", "gsm_a_ccch.pbcch_tsc",
FT_UINT8, BASE_DEC, NULL, 0x0,
"Training Sequence Code for PBCCH (TSC)", HFILL }
},
{ &hf_gsm_a_rr_pbcch_tn,
- { "TN", "gsm_a.rr.pbcch_tn",
+ { "TN", "gsm_a_ccch.pbcch_tn",
FT_UINT8, BASE_DEC, NULL, 0x0,
"Timeslot Number for PCCH (TN)", HFILL }
},
{ &hf_gsm_a_rr_spgc_ccch_sup,
- { "SPGC CCCH Sup", "gsm_a.rr.spgc_ccch_sup",
+ { "SPGC CCCH Sup", "gsm_a_ccch.spgc_ccch_sup",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_spgc_ccch_sup_value), 0x0,
"Split PG Cycle Code on CCCH Support (SPGC CCCH Sup)", HFILL }
},
{ &hf_gsm_a_rr_priority_access_thr,
- { "Priority Access Thr", "gsm_a.rr.priority_access_thr",
+ { "Priority Access Thr", "gsm_a_ccch.priority_access_thr",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_priority_access_thr_vals), 0x0,
"Priority Access Threshold for packet access (Priority Access Thr)", HFILL }
},
{ &hf_gsm_a_rr_nmo,
- { "NMO", "gsm_a.rr.nmo",
+ { "NMO", "gsm_a_ccch.nmo",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_nmo_vals), 0x0,
"Network mode of Operation (NMO)", HFILL }
},
{ &hf_gsm_a_rr_t3168,
- { "T3168", "gsm_a.rr.t3168",
+ { "T3168", "gsm_a_ccch.t3168",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_t3168_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_t3192,
- { "T3192", "gsm_a.rr.t3192",
+ { "T3192", "gsm_a_ccch.t3192",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_t3192_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_drx_timer_max,
- { "DRX Timer Max", "gsm_a.rr.drx_timer_max",
+ { "DRX Timer Max", "gsm_a_ccch.drx_timer_max",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_drx_timer_max_vals), 0x0,
"Discontinuous Reception Timer Max (DRX Timer Max)", HFILL }
},
{ &hf_gsm_a_rr_access_burst_type,
- { "Access Burst Type", "gsm_a.rr.access_burst_type",
+ { "Access Burst Type", "gsm_a_ccch.access_burst_type",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_access_burst_type_value), 0x0,
"Format used in the PACKET CHANNEL REQUEST message, the PS HANDOVER ACCESS message, the PTCCH uplink block and in the PACKET CONTROL ACKNOWLEDGMENT message (Access Burst Type)", HFILL }
},
{ &hf_gsm_a_rr_control_ack_type,
- { "Control Ack Type", "gsm_a.rr.control_ack_type",
+ { "Control Ack Type", "gsm_a_ccch.control_ack_type",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_control_ack_type_value), 0x0,
"Default format of the PACKET CONTROL ACKNOWLEDGMENT message (Control Ack Type)", HFILL }
},
{ &hf_gsm_a_rr_bs_cv_max,
- { "BS CV Max", "gsm_a.rr.bs_cv_max",
+ { "BS CV Max", "gsm_a_ccch.bs_cv_max",
FT_UINT8, BASE_DEC, NULL, 0x0,
"Base Station Countdown Value Maximum (BS CV Max)", HFILL }
},
{ &hf_gsm_a_rr_pan_dec,
- { "PAN Dec", "gsm_a.rr.pan_dec",
+ { "PAN Dec", "gsm_a_ccch.pan_dec",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_pan_inc,
- { "PAN Inc", "gsm_a.rr.pan_inc",
+ { "PAN Inc", "gsm_a_ccch.pan_inc",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_pan_max,
- { "PAN Max", "gsm_a.rr.pan_max",
+ { "PAN Max", "gsm_a_ccch.pan_max",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_pan_max_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_egprs_packet_channel_request,
- { "EGPRS Packet Channel Request", "gsm_a.rr.egprs_packet_channel_request",
+ { "EGPRS Packet Channel Request", "gsm_a_ccch.egprs_packet_channel_request",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_egprs_packet_channel_request_value), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_bep_period,
- { "BEP Period", "gsm_a.rr.bep_period",
+ { "BEP Period", "gsm_a_ccch.bep_period",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_bep_period_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_pfc_feature_mode,
- { "PFC Feature Mode", "gsm_a.rr.pfc_feature_mode",
+ { "PFC Feature Mode", "gsm_a_ccch.pfc_feature_mode",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_pfc_feature_mode_value), 0x0,
"Packet Flow Context Feature Mode (PFC Feature Mode)", HFILL }
},
{ &hf_gsm_a_rr_dtm_support,
- { "DTM Support", "gsm_a.rr.dtm_support",
+ { "DTM Support", "gsm_a_ccch.dtm_support",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_dtm_support_value), 0x0,
"Dual Transfer Mode Support (DTM Support)", HFILL }
},
{ &hf_gsm_a_rr_bss_paging_coordination,
- { "BSS Paging Coordination", "gsm_a.rr.bss_paging_coordination",
+ { "BSS Paging Coordination", "gsm_a_ccch.bss_paging_coordination",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_bss_paging_coordination_value), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_ccn_active,
- { "CCN Active", "gsm_a.rr.ccn_active",
+ { "CCN Active", "gsm_a_ccch.ccn_active",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_ccn_active_value), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_nw_ext_utbf,
- { "NW Ext UTBF", "gsm_a.rr.nw_ext_utbf",
+ { "NW Ext UTBF", "gsm_a_ccch.nw_ext_utbf",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_nw_ext_utbf_value), 0x0,
"Network Extended Uplink TBF (NW Ext UTBF)", HFILL }
},
{ &hf_gsm_a_rr_multiple_tbf_capability,
- { "Multiple TBF Capability", "gsm_a.rr.multiple_tbf_capability",
+ { "Multiple TBF Capability", "gsm_a_ccch.multiple_tbf_capability",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_multiple_tbf_capability_value), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_ext_utbf_no_data,
- { "Ext UTBF No Data", "gsm_a.rr.ext_utbf_no_data",
+ { "Ext UTBF No Data", "gsm_a_ccch.ext_utbf_no_data",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_ext_utbf_no_data_value), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_dtm_enhancements_capability,
- { "DTM Enhancements Capability", "gsm_a.rr.dtm_enhancements_capability",
+ { "DTM Enhancements Capability", "gsm_a_ccch.dtm_enhancements_capability",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_dtm_enhancements_capability_value), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_reduced_latency_access,
- { "Reduced Latency Access", "gsm_a.rr.reduced_latency_access",
+ { "Reduced Latency Access", "gsm_a_ccch.reduced_latency_access",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_reduced_latency_access_value), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_alpha,
- { "Alpha", "gsm_a.rr.alpha",
+ { "Alpha", "gsm_a_ccch.alpha",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_alpha_vals), 0x0,
"Alpha parameter for GPR MS output power control (Alpha)", HFILL }
},
{ &hf_gsm_a_rr_t_avg_w,
- { "T Avg W", "gsm_a.rr.t_avg_w",
+ { "T Avg W", "gsm_a_ccch.t_avg_w",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_t_avg_x_vals), 0x0,
"Signal strength filter period for power control in packet idle mode", HFILL }
},
{ &hf_gsm_a_rr_t_avg_t,
- { "T Avg T", "gsm_a.rr.t_avg_t",
+ { "T Avg T", "gsm_a_ccch.t_avg_t",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_t_avg_x_vals), 0x0,
"Signal strength filter period for power control in packet transfer mode", HFILL }
},
{ &hf_gsm_a_rr_pc_meas_chan,
- { "PC Meas Chan", "gsm_a.rr.pc_meas_chan",
+ { "PC Meas Chan", "gsm_a_ccch.pc_meas_chan",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_pc_meas_chan_value), 0x0,
"Channel used to measure the received power level on the downlink for the purpose of the uplink power control (PC Meas Chan)", HFILL }
},
{ &hf_gsm_a_rr_n_avg_i,
- { "N Avg I", "gsm_a.rr.n_avg_i",
+ { "N Avg I", "gsm_a_ccch.n_avg_i",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_n_avg_i_vals), 0x0,
"Interfering signal strength filter constant for power control (N Avg I)", HFILL }
},
{ &hf_gsm_a_rr_sgsnr,
- { "SGSNR", "gsm_a.rr.sgsnr",
+ { "SGSNR", "gsm_a_ccch.sgsnr",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_sgsnr_value), 0x0,
"SGSN Release (SGSNR)", HFILL }
},
{ &hf_gsm_a_rr_si_status_ind,
- { "SI Status Ind", "gsm_a.rr.si_status_ind",
+ { "SI Status Ind", "gsm_a_ccch.si_status_ind",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_si_status_ind_value), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_lb_ms_txpwr_max_cch,
- { "LB MS TxPwr Max CCCH", "gsm_a.rr.n_avg_i",
+ { "LB MS TxPwr Max CCCH", "gsm_a_ccch.n_avg_i",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_n_avg_i_vals), 0x0,
"Maximum TX power level an MS is allowed to use on all other than DCS 1800 and PCS 1900 frequency bands when accessing the system until otherwise commanded (LB MS TxPwr Max CCCH)", HFILL }
},
{ &hf_gsm_a_rr_si2n_support,
- { "SI2n Support", "gsm_a.rr.si2n_support",
+ { "SI2n Support", "gsm_a_ccch.si2n_support",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_si2n_support_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_mi_index,
- { "Measurement Information Index", "gsm_a.rr.mi_index",
+ { "Measurement Information Index", "gsm_a_ccch.mi_index",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_mi_count,
- { "Measurement Information Count", "gsm_a.rr.mi_count",
+ { "Measurement Information Count", "gsm_a_ccch.mi_count",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_3g_wait,
- { "3G Wait", "gsm_a.rr.3g_wait",
+ { "3G Wait", "gsm_a_ccch.3g_wait",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_3g_wait_vals), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_qsearch_c,
- { "Qsearch C", "gsm_a.rr.qsearch_c",
+ { "Qsearch C", "gsm_a_ccch.qsearch_c",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_qsearch_x_vals), 0x00,
"Search for 3G cells if signal level is below (0 7) or above (8 15) threshold (Qsearch C)", HFILL }
},
{ &hf_gsm_a_rr_bsic_seen,
- { "BSIC Seen", "gsm_a.rr.bsic_seen",
+ { "BSIC Seen", "gsm_a_ccch.bsic_seen",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_bsic_seen_value), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_scale,
- { "Scale", "gsm_a.rr.scale",
+ { "Scale", "gsm_a_ccch.scale",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_scale_value), 0x0,
"Offset applied for the reported RXLEV values (Scale)", HFILL }
},
{ &hf_gsm_a_rr_mean_bep_gmsk,
- { "Mean BEP GMSK", "gsm_a.rr.mean_bep_gmsk",
+ { "Mean BEP GMSK", "gsm_a_ccch.mean_bep_gmsk",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_mean_bep_gmsk_vals), 0x00,
"Mean Bit Error Probability in GMSK (Mean BEP GMSK)", HFILL }
},
{ &hf_gsm_a_rr_mean_cv_bep,
- { "CV BEP", "gsm_a.rr.cv_bep",
+ { "CV BEP", "gsm_a_ccch.cv_bep",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_cv_bep_vals), 0x00,
"Coefficient of Variation of the Bit Error Probability (CV BEP)", HFILL }
},
{ &hf_gsm_a_rr_nbr_rcvd_blocks,
- { "Nb Rcvd Blocks", "gsm_a.rr.nbr_rcvd_blocks",
+ { "Nb Rcvd Blocks", "gsm_a_ccch.nbr_rcvd_blocks",
FT_UINT8, BASE_DEC, NULL, 0x00,
"Number of correctly decoded blocks that were completed during the measurement report period (Nb Rcvd Blocks)", HFILL }
},
{ &hf_gsm_a_rr_reporting_quantity,
- { "Reporting Quantity", "gsm_a.rr.reporting_quantity",
+ { "Reporting Quantity", "gsm_a_ccch.reporting_quantity",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_3g_priority_param_desc_utran_start,
- { "UTRAN Start", "gsm_a.rr.3g_priority.utran_start",
+ { "UTRAN Start", "gsm_a_ccch.3g_priority.utran_start",
FT_BOOLEAN, BASE_NONE, TFS(&priority_utran_start), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_3g_priority_param_desc_utran_stop,
- { "UTRAN Stop", "gsm_a.rr.3g_priority.utran_stop",
+ { "UTRAN Stop", "gsm_a_ccch.3g_priority.utran_stop",
FT_BOOLEAN, BASE_NONE, TFS(&priority_utran_stop), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_3g_priority_param_desc_default_utran_prio,
- { "DEFAULT_UTRAN_PRIORITY", "gsm_a.rr.3g_priority.default_utran_prio",
+ { "DEFAULT_UTRAN_PRIORITY", "gsm_a_ccch.3g_priority.default_utran_prio",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_3g_priority_param_desc_default_threshold_utran,
- { "DEFAULT_THRESH_UTRAN", "gsm_a.rr.3g_priority.default_threshold_utran",
+ { "DEFAULT_THRESH_UTRAN", "gsm_a_ccch.3g_priority.default_threshold_utran",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_thresh_utran_eutran_high_low), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_3g_priority_param_desc_default_utran_qrxlevmin,
- { "DEFAULT_UTRAN_QRXLEVMIN", "gsm_a.rr.3g_priority.default_utran_qrxlevmin",
+ { "DEFAULT_UTRAN_QRXLEVMIN", "gsm_a_ccch.3g_priority.default_utran_qrxlevmin",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_utran_qrxlevmin), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_utran_frequency_index,
- { "UTRAN Frequency Index", "gsm_a.rr.3g_priority.utran_frequency_index",
+ { "UTRAN Frequency Index", "gsm_a_ccch.3g_priority.utran_frequency_index",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_utran_priority,
- { "UTRAN_PRIORITY", "gsm_a.rr.3g_priority.utran_priority",
+ { "UTRAN_PRIORITY", "gsm_a_ccch.3g_priority.utran_priority",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_thresh_utran_high,
- { "THRESH_UTRAN_high", "gsm_a.rr.3g_priority.thres_utran_high",
+ { "THRESH_UTRAN_high", "gsm_a_ccch.3g_priority.thres_utran_high",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_thresh_utran_eutran_high_low), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_thresh_utran_low,
- { "THRESH_UTRAN_low", "gsm_a.rr.3g_priority.thres_utran_low",
+ { "THRESH_UTRAN_low", "gsm_a_ccch.3g_priority.thres_utran_low",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_thresh_utran_eutran_high_low), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_utran_qrxlevmin,
- { "UTRAN_QRXLEVMIN", "gsm_a.rr.3g_priority.utran_qrxlevmin",
+ { "UTRAN_QRXLEVMIN", "gsm_a_ccch.3g_priority.utran_qrxlevmin",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_utran_qrxlevmin), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_eutran_ccn_active,
- { "E-UTRAN_CCN_ACTIVE", "gsm_a.rr.3g_priority.eutran_ccn_active",
+ { "E-UTRAN_CCN_ACTIVE", "gsm_a_ccch.3g_priority.eutran_ccn_active",
FT_BOOLEAN, BASE_NONE, TFS(&eutran_ccn_active), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_eutran_start,
- { "E-UTRAN Start", "gsm_a.rr.3g_priority.eutran_start",
+ { "E-UTRAN Start", "gsm_a_ccch.3g_priority.eutran_start",
FT_BOOLEAN, BASE_NONE, TFS(&priority_utran_start), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_eutran_stop,
- { "E-UTRAN Stop", "gsm_a.rr.3g_priority.utran_stop",
+ { "E-UTRAN Stop", "gsm_a_ccch.3g_priority.utran_stop",
FT_BOOLEAN, BASE_NONE, TFS(&priority_utran_stop), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_qsearch_c_eutran_initial,
- { "Qsearch_C_E-UTRAN_Initial", "gsm_a.rr.qsearch_c_eutran_initial",
+ { "Qsearch_C_E-UTRAN_Initial", "gsm_a_ccch.qsearch_c_eutran_initial",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_qsearch_c_eutran_initial), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_eutran_multirat_reporting,
- { "E-UTRAN_MULTIRAT_REPORTING (nb of E-UTRAN cells to be included in measurement report)", "gsm_a.rr.eutran_multirat_reporting",
+ { "E-UTRAN_MULTIRAT_REPORTING (nb of E-UTRAN cells to be included in measurement report)", "gsm_a_ccch.eutran_multirat_reporting",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_eutran_fdd_reporting_threshold_rsrp,
- { "E-UTRAN_FDD_REPORTING_THRESHOLD", "gsm_a.rr.eutran_fdd_reporting_threshold_rsrp",
+ { "E-UTRAN_FDD_REPORTING_THRESHOLD", "gsm_a_ccch.eutran_fdd_reporting_threshold_rsrp",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_lte_rsrp_reporting_threshold_vals), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_eutran_fdd_reporting_threshold_rsrq,
- { "E-UTRAN_FDD_REPORTING_THRESHOLD", "gsm_a.rr.eutran_fdd_reporting_threshold_rsrq",
+ { "E-UTRAN_FDD_REPORTING_THRESHOLD", "gsm_a_ccch.eutran_fdd_reporting_threshold_rsrq",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_lte_rsrq_reporting_threshold_vals), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_eutran_fdd_reporting_threshold_2,
- { "E-UTRAN_FDD_REPORTING_THRESHOLD_2", "gsm_a.rr.eutran_fdd_reporting_threshold_2",
+ { "E-UTRAN_FDD_REPORTING_THRESHOLD_2", "gsm_a_ccch.eutran_fdd_reporting_threshold_2",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_eutran_fdd_reporting_offset,
- { "E-UTRAN_FDD_REPORTING_OFFSET", "gsm_a.rr.eutran_fdd_reporting_offset",
+ { "E-UTRAN_FDD_REPORTING_OFFSET", "gsm_a_ccch.eutran_fdd_reporting_offset",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_eutran_tdd_reporting_threshold_rsrp,
- { "E-UTRAN_TDD_REPORTING_THRESHOLD", "gsm_a.rr.eutran_tdd_reporting_threshold_rsrp",
+ { "E-UTRAN_TDD_REPORTING_THRESHOLD", "gsm_a_ccch.eutran_tdd_reporting_threshold_rsrp",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_lte_rsrp_reporting_threshold_vals), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_eutran_tdd_reporting_threshold_rsrq,
- { "E-UTRAN_TDD_REPORTING_THRESHOLD", "gsm_a.rr.eutran_tdd_reporting_threshold_rsrq",
+ { "E-UTRAN_TDD_REPORTING_THRESHOLD", "gsm_a_ccch.eutran_tdd_reporting_threshold_rsrq",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_lte_rsrq_reporting_threshold_vals), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_eutran_tdd_reporting_threshold_2,
- { "E-UTRAN_TDD_REPORTING_THRESHOLD_2", "gsm_a.rr.eutran_tdd_reporting_threshold_2",
+ { "E-UTRAN_TDD_REPORTING_THRESHOLD_2", "gsm_a_ccch.eutran_tdd_reporting_threshold_2",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_eutran_tdd_reporting_offset,
- { "E-UTRAN_TDD_REPORTING_OFFSET", "gsm_a.rr.eutran_tdd_reporting_offset",
+ { "E-UTRAN_TDD_REPORTING_OFFSET", "gsm_a_ccch.eutran_tdd_reporting_offset",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_eutran_fdd_measurement_report_offset,
- { "E-UTRAN_FDD_MEASUREMENT_REPORT_OFFSET", "gsm_a.rr.eutran_fdd_measurement_report_offset",
+ { "E-UTRAN_FDD_MEASUREMENT_REPORT_OFFSET", "gsm_a_ccch.eutran_fdd_measurement_report_offset",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_eutran_tdd_measurement_report_offset,
- { "E-UTRAN_TDD_MEASUREMENT_REPORT_OFFSET", "gsm_a.rr.eutran_tdd_measurement_report_offset",
+ { "E-UTRAN_TDD_MEASUREMENT_REPORT_OFFSET", "gsm_a_ccch.eutran_tdd_measurement_report_offset",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_reporting_granularity,
- { "REPORTING_GRANULARITY", "gsm_a.rr.reporting_granularity",
+ { "REPORTING_GRANULARITY", "gsm_a_ccch.reporting_granularity",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_eutran_default_measurement_control_eutran,
- { "DEFAULT_Measurement_Control_E-UTRAN", "gsm_a.rr.eutran_default_measurement_control_eutran",
+ { "DEFAULT_Measurement_Control_E-UTRAN", "gsm_a_ccch.eutran_default_measurement_control_eutran",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_eutran_measurement_control_eutran,
- { "Measurement_Control_E-UTRAN", "gsm_a.rr.eutran_measurement_control_eutran",
+ { "Measurement_Control_E-UTRAN", "gsm_a_ccch.eutran_measurement_control_eutran",
FT_BOOLEAN, BASE_NONE, TFS(&measurement_control_eutran), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_qsearch_p_eutran,
- { "Qsearch_P_E-UTRAN", "gsm_a.rr.qsearch_p_eutran",
+ { "Qsearch_P_E-UTRAN", "gsm_a_ccch.qsearch_p_eutran",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_serving_cell_priority_param_geran_priority,
- { "GERAN_PRIORITY", "gsm_a.rr.serving_cell_priority_param_geran_priority",
+ { "GERAN_PRIORITY", "gsm_a_ccch.serving_cell_priority_param_geran_priority",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_serving_cell_priority_param_thresh_prio_search,
- { "THRESH_Priority_Search", "gsm_a.rr.serving_cell_priority_param_thresh_prio_search",
+ { "THRESH_Priority_Search", "gsm_a_ccch.serving_cell_priority_param_thresh_prio_search",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_serving_cell_thresh_priority_search), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_serving_cell_priority_param_thresh_gsm_low,
- { "THRESH_GSM_low", "gsm_a.rr.serving_cell_priority_param_thresh_gsm_low",
+ { "THRESH_GSM_low", "gsm_a_ccch.serving_cell_priority_param_thresh_gsm_low",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_serving_cell_thresh_gsm_low), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_serving_cell_priority_param_h_prio,
- { "H_PRIO", "gsm_a.rr.serving_cell_priority_param_h_prio",
+ { "H_PRIO", "gsm_a_ccch.serving_cell_priority_param_h_prio",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_serving_cell_priority_param_h_prio), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_serving_cell_priority_param_t_reselection,
- { "T_Reselection", "gsm_a.rr.serving_cell_priority_param_t_reselection",
+ { "T_Reselection", "gsm_a_ccch.serving_cell_priority_param_t_reselection",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_serving_cell_priority_param_t_reselection), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_eutran_earfcn,
- { "EARFCN", "gsm_a.rr.earfcn",
+ { "EARFCN", "gsm_a_ccch.earfcn",
FT_UINT16, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_eutran_measurement_bandwidth,
- { "Measurement Bandwidth", "gsm_a.rr.eutran_measurement_bandwidth",
+ { "Measurement Bandwidth", "gsm_a_ccch.eutran_measurement_bandwidth",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_eutran_measurement_bandwidth), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_eutran_priority,
- { "E-UTRAN_PRIORITY", "gsm_a.rr.eutran_priority",
+ { "E-UTRAN_PRIORITY", "gsm_a_ccch.eutran_priority",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_thresh_eutran_high,
- { "THRESH_EUTRAN_high", "gsm_a.rr.thresh_eutran_high",
+ { "THRESH_EUTRAN_high", "gsm_a_ccch.thresh_eutran_high",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_thresh_utran_eutran_high_low), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_thresh_eutran_low,
- { "THRESH_EUTRAN_low", "gsm_a.rr.thresh_eutran_low",
+ { "THRESH_EUTRAN_low", "gsm_a_ccch.thresh_eutran_low",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_thresh_utran_eutran_high_low), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_eutran_qrxlevmin,
- { "E-UTRAN_QRXLEVMIN", "gsm_a.rr.eutran_qrxlevmin",
+ { "E-UTRAN_QRXLEVMIN", "gsm_a_ccch.eutran_qrxlevmin",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_eutran_qrxlevmin), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_eutran_pcid,
- { "PCID", "gsm_a.rr.pcid",
+ { "PCID", "gsm_a_ccch.pcid",
FT_UINT16, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_eutran_pcid_bitmap_group,
- { "PCID_BITMAP_GROUP", "gsm_a.rr.pcid_bitmap_group",
+ { "PCID_BITMAP_GROUP", "gsm_a_ccch.pcid_bitmap_group",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_eutran_pcid_pattern_length,
- { "PCID_Pattern_length", "gsm_a.rr.pcid_pattern_length",
+ { "PCID_Pattern_length", "gsm_a_ccch.pcid_pattern_length",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_pcid_psc_pattern_length), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_eutran_pcid_pattern,
- { "PCID_Pattern", "gsm_a.rr.pcid_pattern",
+ { "PCID_Pattern", "gsm_a_ccch.pcid_pattern",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_eutran_pcid_pattern_sense,
- { "PCID_pattern_sense", "gsm_a.rr.pcid_pattern_sense",
+ { "PCID_pattern_sense", "gsm_a_ccch.pcid_pattern_sense",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_pcid_pattern_sense), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_eutran_frequency_index,
- { "E-UTRAN_FREQUENCY_INDEX", "gsm_a.rr.eutran_frequency_index",
+ { "E-UTRAN_FREQUENCY_INDEX", "gsm_a_ccch.eutran_frequency_index",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_psc,
- { "PSC", "gsm_a.rr.psc",
+ { "PSC", "gsm_a_ccch.psc",
FT_UINT16, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_utran_psc_pattern_length,
- { "PSC_Pattern_length", "gsm_a.rr.psc_pattern_length",
+ { "PSC_Pattern_length", "gsm_a_ccch.psc_pattern_length",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_pcid_psc_pattern_length), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_utran_psc_pattern_sense,
- { "PSC_pattern_sense", "gsm_a.rr.psc_pattern_sense",
+ { "PSC_pattern_sense", "gsm_a_ccch.psc_pattern_sense",
FT_BOOLEAN, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_utran_csg_fdd_uarfcn,
- { "CSG FDD UARFCN", "gsm_a.rr.utran_csg_fdd_uarfcn",
+ { "CSG FDD UARFCN", "gsm_a_ccch.utran_csg_fdd_uarfcn",
FT_UINT16, BASE_DEC, NULL, 0x0000,
NULL, HFILL }
},
{ &hf_gsm_a_rr_utran_csg_tdd_uarfcn,
- { "CSG TDD UARFCN", "gsm_a.rr.utran_csg_tdd_uarfcn",
+ { "CSG TDD UARFCN", "gsm_a_ccch.utran_csg_tdd_uarfcn",
FT_UINT16, BASE_DEC, NULL, 0x0000,
NULL, HFILL }
},
{ &hf_gsm_a_rr_csg_earfcn,
- { "CSG_EARFCN", "gsm_a.rr.csg_earfcn",
+ { "CSG_EARFCN", "gsm_a_ccch.csg_earfcn",
FT_UINT16, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_3g_control_param_desc_meas_ctrl_utran,
- { "PCID_pattern_sense", "gsm_a.rr._meas_ctrl_utran",
+ { "PCID_pattern_sense", "gsm_a_ccch._meas_ctrl_utran",
FT_BOOLEAN, BASE_NONE, TFS(&measurement_control_utran), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_extended_ra,
- { "Extended_RA", "gsm_a.rr.extended_ra",
+ { "Extended_RA", "gsm_a_ccch.extended_ra",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_access_tech_type,
- { "Access_Technology_Type", "gsm_a.rr.access_tech_type",
+ { "Access_Technology_Type", "gsm_a_ccch.access_tech_type",
FT_UINT8, BASE_DEC, VALS(gsm_a_access_tech_type_vals), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_tfi_assignment,
- { "TFI_Assignment", "gsm_a.rr.tfi_assignment",
+ { "TFI_Assignment", "gsm_a_ccch.tfi_assignment",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_polling,
- { "Polling", "gsm_a.rr.polling",
+ { "Polling", "gsm_a_ccch.polling",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_polling_vals), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_usf,
- { "USF", "gsm_a.rr.usf",
+ { "USF", "gsm_a_ccch.usf",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_usf_granularity,
- { "USF_granularity", "gsm_a.rr.usf_granularity",
+ { "USF_granularity", "gsm_a_ccch.usf_granularity",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_usf_granularity_vals), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_p0,
- { "P0", "gsm_a.rr.p0",
+ { "P0", "gsm_a_ccch.p0",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_pr_mode,
- { "pr_mode", "gsm_a.rr.pr_mode",
+ { "pr_mode", "gsm_a_ccch.pr_mode",
FT_BOOLEAN, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_egprs_mcs,
- { "Egprs_Modulation_and_Coding_Scheme", "gsm_a.rr.egprs_mcs",
+ { "Egprs_Modulation_and_Coding_Scheme", "gsm_a_ccch.egprs_mcs",
FT_UINT8, BASE_DEC, VALS(gsm_a_egprs_mcs_vals), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_tlli_block_channel_coding,
- { "TLLI_Block_Channel_Coding", "gsm_a.rr.tlli_block_cs",
+ { "TLLI_Block_Channel_Coding", "gsm_a_ccch.tlli_block_cs",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_tlli_block_channel_coding_vals), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_bep_period2,
- { "Bep_Period2", "gsm_a.rr.bep_period2",
+ { "Bep_Period2", "gsm_a_ccch.bep_period2",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_resegment,
- { "Resegment", "gsm_a.rr.resegment",
+ { "Resegment", "gsm_a_ccch.resegment",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_resegment_vals), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_egprs_window_size,
- { "Egprs_Windows_Size", "gsm_a.rr.egprs_win_size",
+ { "Egprs_Windows_Size", "gsm_a_ccch.egprs_win_size",
FT_UINT8, BASE_DEC, VALS(gsm_a_egprs_windows_size_vals), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_gamma,
- { "Gamma", "gsm_a.rr.gamma",
+ { "Gamma", "gsm_a_ccch.gamma",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_gamma_vals), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_timing_adv_index,
- { "Timing_Advance_Index", "gsm_a.rr.timing_adv_idx",
+ { "Timing_Advance_Index", "gsm_a_ccch.timing_adv_idx",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_tbf_starting_time,
- { "TBF_Starting_Time", "gsm_a.rr.tvf_start_time",
+ { "TBF_Starting_Time", "gsm_a_ccch.tvf_start_time",
FT_UINT16, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_num_of_radio_block_allocated,
- { "Number_of_Radio_Block_Allocated", "gsm_a.rr.num_of_radio_blk_allocated",
+ { "Number_of_Radio_Block_Allocated", "gsm_a_ccch.num_of_radio_blk_allocated",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_pfi,
- { "PFI", "gsm_a.rr.pfi",
+ { "PFI", "gsm_a_ccch.pfi",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_mbms_service_id,
- { "MBMS_Service_ID", "gsm_a.rr.mbms_service_id",
+ { "MBMS_Service_ID", "gsm_a_ccch.mbms_service_id",
FT_UINT32, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_ms_id,
- { "MS_ID", "gsm_a.rr.ms_id",
+ { "MS_ID", "gsm_a_ccch.ms_id",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_timing_adv_timeslot_num,
- { "Timing_Advance_Timeslot_Number", "gsm_a.rr.timing_adv_ts",
+ { "Timing_Advance_Timeslot_Number", "gsm_a_ccch.timing_adv_ts",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_gprs_cs,
- { "Channel_Coding_Command", "gsm_a.rr.gprs_cs",
+ { "Channel_Coding_Command", "gsm_a_ccch.gprs_cs",
FT_UINT8, BASE_DEC, VALS(gsm_a_gprs_cs_vals), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_rlc_mode,
- { "RLC_Mode", "gsm_a.rr.rlc_mode",
+ { "RLC_Mode", "gsm_a_ccch.rlc_mode",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rlc_mode_vals), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_ta_valid,
- { "TA_Valid", "gsm_a.rr.ta_valid",
+ { "TA_Valid", "gsm_a_ccch.ta_valid",
FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_ta_valid_vals), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_link_quality_meas_mode,
- { "Link_Quality_Measure_Mode", "gsm_a.rr.link_qual_meas_mode",
+ { "Link_Quality_Measure_Mode", "gsm_a_ccch.link_qual_meas_mode",
FT_UINT8, BASE_DEC, VALS(gsm_a_link_quality_meas_mode_vals), 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_emr_bitmap_length,
- { "BITMAP_LENGTH", "gsm_a.rr.emr_bitmap_len",
+ { "BITMAP_LENGTH", "gsm_a_ccch.emr_bitmap_len",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_eutran_mr_n_eutran,
- { "N_E-UTRAN", "gsm_a.rr.eutran_mr_n_eutran",
+ { "N_E-UTRAN", "gsm_a_ccch.eutran_mr_n_eutran",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_eutran_mr_freq_idx,
- { "E-UTRAN_FREQUENCY_INDEX", "gsm_a.rr.eutran_mr_freq_idx",
+ { "E-UTRAN_FREQUENCY_INDEX", "gsm_a_ccch.eutran_mr_freq_idx",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_eutran_mr_cell_id,
- { "CELL IDENTITY", "gsm_a.rr.eutran_mr_cell_id",
+ { "CELL IDENTITY", "gsm_a_ccch.eutran_mr_cell_id",
FT_UINT16, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_eutran_mr_rpt_quantity,
- { "REPORTING_QUANTITY", "gsm_a.rr.eutran_mr_rpt_quantity",
+ { "REPORTING_QUANTITY", "gsm_a_ccch.eutran_mr_rpt_quantity",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_gsm_a_rr_ma_channel_set,
- { "Channel Set", "gsm_a.rr.ma_channel_set",
+ { "Channel Set", "gsm_a_ccch.ma_channel_set",
FT_UINT8, BASE_HEX, NULL, 0x00,
NULL, HFILL }
},
{ &hf_n_range_orig_arfcn,
- { "ORIG-ARFCN", "gsm_a.rr.orig_arfcn",
+ { "ORIG-ARFCN", "gsm_a_ccch.orig_arfcn",
FT_UINT16, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
@@ -12224,17 +12224,17 @@ proto_register_gsm_a_rr(void)
static hf_register_info hf_rr_short_pd[] =
{
{ &hf_gsm_a_rr_short_pd,
- { "Radio Resources Short Protocol Discriminator", "gsm_a.rr_short_pd",
+ { "Radio Resources Short Protocol Discriminator", "gsm_a_sacch.pd",
FT_UINT8, BASE_HEX, NULL, 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_short_pd_msg_type,
- { "Radio Resources Short PD Message Type", "gsm_a.rr_short_pd_type",
+ { "Radio Resources Short PD Message Type", "gsm_a_sacch.pd_type",
FT_UINT8, BASE_HEX, VALS(gsm_a_rr_short_pd_msg_strings), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_rr_short_l2_header,
- { "Radio Resources Short L2 Header", "gsm_a.rr_short_l2_header",
+ { "Radio Resources Short L2 Header", "gsm_a_sacch.l2_header",
FT_UINT8, BASE_HEX, NULL, 0x0,
NULL, HFILL }
}
diff --git a/epan/dissectors/packet-gsm_abis_om2000.c b/epan/dissectors/packet-gsm_abis_om2000.c
index 15d4f233bd..063e80767c 100644
--- a/epan/dissectors/packet-gsm_abis_om2000.c
+++ b/epan/dissectors/packet-gsm_abis_om2000.c
@@ -1044,354 +1044,354 @@ proto_register_abis_om2000(void)
{
static hf_register_info hf[] = {
{ &hf_om2k_msg_code,
- { "Message Code", "om2000.msg_code",
+ { "Message Code", "gsm_a_om2000.msg_code",
FT_UINT16, BASE_HEX|BASE_EXT_STRING, &om2k_msgcode_vals_ext, 0,
NULL, HFILL }
},
{ &hf_om2k_mo_if,
- { "MO Interface", "om2000.mo_if",
+ { "MO Interface", "gsm_a_om2000.mo_if",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }
},
{ &hf_om2k_mo_class,
- { "MO IF Class", "om2000.mo_if.class",
+ { "MO IF Class", "gsm_a_om2000.mo_if.class",
FT_UINT8, BASE_HEX, VALS(om2k_mo_class_vals), 0,
NULL, HFILL }
},
{ &hf_om2k_mo_instance,
- { "MO IF Instance", "om2000.mo_if.instance",
+ { "MO IF Instance", "gsm_a_om2000.mo_if.instance",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }
},
{ &hf_om2k_oip,
- { "OIP (Operational Info)", "om2000.oip",
+ { "OIP (Operational Info)", "gsm_a_om2000.oip",
FT_UINT8, BASE_HEX, VALS(om2k_oip_vals), 0,
"Operational Information Parameter", HFILL }
},
{ &hf_om2k_aip,
- { "AIP (Accordance Info)", "om2000.aip",
+ { "AIP (Accordance Info)", "gsm_a_om2000.aip",
FT_UINT8, BASE_HEX, VALS(om2k_aip_vals), 0,
"Accordance Information Parameter", HFILL }
},
{ &hf_om2k_comb,
- { "Channel Combination", "om2000.chan_comb",
+ { "Channel Combination", "gsm_a_om2000.chan_comb",
FT_UINT8, BASE_DEC, VALS(om2k_comb_vals), 0,
"Logical Channel Combination", HFILL }
},
{ &hf_om2k_ts,
- { "Timeslot Number", "om2000.ts",
+ { "Timeslot Number", "gsm_a_om2000.ts",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }
},
{ &hf_om2k_hsn,
- { "HSN", "om2000.hsn",
+ { "HSN", "gsm_a_om2000.hsn",
FT_UINT8, BASE_DEC, NULL, 0,
"Hopping Sequence Number", HFILL }
},
{ &hf_om2k_maio,
- { "MAIO", "om2000.maio",
+ { "MAIO", "gsm_a_om2000.maio",
FT_UINT8, BASE_DEC, NULL, 0,
"Mobile Allication Index Offset", HFILL }
},
{ &hf_om2k_bsic,
- { "BSIC", "om2000.bsic",
+ { "BSIC", "gsm_a_om2000.bsic",
FT_UINT8, BASE_HEX, NULL, 0,
"Base Station Identity Code", HFILL }
},
{ &hf_om2k_diversity,
- { "Receiver Diversity", "om2000.diversity",
+ { "Receiver Diversity", "gsm_a_om2000.diversity",
FT_UINT8, BASE_HEX, VALS(om2k_diversity_vals), 0,
NULL, HFILL }
},
{ &hf_om2k_fn_offs,
- { "FN Offset", "om2000.fn_offset",
+ { "FN Offset", "gsm_a_om2000.fn_offset",
FT_UINT16, BASE_DEC, NULL, 0,
"GSM Frame Number Offset", HFILL }
},
{ &hf_om2k_ext_range,
- { "Extended Range", "om2000.ext_range",
+ { "Extended Range", "gsm_a_om2000.ext_range",
FT_BOOLEAN, 1, NULL, 0, /* XXX: bitmask needed? 'FT_BOOLEAN, 8, NULL, 0x01' ? */
NULL, HFILL }
},
{ &hf_om2k_irc,
- { "Interference Rejection Combining", "om2000.irc",
+ { "Interference Rejection Combining", "gsm_a_om2000.irc",
FT_BOOLEAN, 1, NULL, 0, /* XXX: bitmask needed? 'FT_BOOLEAN, 8, NULL, 0x01,' ? */
NULL, HFILL }
},
{ &hf_om2k_bs_pa_mfrms,
- { "BS_PA_MFRMS", "om2000.bs_pa_mfrms",
+ { "BS_PA_MFRMS", "gsm_a_om2000.bs_pa_mfrms",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }
},
{ &hf_om2k_bs_ag_blks_res,
- { "BS_AG_BLKS_RES", "om2000.bs_ag_blks_res",
+ { "BS_AG_BLKS_RES", "gsm_a_om2000.bs_ag_blks_res",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }
},
{ &hf_om2k_drx_dev_max,
- { "DRX_DEV_MAX", "om2000.drx_dev_max",
+ { "DRX_DEV_MAX", "gsm_a_om2000.drx_dev_max",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }
},
{ &hf_om2k_cr,
- { "CCCH Repeat", "om2000.ccch_repeat",
+ { "CCCH Repeat", "gsm_a_om2000.ccch_repeat",
FT_BOOLEAN, 1, NULL, 0, /* XXX: bitmask needed? 'FT_BOOLEAN, 8, NULL, 0x01,' ? */
NULL, HFILL }
},
{ &hf_om2k_ipt3,
- { "Inhibit Paging Request Type 3", "om2000.ipt3",
+ { "Inhibit Paging Request Type 3", "gsm_a_om2000.ipt3",
FT_BOOLEAN, 2, NULL, 0, /* XXX: bitmask needed? 'FT_BOOLEAN, 8, NULL, 0x02,' ? */
NULL, HFILL }
},
{ &hf_om2k_aop,
- { "Age Of Paging", "om2000.aop",
+ { "Age Of Paging", "gsm_a_om2000.aop",
FT_UINT8, BASE_DEC, NULL, 0x3C, /* XXX: Verify bitmask */
NULL, HFILL }
},
{ &hf_om2k_t3105,
- { "T3105 (in 10ms)", "om2000.t3105",
+ { "T3105 (in 10ms)", "gsm_a_om2000.t3105",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }
},
{ &hf_om2k_ny1,
- { "Ny1", "om2000.ny1",
+ { "Ny1", "gsm_a_om2000.ny1",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }
},
{ &hf_om2k_cbi,
- { "CBCH Indicator", "om2000.ny1",
+ { "CBCH Indicator", "gsm_a_om2000.ny1",
FT_BOOLEAN, 1, NULL, 0, /* XXX: bitmask needed? 'FT_BOOLEAN, 8, NULL, 0x01,' ? */
NULL, HFILL }
},
{ &hf_om2k_tsc,
- { "Training Sequence Code", "om2000.tsc",
+ { "Training Sequence Code", "gsm_a_om2000.tsc",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }
},
{ &hf_om2k_icm,
- { "Idle Channel Measurement", "om2000.icm",
+ { "Idle Channel Measurement", "gsm_a_om2000.icm",
FT_BOOLEAN, 1, NULL, 0, /* XXX: bitmask needed? 'FT_BOOLEAN, 8, NULL, 0x01,' ? */
NULL, HFILL }
},
{ &hf_om2k_tta,
- { "Timer for Time Alignment", "om2000.tta",
+ { "Timer for Time Alignment", "gsm_a_om2000.tta",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }
},
{ &hf_om2k_icm_cr,
- { "ICM Channel Rate", "om2000.icm_cr",
+ { "ICM Channel Rate", "gsm_a_om2000.icm_cr",
FT_UINT8, BASE_DEC, VALS(om2k_icmcr_vals), 0,
NULL, HFILL }
},
{ &hf_om2k_lsc_fm,
- { "LSC Dummy Frequency Measurement", "om2000.lsc.fm",
+ { "LSC Dummy Frequency Measurement", "gsm_a_om2000.lsc.fm",
FT_BOOLEAN, 8, NULL, 0x80,
NULL, HFILL }
},
{ &hf_om2k_lsc_lsi,
- { "LSC Idle Channels", "om2000.ls.lsi",
+ { "LSC Idle Channels", "gsm_a_om2000.ls.lsi",
FT_BOOLEAN, 8, NULL, 0x01,
NULL, HFILL }
},
{ &hf_om2k_lsc_lsa,
- { "LSC Active Channels", "om2000.ls.lsa",
+ { "LSC Active Channels", "gsm_a_om2000.ls.lsa",
FT_BOOLEAN, 8, NULL, 0x02,
NULL, HFILL }
},
{ &hf_om2k_ls_ft,
- { "Link Supervision Filtering Time (100ms)", "om2000.ls_ft",
+ { "Link Supervision Filtering Time (100ms)", "gsm_a_om2000.ls_ft",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }
},
{ &hf_om2k_cst,
- { "Call Supervision Time (480ms)", "om2000.cst",
+ { "Call Supervision Time (480ms)", "gsm_a_om2000.cst",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }
},
{ &hf_om2k_ea,
- { "Encryption Algorithm", "om2000.ea",
+ { "Encryption Algorithm", "gsm_a_om2000.ea",
FT_UINT8, BASE_DEC, VALS(om2k_ea_vals), 0,
NULL, HFILL }
},
{ &hf_om2k_nom_pwr,
- { "Nominal Power (dBm)", "om2000.pwr",
+ { "Nominal Power (dBm)", "gsm_a_om2000.pwr",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }
},
{ &hf_om2k_fill_mark,
- { "Filling Marker", "om2000.filling",
+ { "Filling Marker", "gsm_a_om2000.filling",
FT_UINT8, BASE_DEC, VALS(om2k_fill_vals), 0,
NULL, HFILL }
},
{ &hf_om2k_bcc,
- { "BCC", "om2000.bcc",
+ { "BCC", "gsm_a_om2000.bcc",
FT_UINT8, BASE_DEC, NULL, 0,
"Base Station Color Code", HFILL }
},
{ &hf_om2k_mo_state,
- { "MO State", "om2000.mo_state",
+ { "MO State", "gsm_a_om2000.mo_state",
FT_UINT8, BASE_DEC, VALS(om2k_mo_state_vals), 0,
NULL, HFILL }
},
{ &hf_om2k_la_state,
- { "Local Access State", "om2000.la_state",
+ { "Local Access State", "gsm_a_om2000.la_state",
FT_UINT8, BASE_DEC, VALS(om2k_la_state_vals), 0,
NULL, HFILL }
},
{ &hf_om2k_tsn_state,
- { "Time Slot N MO State", "om2000.tsn_mo_state",
+ { "Time Slot N MO State", "gsm_a_om2000.tsn_mo_state",
FT_UINT8, BASE_DEC, VALS(om2k_mo_state_vals), 0,
NULL, HFILL }
},
{ &hf_om2k_bts_manuf,
- { "BTS Manufacturer ID", "om2000.bts_ver.manuf",
+ { "BTS Manufacturer ID", "gsm_a_om2000.bts_ver.manuf",
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL }
},
{ &hf_om2k_bts_gen,
- { "BTS Generation", "om2000.bts_ver.gen",
+ { "BTS Generation", "gsm_a_om2000.bts_ver.gen",
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL }
},
{ &hf_om2k_bts_rev,
- { "BTS Revision", "om2000.bts_ver.rev",
+ { "BTS Revision", "gsm_a_om2000.bts_ver.rev",
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL }
},
{ &hf_om2k_bts_var,
- { "BTS Variant", "om2000.bts_ver.variant",
+ { "BTS Variant", "gsm_a_om2000.bts_ver.variant",
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL }
},
{ &hf_om2k_brr,
- { "BTS Requested Restart", "om2000.brr",
+ { "BTS Requested Restart", "gsm_a_om2000.brr",
FT_BOOLEAN, 0x01, NULL, 0, /* XXX: bitmask needed? 'FT_BOOLEAN, 8, NULL, 0x??,' ? */
NULL, HFILL }
},
{ &hf_om2k_bfr,
- { "BTS Requested File Relation", "om2000.bfr",
+ { "BTS Requested File Relation", "gsm_a_om2000.bfr",
FT_BOOLEAN, 0x01, NULL, 0, /* XXX: bitmask needed? 'FT_BOOLEAN, 8, NULL, 0x??,' ? */
NULL, HFILL }
},
{ &hf_om2k_hwinfo_sig,
- { "HW Info Signature", "om2000.hwinfo_sig",
+ { "HW Info Signature", "gsm_a_om2000.hwinfo_sig",
FT_UINT16, BASE_HEX, NULL, 0,
NULL, HFILL }
},
{ &hf_om2k_capa_sig,
- { "Capabilities Signature", "om2000.capa_sig",
+ { "Capabilities Signature", "gsm_a_om2000.capa_sig",
FT_UINT16, BASE_HEX, NULL, 0,
NULL, HFILL }
},
{ &hf_om2k_unknown_tag,
- { "Unknown Tag", "om2000.unknown.tag",
+ { "Unknown Tag", "gsm_a_om2000.unknown.tag",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }
},
{ &hf_om2k_unknown_val,
- { "Unknown Value", "om2000.unknown.val",
+ { "Unknown Value", "gsm_a_om2000.unknown.val",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }
},
{ &hf_om2k_file_rev,
- { "File Revision", "om2000.file_rev",
+ { "File Revision", "gsm_a_om2000.file_rev",
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL }
},
{ &hf_om2k_filerel_ilr,
- { "Immediate Load Requested", "om2000.filerel.ilr",
+ { "Immediate Load Requested", "gsm_a_om2000.filerel.ilr",
FT_BOOLEAN, 8, NULL, 0x08,
NULL, HFILL }
},
{ &hf_om2k_filerel_cur,
- { "Current State", "om2000.filerel.cur",
+ { "Current State", "gsm_a_om2000.filerel.cur",
FT_UINT8, BASE_HEX, VALS(filerel_state_vals), 0x07,
NULL, HFILL }
},
{ &hf_om2k_filerel_other,
- { "Other State", "om2000.filerel.other",
+ { "Other State", "gsm_a_om2000.filerel.other",
FT_UINT8, BASE_HEX, VALS(filerel_state_vals), 0x07,
NULL, HFILL }
},
{ &hf_om2k_cal_time,
- { "Calendar Time", "om2000.cal_time",
+ { "Calendar Time", "gsm_a_om2000.cal_time",
FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0,
NULL, HFILL }
},
{ &hf_om2k_list_nr,
- { "List Number", "om2000.list_nr",
+ { "List Number", "gsm_a_om2000.list_nr",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }
},
{ &hf_om2k_list_nr_end,
- { "End List Number", "om2000.list_nr_end",
+ { "End List Number", "gsm_a_om2000.list_nr_end",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }
},
{ &hf_om2k_isl,
- { "IS Connection List", "om2000.is_list",
+ { "IS Connection List", "gsm_a_om2000.is_list",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }
},
{ &hf_om2k_isl_icp1,
- { "ICP1", "om2000.is_list.icp1",
+ { "ICP1", "gsm_a_om2000.is_list.icp1",
FT_UINT16, BASE_DEC, NULL, 0x7ff,
NULL, HFILL }
},
{ &hf_om2k_isl_icp2,
- { "ICP2", "om2000.is_list.icp2",
+ { "ICP2", "gsm_a_om2000.is_list.icp2",
FT_UINT16, BASE_DEC, NULL, 0x7ff,
NULL, HFILL }
},
{ &hf_om2k_isl_ci,
- { "Contiguity Index", "om2000.is_list.ci",
+ { "Contiguity Index", "gsm_a_om2000.is_list.ci",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }
},
{ &hf_om2k_conl,
- { "Connection List", "om2000.con_list",
+ { "Connection List", "gsm_a_om2000.con_list",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }
},
{ &hf_om2k_conl_nr_cgs,
- { "Number of CGs", "om2000.con_list.nr_cgs",
+ { "Number of CGs", "gsm_a_om2000.con_list.nr_cgs",
FT_UINT8, BASE_DEC, NULL, 0x1f,
"Number of Concentration Groups in the DE", HFILL }
},
{ &hf_om2k_conl_nr_cps_cg,
- { "Number of CPS in CG", "om2000.con_list.nr_cps_cg",
+ { "Number of CPS in CG", "gsm_a_om2000.con_list.nr_cps_cg",
FT_UINT8, BASE_DEC, NULL, 0x1f,
"Number of CPS in Concentration Group", HFILL }
},
{ &hf_om2k_conl_ccp,
- { "CON Connection Point", "om2000.con_list.cpp",
+ { "CON Connection Point", "gsm_a_om2000.con_list.cpp",
FT_UINT16, BASE_DEC, NULL, 0x3ff,
NULL, HFILL }
},
{ &hf_om2k_conl_ci,
- { "Contiguity Index", "om2000.con_list.ci",
+ { "Contiguity Index", "gsm_a_om2000.con_list.ci",
FT_UINT8, BASE_DEC, NULL, 0x7,
NULL, HFILL }
},
{ &hf_om2k_conl_tag,
- { "Tag", "om2000.con_list.tag",
+ { "Tag", "gsm_a_om2000.con_list.tag",
FT_UINT8, BASE_DEC, NULL, 0x1f,
NULL, HFILL }
},
{ &hf_om2k_conl_tei,
- { "TEI", "om2000.con_list.tei",
+ { "TEI", "gsm_a_om2000.con_list.tei",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }
},
{ &hf_om2k_tf_mode,
- { "TF Mode", "om2000.tf_mode",
+ { "TF Mode", "gsm_a_om2000.tf_mode",
FT_UINT8, BASE_HEX, VALS(om2k_tf_mode_vals), 0,
NULL, HFILL }
},
{ &hf_om2k_tf_fs_offset,
- { "TF FS Offset", "om2000.tf_fs_offset",
+ { "TF FS Offset", "gsm_a_om2000.tf_fs_offset",
FT_UINT64, BASE_DEC, NULL, 0,
NULL, HFILL }
},
@@ -1405,13 +1405,13 @@ proto_register_abis_om2000(void)
proto_abis_om2000 = proto_register_protocol("Ericsson A-bis OML",
"Ericsson OML",
- "gsm_abis_om2000");
+ "gsm_a_om2000");
proto_register_field_array(proto_abis_om2000, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
- register_dissector("gsm_abis_om2000", dissect_abis_om2000,
+ register_dissector("gsm_a_om2000", dissect_abis_om2000,
proto_abis_om2000);
}
diff --git a/epan/dissectors/packet-gsm_abis_oml.c b/epan/dissectors/packet-gsm_abis_oml.c
index 5af57b0795..964c7f75ba 100644
--- a/epan/dissectors/packet-gsm_abis_oml.c
+++ b/epan/dissectors/packet-gsm_abis_oml.c
@@ -1873,62 +1873,62 @@ proto_register_abis_oml(void)
{
static hf_register_info hf[] = {
{ &hf_oml_msg_disc,
- { "Message Discriminator", "oml.msg_dsc",
+ { "Message Discriminator", "gsm_a_oml.msg_dsc",
FT_UINT8, BASE_HEX, VALS(oml_msg_disc_vals), 0,
"GSM 12.21 Message Discriminator", HFILL }
},
{ &hf_oml_placement,
- { "Placement Indicator", "oml.placement",
+ { "Placement Indicator", "gsm_a_oml.placement",
FT_UINT8, BASE_HEX, VALS(oml_placement_vals), 0,
"GSM 12.21 Placement Indicator", HFILL }
},
{ &hf_oml_sequence,
- { "Sequence Number", "oml.sequence",
+ { "Sequence Number", "gsm_a_oml.sequence",
FT_UINT8, BASE_HEX, NULL, 0,
"Sequence Number (if multi-part msg)", HFILL }
},
{ &hf_oml_length,
- { "Length Indicator", "oml.length",
+ { "Length Indicator", "gsm_a_oml.length",
FT_UINT8, BASE_DEC, NULL, 0,
"Total length of payload", HFILL }
},
{ &hf_oml_fom_msgtype,
- { "FOM Message Type", "oml.fom.msg_type",
+ { "FOM Message Type", "gsm_a_oml.fom.msg_type",
FT_UINT8, BASE_CUSTOM, &format_custom_msgtype, 0,
NULL, HFILL }
},
{ &hf_oml_fom_objclass,
- { "FOM Object Class", "oml.fom.obj_class",
+ { "FOM Object Class", "gsm_a_oml.fom.obj_class",
FT_UINT8, BASE_HEX, VALS(oml_fom_objclass_vals), 0,
NULL, HFILL }
},
{ &hf_oml_fom_inst_bts,
- { "FOM Object Instance BTS", "oml.fom.obj_inst.bts",
+ { "FOM Object Instance BTS", "gsm_a_oml.fom.obj_inst.bts",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }
},
{ &hf_oml_fom_inst_trx,
- { "FOM Object Instance TRX", "oml.fom.obj_inst.trx",
+ { "FOM Object Instance TRX", "gsm_a_oml.fom.obj_inst.trx",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }
},
{ &hf_oml_fom_inst_ts,
- { "FOM Object Instance TS", "oml.fom.obj_inst.ts",
+ { "FOM Object Instance TS", "gsm_a_oml.fom.obj_inst.ts",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }
},
{ &hf_oml_fom_attr_tag,
- { "FOM Attribute ID", "oml.fom.attr_id",
+ { "FOM Attribute ID", "gsm_a_oml.fom.attr_id",
FT_UINT8, BASE_CUSTOM, &format_custom_attr, 0,
NULL, HFILL }
},
{ &hf_oml_fom_attr_len,
- { "FOM Attribute Length", "oml.fom.attr_len",
+ { "FOM Attribute Length", "gsm_a_oml.fom.attr_len",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL }
},
{ &hf_oml_fom_attr_val,
- { "FOM Attribute Value", "oml.fom.attr_val",
+ { "FOM Attribute Value", "gsm_a_oml.fom.attr_val",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }
},
@@ -1937,91 +1937,91 @@ proto_register_abis_oml(void)
/* OML Attributes */
{ &hf_attr_adm_state,
- { "Administrative State", "oml.fom.attr.adm_state",
+ { "Administrative State", "gsm_a_oml.fom.attr.adm_state",
FT_UINT8, BASE_HEX, VALS(oml_adm_state_vals), 0,
NULL, HFILL }
},
{ &hf_attr_arfcn,
- { "ARFCN", "oml.fom.attr.arfcn",
+ { "ARFCN", "gsm_a_oml.fom.attr.arfcn",
FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }
},
{ &hf_attr_oper_state,
- { "Operational State", "oml.fom.attr.oper_state",
+ { "Operational State", "gsm_a_oml.fom.attr.oper_state",
FT_UINT8, BASE_HEX, VALS(oml_oper_state_vals), 0,
NULL, HFILL }
},
{ &hf_attr_avail_state,
- { "Availability Status", "oml.fom.attr.avail_state",
+ { "Availability Status", "gsm_a_oml.fom.attr.avail_state",
FT_UINT8, BASE_HEX, VALS(oml_avail_state_vals), 0,
NULL, HFILL }
},
{ &hf_attr_event_type,
- { "Event Type", "oml.fom.attr.event_type",
+ { "Event Type", "gsm_a_oml.fom.attr.event_type",
FT_UINT8, BASE_HEX, VALS(oml_event_type_vals), 0,
NULL, HFILL }
},
{ &hf_attr_severity,
- { "Severity", "oml.fom.attr.severity",
+ { "Severity", "gsm_a_oml.fom.attr.severity",
FT_UINT8, BASE_HEX, VALS(oml_severity_vals), 0,
NULL, HFILL }
},
{ &hf_attr_bcch_arfcn,
- { "BCCH ARFCN", "oml.fom.attr.bcch_arfcn",
+ { "BCCH ARFCN", "gsm_a_oml.fom.attr.bcch_arfcn",
FT_UINT16, BASE_DEC, NULL, 0,
"ARFCN of the BCCH", HFILL }
},
{ &hf_attr_bsic,
- { "BSIC", "oml.fom.attr.bsic",
+ { "BSIC", "gsm_a_oml.fom.attr.bsic",
FT_UINT16, BASE_HEX, NULL, 0,
"Base Station Identity Cdoe", HFILL }
},
{ &hf_attr_test_no,
- { "Test Number", "oml.fom.attr.test_no",
+ { "Test Number", "gsm_a_oml.fom.attr.test_no",
FT_UINT8, BASE_HEX, VALS(oml_test_no_vals), 0,
NULL, HFILL }
},
{ &hf_attr_tsc,
- { "TSC", "oml.fom.attr.tsc",
+ { "TSC", "gsm_a_oml.fom.attr.tsc",
FT_UINT8, BASE_HEX, NULL, 0,
"Training Sequence Code", HFILL }
},
{ &hf_attr_tei,
- { "TEI", "oml.fom.attr.tei",
+ { "TEI", "gsm_a_oml.fom.attr.tei",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }
},
{ &hf_attr_ach_btsp,
- { "BTS E1 Port", "oml.fom.attr.abis_ch.bts_port",
+ { "BTS E1 Port", "gsm_a_oml.fom.attr.abis_ch.bts_port",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }
},
{ &hf_attr_ach_tslot,
- { "E1 Timeslot", "oml.fom.attr.abis_ch.timeslot",
+ { "E1 Timeslot", "gsm_a_oml.fom.attr.abis_ch.timeslot",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }
},
{ &hf_attr_ach_sslot,
- { "E1 Subslot", "oml.fom.attr.abis_ch.subslot",
+ { "E1 Subslot", "gsm_a_oml.fom.attr.abis_ch.subslot",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }
},
{ &hf_attr_gsm_time,
- { "GSM Time", "oml.fom.attr.gsm_time",
+ { "GSM Time", "gsm_a_oml.fom.attr.gsm_time",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL }
},
{ &hf_attr_chan_comb,
- { "Channel Combination", "oml.fom.attr.chan_comb",
+ { "Channel Combination", "gsm_a_oml.fom.attr.chan_comb",
FT_UINT8, BASE_HEX, VALS(oml_chan_comb_vals), 0,
NULL, HFILL }
},
{ &hf_attr_hsn,
- { "HSN", "oml.fom.attr.hsn",
+ { "HSN", "gsm_a_oml.fom.attr.hsn",
FT_UINT8, BASE_DEC, NULL, 0,
"Hopping Sequence Number", HFILL }
},
{ &hf_attr_maio,
- { "MAIO", "oml.fom.attr.maio",
+ { "MAIO", "gsm_a_oml.fom.attr.maio",
FT_UINT8, BASE_DEC, NULL, 0,
"Mobile Allocation Index Offset", HFILL }
},
@@ -2029,156 +2029,156 @@ proto_register_abis_oml(void)
/* IP Access */
{ &hf_oml_ipa_tres_attr_tag,
{ "IPA Test Result Embedded IE",
- "oml.fom.testrep.ipa_tag",
+ "gsm_a_oml.fom.testrep.ipa_tag",
FT_UINT8, BASE_HEX, VALS(ipacc_testres_ie_vals), 0,
"Information Element embedded into the Test Result "
"of ip.access BTS", HFILL },
},
{ &hf_oml_ipa_tres_attr_len,
{ "IPA Test Result Embedded IE Length",
- "oml.fom.testrep.ipa_len",
+ "gsm_a_oml.fom.testrep.ipa_len",
FT_UINT16, BASE_DEC, NULL, 0,
"Length of ip.access Test Result Embedded IE", HFILL }
},
{ &hf_attr_ipa_test_res,
- { "IPA Test Result", "oml.fom.testrep.result",
+ { "IPA Test Result", "gsm_a_oml.fom.testrep.result",
FT_UINT8, BASE_DEC, VALS(ipacc_test_res_vals), 0,
NULL, HFILL }
},
{ &hf_attr_ipa_tr_rxlev,
- { "Rx Level", "oml.fom.testrep.ipa_rxlev",
+ { "Rx Level", "gsm_a_oml.fom.testrep.ipa_rxlev",
FT_UINT16, BASE_DEC, NULL, 0xfc00, NULL, HFILL }
},
{ &hf_attr_ipa_tr_b_rxlev,
- { "Rx Level", "oml.fom.testrep.ipa_rxlev_b",
+ { "Rx Level", "gsm_a_oml.fom.testrep.ipa_rxlev_b",
FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }
},
{ &hf_attr_ipa_tr_arfcn,
- { "ARFCN", "oml.fom.testrep.ipa_arfcn",
+ { "ARFCN", "gsm_a_oml.fom.testrep.ipa_arfcn",
FT_UINT16, BASE_DEC, NULL, 0x03ff, NULL, HFILL }
},
{ &hf_attr_ipa_tr_f_qual,
- { "Frequency Quality", "oml.fom.testrep.ipa.freq_qual",
+ { "Frequency Quality", "gsm_a_oml.fom.testrep.ipa.freq_qual",
FT_UINT8, BASE_DEC, NULL, 0xfc, NULL, HFILL }
},
{ &hf_attr_ipa_tr_f_err,
- { "Frequency Error", "oml.fom.testrep.ipa.freq_err",
+ { "Frequency Error", "gsm_a_oml.fom.testrep.ipa.freq_err",
FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }
},
{ &hf_attr_ipa_tr_rxqual,
- { "Rx Quality", "oml.fom.testrep.ipa.rx_qual",
+ { "Rx Quality", "gsm_a_oml.fom.testrep.ipa.rx_qual",
FT_UINT8, BASE_DEC, NULL, 0x7, NULL, HFILL }
},
{ &hf_attr_ipa_tr_frame_offs,
- { "Frame Offset", "oml.fom.testrep.ipa.frame_offset",
+ { "Frame Offset", "gsm_a_oml.fom.testrep.ipa.frame_offset",
FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }
},
{ &hf_attr_ipa_tr_framenr_offs,
{ "Frame Number Offset",
- "oml.fom.testrep.ipa.framenr_offset",
+ "gsm_a_oml.fom.testrep.ipa.framenr_offset",
FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }
},
{ &hf_attr_ipa_tr_bsic,
- { "BSIC", "oml.fom.testrep.ipa.bsic",
+ { "BSIC", "gsm_a_oml.fom.testrep.ipa.bsic",
FT_UINT8, BASE_DEC, NULL, 0x3f,
"Base Station Identity Code", HFILL }
},
{ &hf_attr_ipa_tr_cell_id,
- { "Cell ID", "oml.fom.testrep.ipa.cell_id",
+ { "Cell ID", "gsm_a_oml.fom.testrep.ipa.cell_id",
FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }
},
{ &hf_attr_ipa_rsl_ip,
- { "BSC RSL IP Address", "oml.fom.attr.ipa.rsl_ip",
+ { "BSC RSL IP Address", "gsm_a_oml.fom.attr.ipa.rsl_ip",
FT_IPv4, BASE_NONE, NULL, 0,
"IP Address to which the BTS establishes "
"the RSL link", HFILL }
},
{ &hf_attr_ipa_rsl_port,
- { "BSC RSL TCP Port", "oml.fom.attr.ipa.rsl_port",
+ { "BSC RSL TCP Port", "gsm_a_oml.fom.attr.ipa.rsl_port",
FT_UINT16, BASE_DEC, NULL, 0,
"Port number to which the BST establishes "
"the RSL link", HFILL }
},
{ &hf_attr_ipa_prim_oml_ip,
{ "Primary OML IP Address",
- "oml.fom.attr.ipa.prim_oml_ip",
+ "gsm_a_oml.fom.attr.ipa.prim_oml_ip",
FT_IPv4, BASE_NONE, NULL, 0,
"IP Address of the BSC for the primary OML link",
HFILL }
},
{ &hf_attr_ipa_prim_oml_port,
{ "Primary OML TCP Port",
- "oml.fom.attr.ipa.prim_oml_port",
+ "gsm_a_oml.fom.attr.ipa.prim_oml_port",
FT_UINT16, BASE_DEC, NULL, 0,
"TCP Port of the BSC for the primarly OML link",
HFILL }
},
{ &hf_attr_ipa_location_name,
- { "Location Name", "oml.fom.attr.ipa.loc_name",
+ { "Location Name", "gsm_a_oml.fom.attr.ipa.loc_name",
FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }
},
{ &hf_attr_ipa_unit_name,
- { "Unit Name", "oml.fom.attr.ipa.unit_name",
+ { "Unit Name", "gsm_a_oml.fom.attr.ipa.unit_name",
FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }
},
{ &hf_attr_ipa_unit_id,
- { "Unit ID", "oml.fom.attr.ipa.unit_id",
+ { "Unit ID", "gsm_a_oml.fom.attr.ipa.unit_id",
FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }
},
{ &hf_attr_ipa_nv_flags,
- { "NVRAM Config Flags", "oml.fom.attr.ipa.nv_flags",
+ { "NVRAM Config Flags", "gsm_a_oml.fom.attr.ipa.nv_flags",
FT_UINT16, BASE_HEX, NULL, 0xffff, NULL, HFILL }
},
{ &hf_attr_ipa_nv_mask,
- { "NVRAM Config Mask", "oml.fom.attr.ipa.nv_mask",
+ { "NVRAM Config Mask", "gsm_a_oml.fom.attr.ipa.nv_mask",
FT_UINT16, BASE_HEX, NULL, 0xffff, NULL, HFILL }
},
{ &hf_attr_ipa_tr_si2,
- { "System Information 2", "oml.fom.attr.ipa.si2",
+ { "System Information 2", "gsm_a_oml.fom.attr.ipa.si2",
FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
},
{ &hf_attr_ipa_tr_si2bis,
- { "System Information 2bis", "oml.fom.attr.ipa.si2bis",
+ { "System Information 2bis", "gsm_a_oml.fom.attr.ipa.si2bis",
FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
},
{ &hf_attr_ipa_tr_si2ter,
- { "System Information 2ter", "oml.fom.attr.ipa.si2ter",
+ { "System Information 2ter", "gsm_a_oml.fom.attr.ipa.si2ter",
FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
},
{ &hf_attr_ipa_tr_chan_desc,
{ "Cell Channel Description",
- "oml.fom.attr.ipa.chan_desc",
+ "gsm_a_oml.fom.attr.ipa.chan_desc",
FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
},
{ &hf_attr_ipa_nsl_sport,
{ "NS Link IP Source Port",
- "oml.fom.attr.ipa.nsl_sport",
+ "gsm_a_oml.fom.attr.ipa.nsl_sport",
FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }
},
{ &hf_attr_ipa_nsl_daddr,
{ "NS Link IP Destination Addr",
- "oml.fom.attr.ipa.nsl_daddr",
+ "gsm_a_oml.fom.attr.ipa.nsl_daddr",
FT_IPv4, BASE_NONE, NULL, 0, NULL, HFILL }
},
{ &hf_attr_ipa_nsl_dport,
{ "NS Link IP Destination Port",
- "oml.fom.attr.ipa.nsl_dport",
+ "gsm_a_oml.fom.attr.ipa.nsl_dport",
FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }
},
{ &hf_attr_ipa_nsei,
- { "NSEI", "oml.fom.attr.ipa.nsei",
+ { "NSEI", "gsm_a_oml.fom.attr.ipa.nsei",
FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }
},
{ &hf_attr_ipa_nsvci,
- { "NSVCI", "oml.fom.attr.ipa.nsvci",
+ { "NSVCI", "gsm_a_oml.fom.attr.ipa.nsvci",
FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }
},
{ &hf_attr_ipa_bvci,
- { "BVCI", "oml.fom.attr.ipa.bvci",
+ { "BVCI", "gsm_a_oml.fom.attr.ipa.bvci",
FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }
},
{ &hf_attr_ipa_rac,
- { "RAC", "oml.fom.attr.ipa.rac",
+ { "RAC", "gsm_a_oml.fom.attr.ipa.rac",
FT_UINT8, BASE_HEX, NULL, 0,
"Routing Area Code", HFILL }
},
@@ -2355,13 +2355,13 @@ proto_register_abis_oml(void)
/* assign our custom match functions */
proto_abis_oml = proto_register_protocol("GSM A-bis OML", "A-bis OML",
- "gsm_abis_oml");
+ "gsm_a_oml");
proto_register_field_array(proto_abis_oml, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
- new_register_dissector("gsm_abis_oml", dissect_abis_oml, proto_abis_oml);
+ new_register_dissector("gsm_a_oml", dissect_abis_oml, proto_abis_oml);
oml_module = prefs_register_protocol(proto_abis_oml, NULL);
prefs_register_enum_preference(oml_module, "oml_dialect",
@@ -2382,5 +2382,5 @@ proto_reg_handoff_abis_oml(void)
dissector_add_uint("lapd.gsm.sapi", LAPD_GSM_SAPI_OM_PROC,
abis_oml_handle);
- sub_om2000 = find_dissector("gsm_abis_om2000");
+ sub_om2000 = find_dissector("gsm_a_om2000");
}
diff --git a/epan/dissectors/packet-gsm_bssmap_le.c b/epan/dissectors/packet-gsm_bssmap_le.c
index 251c0cab70..aa377aed13 100644
--- a/epan/dissectors/packet-gsm_bssmap_le.c
+++ b/epan/dissectors/packet-gsm_bssmap_le.c
@@ -1018,17 +1018,17 @@ proto_register_gsm_bssmap_le(void)
/* Setup list of header fields */
static hf_register_info hf[] = {
{ &hf_gsm_bssmap_le_msg_type,
- { "BSSMAP LE Message Type", "bssmap_le.msgtype",
+ { "BSSMAP LE Message Type", "gsm_bssmap_le.msgtype",
FT_UINT8, BASE_HEX, VALS(gsm_bssmap_le_msg_strings), 0x0,
NULL, HFILL }
},
{ &hf_gsm_bssmap_le_elem_id,
- { "Element ID", "bssmap_le.elem_id",
+ { "Element ID", "gsm_bssmap_le.elem_id",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }
},
{ &hf_gsm_bssmap_le_apdu_protocol_id,
- { "Protocol ID", "bssmap_le.apdu_protocol_id",
+ { "Protocol ID", "gsm_bssmap_le.apdu_protocol_id",
FT_UINT8, BASE_DEC, VALS(gsm_apdu_protocol_id_strings), 0x0,
"APDU embedded protocol id", HFILL }
},
diff --git a/epan/dissectors/packet-gsm_cbch.c b/epan/dissectors/packet-gsm_cbch.c
index 4f6851685e..faaf262d6c 100644
--- a/epan/dissectors/packet-gsm_cbch.c
+++ b/epan/dissectors/packet-gsm_cbch.c
@@ -435,22 +435,22 @@ proto_register_gsm_cbch(void)
static hf_register_info hf_smscb[] =
{
{ &hf_gsm_cbch_spare_bit,
- { "GSM CBCH spare bit", "gsm_cbch_block_type.spare",
+ { "GSM CBCH spare bit", "gsm_cbch.block_type.spare",
FT_UINT8, BASE_HEX, NULL, 0x80,
NULL, HFILL}
},
{ &hf_gsm_cbch_lpd,
- { "GSM CBCH Link Protocol Discriminator", "gsm_cbch_block_type.lpd",
+ { "GSM CBCH Link Protocol Discriminator", "gsm_cbch.block_type.lpd",
FT_UINT8, BASE_DEC, VALS(block_type_lpd_strings), 0x60,
NULL, HFILL}
},
{ &hf_gsm_cbch_lb,
- { "GSM CBCH Last Block", "gsm_cbch_block_type.lb",
+ { "GSM CBCH Last Block", "gsm_cbch.block_type.lb",
FT_UINT8, BASE_DEC, NULL, 0x10,
NULL, HFILL}
},
{ &hf_gsm_cbch_seq_num,
- { "GSM CBCH Sequence Number", "gsm_cbch_block_type.seq_num",
+ { "GSM CBCH Sequence Number", "gsm_cbch.block_type.seq_num",
FT_UINT8, BASE_DEC, VALS(block_type_seq_num_values), 0x0F,
NULL, HFILL}
},
diff --git a/epan/dissectors/packet-gsm_ipa.c b/epan/dissectors/packet-gsm_ipa.c
index bfce201420..26ebbbcb76 100644
--- a/epan/dissectors/packet-gsm_ipa.c
+++ b/epan/dissectors/packet-gsm_ipa.c
@@ -380,28 +380,28 @@ void proto_register_ipa(void)
static hf_register_info hf[] = {
{&hf_ipa_data_len,
- {"DataLen", "ipa.data_len",
+ {"DataLen", "gsm_ipa.data_len",
FT_UINT16, BASE_DEC, NULL, 0x0,
"The length of the data (in bytes)", HFILL}
},
{&hf_ipa_protocol,
- {"Protocol", "ipa.protocol",
+ {"Protocol", "gsm_ipa.protocol",
FT_UINT8, BASE_HEX, VALS(ipa_protocol_vals), 0x0,
"The IPA Sub-Protocol", HFILL}
},
{&hf_ipa_hsl_debug,
- {"Debug Message", "ipa.hsl_debug",
+ {"Debug Message", "gsm_ipa.hsl_debug",
FT_STRING, BASE_NONE, NULL, 0,
"Hay Systems Limited debug message", HFILL}
},
{&hf_ipa_osmo_proto,
- {"Osmo ext protocol", "ipa.osmo.protocol",
+ {"Osmo ext protocol", "gsm_ipa.osmo.protocol",
FT_UINT8, BASE_HEX, VALS(ipa_osmo_proto_vals), 0x0,
"The osmo extension protocol", HFILL}
},
{&hf_ipa_osmo_ctrl_data,
- {"CTRL data", "ipa.ctrl.data",
+ {"CTRL data", "gsm_ipa.ctrl.data",
FT_STRING, BASE_NONE, NULL, 0x0,
"Control interface data", HFILL}
},
@@ -502,8 +502,8 @@ void proto_reg_handoff_gsm_ipa(void)
static range_t *ipa_tcp_ports, *ipa_udp_ports;
if (!ipa_initialized) {
- sub_handles[SUB_RSL] = find_dissector("gsm_abis_rsl");
- sub_handles[SUB_OML] = find_dissector("gsm_abis_oml");
+ sub_handles[SUB_RSL] = find_dissector("gsm_a_rsl");
+ sub_handles[SUB_OML] = find_dissector("gsm_a_oml");
sub_handles[SUB_SCCP] = find_dissector("sccp");
sub_handles[SUB_MGCP] = find_dissector("mgcp");
sub_handles[SUB_DATA] = find_dissector("data");
diff --git a/epan/dissectors/packet-gsm_rlcmac.c b/epan/dissectors/packet-gsm_rlcmac.c
index af2686ee90..20e6e85732 100644
--- a/epan/dissectors/packet-gsm_rlcmac.c
+++ b/epan/dissectors/packet-gsm_rlcmac.c
@@ -6558,116 +6558,116 @@ proto_register_gsm_rlcmac(void)
static hf_register_info hf[] = {
{ &hf_dl_ctrl_payload_type,
{ "Payload Type",
- "gsm_rlcmac_dl.ctrl_payload_type",
+ "gsm_rlcmac.dl.ctrl_payload_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dl_ctrl_rrbp,
{ "RRBP",
- "gsm_rlcmac_dl.rrbp",
+ "gsm_rlcmac.dl.rrbp",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dl_ctrl_s_p,
{ "S/P",
- "gsm_rlcmac_dl.s_p",
+ "gsm_rlcmac.dl.s_p",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dl_ctrl_usf,
{ "USF",
- "gsm_rlcmac_dl.usf",
+ "gsm_rlcmac.dl.usf",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dl_ctrl_rbsn,
{ "RBSN",
- "gsm_rlcmac_dl.rbsn",
+ "gsm_rlcmac.dl.rbsn",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dl_ctrl_rti,
{ "RTI",
- "gsm_rlcmac_dl.rti",
+ "gsm_rlcmac.dl.rti",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dl_ctrl_fs,
{ "FS",
- "gsm_rlcmac_dl.fs",
+ "gsm_rlcmac.dl.fs",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dl_ctrl_ac,
{ "AC",
- "gsm_rlcmac_dl.ac",
+ "gsm_rlcmac.dl.ac",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dl_ctrl_pr,
{ "PR",
- "gsm_rlcmac_dl.pr",
+ "gsm_rlcmac.dl.pr",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dl_ctrl_tfi,
{ "TFI",
- "gsm_rlcmac_dl.tfi",
+ "gsm_rlcmac.dl.tfi",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dl_ctrl_d,
{ "D",
- "gsm_rlcmac_dl.d",
+ "gsm_rlcmac.dl.d",
FT_BOOLEAN,BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dl_ctrl_rbsn_e,
{ "RBSNe",
- "gsm_rlcmac_dl.rbsn_e",
+ "gsm_rlcmac.dl.rbsn_e",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dl_ctrl_fs_e,
{ "FSe",
- "gsm_rlcmac_dl.fs_e",
+ "gsm_rlcmac.dl.fs_e",
FT_BOOLEAN,BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dl_ctrl_spare,
{ "spare",
- "gsm_rlcmac_dl.spare",
+ "gsm_rlcmac.dl.spare",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_startingtime_n32,
- { "N32", "gsm_rlcmac_dl.n32",
+ { "N32", "gsm_rlcmac.dl.n32",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_startingtime_n51,
- { "N51", "gsm_rlcmac_dl.n51",
+ { "N51", "gsm_rlcmac.dl.n51",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_startingtime_n26,
- { "N26", "gsm_rlcmac_dl.n26",
+ { "N26", "gsm_rlcmac.dl.n26",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -6675,13 +6675,13 @@ proto_register_gsm_rlcmac(void)
/*< Global TFI IE >*/
{ &hf_globalfi_t_uplink_tfi,
- { "UPLINK_TFI", "gsm_rlcmac_dl.uplink_tfi",
+ { "UPLINK_TFI", "gsm_rlcmac.dl.uplink_tfi",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_globalfi_t_downlink_tfi,
- { "DOWNLINK_TFI", "gsm_rlcmac_dl.downlink_tfi",
+ { "DOWNLINK_TFI", "gsm_rlcmac.dl.downlink_tfi",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -6689,7 +6689,7 @@ proto_register_gsm_rlcmac(void)
/*< Starting Frame Number Description IE >*/
{ &hf_starting_frame_number_k,
- { "k", "gsm_rlcmac_dl.k",
+ { "k", "gsm_rlcmac.dl.k",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -6697,13 +6697,13 @@ proto_register_gsm_rlcmac(void)
/*< Ack/Nack Description IE >*/
{ &hf_ack_nack_description_final_ack_indication,
- { "FINAL_ACK_INDICATION", "gsm_rlcmac_dl.final_ack_indication",
+ { "FINAL_ACK_INDICATION", "gsm_rlcmac.dl.final_ack_indication",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ack_nack_description_starting_sequence_number,
- { "STARTING_SEQUENCE_NUMBER", "gsm_rlcmac_dl.starting_sequence_number",
+ { "STARTING_SEQUENCE_NUMBER", "gsm_rlcmac.dl.starting_sequence_number",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -6711,19 +6711,19 @@ proto_register_gsm_rlcmac(void)
/*< Packet Timing Advance IE >*/
{ &hf_packetiming_advance_t_timing_advance_value,
- { "TIMING_ADVANCE_VALUE", "gsm_rlcmac_dl.timing_advance_value",
+ { "TIMING_ADVANCE_VALUE", "gsm_rlcmac.dl.timing_advance_value",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packetiming_advance_t_timing_advance_index,
- { "TIMING_ADVANCE_INDEX", "gsm_rlcmac_dl.timing_advance_index",
+ { "TIMING_ADVANCE_INDEX", "gsm_rlcmac.dl.timing_advance_index",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packetiming_advance_t_timing_advance_timeslot_number,
- { "TIMING_ADVANCE_TIMESLOT_NUMBER", "gsm_rlcmac_dl.timing_advance_timeslot_number",
+ { "TIMING_ADVANCE_TIMESLOT_NUMBER", "gsm_rlcmac.dl.timing_advance_timeslot_number",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -6731,31 +6731,31 @@ proto_register_gsm_rlcmac(void)
/*< Power Control Parameters IE >*/
{ &hf_gprs_power_control_parameters_alpha,
- { "ALPHA", "gsm_rlcmac_dl.alpha",
+ { "ALPHA", "gsm_rlcmac.dl.alpha",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprs_power_control_parameters_t_avg_w,
- { "T_AVG_W", "gsm_rlcmac_dl.t_avg_w",
+ { "T_AVG_W", "gsm_rlcmac.dl.t_avg_w",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprs_power_control_parameters_t_avg_t,
- { "T_AVG_T", "gsm_rlcmac_dl.t_avg_t",
+ { "T_AVG_T", "gsm_rlcmac.dl.t_avg_t",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprs_power_control_parameters_pc_meas_chan,
- { "PC_MEAS_CHAN", "gsm_rlcmac_dl.pc_meas_chan",
+ { "PC_MEAS_CHAN", "gsm_rlcmac.dl.pc_meas_chan",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprs_power_control_parameters_n_avg_i,
- { "N_AVG_I", "gsm_rlcmac_dl.n_avg_i",
+ { "N_AVG_I", "gsm_rlcmac.dl.n_avg_i",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -6763,43 +6763,43 @@ proto_register_gsm_rlcmac(void)
/*< Global Power Control Parameters IE >*/
{ &hf_global_power_control_parameters_alpha,
- { "ALPHA", "gsm_rlcmac_dl.alpha",
+ { "ALPHA", "gsm_rlcmac.dl.alpha",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_global_power_control_parameters_t_avg_w,
- { "T_AVG_W", "gsm_rlcmac_dl.t_avg_w",
+ { "T_AVG_W", "gsm_rlcmac.dl.t_avg_w",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_global_power_control_parameters_t_avg_t,
- { "T_AVG_T", "gsm_rlcmac_dl.t_avg_t",
+ { "T_AVG_T", "gsm_rlcmac.dl.t_avg_t",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_global_power_control_parameters_pb,
- { "Pb", "gsm_rlcmac_dl.pb",
+ { "Pb", "gsm_rlcmac.dl.pb",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_global_power_control_parameters_pc_meas_chan,
- { "PC_MEAS_CHAN", "gsm_rlcmac_dl.pc_meas_chan",
+ { "PC_MEAS_CHAN", "gsm_rlcmac.dl.pc_meas_chan",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_global_power_control_parameters_int_meas_channel_list_avail,
- { "INT_MEAS_CHANNEL_LIST_AVAIL", "gsm_rlcmac_dl.int_meas_channel_list_avail",
+ { "INT_MEAS_CHANNEL_LIST_AVAIL", "gsm_rlcmac.dl.int_meas_channel_list_avail",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_global_power_control_parameters_n_avg_i,
- { "N_AVG_I", "gsm_rlcmac_dl.n_avg_i",
+ { "N_AVG_I", "gsm_rlcmac.dl.n_avg_i",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -6807,31 +6807,31 @@ proto_register_gsm_rlcmac(void)
/*< Global Packet Timing Advance IE >*/
{ &hf_global_packetiming_advance_t_timing_advance_value,
- { "TIMING_ADVANCE_VALUE", "gsm_rlcmac_dl.timing_advance_value",
+ { "TIMING_ADVANCE_VALUE", "gsm_rlcmac.dl.timing_advance_value",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_global_packetiming_advance_t_uplink_timing_advance_index,
- { "UPLINK_TIMING_ADVANCE_INDEX", "gsm_rlcmac_dl.uplink_timing_advance_index",
+ { "UPLINK_TIMING_ADVANCE_INDEX", "gsm_rlcmac.dl.uplink_timing_advance_index",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_global_packetiming_advance_t_uplink_timing_advance_timeslot_number,
- { "UPLINK_TIMING_ADVANCE_TIMESLOT_NUMBER", "gsm_rlcmac_dl.uplink_timing_advance_timeslot_number",
+ { "UPLINK_TIMING_ADVANCE_TIMESLOT_NUMBER", "gsm_rlcmac.dl.uplink_timing_advance_timeslot_number",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_global_packetiming_advance_t_downlink_timing_advance_index,
- { "DOWNLINK_TIMING_ADVANCE_INDEX", "gsm_rlcmac_dl.downlink_timing_advance_index",
+ { "DOWNLINK_TIMING_ADVANCE_INDEX", "gsm_rlcmac.dl.downlink_timing_advance_index",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_global_packetiming_advance_t_downlink_timing_advance_timeslot_number,
- { "DOWNLINK_TIMING_ADVANCE_TIMESLOT_NUMBER", "gsm_rlcmac_dl.downlink_timing_advance_timeslot_number",
+ { "DOWNLINK_TIMING_ADVANCE_TIMESLOT_NUMBER", "gsm_rlcmac.dl.downlink_timing_advance_timeslot_number",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -6839,67 +6839,67 @@ proto_register_gsm_rlcmac(void)
/*< Channel Quality Report struct >*/
{ &hf_channel_quality_report_c_value,
- { "C_VALUE", "gsm_rlcmac_dl.c_value",
+ { "C_VALUE", "gsm_rlcmac.dl.c_value",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_channel_quality_report_rxqual,
- { "RXQUAL", "gsm_rlcmac_dl.rxqual",
+ { "RXQUAL", "gsm_rlcmac.dl.rxqual",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_channel_quality_report_sign_var,
- { "SIGN_VAR", "gsm_rlcmac_dl.sign_var",
+ { "SIGN_VAR", "gsm_rlcmac.dl.sign_var",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_channel_quality_report_slot0_i_level_tn,
- { "Slot[0].I_LEVEL_TN", "gsm_rlcmac_dl.slot0_i_level_tn",
+ { "Slot[0].I_LEVEL_TN", "gsm_rlcmac.dl.slot0_i_level_tn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_channel_quality_report_slot1_i_level_tn,
- { "Slot[1].I_LEVEL_TN", "gsm_rlcmac_dl.slot1_i_level_tn",
+ { "Slot[1].I_LEVEL_TN", "gsm_rlcmac.dl.slot1_i_level_tn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_channel_quality_report_slot2_i_level_tn,
- { "Slot[2].I_LEVEL_TN", "gsm_rlcmac_dl.slot2_i_level_tn",
+ { "Slot[2].I_LEVEL_TN", "gsm_rlcmac.dl.slot2_i_level_tn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_channel_quality_report_slot3_i_level_tn,
- { "Slot[3].I_LEVEL_TN", "gsm_rlcmac_dl.slot3_i_level_tn",
+ { "Slot[3].I_LEVEL_TN", "gsm_rlcmac.dl.slot3_i_level_tn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_channel_quality_report_slot4_i_level_tn,
- { "Slot[4].I_LEVEL_TN", "gsm_rlcmac_dl.slot4_i_level_tn",
+ { "Slot[4].I_LEVEL_TN", "gsm_rlcmac.dl.slot4_i_level_tn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_channel_quality_report_slot5_i_level_tn,
- { "Slot[5].I_LEVEL_TN", "gsm_rlcmac_dl.slot5_i_level_tn",
+ { "Slot[5].I_LEVEL_TN", "gsm_rlcmac.dl.slot5_i_level_tn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_channel_quality_report_slot6_i_level_tn,
- { "Slot[6].I_LEVEL_TN", "gsm_rlcmac_dl.slot6_i_level_tn",
+ { "Slot[6].I_LEVEL_TN", "gsm_rlcmac.dl.slot6_i_level_tn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_channel_quality_report_slot7_i_level_tn,
- { "Slot[7].I_LEVEL_TN", "gsm_rlcmac_dl.slot7_i_level_tn",
+ { "Slot[7].I_LEVEL_TN", "gsm_rlcmac.dl.slot7_i_level_tn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -6907,43 +6907,43 @@ proto_register_gsm_rlcmac(void)
/*< EGPRS Ack/Nack Description >*/
{ &hf_egprs_acknack_length,
- { "LENGTH", "gsm_rlcmac_dl.length",
+ { "LENGTH", "gsm_rlcmac.dl.length",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_egprs_acknack_final_ack_indication,
- { "FINAL_ACK_INDICATION", "gsm_rlcmac_dl.final_ack_indication",
+ { "FINAL_ACK_INDICATION", "gsm_rlcmac.dl.final_ack_indication",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_egprs_acknack_beginning_of_window,
- { "BEGINNING_OF_WINDOW", "gsm_rlcmac_dl.beginning_of_window",
+ { "BEGINNING_OF_WINDOW", "gsm_rlcmac.dl.beginning_of_window",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_egprs_acknack_end_of_window,
- { "END_OF_WINDOW", "gsm_rlcmac_dl.end_of_window",
+ { "END_OF_WINDOW", "gsm_rlcmac.dl.end_of_window",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_egprs_acknack_starting_sequence_number,
- { "STARTING_SEQUENCE_NUMBER", "gsm_rlcmac_dl.starting_sequence_number",
+ { "STARTING_SEQUENCE_NUMBER", "gsm_rlcmac.dl.starting_sequence_number",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_egprs_acknack_crbb_length,
- { "CRBB_LENGTH", "gsm_rlcmac_dl.crbb_length",
+ { "CRBB_LENGTH", "gsm_rlcmac.dl.crbb_length",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_egprs_acknack_crbb_starting_color_code,
- { "CRBB_STARTING_COLOR_CODE", "gsm_rlcmac_dl.crbb_starting_color_code",
+ { "CRBB_STARTING_COLOR_CODE", "gsm_rlcmac.dl.crbb_starting_color_code",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -6953,157 +6953,157 @@ proto_register_gsm_rlcmac(void)
/*<P2 Rest Octets>*/
{ &hf_mobileallocationie_length,
- { "Length", "gsm_rlcmac_dl.mobileallocationie_length",
+ { "Length", "gsm_rlcmac.dl.mobileallocationie_length",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_single_rf_channel_spare,
- { "spare", "gsm_rlcmac_dl.single_rf_channel_spare",
+ { "spare", "gsm_rlcmac.dl.single_rf_channel_spare",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_single_rf_channel_arfcn,
- { "ARFCN", "gsm_rlcmac_dl.single_rf_channel_arfcn",
+ { "ARFCN", "gsm_rlcmac.dl.single_rf_channel_arfcn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_rfhoppingchannel_maio,
- { "MAIO", "gsm_rlcmac_dl.rfhoppingchannel_maio",
+ { "MAIO", "gsm_rlcmac.dl.rfhoppingchannel_maio",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_rfhoppingchannel_hsn,
- { "HSN", "gsm_rlcmac_dl.rfhoppingchannel_hsn",
+ { "HSN", "gsm_rlcmac.dl.rfhoppingchannel_hsn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_channel_description_channel_type_and_tdma_offset,
- { "Channel_type_and_TDMA_offset", "gsm_rlcmac_dl.channel_description_channel_type_and_tdma_offset",
+ { "Channel_type_and_TDMA_offset", "gsm_rlcmac.dl.channel_description_channel_type_and_tdma_offset",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_channel_description_tn,
- { "TN", "gsm_rlcmac_dl.channel_description_tn",
+ { "TN", "gsm_rlcmac.dl.channel_description_tn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_channel_description_tsc,
- { "TSC", "gsm_rlcmac_dl.channel_description_tsc",
+ { "TSC", "gsm_rlcmac.dl.channel_description_tsc",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_group_call_reference_value,
- { "value", "gsm_rlcmac_dl.group_call_value",
+ { "value", "gsm_rlcmac.dl.group_call_value",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_group_call_reference_sf,
- { "SF", "gsm_rlcmac_dl.group_call_sf",
+ { "SF", "gsm_rlcmac.dl.group_call_sf",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_group_call_reference_af,
- { "AF", "gsm_rlcmac_dl.group_call_af",
+ { "AF", "gsm_rlcmac.dl.group_call_af",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_group_call_reference_call_priority,
- { "call_priority", "gsm_rlcmac_dl.group_call_reference_call_priority",
+ { "call_priority", "gsm_rlcmac.dl.group_call_reference_call_priority",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_group_call_reference_ciphering_information,
- { "Ciphering_information", "gsm_rlcmac_dl.group_call_reference_call_ciphering_information",
+ { "Ciphering_information", "gsm_rlcmac.dl.group_call_reference_call_ciphering_information",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_p1_rest_octets_nln_pch,
- { "NLN_PCH", "gsm_rlcmac_dl.p1_rest_octets_nln_pch",
+ { "NLN_PCH", "gsm_rlcmac.dl.p1_rest_octets_nln_pch",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_p1_rest_octets_nln_status,
- { "NLN_status", "gsm_rlcmac_dl.p1_rest_octets_nln_status",
+ { "NLN_status", "gsm_rlcmac.dl.p1_rest_octets_nln_status",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_p1_rest_octets_priority1,
- { "Priority1", "gsm_rlcmac_dl.p1_rest_octets_priority1",
+ { "Priority1", "gsm_rlcmac.dl.p1_rest_octets_priority1",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_p1_rest_octets_priority2,
- { "Priority2", "gsm_rlcmac_dl.p1_rest_octets_priority2",
+ { "Priority2", "gsm_rlcmac.dl.p1_rest_octets_priority2",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_p1_rest_octets_packet_page_indication_1,
- { "Packet_Page_Indication_1", "gsm_rlcmac_dl.p1_rest_octets_packet_page_indication_1",
+ { "Packet_Page_Indication_1", "gsm_rlcmac.dl.p1_rest_octets_packet_page_indication_1",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_p1_rest_octets_packet_page_indication_2,
- { "Packet_Page_Indication_2", "gsm_rlcmac_dl.p1_rest_octets_packet_page_indication_2",
+ { "Packet_Page_Indication_2", "gsm_rlcmac.dl.p1_rest_octets_packet_page_indication_2",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_p2_rest_octets_cn3,
- { "CN3", "gsm_rlcmac_dl.p2_rest_octets_cn3",
+ { "CN3", "gsm_rlcmac.dl.p2_rest_octets_cn3",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_p2_rest_octets_nln,
- { "NLN", "gsm_rlcmac_dl.p2_rest_octets_nln",
+ { "NLN", "gsm_rlcmac.dl.p2_rest_octets_nln",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_p2_rest_octets_nln_status,
- { "NLN_status", "gsm_rlcmac_dl.p2_rest_octets_nln_status",
+ { "NLN_status", "gsm_rlcmac.dl.p2_rest_octets_nln_status",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_p2_rest_octets_priority1,
- { "Priority1", "gsm_rlcmac_dl.p2_rest_octets_priority1",
+ { "Priority1", "gsm_rlcmac.dl.p2_rest_octets_priority1",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_p2_rest_octets_priority2,
- { "Priority2", "gsm_rlcmac_dl.p2_rest_octets_priority2",
+ { "Priority2", "gsm_rlcmac.dl.p2_rest_octets_priority2",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_p2_rest_octets_priority3,
- { "Priority3", "gsm_rlcmac_dl.p2_rest_octets_priority3",
+ { "Priority3", "gsm_rlcmac.dl.p2_rest_octets_priority3",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_p2_rest_octets_packet_page_indication_3,
- { "Packet_Page_Indication_3", "gsm_rlcmac_dl.p2_rest_octets_packet_page_indication_3",
+ { "Packet_Page_Indication_3", "gsm_rlcmac.dl.p2_rest_octets_packet_page_indication_3",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -7111,350 +7111,350 @@ proto_register_gsm_rlcmac(void)
/* <IA Rest Octets> */
{ &hf_dynamicallocation_usf,
- { "USF", "gsm_rlcmac_dl.dynamicallocation_usf",
+ { "USF", "gsm_rlcmac.dl.dynamicallocation_usf",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dynamicallocation_usf_granularity,
- { "USF_GRANULARITY", "gsm_rlcmac_dl.dynamicallocation_usf_granularity",
+ { "USF_GRANULARITY", "gsm_rlcmac.dl.dynamicallocation_usf_granularity",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dynamicallocation_p0,
- { "P0", "gsm_rlcmac_dl.dynamicallocation_p0",
+ { "P0", "gsm_rlcmac.dl.dynamicallocation_p0",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dynamicallocation_pr_mode,
- { "PR_MODE", "gsm_rlcmac_dl.dynamicallocation_pr_mode",
+ { "PR_MODE", "gsm_rlcmac.dl.dynamicallocation_pr_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_egprstwophaseaccess_alpha,
- { "ALPHA", "gsm_rlcmac_dl.egprstwophaseaccess_alpha",
+ { "ALPHA", "gsm_rlcmac.dl.egprstwophaseaccess_alpha",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_egprstwophaseaccess_gamma,
- { "GAMMA", "gsm_rlcmac_dl.egprstwophaseaccess_gamma",
+ { "GAMMA", "gsm_rlcmac.dl.egprstwophaseaccess_gamma",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_egprstwophaseaccess_nr_of_radio_blocks_allocated,
- { "NR_OF_RADIO_BLOCKS_ALLOCATED", "gsm_rlcmac_dl.egprstwophaseaccess_nr_of_radio_blocks_allocated",
+ { "NR_OF_RADIO_BLOCKS_ALLOCATED", "gsm_rlcmac.dl.egprstwophaseaccess_nr_of_radio_blocks_allocated",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_egprstwophaseaccess_p0,
- { "P0", "gsm_rlcmac_dl.egprstwophaseaccess_p0",
+ { "P0", "gsm_rlcmac.dl.egprstwophaseaccess_p0",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_egprstwophaseaccess_bts_pwr_ctrl_mode,
- { "BTS_PWR_CTRL_MODE", "gsm_rlcmac_dl.egprstwophaseaccess_bts_pwr_ctrl_mode",
+ { "BTS_PWR_CTRL_MODE", "gsm_rlcmac.dl.egprstwophaseaccess_bts_pwr_ctrl_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_egprstwophaseaccess_pr_mode,
- { "PR_MODE", "gsm_rlcmac_dl.egprstwophaseaccess_pr_mode",
+ { "PR_MODE", "gsm_rlcmac.dl.egprstwophaseaccess_pr_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_egprs_onephaseaccess_tfi_assignment,
- { "TFI_ASSIGNMENT", "gsm_rlcmac_dl.egprsonephaseaccess_tfi_assignment",
+ { "TFI_ASSIGNMENT", "gsm_rlcmac.dl.egprsonephaseaccess_tfi_assignment",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_egprs_onephaseaccess_polling,
- { "POLLING", "gsm_rlcmac_dl.egprsonephaseaccess_polling",
+ { "POLLING", "gsm_rlcmac.dl.egprsonephaseaccess_polling",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_egprs_onephaseaccess_egprs_channel_coding_command,
- { "EGPRS_CHANNEL_CODING_COMMAND", "gsm_rlcmac_dl.egprsonephaseaccess_egprs_channel_coding_command",
+ { "EGPRS_CHANNEL_CODING_COMMAND", "gsm_rlcmac.dl.egprsonephaseaccess_egprs_channel_coding_command",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_egprs_onephaseaccess_tlli_block_channel_coding,
- { "TLLI_BLOCK_CHANNEL_CODING", "gsm_rlcmac_dl.egprsonephaseaccess_tlli_block_channel_coding",
+ { "TLLI_BLOCK_CHANNEL_CODING", "gsm_rlcmac.dl.egprsonephaseaccess_tlli_block_channel_coding",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_egprs_onephaseaccess_bep_period2,
- { "BEP_PERIOD2", "gsm_rlcmac_dl.egprsonephaseaccess_bep_period2",
+ { "BEP_PERIOD2", "gsm_rlcmac.dl.egprsonephaseaccess_bep_period2",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_egprs_onephaseaccess_resegment,
- { "RESEGMENT", "gsm_rlcmac_dl.egprs_onephaseaccess_resegment",
+ { "RESEGMENT", "gsm_rlcmac.dl.egprs_onephaseaccess_resegment",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_egprs_onephaseaccess_egprs_windowsize,
- { "EGPRS_WindowSize", "gsm_rlcmac_dl.egprs_onephaseaccess_windowsize",
+ { "EGPRS_WindowSize", "gsm_rlcmac.dl.egprs_onephaseaccess_windowsize",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_egprs_onephaseaccess_alpha,
- { "ALPHA", "gsm_rlcmac_dl.egprsonephaseaccess_alpha",
+ { "ALPHA", "gsm_rlcmac.dl.egprsonephaseaccess_alpha",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_egprs_onephaseaccess_gamma,
- { "GAMMA", "gsm_rlcmac_dl.egprsonephaseaccess_gamma",
+ { "GAMMA", "gsm_rlcmac.dl.egprsonephaseaccess_gamma",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_egprs_onephaseaccess_timing_advance_index,
- { "TIMING_ADVANCE_INDEX", "gsm_rlcmac_dl.egprsonephaseaccess_timing_advance_index",
+ { "TIMING_ADVANCE_INDEX", "gsm_rlcmac.dl.egprsonephaseaccess_timing_advance_index",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ia_egprs_00_extendedra,
- { "ExtendedRA", "gsm_rlcmac_dl.ia_egprs_00_extendedra",
+ { "ExtendedRA", "gsm_rlcmac.dl.ia_egprs_00_extendedra",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ia_egprs_uniontype ,
- { "UnionType", "gsm_rlcmac_dl.ia_egprs_00_uniontype",
+ { "UnionType", "gsm_rlcmac.dl.ia_egprs_00_uniontype",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ia_freqparamsbeforetime_length,
- { "Length", "gsm_rlcmac_dl.ia_freqparamsbeforetime_length",
+ { "Length", "gsm_rlcmac.dl.ia_freqparamsbeforetime_length",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ia_freqparamsbeforetime_maio,
- { "MAIO", "gsm_rlcmac_dl.ia_freqparamsbeforetime_maio",
+ { "MAIO", "gsm_rlcmac.dl.ia_freqparamsbeforetime_maio",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprs_singleblockallocation_alpha,
- { "ALPHA", "gsm_rlcmac_dl.gprs_singleblockallocation_alpha",
+ { "ALPHA", "gsm_rlcmac.dl.gprs_singleblockallocation_alpha",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprs_singleblockallocation_gamma,
- { "GAMMA", "gsm_rlcmac_dl.gprs_singleblockallocation_gamma",
+ { "GAMMA", "gsm_rlcmac.dl.gprs_singleblockallocation_gamma",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprs_singleblockallocation_p0,
- { "P0", "gsm_rlcmac_dl.gprs_singleblockallocation_p0",
+ { "P0", "gsm_rlcmac.dl.gprs_singleblockallocation_p0",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprs_singleblockallocation_bts_pwr_ctrl_mode,
- { "BTS_PWR_CTRL_MODE", "gsm_rlcmac_dl.gprs_singleblockallocation_bts_pwr_ctrl_mode",
+ { "BTS_PWR_CTRL_MODE", "gsm_rlcmac.dl.gprs_singleblockallocation_bts_pwr_ctrl_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprs_singleblockallocation_pr_mode,
- { "PR_MODE", "gsm_rlcmac_dl.gprs_singleblockallocation_pr_mode",
+ { "PR_MODE", "gsm_rlcmac.dl.gprs_singleblockallocation_pr_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprs_dynamicorfixedallocation_tfi_assignment,
- { "TFI_ASSIGNMENT", "gsm_rlcmac_dl.gprs_dynamicorfixedallocation_tfi_assignment",
+ { "TFI_ASSIGNMENT", "gsm_rlcmac.dl.gprs_dynamicorfixedallocation_tfi_assignment",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprs_dynamicorfixedallocation_polling,
- { "POLLING", "gsm_rlcmac_dl.gprs_dynamicorfixedallocation_polling",
+ { "POLLING", "gsm_rlcmac.dl.gprs_dynamicorfixedallocation_polling",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprs_dynamicorfixedallocation_channel_coding_command,
- { "CHANNEL_CODING_COMMAND", "gsm_rlcmac_dl.gprs_dynamicorfixedallocation_channel_coding_command",
+ { "CHANNEL_CODING_COMMAND", "gsm_rlcmac.dl.gprs_dynamicorfixedallocation_channel_coding_command",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprs_dynamicorfixedallocation_tlli_block_channel_coding,
- { "TLLI_BLOCK_CHANNEL_CODING", "gsm_rlcmac_dl.gprs_dynamicorfixedallocation_tlli_block_channel_coding",
+ { "TLLI_BLOCK_CHANNEL_CODING", "gsm_rlcmac.dl.gprs_dynamicorfixedallocation_tlli_block_channel_coding",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprs_dynamicorfixedallocation_alpha,
- { "ALPHA", "gsm_rlcmac_dl.gprs_dynamicorfixedallocation_alpha",
+ { "ALPHA", "gsm_rlcmac.dl.gprs_dynamicorfixedallocation_alpha",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprs_dynamicorfixedallocation_gamma,
- { "GAMMA", "gsm_rlcmac_dl.gprs_dynamicorfixedallocation_gamma",
+ { "GAMMA", "gsm_rlcmac.dl.gprs_dynamicorfixedallocation_gamma",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprs_dynamicorfixedallocation_timing_advance_index,
- { "TIMING_ADVANCE_INDEX", "gsm_rlcmac_dl.gprs_dynamicorfixedallocation_timing_advance_index",
+ { "TIMING_ADVANCE_INDEX", "gsm_rlcmac.dl.gprs_dynamicorfixedallocation_timing_advance_index",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pu_ia_additionsr99_extendedra,
- { "ExtendedRA", "gsm_rlcmac_dl.pu_ia_additionsr99_extendedra",
+ { "ExtendedRA", "gsm_rlcmac.dl.pu_ia_additionsr99_extendedra",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pd_ia_additionsr99_egprs_windowsize,
- { "EGPRS_WindowSize", "gsm_rlcmac_dl.pd_ia_additionr99_egprs_windowsize",
+ { "EGPRS_WindowSize", "gsm_rlcmac.dl.pd_ia_additionr99_egprs_windowsize",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pd_ia_additionsr99_link_quality_measurement_mode,
- { "LINK_QUALITY_MEASUREMENT_MODE", "gsm_rlcmac_dl.pd_ia_additionsr99_link_quality_measurement_mode",
+ { "LINK_QUALITY_MEASUREMENT_MODE", "gsm_rlcmac.dl.pd_ia_additionsr99_link_quality_measurement_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pd_ia_additionsr99_bep_period2,
- { "BEP_PERIOD2", "gsm_rlcmac_dl.pd_ia_additionsr99_bep_period2",
+ { "BEP_PERIOD2", "gsm_rlcmac.dl.pd_ia_additionsr99_bep_period2",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_downlink_immassignment_tlli,
- { "TLLI", "gsm_rlcmac_dl.packet_downlink_immassignment_tlli",
+ { "TLLI", "gsm_rlcmac.dl.packet_downlink_immassignment_tlli",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_downlink_immassignment_tfi_assignment,
- { "TFI_ASSIGNMENT", "gsm_rlcmac_dl.packet_downlink_immassignment_tfi_assignment",
+ { "TFI_ASSIGNMENT", "gsm_rlcmac.dl.packet_downlink_immassignment_tfi_assignment",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_downlink_immassignment_rlc_mode,
- { "RLC_MODE", "gsm_rlcmac_dl.packet_downlink_immassignment_rlc_mode",
+ { "RLC_MODE", "gsm_rlcmac.dl.packet_downlink_immassignment_rlc_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_downlink_immassignment_alpha,
- { "ALPHA", "gsm_rlcmac_dl.packet_downlink_immassignment_alpha",
+ { "ALPHA", "gsm_rlcmac.dl.packet_downlink_immassignment_alpha",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_downlink_immassignment_gamma,
- { "GAMMA", "gsm_rlcmac_dl.packet_downlink_immassignment_gamma",
+ { "GAMMA", "gsm_rlcmac.dl.packet_downlink_immassignment_gamma",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_downlink_immassignment_polling,
- { "POLLING", "gsm_rlcmac_dl.packet_downlink_immassignment_polling",
+ { "POLLING", "gsm_rlcmac.dl.packet_downlink_immassignment_polling",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_downlink_immassignment_ta_valid,
- { "TA_VALID", "gsm_rlcmac_dl.packet_downlink_immassignment_ta_valid",
+ { "TA_VALID", "gsm_rlcmac.dl.packet_downlink_immassignment_ta_valid",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_downlink_immassignment_timing_advance_index,
- { "TIMING_ADVANCE_INDEX", "gsm_rlcmac_dl.packet_downlink_immassignment_timing_advance_index",
+ { "TIMING_ADVANCE_INDEX", "gsm_rlcmac.dl.packet_downlink_immassignment_timing_advance_index",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_downlink_immassignment_p0,
- { "P0", "gsm_rlcmac_dl.packet_downlink_immassignment_p0",
+ { "P0", "gsm_rlcmac.dl.packet_downlink_immassignment_p0",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_downlink_immassignment_bts_pwr_ctrl_mode,
- { "BTS_PWR_CTRL_MODE", "gsm_rlcmac_dl.packet_downlink_immassignment_bts_pwr_ctrl_mode",
+ { "BTS_PWR_CTRL_MODE", "gsm_rlcmac.dl.packet_downlink_immassignment_bts_pwr_ctrl_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_downlink_immassignment_pr_mode,
- { "PR_MODE", "gsm_rlcmac_dl.packet_downlink_immassignment_pr_mode",
+ { "PR_MODE", "gsm_rlcmac.dl.packet_downlink_immassignment_pr_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_second_part_packet_assignment_extendedra,
- { "ExtendedRA", "gsm_rlcmac_dl.packet_downlink_immassignment_extendedra",
+ { "ExtendedRA", "gsm_rlcmac.dl.packet_downlink_immassignment_extendedra",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packetpollingid_tlli,
- { "TLLI", "gsm_rlcmac_dl.packetpollingid_tlli",
+ { "TLLI", "gsm_rlcmac.dl.packetpollingid_tlli",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packetpollingid_tqi,
- { "TQI", "gsm_rlcmac_dl.packetpollingid_tqi",
+ { "TQI", "gsm_rlcmac.dl.packetpollingid_tqi",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
/* <Packet Polling Request> */
{ &hf_packet_polling_request_message_type,
- { "MESSAGE_TYPE", "gsm_rlcmac_dl.ppr_message_type",
+ { "MESSAGE_TYPE", "gsm_rlcmac.dl.ppr_message_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_polling_request_page_mode,
- { "PAGE_MODE", "gsm_rlcmac_dl.ppr_page_mode",
+ { "PAGE_MODE", "gsm_rlcmac.dl.ppr_page_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_polling_request_type_of_ack,
- { "TYPE_OF_ACK", "gsm_rlcmac_dl.ppr_type_of_ack",
+ { "TYPE_OF_ACK", "gsm_rlcmac.dl.ppr_type_of_ack",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprs_mobile_allocation_hsn,
- { "HSN", "gsm_rlcmac_dl.gprs_mobile_allocation_hsn",
+ { "HSN", "gsm_rlcmac.dl.gprs_mobile_allocation_hsn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -7462,139 +7462,139 @@ proto_register_gsm_rlcmac(void)
/*< SI 13 Rest Octets >*/
{ &hf_gprs_cell_options_nmo,
- { "NMO", "gsm_rlcmac_dl.gprs_cell_options_nmo",
+ { "NMO", "gsm_rlcmac.dl.gprs_cell_options_nmo",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprs_cell_options_drx_timer_max,
- { "DRX_TIMER_MAX", "gsm_rlcmac_dl.gprs_cell_options_drx_timer_max",
+ { "DRX_TIMER_MAX", "gsm_rlcmac.dl.gprs_cell_options_drx_timer_max",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprs_cell_options_access_burst_type,
- { "ACCESS_BURST_TYPE", "gsm_rlcmac_dl.gprs_cell_options_access_burst_type",
+ { "ACCESS_BURST_TYPE", "gsm_rlcmac.dl.gprs_cell_options_access_burst_type",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprs_cell_options_control_ack_type,
- { "CONTROL_ACK_TYPE", "gsm_rlcmac_dl.gprs_cell_options_control_ack_type",
+ { "CONTROL_ACK_TYPE", "gsm_rlcmac.dl.gprs_cell_options_control_ack_type",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprs_cell_options_bs_cv_max,
- { "BS_CV_MAX", "gsm_rlcmac_dl.gprs_cell_options_bs_cv_max",
+ { "BS_CV_MAX", "gsm_rlcmac.dl.gprs_cell_options_bs_cv_max",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprs_cell_options_pan_dec,
- { "PAN_DEC", "gsm_rlcmac_dl.gprs_cell_options_pan_dec",
+ { "PAN_DEC", "gsm_rlcmac.dl.gprs_cell_options_pan_dec",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprs_cell_options_pan_inc,
- { "PAN_INC", "gsm_rlcmac_dl.gprs_cell_options_pan_inc",
+ { "PAN_INC", "gsm_rlcmac.dl.gprs_cell_options_pan_inc",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprs_cell_options_pan_max,
- { "PAN_MAX", "gsm_rlcmac_dl.gprs_cell_options_pan_max",
+ { "PAN_MAX", "gsm_rlcmac.dl.gprs_cell_options_pan_max",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pbcch_not_present_rac,
- { "RAC", "gsm_rlcmac_dl.pbcch_not_present_rac",
+ { "RAC", "gsm_rlcmac.dl.pbcch_not_present_rac",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pbcch_not_present_spgc_ccch_sup,
- { "SPGC_CCCH_SUP", "gsm_rlcmac_dl.pbcch_not_present_spgc_ccch_sup",
+ { "SPGC_CCCH_SUP", "gsm_rlcmac.dl.pbcch_not_present_spgc_ccch_sup",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pbcch_not_present_priority_access_thr,
- { "PRIORITY_ACCESS_THR", "gsm_rlcmac_dl.pbcch_not_present_priority_access_thr",
+ { "PRIORITY_ACCESS_THR", "gsm_rlcmac.dl.pbcch_not_present_priority_access_thr",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pbcch_not_present_network_control_order,
- { "NETWORK_CONTROL_ORDER", "gsm_rlcmac_dl.pbcch_not_present_network_control_order",
+ { "NETWORK_CONTROL_ORDER", "gsm_rlcmac.dl.pbcch_not_present_network_control_order",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pbcch_description_arfcn,
- { "ARFCN", "gsm_rlcmac_dl.pbcch_description_arfcn",
+ { "ARFCN", "gsm_rlcmac.dl.pbcch_description_arfcn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pbcch_description_maio,
- { "MAIO", "gsm_rlcmac_dl.pbcch_description_maio",
+ { "MAIO", "gsm_rlcmac.dl.pbcch_description_maio",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pbcch_description_pb,
- { "Pb", "gsm_rlcmac_dl.pbcch_description_pb",
+ { "Pb", "gsm_rlcmac.dl.pbcch_description_pb",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pbcch_description_tsc,
- { "TSC", "gsm_rlcmac_dl.pbcch_description_tsc",
+ { "TSC", "gsm_rlcmac.dl.pbcch_description_tsc",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pbcch_description_tn,
- { "TN", "gsm_rlcmac_dl.pbcch_description_tn",
+ { "TN", "gsm_rlcmac.dl.pbcch_description_tn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pbcch_present_psi1_repeat_period,
- { "PSI1_REPEAT_PERIOD", "gsm_rlcmac_dl.pbcch_present_psi1_repeat_period",
+ { "PSI1_REPEAT_PERIOD", "gsm_rlcmac.dl.pbcch_present_psi1_repeat_period",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_si_13_bcch_change_mark,
- { "BCCH_CHANGE_MARK", "gsm_rlcmac_dl.si_13_bcch_change_mark",
+ { "BCCH_CHANGE_MARK", "gsm_rlcmac.dl.si_13_bcch_change_mark",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_si_13_si_change_field,
- { "SI_CHANGE_FIELD", "gsm_rlcmac_dl.si_13_si_change_field",
+ { "SI_CHANGE_FIELD", "gsm_rlcmac.dl.si_13_si_change_field",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_si_13_si13_change_mark,
- { "SI13_CHANGE_MARK", "gsm_rlcmac_dl.si_13_si13_change_mark",
+ { "SI13_CHANGE_MARK", "gsm_rlcmac.dl.si_13_si13_change_mark",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_si_13_sgsnr,
- { "SGSNR", "gsm_rlcmac_dl.si_13_sgsnr",
+ { "SGSNR", "gsm_rlcmac.dl.si_13_sgsnr",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_si_13_si_status_ind,
- { "SI_STATUS_IND", "gsm_rlcmac_dl.si_13_si_status_ind",
+ { "SI_STATUS_IND", "gsm_rlcmac.dl.si_13_si_status_ind",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -7602,31 +7602,31 @@ proto_register_gsm_rlcmac(void)
/*< Packet TBF Release message content >*/
{ &hf_packetbf_release_message_type,
- { "MESSAGE_TYPE", "gsm_rlcmac_dl.packetbf_release_message_type",
+ { "MESSAGE_TYPE", "gsm_rlcmac.dl.packetbf_release_message_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packetbf_release_page_mode,
- { "PAGE_MODE", "gsm_rlcmac_dl.packetbf_release_page_mode",
+ { "PAGE_MODE", "gsm_rlcmac.dl.packetbf_release_page_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packetbf_release_uplink_release,
- { "UPLINK_RELEASE", "gsm_rlcmac_dl.packetbf_release_uplink_release",
+ { "UPLINK_RELEASE", "gsm_rlcmac.dl.packetbf_release_uplink_release",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packetbf_release_downlink_release,
- { "DOWNLINK_RELEASE", "gsm_rlcmac_dl.packetbf_release_downlink_release",
+ { "DOWNLINK_RELEASE", "gsm_rlcmac.dl.packetbf_release_downlink_release",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packetbf_release_tbf_release_cause,
- { "TBF_RELEASE_CAUSE", "gsm_rlcmac_dl.packetbf_release_tbf_release_cause",
+ { "TBF_RELEASE_CAUSE", "gsm_rlcmac.dl.packetbf_release_tbf_release_cause",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -7634,55 +7634,55 @@ proto_register_gsm_rlcmac(void)
/*< Packet Control Acknowledgement message content >*/
{ &hf_packet_control_acknowledgement_additionsr6_ctrl_ack_extension,
- { "CTRL_ACK_Extension", "gsm_rlcmac_ul.packet_control_ack_additionsr6_ctrl_ack_extension",
+ { "CTRL_ACK_Extension", "gsm_rlcmac.ul.packet_control_ack_additionsr6_ctrl_ack_extension",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_control_acknowledgement_additionsr5_tn_rrbp,
- { "TN_RRBP", "gsm_rlcmac_ul.packet_control_ack_additionsr5_tn_rrbp",
+ { "TN_RRBP", "gsm_rlcmac.ul.packet_control_ack_additionsr5_tn_rrbp",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_control_acknowledgement_additionsr5_g_rnti_extension,
- { "G_RNTI_Extension", "gsm_rlcmac_ul.packet_control_ack_additionsr5_g_rnti_extension",
+ { "G_RNTI_Extension", "gsm_rlcmac.ul.packet_control_ack_additionsr5_g_rnti_extension",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_control_acknowledgement_payloadtype,
- { "PayloadType", "gsm_rlcmac_ul.packet_control_ack_payloadtype",
+ { "PayloadType", "gsm_rlcmac.ul.packet_control_ack_payloadtype",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_control_acknowledgement_spare,
- { "spare", "gsm_rlcmac_ul.packet_control_ack_spare",
+ { "spare", "gsm_rlcmac.ul.packet_control_ack_spare",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_control_acknowledgement_r,
- { "R", "gsm_rlcmac_ul.packet_control_ack_r",
+ { "R", "gsm_rlcmac.ul.packet_control_ack_r",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_control_acknowledgement_message_type,
- { "MESSAGE_TYPE", "gsm_rlcmac_ul.packet_control_ack_message_type",
+ { "MESSAGE_TYPE", "gsm_rlcmac.ul.packet_control_ack_message_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_control_acknowledgement_tlli,
- { "TLLI", "gsm_rlcmac_ul.packet_control_ack_tlli",
+ { "TLLI", "gsm_rlcmac.ul.packet_control_ack_tlli",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_control_acknowledgement_ctrl_ack,
- { "CTRL_ACK", "gsm_rlcmac_ul.packet_control_ack_ctrl_ack",
+ { "CTRL_ACK", "gsm_rlcmac.ul.packet_control_ack_ctrl_ack",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -7690,13 +7690,13 @@ proto_register_gsm_rlcmac(void)
/*< Packet Downlink Dummy Control Block message content >*/
{ &hf_packet_downlink_dummy_control_block_message_type,
- { "MESSAGE_TYPE", "gsm_rlcmac_dl.packet_downlink_dummy_control_block_message_type",
+ { "MESSAGE_TYPE", "gsm_rlcmac.dl.packet_downlink_dummy_control_block_message_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_downlink_dummy_control_block_page_mode,
- { "PAGE_MODE", "gsm_rlcmac_dl.packet_downlink_dummy_control_block_page_mode",
+ { "PAGE_MODE", "gsm_rlcmac.dl.packet_downlink_dummy_control_block_page_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -7704,43 +7704,43 @@ proto_register_gsm_rlcmac(void)
/*< Packet Uplink Dummy Control Block message content >*/
{ &hf_packet_uplink_dummy_control_block_payloadtype,
- { "PayloadType", "gsm_rlcmac_dl.packet_uplink_dummy_control_block_payloadtype",
+ { "PayloadType", "gsm_rlcmac.dl.packet_uplink_dummy_control_block_payloadtype",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_uplink_dummy_control_block_spare,
- { "spare", "gsm_rlcmac_dl.packet_uplink_dummy_control_block_spare",
+ { "spare", "gsm_rlcmac.dl.packet_uplink_dummy_control_block_spare",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_uplink_dummy_control_block_r,
- { "R", "gsm_rlcmac_dl.packet_uplink_dummy_control_block_r",
+ { "R", "gsm_rlcmac.dl.packet_uplink_dummy_control_block_r",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_uplink_dummy_control_block_message_type,
- { "MESSAGE_TYPE", "gsm_rlcmac_dl.packet_uplink_dummy_control_block_message_type",
+ { "MESSAGE_TYPE", "gsm_rlcmac.dl.packet_uplink_dummy_control_block_message_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_uplink_dummy_control_block_tlli,
- { "TLLI", "gsm_rlcmac_dl.packet_uplink_dummy_control_block_pu_dummy_ctrl_blk_tlli",
+ { "TLLI", "gsm_rlcmac.dl.packet_uplink_dummy_control_block_pu_dummy_ctrl_blk_tlli",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_receive_n_pdu_number_nsapi,
- { "nsapi", "gsm_rlcmac_dl.receive_n_pdu_number_nsapi",
+ { "nsapi", "gsm_rlcmac.dl.receive_n_pdu_number_nsapi",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_receive_n_pdu_number_value,
- { "value", "gsm_rlcmac_dl.receive_n_pdu_number_value",
+ { "value", "gsm_rlcmac.dl.receive_n_pdu_number_value",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -7748,266 +7748,266 @@ proto_register_gsm_rlcmac(void)
/*< MS Radio Access capability IE >*/
{ &hf_dtm_egprs_dtm_egprs_multislot_class,
- { "DTM_EGPRS_multislot_class", "gsm_rlcmac_ul.dtm_egprs_multislot_class",
+ { "DTM_EGPRS_multislot_class", "gsm_rlcmac.ul.dtm_egprs_multislot_class",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dtm_egprs_highmultislotclass_dtm_egprs_highmultislotclass,
- { "DTM_EGPRS_HighMultislotClass", "gsm_rlcmac_ul.dtm_egprs_highmultislotclass",
+ { "DTM_EGPRS_HighMultislotClass", "gsm_rlcmac.ul.dtm_egprs_highmultislotclass",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_multislot_capability_hscsd_multislot_class,
- { "HSCSD_multislot_class", "gsm_rlcmac_ul.hscsd_multislot_class",
+ { "HSCSD_multislot_class", "gsm_rlcmac.ul.hscsd_multislot_class",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_multislot_capability_gprs_multislot_class,
- { "GPRS_multislot_class", "gsm_rlcmac_ul.gprs_multislot_class",
+ { "GPRS_multislot_class", "gsm_rlcmac.ul.gprs_multislot_class",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_multislot_capability_gprs_extended_dynamic_allocation_capability,
- { "GPRS_Extended_Dynamic_Allocation_Capability", "gsm_rlcmac_ul.gprs_extended_dynamic_allocation_capability",
+ { "GPRS_Extended_Dynamic_Allocation_Capability", "gsm_rlcmac.ul.gprs_extended_dynamic_allocation_capability",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_multislot_capability_sms_value,
- { "SMS_VALUE", "gsm_rlcmac_ul.sms_value",
+ { "SMS_VALUE", "gsm_rlcmac.ul.sms_value",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_multislot_capability_sm_value,
- { "SM_VALUE", "gsm_rlcmac_ul.sm_value",
+ { "SM_VALUE", "gsm_rlcmac.ul.sm_value",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_multislot_capability_ecsd_multislot_class,
- { "ECSD_multislot_class", "gsm_rlcmac_ul.ecsd_multislot_class",
+ { "ECSD_multislot_class", "gsm_rlcmac.ul.ecsd_multislot_class",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_multislot_capability_egprs_multislot_class,
- { "EGPRS_multislot_class", "gsm_rlcmac_ul.egprs_multislot_class",
+ { "EGPRS_multislot_class", "gsm_rlcmac.ul.egprs_multislot_class",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_multislot_capability_egprs_extended_dynamic_allocation_capability,
- { "EGPRS_Extended_Dynamic_Allocation_Capability", "gsm_rlcmac_ul.egprs_extended_dynamic_allocation_capability",
+ { "EGPRS_Extended_Dynamic_Allocation_Capability", "gsm_rlcmac.ul.egprs_extended_dynamic_allocation_capability",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_multislot_capability_dtm_gprs_multislot_class,
- { "DTM_GPRS_multislot_class", "gsm_rlcmac_ul.dtm_gprs_multislot_class",
+ { "DTM_GPRS_multislot_class", "gsm_rlcmac.ul.dtm_gprs_multislot_class",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_multislot_capability_single_slot_dtm,
- { "Single_Slot_DTM", "gsm_rlcmac_ul.single_slot_dtm",
+ { "Single_Slot_DTM", "gsm_rlcmac.ul.single_slot_dtm",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_content_rf_power_capability,
- { "RF_Power_Capability", "gsm_rlcmac_ul.rf_power_capability",
+ { "RF_Power_Capability", "gsm_rlcmac.ul.rf_power_capability",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_content_a5_bits,
- { "A5_bits", "gsm_rlcmac_ul.a5_bits",
+ { "A5_bits", "gsm_rlcmac.ul.a5_bits",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_content_es_ind,
- { "ES_IND", "gsm_rlcmac_ul.es_ind",
+ { "ES_IND", "gsm_rlcmac.ul.es_ind",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_content_ps,
- { "PS", "gsm_rlcmac_ul.ps",
+ { "PS", "gsm_rlcmac.ul.ps",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_content_vgcs,
- { "VGCS", "gsm_rlcmac_ul.vgcs",
+ { "VGCS", "gsm_rlcmac.ul.vgcs",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_content_vbs,
- { "VBS", "gsm_rlcmac_ul.vbs",
+ { "VBS", "gsm_rlcmac.ul.vbs",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_content_eight_psk_power_capability,
- { "Eight_PSK_Power_Capability", "gsm_rlcmac_ul.eight_psk_power_capability",
+ { "Eight_PSK_Power_Capability", "gsm_rlcmac.ul.eight_psk_power_capability",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_content_compact_interference_measurement_capability,
- { "COMPACT_Interference_Measurement_Capability", "gsm_rlcmac_ul.compact_interference_measurement_capability",
+ { "COMPACT_Interference_Measurement_Capability", "gsm_rlcmac.ul.compact_interference_measurement_capability",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_content_revision_level_indicator,
- { "Revision_Level_Indicator", "gsm_rlcmac_ul.revision_level_indicator",
+ { "Revision_Level_Indicator", "gsm_rlcmac.ul.revision_level_indicator",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_content_umts_fdd_radio_access_technology_capability,
- { "UMTS_FDD_Radio_Access_Technology_Capability", "gsm_rlcmac_ul.umts_fdd_radio_access_technology_capability",
+ { "UMTS_FDD_Radio_Access_Technology_Capability", "gsm_rlcmac.ul.umts_fdd_radio_access_technology_capability",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_content_umts_384_tdd_radio_access_technology_capability,
- { "UMTS_384_TDD_Radio_Access_Technology_Capability", "gsm_rlcmac_ul.umts_384_tdd_radio_access_technology_capability",
+ { "UMTS_384_TDD_Radio_Access_Technology_Capability", "gsm_rlcmac.ul.umts_384_tdd_radio_access_technology_capability",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_content_cdma2000_radio_access_technology_capability,
- { "CDMA2000_Radio_Access_Technology_Capability", "gsm_rlcmac_ul.cdma2000_radio_access_technology_capability",
+ { "CDMA2000_Radio_Access_Technology_Capability", "gsm_rlcmac.ul.cdma2000_radio_access_technology_capability",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_content_umts_128_tdd_radio_access_technology_capability,
- { "UMTS_128_TDD_Radio_Access_Technology_Capability", "gsm_rlcmac_ul.umts_128_tdd_radio_access_technology_capability",
+ { "UMTS_128_TDD_Radio_Access_Technology_Capability", "gsm_rlcmac.ul.umts_128_tdd_radio_access_technology_capability",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_content_geran_feature_package_1,
- { "GERAN_Feature_Package_1", "gsm_rlcmac_ul.geran_feature_package_1",
+ { "GERAN_Feature_Package_1", "gsm_rlcmac.ul.geran_feature_package_1",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_content_extended_dtm_gprs_multislot_class,
- { "Extended_DTM_GPRS_multislot_class", "gsm_rlcmac_ul.extended_dtm_gprs_multislot_class",
+ { "Extended_DTM_GPRS_multislot_class", "gsm_rlcmac.ul.extended_dtm_gprs_multislot_class",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_content_extended_dtm_egprs_multislot_class,
- { "Extended_DTM_EGPRS_multislot_class", "gsm_rlcmac_ul.extended_dtm_egprs_multislot_class",
+ { "Extended_DTM_EGPRS_multislot_class", "gsm_rlcmac.ul.extended_dtm_egprs_multislot_class",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_content_modulation_based_multislot_class_support,
- { "Modulation_based_multislot_class_support", "gsm_rlcmac_ul.modulation_based_multislot_class_support",
+ { "Modulation_based_multislot_class_support", "gsm_rlcmac.ul.modulation_based_multislot_class_support",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_content_highmultislotcapability,
- { "HighMultislotCapability", "gsm_rlcmac_ul.highmultislotcapability",
+ { "HighMultislotCapability", "gsm_rlcmac.ul.highmultislotcapability",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_content_geran_lu_modecapability,
- { "GERAN_lu_ModeCapability", "gsm_rlcmac_ul.geran_lu_modecapability",
+ { "GERAN_lu_ModeCapability", "gsm_rlcmac.ul.geran_lu_modecapability",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_content_gmsk_multislotpowerprofile,
- { "GMSK_MultislotPowerProfile", "gsm_rlcmac_ul.gmsk_multislotpowerprofile",
+ { "GMSK_MultislotPowerProfile", "gsm_rlcmac.ul.gmsk_multislotpowerprofile",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_content_eightpsk_multislotprofile,
- { "EightPSK_MultislotProfile", "gsm_rlcmac_ul.eightpsk_multislotprofile",
+ { "EightPSK_MultislotProfile", "gsm_rlcmac.ul.eightpsk_multislotprofile",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_content_multipletbf_capability,
- { "MultipleTBF_Capability", "gsm_rlcmac_ul.multipletbf_capability",
+ { "MultipleTBF_Capability", "gsm_rlcmac.ul.multipletbf_capability",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_content_downlinkadvancedreceiverperformance,
- { "DownlinkAdvancedReceiverPerformance", "gsm_rlcmac_ul.downlinkadvancedreceiverperformance",
+ { "DownlinkAdvancedReceiverPerformance", "gsm_rlcmac.ul.downlinkadvancedreceiverperformance",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_content_extendedrlc_mac_controlmessagesegmentionscapability,
- { "ExtendedRLC_MAC_ControlMessageSegmentionsCapability", "gsm_rlcmac_ul.extendedrlc_mac_controlmessagesegmentionscapability",
+ { "ExtendedRLC_MAC_ControlMessageSegmentionsCapability", "gsm_rlcmac.ul.extendedrlc_mac_controlmessagesegmentionscapability",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_content_dtm_enhancementscapability,
- { "DTM_EnhancementsCapability", "gsm_rlcmac_ul.dtm_enhancementscapability",
+ { "DTM_EnhancementsCapability", "gsm_rlcmac.ul.dtm_enhancementscapability",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_content_dtm_gprs_highmultislotclass,
- { "DTM_GPRS_HighMultislotClass", "gsm_rlcmac_ul.dtm_gprs_highmultislotclass",
+ { "DTM_GPRS_HighMultislotClass", "gsm_rlcmac.ul.dtm_gprs_highmultislotclass",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_content_ps_handovercapability,
- { "PS_HandoverCapability", "gsm_rlcmac_ul.ps_handovercapability",
+ { "PS_HandoverCapability", "gsm_rlcmac.ul.ps_handovercapability",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_additional_accessechnologies_struct_t_access_technology_type,
- { "Access_Technology_Type", "gsm_rlcmac_ul.access_technology_type",
+ { "Access_Technology_Type", "gsm_rlcmac.ul.access_technology_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_additional_accessechnologies_struct_t_gmsk_power_class,
- { "GMSK_Power_class", "gsm_rlcmac_ul.gmsk_power_class",
+ { "GMSK_Power_class", "gsm_rlcmac.ul.gmsk_power_class",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_additional_accessechnologies_struct_t_eight_psk_power_class,
- { "Eight_PSK_Power_class", "gsm_rlcmac_ul.eight_psk_power_class",
+ { "Eight_PSK_Power_class", "gsm_rlcmac.ul.eight_psk_power_class",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
#if 0
{ &hf_ms_radio_access_capability_iei,
- { "IEI", "gsm_rlcmac_ul.iei",
+ { "IEI", "gsm_rlcmac.ul.iei",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_radio_access_capability_length,
- { "Length", "gsm_rlcmac_ul.length",
+ { "Length", "gsm_rlcmac.ul.length",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -8015,301 +8015,301 @@ proto_register_gsm_rlcmac(void)
#endif
/*< MS Classmark 3 IE >*/
{ &hf_arc_a5_bits,
- { "A5_Bits", "gsm_rlcmac_ul.a5_bits",
+ { "A5_Bits", "gsm_rlcmac.ul.a5_bits",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_arc_arc2_spare,
- { "Arc2_Spare", "gsm_rlcmac_ul.arc2_spare",
+ { "Arc2_Spare", "gsm_rlcmac.ul.arc2_spare",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_arc_arc1,
- { "Arc1", "gsm_rlcmac_ul.arc1",
+ { "Arc1", "gsm_rlcmac.ul.arc1",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_multiband_a5_bits,
- { "A5 Bits", "gsm_rlcmac_ul.multiband_a5_bits",
+ { "A5 Bits", "gsm_rlcmac.ul.multiband_a5_bits",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_edge_rf_pwr_edge_rf_pwrcap1,
- { "EDGE_RF_PwrCap1", "gsm_rlcmac_ul.edge_rf_pwrcap1",
+ { "EDGE_RF_PwrCap1", "gsm_rlcmac.ul.edge_rf_pwrcap1",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_edge_rf_pwr_edge_rf_pwrcap2,
- { "EDGE_RF_PwrCap2", "gsm_rlcmac_ul.edge_rf_pwrcap2",
+ { "EDGE_RF_PwrCap2", "gsm_rlcmac.ul.edge_rf_pwrcap2",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_class3_unpacked_spare1,
- { "Spare1", "gsm_rlcmac_ul.ms_class3_unpacked_spare1",
+ { "Spare1", "gsm_rlcmac.ul.ms_class3_unpacked_spare1",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_class3_unpacked_r_gsm_arc,
- { "R_GSM_Arc", "gsm_rlcmac_ul.ms_class3_unpacked_r_gsm_arc",
+ { "R_GSM_Arc", "gsm_rlcmac.ul.ms_class3_unpacked_r_gsm_arc",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_class3_unpacked_multislotclass,
- { "MultiSlotClass", "gsm_rlcmac_ul.ms_class3_unpacked_multislotclass",
+ { "MultiSlotClass", "gsm_rlcmac.ul.ms_class3_unpacked_multislotclass",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_class3_unpacked_ucs2,
- { "UCS2", "gsm_rlcmac_ul.ms_class3_unpacked_ucs2",
+ { "UCS2", "gsm_rlcmac.ul.ms_class3_unpacked_ucs2",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_class3_unpacked_extendedmeasurementcapability,
- { "ExtendedMeasurementCapability", "gsm_rlcmac_ul.ms_class3_unpacked_extendedmeasurementcapability",
+ { "ExtendedMeasurementCapability", "gsm_rlcmac.ul.ms_class3_unpacked_extendedmeasurementcapability",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_class3_unpacked_sms_value,
- { "SMS_VALUE", "gsm_rlcmac_ul.ms_class3_unpacked_sms_value",
+ { "SMS_VALUE", "gsm_rlcmac.ul.ms_class3_unpacked_sms_value",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_class3_unpacked_sm_value,
- { "SM_VALUE", "gsm_rlcmac_ul.ms_class3_unpacked_sm_value",
+ { "SM_VALUE", "gsm_rlcmac.ul.ms_class3_unpacked_sm_value",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_class3_unpacked_ms_positioningmethod,
- { "MS_PositioningMethod", "gsm_rlcmac_ulms_class3_unpacked_.ms_positioningmethod",
+ { "MS_PositioningMethod", "gsm_rlcmac.ul.ms_class3_unpacked_.ms_positioningmethod",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_class3_unpacked_edge_multislotclass,
- { "EDGE_MultiSlotClass", "gsm_rlcmac_ul.ms_class3_unpacked_edge_multislotclass",
+ { "EDGE_MultiSlotClass", "gsm_rlcmac.ul.ms_class3_unpacked_edge_multislotclass",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_class3_unpacked_modulationcapability,
- { "ModulationCapability", "gsm_rlcmac_ul.ms_class3_unpacked_modulationcapability",
+ { "ModulationCapability", "gsm_rlcmac.ul.ms_class3_unpacked_modulationcapability",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_class3_unpacked_gsm400_bands,
- { "GSM400_Bands", "gsm_rlcmac_ul.ms_class3_unpacked_gsm400_bands",
+ { "GSM400_Bands", "gsm_rlcmac.ul.ms_class3_unpacked_gsm400_bands",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_class3_unpacked_gsm400_arc,
- { "GSM400_Arc", "gsm_rlcmac_ul.ms_class3_unpacked_gsm400_arc",
+ { "GSM400_Arc", "gsm_rlcmac.ul.ms_class3_unpacked_gsm400_arc",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_class3_unpacked_gsm850_arc,
- { "GSM850_Arc", "gsm_rlcmac_ul.ms_class3_unpacked_gsm850_arc",
+ { "GSM850_Arc", "gsm_rlcmac.ul.ms_class3_unpacked_gsm850_arc",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_class3_unpacked_pcs1900_arc,
- { "PCS1900_Arc", "gsm_rlcmac_ul.ms_class3_unpacked_pcs1900_arc",
+ { "PCS1900_Arc", "gsm_rlcmac.ul.ms_class3_unpacked_pcs1900_arc",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_class3_unpacked_umts_fdd_radio_access_technology_capability,
- { "UMTS_FDD_Radio_Access_Technology_Capability", "gsm_rlcmac_ul.ms_class3_unpacked_umts_fdd_radio_access_technology_capability",
+ { "UMTS_FDD_Radio_Access_Technology_Capability", "gsm_rlcmac.ul.ms_class3_unpacked_umts_fdd_radio_access_technology_capability",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_class3_unpacked_umts_384_tdd_radio_access_technology_capability,
- { "UMTS_384_TDD_Radio_Access_Technology_Capability", "gsm_rlcmac_ul.ms_class3_unpacked_umts_384_tdd_radio_access_technology_capability",
+ { "UMTS_384_TDD_Radio_Access_Technology_Capability", "gsm_rlcmac.ul.ms_class3_unpacked_umts_384_tdd_radio_access_technology_capability",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_class3_unpacked_cdma2000_radio_access_technology_capability,
- { "CDMA2000_Radio_Access_Technology_Capability", "gsm_rlcmac_ul.ms_class3_unpacked_cdma2000_radio_access_technology_capability",
+ { "CDMA2000_Radio_Access_Technology_Capability", "gsm_rlcmac.ul.ms_class3_unpacked_cdma2000_radio_access_technology_capability",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_class3_unpacked_dtm_gprs_multislot_class,
- { "DTM_GPRS_multislot_class", "gsm_rlcmac_ul.ms_class3_unpacked_dtm_gprs_multislot_class",
+ { "DTM_GPRS_multislot_class", "gsm_rlcmac.ul.ms_class3_unpacked_dtm_gprs_multislot_class",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_class3_unpacked_single_slot_dtm,
- { "Single_Slot_DTM", "gsm_rlcmac_ul.ms_class3_unpacked_single_slot_dtm",
+ { "Single_Slot_DTM", "gsm_rlcmac.ul.ms_class3_unpacked_single_slot_dtm",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_class3_unpacked_gsm_band,
- { "GSM_Band", "gsm_rlcmac_ul.ms_class3_unpacked_gsm_band",
+ { "GSM_Band", "gsm_rlcmac.ul.ms_class3_unpacked_gsm_band",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_class3_unpacked_gsm_700_associated_radio_capability,
- { "GSM_700_Associated_Radio_Capability", "gsm_rlcmac_ul.ms_class3_unpacked_gsm_700_associated_radio_capability",
+ { "GSM_700_Associated_Radio_Capability", "gsm_rlcmac.ul.ms_class3_unpacked_gsm_700_associated_radio_capability",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_class3_unpacked_umts_128_tdd_radio_access_technology_capability,
- { "UMTS_128_TDD_Radio_Access_Technology_Capability", "gsm_rlcmac_ul.ms_class3_unpacked_umts_128_tdd_radio_access_technology_capability",
+ { "UMTS_128_TDD_Radio_Access_Technology_Capability", "gsm_rlcmac.ul.ms_class3_unpacked_umts_128_tdd_radio_access_technology_capability",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_class3_unpacked_geran_feature_package_1,
- { "GERAN_Feature_Package_1", "gsm_rlcmac_ul.ms_class3_unpacked_geran_feature_package_1",
+ { "GERAN_Feature_Package_1", "gsm_rlcmac.ul.ms_class3_unpacked_geran_feature_package_1",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_class3_unpacked_extended_dtm_gprs_multislot_class,
- { "Extended_DTM_GPRS_multislot_class", "gsm_rlcmac_ul.ms_class3_unpacked_extended_dtm_gprs_multislot_class",
+ { "Extended_DTM_GPRS_multislot_class", "gsm_rlcmac.ul.ms_class3_unpacked_extended_dtm_gprs_multislot_class",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_class3_unpacked_extended_dtm_egprs_multislot_class,
- { "Extended_DTM_EGPRS_multislot_class", "gsm_rlcmac_ul.ms_class3_unpacked_extended_dtm_egprs_multislot_class",
+ { "Extended_DTM_EGPRS_multislot_class", "gsm_rlcmac.ul.ms_class3_unpacked_extended_dtm_egprs_multislot_class",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_class3_unpacked_highmultislotcapability,
- { "HighMultislotCapability", "gsm_rlcmac_ul.ms_class3_unpacked_highmultislotcapability",
+ { "HighMultislotCapability", "gsm_rlcmac.ul.ms_class3_unpacked_highmultislotcapability",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_class3_unpacked_geran_lu_modecapability,
- { "GERAN_lu_ModeCapability", "gsm_rlcmac_ul.ms_class3_unpacked_geran_lu_modecapability",
+ { "GERAN_lu_ModeCapability", "gsm_rlcmac.ul.ms_class3_unpacked_geran_lu_modecapability",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_class3_unpacked_geran_featurepackage_2,
- { "GERAN_FeaturePackage_2", "gsm_rlcmac_ul.ms_class3_unpacked_geran_featurepackage_2",
+ { "GERAN_FeaturePackage_2", "gsm_rlcmac.ul.ms_class3_unpacked_geran_featurepackage_2",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_class3_unpacked_gmsk_multislotpowerprofile,
- { "GMSK_MultislotPowerProfile", "gsm_rlcmac_ul.ms_class3_unpacked_gmsk_multislotpowerprofile",
+ { "GMSK_MultislotPowerProfile", "gsm_rlcmac.ul.ms_class3_unpacked_gmsk_multislotpowerprofile",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_class3_unpacked_eightpsk_multislotprofile,
- { "EightPSK_MultislotProfile", "gsm_rlcmac_ul.ms_class3_unpacked_eightpsk_multislotprofile",
+ { "EightPSK_MultislotProfile", "gsm_rlcmac.ul.ms_class3_unpacked_eightpsk_multislotprofile",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_class3_unpacked_tgsm_400_bandssupported,
- { "TGSM_400_BandsSupported", "gsm_rlcmac_ul.ms_class3_unpacked_tgsm_400_bandssupported",
+ { "TGSM_400_BandsSupported", "gsm_rlcmac.ul.ms_class3_unpacked_tgsm_400_bandssupported",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_class3_unpacked_tgsm_400_associatedradiocapability,
- { "TGSM_400_AssociatedRadioCapability", "gsm_rlcmac_ul.ms_class3_unpacked_tgsm_400_associatedradiocapability",
+ { "TGSM_400_AssociatedRadioCapability", "gsm_rlcmac.ul.ms_class3_unpacked_tgsm_400_associatedradiocapability",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_class3_unpacked_tgsm_900_associatedradiocapability,
- { "TGSM_900_AssociatedRadioCapability", "gsm_rlcmac_ul.ms_class3_unpacked_tgsm_900_associatedradiocapability",
+ { "TGSM_900_AssociatedRadioCapability", "gsm_rlcmac.ul.ms_class3_unpacked_tgsm_900_associatedradiocapability",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_class3_unpacked_downlinkadvancedreceiverperformance,
- { "DownlinkAdvancedReceiverPerformance", "gsm_rlcmac_ul.ms_class3_unpacked_downlinkadvancedreceiverperformance",
+ { "DownlinkAdvancedReceiverPerformance", "gsm_rlcmac.ul.ms_class3_unpacked_downlinkadvancedreceiverperformance",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_class3_unpacked_dtm_enhancementscapability,
- { "DTM_EnhancementsCapability", "gsm_rlcmac_ul.ms_class3_unpacked_dtm_enhancementscapability",
+ { "DTM_EnhancementsCapability", "gsm_rlcmac.ul.ms_class3_unpacked_dtm_enhancementscapability",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_class3_unpacked_dtm_gprs_highmultislotclass,
- { "DTM_GPRS_HighMultislotClass", "gsm_rlcmac_ul.ms_class3_unpacked_dtm_gprs_highmultislotclass",
+ { "DTM_GPRS_HighMultislotClass", "gsm_rlcmac.ul.ms_class3_unpacked_dtm_gprs_highmultislotclass",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_class3_unpacked_offsetrequired,
- { "OffsetRequired", "gsm_rlcmac_ul.ms_class3_unpacked_offsetrequired",
+ { "OffsetRequired", "gsm_rlcmac.ul.ms_class3_unpacked_offsetrequired",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_class3_unpacked_repeatedsacch_capability,
- { "RepeatedSACCH_Capability", "gsm_rlcmac_ul.ms_class3_unpacked_repeatedsacch_capability",
+ { "RepeatedSACCH_Capability", "gsm_rlcmac.ul.ms_class3_unpacked_repeatedsacch_capability",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ms_class3_unpacked_spare2,
- { "Spare2", "gsm_rlcmac_ul.ms_class3_unpacked_spare2",
+ { "Spare2", "gsm_rlcmac.ul.ms_class3_unpacked_spare2",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_channel_request_description_peak_throughput_class,
- { "PEAK_THROUGHPUT_CLASS", "gsm_rlcmac_ul.channel_request_description_peak_throughput_class",
+ { "PEAK_THROUGHPUT_CLASS", "gsm_rlcmac.ul.channel_request_description_peak_throughput_class",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_channel_request_description_radio_priority,
- { "RADIO_PRIORITY", "gsm_rlcmac_ul.channel_request_description_radio_priority",
+ { "RADIO_PRIORITY", "gsm_rlcmac.ul.channel_request_description_radio_priority",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_channel_request_description_rlc_mode,
- { "RLC_MODE", "gsm_rlcmac_ul.channel_request_description_rlc_mode",
+ { "RLC_MODE", "gsm_rlcmac.ul.channel_request_description_rlc_mode",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_channel_request_description_llc_pdu_type,
- { "LLC_PDU_TYPE", "gsm_rlcmac_ul.channel_request_description_llc_pdu_type",
+ { "LLC_PDU_TYPE", "gsm_rlcmac.ul.channel_request_description_llc_pdu_type",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_channel_request_description_rlc_octet_count,
- { "RLC_OCTET_COUNT", "gsm_rlcmac_ul.channel_request_description_rlc_octet_count",
+ { "RLC_OCTET_COUNT", "gsm_rlcmac.ul.channel_request_description_rlc_octet_count",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -8317,115 +8317,115 @@ proto_register_gsm_rlcmac(void)
/* < Packet Resource Request message content > */
{ &hf_packetresourcerequestid_tlli,
- { "TLLI", "gsm_rlcmac_ul.prr_tlli",
+ { "TLLI", "gsm_rlcmac.ul.prr_tlli",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_bep_measurementreport_mean_bep_gmsk,
- { "MEAN_BEP_GMSK", "gsm_rlcmac_ul.prr_mean_bep_gmsk",
+ { "MEAN_BEP_GMSK", "gsm_rlcmac.ul.prr_mean_bep_gmsk",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_bep_measurementreport_mean_bep_8psk,
- { "MEAN_BEP_8PSK", "gsm_rlcmac_ul.prr_mean_bep_8psk",
+ { "MEAN_BEP_8PSK", "gsm_rlcmac.ul.prr_mean_bep_8psk",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_interferencemeasurementreport_i_level,
- { "I_LEVEL", "gsm_rlcmac_ul.prr_i_level",
+ { "I_LEVEL", "gsm_rlcmac.ul.prr_i_level",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_egprs_bep_linkqualitymeasurements_mean_bep_gmsk,
- { "MEAN_BEP_GMSK", "gsm_rlcmac_ul.prr_mean_bep_gmsk",
+ { "MEAN_BEP_GMSK", "gsm_rlcmac.ul.prr_mean_bep_gmsk",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_egprs_bep_linkqualitymeasurements_cv_bep_gmsk,
- { "CV_BEP_GMSK", "gsm_rlcmac_ul.prr_cv_bep_gmsk",
+ { "CV_BEP_GMSK", "gsm_rlcmac.ul.prr_cv_bep_gmsk",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_egprs_bep_linkqualitymeasurements_mean_bep_8psk,
- { "MEAN_BEP_8PSK", "gsm_rlcmac_ul.prr_mean_bep_8psk",
+ { "MEAN_BEP_8PSK", "gsm_rlcmac.ul.prr_mean_bep_8psk",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_egprs_bep_linkqualitymeasurements_cv_bep_8psk,
- { "CV_BEP_8PSK", "gsm_rlcmac_ul.prr_cv_bep_8psk",
+ { "CV_BEP_8PSK", "gsm_rlcmac.ul.prr_cv_bep_8psk",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_prr_additionsr99_pfi,
- { "PFI", "gsm_rlcmac_ul.prr_pfi",
+ { "PFI", "gsm_rlcmac.ul.prr_pfi",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_prr_additionsr99_ms_rac_additionalinformationavailable,
- { "MS_RAC_AdditionalInformationAvailable", "gsm_rlcmac_ul.prr_ms_rac_additionalinformationavailable",
+ { "MS_RAC_AdditionalInformationAvailable", "gsm_rlcmac.ul.prr_ms_rac_additionalinformationavailable",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_prr_additionsr99_retransmissionofprr,
- { "RetransmissionOfPRR", "gsm_rlcmac_ul.prr_retransmissionofprr",
+ { "RetransmissionOfPRR", "gsm_rlcmac.ul.prr_retransmissionofprr",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_resource_request_payloadtype,
- { "PayloadType", "gsm_rlcmac_ul.prr_payloadtype",
+ { "PayloadType", "gsm_rlcmac.ul.prr_payloadtype",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_resource_request_spare,
- { "spare", "gsm_rlcmac_ul.prr_spare",
+ { "spare", "gsm_rlcmac.ul.prr_spare",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_resource_request_r,
- { "R", "gsm_rlcmac_ul.prr_r",
+ { "R", "gsm_rlcmac.ul.prr_r",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_resource_request_message_type,
- { "MESSAGE_TYPE", "gsm_rlcmac_ul.prr_message_type",
+ { "MESSAGE_TYPE", "gsm_rlcmac.ul.prr_message_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_resource_request_access_type,
- { "ACCESS_TYPE", "gsm_rlcmac_ul.prr_access_type",
+ { "ACCESS_TYPE", "gsm_rlcmac.ul.prr_access_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_resource_request_change_mark,
- { "CHANGE_MARK", "gsm_rlcmac_ul.prr_change_mark",
+ { "CHANGE_MARK", "gsm_rlcmac.ul.prr_change_mark",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_resource_request_c_value,
- { "C_VALUE", "gsm_rlcmac_ul.prr_c_value",
+ { "C_VALUE", "gsm_rlcmac.ul.prr_c_value",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_resource_request_sign_var,
- { "SIGN_VAR", "gsm_rlcmac_ul.prr_sign_var",
+ { "SIGN_VAR", "gsm_rlcmac.ul.prr_sign_var",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -8433,37 +8433,37 @@ proto_register_gsm_rlcmac(void)
/*< Packet Mobile TBF Status message content > */
{ &hf_packet_mobile_tbf_status_payloadtype,
- { "PayloadType", "gsm_rlcmac_ul.pmts_payloadtype",
+ { "PayloadType", "gsm_rlcmac.ul.pmts_payloadtype",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_mobile_tbf_status_spare,
- { "spare", "gsm_rlcmac_ul.pmts_spare",
+ { "spare", "gsm_rlcmac.ul.pmts_spare",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_mobile_tbf_status_r,
- { "R", "gsm_rlcmac_ul.pmts_r",
+ { "R", "gsm_rlcmac.ul.pmts_r",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_mobile_tbf_status_message_type,
- { "MESSAGE_TYPE", "gsm_rlcmac_ul.pmts_message_type",
+ { "MESSAGE_TYPE", "gsm_rlcmac.ul.pmts_message_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_mobile_tbf_status_tbf_cause,
- { "TBF_CAUSE", "gsm_rlcmac_ul.pmts_tbf_cause",
+ { "TBF_CAUSE", "gsm_rlcmac.ul.pmts_tbf_cause",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_mobile_tbf_status_status_message_type,
- { "STATUS_MESSAGE_TYPE", "gsm_rlcmac_ul.pmts_status_message_type",
+ { "STATUS_MESSAGE_TYPE", "gsm_rlcmac.ul.pmts_status_message_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -8471,55 +8471,55 @@ proto_register_gsm_rlcmac(void)
/*< Packet PSI Status message content > */
{ &hf_psi_message_psi_message_type,
- { "PSI_MESSAGE_TYPE", "gsm_rlcmac_ul.pps_psi_message_type",
+ { "PSI_MESSAGE_TYPE", "gsm_rlcmac.ul.pps_psi_message_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_psi_message_psix_change_mark,
- { "PSIX_CHANGE_MARK", "gsm_rlcmac_ul.pps_psix_change_mark",
+ { "PSIX_CHANGE_MARK", "gsm_rlcmac.ul.pps_psix_change_mark",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_psi_message_list_additional_msg_type,
- { "ADDITIONAL_MSG_TYPE", "gsm_rlcmac_ul.pps_additional_msg_type",
+ { "ADDITIONAL_MSG_TYPE", "gsm_rlcmac.ul.pps_additional_msg_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_unknown_psi_message_list_additional_msg_type,
- { "ADDITIONAL_MSG_TYPE", "gsm_rlcmac_ul.pps_additional_msg_type",
+ { "ADDITIONAL_MSG_TYPE", "gsm_rlcmac.ul.pps_additional_msg_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_psi_status_payloadtype,
- { "PayloadType", "gsm_rlcmac_ul.pps_payloadtype",
+ { "PayloadType", "gsm_rlcmac.ul.pps_payloadtype",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_psi_status_spare,
- { "spare", "gsm_rlcmac_ul.pps_spare",
+ { "spare", "gsm_rlcmac.ul.pps_spare",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_psi_status_r,
- { "R", "gsm_rlcmac_ul.pps_r",
+ { "R", "gsm_rlcmac.ul.pps_r",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_psi_status_message_type,
- { "MESSAGE_TYPE", "gsm_rlcmac_ul.pps_message_type",
+ { "MESSAGE_TYPE", "gsm_rlcmac.ul.pps_message_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_psi_status_pbcch_change_mark,
- { "PBCCH_CHANGE_MARK", "gsm_rlcmac_ul.pps_pbcch_change_mark",
+ { "PBCCH_CHANGE_MARK", "gsm_rlcmac.ul.pps_pbcch_change_mark",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -8527,55 +8527,55 @@ proto_register_gsm_rlcmac(void)
/* < Packet SI Status message content > */
{ &hf_si_message_si_message_type,
- { "SI_MESSAGE_TYPE", "gsm_rlcmac_ul.si_message_message_type",
+ { "SI_MESSAGE_TYPE", "gsm_rlcmac.ul.si_message_message_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_si_message_mess_rec,
- { "MESS_REC", "gsm_rlcmac_ul.si_message_mess_rec",
+ { "MESS_REC", "gsm_rlcmac.ul.si_message_mess_rec",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_si_message_list_additional_msg_type,
- { "ADDITIONAL_MSG_TYPE", "gsm_rlcmac_ul.si_message_list_additional_msg_type",
+ { "ADDITIONAL_MSG_TYPE", "gsm_rlcmac.ul.si_message_list_additional_msg_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_unknown_si_message_list_additional_msg_type,
- { "ADDITIONAL_MSG_TYPE", "gsm_rlcmac_ulunknown_si_message_list_additional_msg_type",
+ { "ADDITIONAL_MSG_TYPE", "gsm_rlcmac.ul.unknown_si_message_list_additional_msg_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_si_status_payloadtype,
- { "PayloadType", "gsm_rlcmac_ul.packet_si_status_payloadtype",
+ { "PayloadType", "gsm_rlcmac.ul.packet_si_status_payloadtype",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_si_status_spare,
- { "spare", "gsm_rlcmac_ul.packet_si_status_spare",
+ { "spare", "gsm_rlcmac.ul.packet_si_status_spare",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_si_status_r,
- { "R", "gsm_rlcmac_ul.packet_si_status_r",
+ { "R", "gsm_rlcmac.ul.packet_si_status_r",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_si_status_message_type,
- { "MESSAGE_TYPE", "gsm_rlcmac_ul.packet_si_status_message_type",
+ { "MESSAGE_TYPE", "gsm_rlcmac.ul.packet_si_status_message_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_si_status_bcch_change_mark,
- { "BCCH_CHANGE_MARK", "gsm_rlcmac_ul.packet_si_status_bcch_change_mark",
+ { "BCCH_CHANGE_MARK", "gsm_rlcmac.ul.packet_si_status_bcch_change_mark",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -8583,37 +8583,37 @@ proto_register_gsm_rlcmac(void)
/* < Packet Downlink Ack/Nack message content > */
{ &hf_pd_acknack_additionsr99_pfi,
- { "PFI", "gsm_rlcmac_ul.pdan_pfi",
+ { "PFI", "gsm_rlcmac.ul.pdan_pfi",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_downlink_ack_nack_payloadtype,
- { "PayloadType", "gsm_rlcmac_ul.pdan_payloadtype",
+ { "PayloadType", "gsm_rlcmac.ul.pdan_payloadtype",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_downlink_ack_nack_spare,
- { "spare", "gsm_rlcmac_ul.pdan_spare",
+ { "spare", "gsm_rlcmac.ul.pdan_spare",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_downlink_ack_nack_r,
- { "R", "gsm_rlcmac_ul.pdan_r",
+ { "R", "gsm_rlcmac.ul.pdan_r",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_downlink_ack_nack_message_type,
- { "MESSAGE_TYPE", "gsm_rlcmac_ul.pdan_message_type",
+ { "MESSAGE_TYPE", "gsm_rlcmac.ul.pdan_message_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_downlink_ack_nack_downlink_tfi,
- { "DOWNLINK_TFI", "gsm_rlcmac_ul.pdan_downlink_tfi",
+ { "DOWNLINK_TFI", "gsm_rlcmac.ul.pdan_downlink_tfi",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -8621,103 +8621,103 @@ proto_register_gsm_rlcmac(void)
/*< EGPRS Packet Downlink Ack/Nack message content > */
{ &hf_egprs_channelqualityreport_c_value,
- { "C_VALUE", "gsm_rlcmac_ul.epdan_c_value",
+ { "C_VALUE", "gsm_rlcmac.ul.epdan_c_value",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_egprs_pd_acknack_payloadtype,
- { "PayloadType", "gsm_rlcmac_ul.epdan_payloadtype",
+ { "PayloadType", "gsm_rlcmac.ul.epdan_payloadtype",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_egprs_pd_acknack_spare,
- { "spare", "gsm_rlcmac_ul.epdan_spare",
+ { "spare", "gsm_rlcmac.ul.epdan_spare",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_egprs_pd_acknack_r,
- { "R", "gsm_rlcmac_ul.epdan_r",
+ { "R", "gsm_rlcmac.ul.epdan_r",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_egprs_pd_acknack_message_type,
- { "MESSAGE_TYPE", "gsm_rlcmac_ul.epdan_message_type",
+ { "MESSAGE_TYPE", "gsm_rlcmac.ul.epdan_message_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_egprs_pd_acknack_downlink_tfi,
- { "DOWNLINK_TFI", "gsm_rlcmac_ul.epdan_downlink_tfi",
+ { "DOWNLINK_TFI", "gsm_rlcmac.ul.epdan_downlink_tfi",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_egprs_pd_acknack_ms_out_of_memory,
- { "MS_OUT_OF_MEMORY", "gsm_rlcmac_ul.epdan_ms_out_of_memory",
+ { "MS_OUT_OF_MEMORY", "gsm_rlcmac.ul.epdan_ms_out_of_memory",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_egprs_pd_acknack_pfi,
- { "PFI", "gsm_rlcmac_ul.epdan_pfi",
+ { "PFI", "gsm_rlcmac.ul.epdan_pfi",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_fddarget_cell_t_fdd_arfcn,
- { "FDD_ARFCN", "gsm_rlcmac_ul.epdan_fdd_arfcn",
+ { "FDD_ARFCN", "gsm_rlcmac.ul.epdan_fdd_arfcn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_fddarget_cell_t_diversity,
- { "DIVERSITY", "gsm_rlcmac_ul.epdan_diversity",
+ { "DIVERSITY", "gsm_rlcmac.ul.epdan_diversity",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_fddarget_cell_t_bandwith_fdd,
- { "BANDWITH_FDD", "gsm_rlcmac_ul.epdan_bandwith_fdd",
+ { "BANDWITH_FDD", "gsm_rlcmac.ul.epdan_bandwith_fdd",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_fddarget_cell_t_scrambling_code,
- { "SCRAMBLING_CODE", "gsm_rlcmac_ul.epdan_scrambling_code",
+ { "SCRAMBLING_CODE", "gsm_rlcmac.ul.epdan_scrambling_code",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_tddarget_cell_t_tdd_arfcn,
- { "TDD-ARFCN", "gsm_rlcmac_ul.epdan_tdd_arfcn",
+ { "TDD-ARFCN", "gsm_rlcmac.ul.epdan_tdd_arfcn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_tddarget_cell_t_diversity,
- { "Diversity TDD", "gsm_rlcmac_ul.epdan_diversity_tdd",
+ { "Diversity TDD", "gsm_rlcmac.ul.epdan_diversity_tdd",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_tddarget_cell_t_bandwith_tdd,
- { "Bandwidth_TDD", "gsm_rlcmac_ul.epdan_bandwidth_tdd",
+ { "Bandwidth_TDD", "gsm_rlcmac.ul.epdan_bandwidth_tdd",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_tddarget_cell_t_cell_parameter,
- { "Cell Parameter", "gsm_rlcmac_ul.epdan_cell_param",
+ { "Cell Parameter", "gsm_rlcmac.ul.epdan_cell_param",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_tddarget_cell_t_sync_case_tstd,
- { "Sync Case TSTD", "gsm_rlcmac_ul.epdan_sync_case_tstd",
+ { "Sync Case TSTD", "gsm_rlcmac.ul.epdan_sync_case_tstd",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -8725,67 +8725,67 @@ proto_register_gsm_rlcmac(void)
/*< Packet Cell Change Failure message content > */
{ &hf_packet_cell_change_failure_payloadtype,
- { "PayloadType", "gsm_rlcmac_ul.pccf_payloadtype",
+ { "PayloadType", "gsm_rlcmac.ul.pccf_payloadtype",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_cell_change_failure_spare,
- { "spare", "gsm_rlcmac_ul.pccf_spare",
+ { "spare", "gsm_rlcmac.ul.pccf_spare",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_cell_change_failure_r,
- { "R", "gsm_rlcmac_ul.pccf_r",
+ { "R", "gsm_rlcmac.ul.pccf_r",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_cell_change_failure_message_type,
- { "MESSAGE_TYPE", "gsm_rlcmac_ul.pccf_message_type",
+ { "MESSAGE_TYPE", "gsm_rlcmac.ul.pccf_message_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_cell_change_failure_tlli,
- { "TLLI", "gsm_rlcmac_ul.pccf_tlli",
+ { "TLLI", "gsm_rlcmac.ul.pccf_tlli",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_cell_change_failure_arfcn,
- { "ARFCN", "gsm_rlcmac_ulpccf_.arfcn",
+ { "ARFCN", "gsm_rlcmac.ul.pccf_arfcn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_cell_change_failure_bsic,
- { "BSIC", "gsm_rlcmac_ul.pccf_bsic",
+ { "BSIC", "gsm_rlcmac.ul.pccf_bsic",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_cell_change_failure_cause,
- { "CAUSE", "gsm_rlcmac_ul.pccf_cause",
+ { "CAUSE", "gsm_rlcmac.ul.pccf_cause",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_utran_csg_target_cell_ci,
- { "UTRAN_CI", "gsm_rlcmac_ul.utran_csg_target_cell_ci",
+ { "UTRAN_CI", "gsm_rlcmac.ul.utran_csg_target_cell_ci",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_eutran_csg_target_cell_ci,
- { "EUTRAN_CI", "gsm_rlcmac_ul.eutran_csg_target_cell_ci",
+ { "EUTRAN_CI", "gsm_rlcmac.ul.eutran_csg_target_cell_ci",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_eutran_csg_target_cell_tac,
- { "Tracking Area Code", "gsm_rlcmac_ul.eutran_csg_target_cell_tac",
+ { "Tracking Area Code", "gsm_rlcmac.ul.eutran_csg_target_cell_tac",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -8793,151 +8793,151 @@ proto_register_gsm_rlcmac(void)
/*< Packet Uplink Ack/Nack message content > */
{ &hf_power_control_parameters_alpha,
- { "ALPHA", "gsm_rlcmac_ul.puan_alpha",
+ { "ALPHA", "gsm_rlcmac.ul.puan_alpha",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_power_control_parameters_slot0_gamma_tn,
- { "Slot[0].GAMMA_TN", "gsm_rlcmac_ul.puan_slot0_gamma_tn",
+ { "Slot[0].GAMMA_TN", "gsm_rlcmac.ul.puan_slot0_gamma_tn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_power_control_parameters_slot1_gamma_tn,
- { "Slot[1].GAMMA_TN", "gsm_rlcmac_ul.puan_slot1_gamma_tn",
+ { "Slot[1].GAMMA_TN", "gsm_rlcmac.ul.puan_slot1_gamma_tn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_power_control_parameters_slot2_gamma_tn,
- { "Slot[2].GAMMA_TN", "gsm_rlcmac_ul.puan_slot2_gamma_tn",
+ { "Slot[2].GAMMA_TN", "gsm_rlcmac.ul.puan_slot2_gamma_tn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_power_control_parameters_slot3_gamma_tn,
- { "Slot[3].GAMMA_TN", "gsm_rlcmac_ul.puan_slot3_gamma_tn",
+ { "Slot[3].GAMMA_TN", "gsm_rlcmac.ul.puan_slot3_gamma_tn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_power_control_parameters_slot4_gamma_tn,
- { "Slot[4].GAMMA_TN", "gsm_rlcmac_ul.puan_slot4_gamma_tn",
+ { "Slot[4].GAMMA_TN", "gsm_rlcmac.ul.puan_slot4_gamma_tn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_power_control_parameters_slot5_gamma_tn,
- { "Slot[5].GAMMA_TN", "gsm_rlcmac_ul.puan_slot5_gamma_tn",
+ { "Slot[5].GAMMA_TN", "gsm_rlcmac.ul.puan_slot5_gamma_tn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_power_control_parameters_slot6_gamma_tn,
- { "Slot[6].GAMMA_TN", "gsm_rlcmac_ul.puan_slot6_gamma_tn",
+ { "Slot[6].GAMMA_TN", "gsm_rlcmac.ul.puan_slot6_gamma_tn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_power_control_parameters_slot7_gamma_tn,
- { "Slot[7].GAMMA_TN", "gsm_rlcmac_ul.puan_slot7_gamma_tn",
+ { "Slot[7].GAMMA_TN", "gsm_rlcmac.ul.puan_slot7_gamma_tn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pu_acknack_gprs_additionsr99_packetextendedtimingadvance,
- { "PacketExtendedTimingAdvance", "gsm_rlcmac_ul.puan_packetextendedtimingadvance",
+ { "PacketExtendedTimingAdvance", "gsm_rlcmac.ul.puan_packetextendedtimingadvance",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pu_acknack_gprs_additionsr99_tbf_est,
- { "TBF_EST", "gsm_rlcmac_ul.puan_tbf_est",
+ { "TBF_EST", "gsm_rlcmac.ul.puan_tbf_est",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pu_acknack_gprs_channel_coding_command,
- { "CHANNEL_CODING_COMMAND", "gsm_rlcmac_ul.puan_channel_coding_command",
+ { "CHANNEL_CODING_COMMAND", "gsm_rlcmac.ul.puan_channel_coding_command",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pu_acknack_gprs_common_uplink_ack_nack_data_contention_resolution_tlli,
- { "Common_Uplink_Ack_Nack_Data.CONTENTION_RESOLUTION_TLLI", "gsm_rlcmac_ul.puan_common_uplink_ack_nack_data_contention_resolution_tlli",
+ { "Common_Uplink_Ack_Nack_Data.CONTENTION_RESOLUTION_TLLI", "gsm_rlcmac.ul.puan_common_uplink_ack_nack_data_contention_resolution_tlli",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pu_acknack_gprs_fixedallocationdummy,
- { "FixedAllocationDummy", "gsm_rlcmac_ul.puan_fixedallocationdummy",
+ { "FixedAllocationDummy", "gsm_rlcmac.ul.puan_fixedallocationdummy",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pu_acknack_egprs_00_egprs_channelcodingcommand,
- { "EGPRS_ChannelCodingCommand", "gsm_rlcmac_ul.puan_egprs_channelcodingcommand",
+ { "EGPRS_ChannelCodingCommand", "gsm_rlcmac.ul.puan_egprs_channelcodingcommand",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pu_acknack_egprs_00_resegment,
- { "RESEGMENT", "gsm_rlcmac_ul.puan_egprs_00_resegment",
+ { "RESEGMENT", "gsm_rlcmac.ul.puan_egprs_00_resegment",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pu_acknack_egprs_00_pre_emptive_transmission,
- { "PRE_EMPTIVE_TRANSMISSION", "gsm_rlcmac_ul.puan_pre_emptive_transmission",
+ { "PRE_EMPTIVE_TRANSMISSION", "gsm_rlcmac.ul.puan_pre_emptive_transmission",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pu_acknack_egprs_00_prr_retransmission_request,
- { "PRR_RETRANSMISSION_REQUEST", "gsm_rlcmac_ul.puan_prr_retransmission_request",
+ { "PRR_RETRANSMISSION_REQUEST", "gsm_rlcmac.ul.puan_prr_retransmission_request",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pu_acknack_egprs_00_arac_retransmission_request,
- { "ARAC_RETRANSMISSION_REQUEST", "gsm_rlcmac_ul.puan_arac_retransmission_request",
+ { "ARAC_RETRANSMISSION_REQUEST", "gsm_rlcmac.ul.puan_arac_retransmission_request",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pu_acknack_egprs_00_common_uplink_ack_nack_data_contention_resolution_tlli,
- { "Common_Uplink_Ack_Nack_Data.CONTENTION_RESOLUTION_TLLI", "gsm_rlcmac_ul.puan_common_uplink_ack_nack_data_contention_resolution_tlli",
+ { "Common_Uplink_Ack_Nack_Data.CONTENTION_RESOLUTION_TLLI", "gsm_rlcmac.ul.puan_common_uplink_ack_nack_data_contention_resolution_tlli",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pu_acknack_egprs_00_tbf_est,
- { "TBF_EST", "gsm_rlcmac_ul.puan_tbf_est",
+ { "TBF_EST", "gsm_rlcmac.ul.puan_tbf_est",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pu_acknack_egprs_00_packet_extended_timing_advance,
- { "Packet_Extended_Timing_Advance", "gsm_rlcmac_ul.puan_packet_extended_timing_advance",
+ { "Packet_Extended_Timing_Advance", "gsm_rlcmac.ul.puan_packet_extended_timing_advance",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_uplink_ack_nack_message_type,
- { "MESSAGE_TYPE", "gsm_rlcmac_ul.puan_message_type",
+ { "MESSAGE_TYPE", "gsm_rlcmac.ul.puan_message_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_uplink_ack_nack_page_mode,
- { "PAGE_MODE", "gsm_rlcmac_ul.puan_page_mode",
+ { "PAGE_MODE", "gsm_rlcmac.ul.puan_page_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_uplink_ack_nack_uplink_tfi,
- { "UPLINK_TFI", "gsm_rlcmac_ul.puan_uplink_tfi",
+ { "UPLINK_TFI", "gsm_rlcmac.ul.puan_uplink_tfi",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -8945,469 +8945,469 @@ proto_register_gsm_rlcmac(void)
/*< Packet Uplink Assignment message content > */
{ &hf_change_mark_change_mark_1,
- { "CHANGE_MARK_1", "gsm_rlcmac_dl.pua_change_mark_1",
+ { "CHANGE_MARK_1", "gsm_rlcmac.dl.pua_change_mark_1",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_change_mark_change_mark_2,
- { "CHANGE_MARK_2", "gsm_rlcmac_dl.pua_change_mark_2",
+ { "CHANGE_MARK_2", "gsm_rlcmac.dl.pua_change_mark_2",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_indirect_encoding_maio,
- { "MAIO", "gsm_rlcmac_dl.pua_maio",
+ { "MAIO", "gsm_rlcmac.dl.pua_maio",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_indirect_encoding_ma_number,
- { "MA_NUMBER", "gsm_rlcmac_dl.pua_ma_number",
+ { "MA_NUMBER", "gsm_rlcmac.dl.pua_ma_number",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_direct_encoding_1_maio,
- { "MAIO", "gsm_rlcmac_dl.pua_maio",
+ { "MAIO", "gsm_rlcmac.dl.pua_maio",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_direct_encoding_2_maio,
- { "MAIO", "gsm_rlcmac_dl.pua_maio",
+ { "MAIO", "gsm_rlcmac.dl.pua_maio",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_direct_encoding_2_hsn,
- { "HSN", "gsm_rlcmac_dl.pua_hsn",
+ { "HSN", "gsm_rlcmac.dl.pua_hsn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_frequency_parameters_tsc,
- { "TSC", "gsm_rlcmac_dl.pua_tsc",
+ { "TSC", "gsm_rlcmac.dl.pua_tsc",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_frequency_parameters_arfcn,
- { "ARFCN", "gsm_rlcmac_dl.pua_arfcn",
+ { "ARFCN", "gsm_rlcmac.dl.pua_arfcn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_request_reference_random_access_information,
- { "RANDOM_ACCESS_INFORMATION", "gsm_rlcmac_dl.pua_random_access_information",
+ { "RANDOM_ACCESS_INFORMATION", "gsm_rlcmac.dl.pua_random_access_information",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_timeslot_allocation_usf_tn,
- { "USF_TN", "gsm_rlcmac_dl.pua_usf_tn",
+ { "USF_TN", "gsm_rlcmac.dl.pua_usf_tn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_timeslot_allocation_power_ctrl_param_alpha,
- { "ALPHA", "gsm_rlcmac_dl.pua_alpha",
+ { "ALPHA", "gsm_rlcmac.dl.pua_alpha",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_timeslot_allocation_power_ctrl_param_slot0_usf_tn,
- { "Slot[0].USF_TN", "gsm_rlcmac_dl.pua_slot0_usf_tn",
+ { "Slot[0].USF_TN", "gsm_rlcmac.dl.pua_slot0_usf_tn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_timeslot_allocation_power_ctrl_param_slot0_gamma_tn,
- { "Slot[0].GAMMA_TN", "gsm_rlcmac_dl.pua_slot0_gamma_tn",
+ { "Slot[0].GAMMA_TN", "gsm_rlcmac.dl.pua_slot0_gamma_tn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_timeslot_allocation_power_ctrl_param_slot1_usf_tn,
- { "Slot[1].USF_TN", "gsm_rlcmac_dl.pua_slot1_usf_tn",
+ { "Slot[1].USF_TN", "gsm_rlcmac.dl.pua_slot1_usf_tn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_timeslot_allocation_power_ctrl_param_slot1_gamma_tn,
- { "Slot[1].GAMMA_TN", "gsm_rlcmac_dl.pua_slot1_gamma_tn",
+ { "Slot[1].GAMMA_TN", "gsm_rlcmac.dl.pua_slot1_gamma_tn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_timeslot_allocation_power_ctrl_param_slot2_usf_tn,
- { "Slot[2].USF_TN", "gsm_rlcmac_dl.pua_slot2_usf_tn",
+ { "Slot[2].USF_TN", "gsm_rlcmac.dl.pua_slot2_usf_tn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_timeslot_allocation_power_ctrl_param_slot2_gamma_tn,
- { "Slot[2].GAMMA_TN", "gsm_rlcmac_dl.pua_slot2_gamma_tn",
+ { "Slot[2].GAMMA_TN", "gsm_rlcmac.dl.pua_slot2_gamma_tn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_timeslot_allocation_power_ctrl_param_slot3_usf_tn,
- { "Slot[3].USF_TN", "gsm_rlcmac_dl.pua_slot3_usf_tn",
+ { "Slot[3].USF_TN", "gsm_rlcmac.dl.pua_slot3_usf_tn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_timeslot_allocation_power_ctrl_param_slot3_gamma_tn,
- { "Slot[3].GAMMA_TN", "gsm_rlcmac_dl.pua_slot3_gamma_tn",
+ { "Slot[3].GAMMA_TN", "gsm_rlcmac.dl.pua_slot3_gamma_tn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_timeslot_allocation_power_ctrl_param_slot4_usf_tn,
- { "Slot[4].USF_TN", "gsm_rlcmac_dl.pua_slot4_usf_tn",
+ { "Slot[4].USF_TN", "gsm_rlcmac.dl.pua_slot4_usf_tn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_timeslot_allocation_power_ctrl_param_slot4_gamma_tn,
- { "Slot[4].GAMMA_TN", "gsm_rlcmac_dl.pua_slot4_gamma_tn",
+ { "Slot[4].GAMMA_TN", "gsm_rlcmac.dl.pua_slot4_gamma_tn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_timeslot_allocation_power_ctrl_param_slot5_usf_tn,
- { "Slot[5].USF_TN", "gsm_rlcmac_dl.pua_slot5_usf_tn",
+ { "Slot[5].USF_TN", "gsm_rlcmac.dl.pua_slot5_usf_tn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_timeslot_allocation_power_ctrl_param_slot5_gamma_tn,
- { "Slot[5].GAMMA_TN", "gsm_rlcmac_dl.pua_slot5_gamma_tn",
+ { "Slot[5].GAMMA_TN", "gsm_rlcmac.dl.pua_slot5_gamma_tn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_timeslot_allocation_power_ctrl_param_slot6_usf_tn,
- { "Slot[6].USF_TN", "gsm_rlcmac_dl.pua_slot6_usf_tn",
+ { "Slot[6].USF_TN", "gsm_rlcmac.dl.pua_slot6_usf_tn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_timeslot_allocation_power_ctrl_param_slot6_gamma_tn,
- { "Slot[6].GAMMA_TN", "gsm_rlcmac_dl.pua_slot6_gamma_tn",
+ { "Slot[6].GAMMA_TN", "gsm_rlcmac.dl.pua_slot6_gamma_tn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_timeslot_allocation_power_ctrl_param_slot7_usf_tn,
- { "Slot[7].USF_TN", "gsm_rlcmac_dl.pua_slot7_usf_tn",
+ { "Slot[7].USF_TN", "gsm_rlcmac.dl.pua_slot7_usf_tn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_timeslot_allocation_power_ctrl_param_slot7_gamma_tn,
- { "Slot[7].GAMMA_TN", "gsm_rlcmac_dl.pua_slot7_gamma_tn",
+ { "Slot[7].GAMMA_TN", "gsm_rlcmac.dl.pua_slot7_gamma_tn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dynamic_allocation_extended_dynamic_allocation,
- { "Extended_Dynamic_Allocation", "gsm_rlcmac_dl.pua_extended_dynamic_allocation",
+ { "Extended_Dynamic_Allocation", "gsm_rlcmac.dl.pua_extended_dynamic_allocation",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dynamic_allocation_p0,
- { "P0", "gsm_rlcmac_dl.pua_p0",
+ { "P0", "gsm_rlcmac.dl.pua_p0",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dynamic_allocation_pr_mode,
- { "PR_MODE", "gsm_rlcmac_dl.pua_pr_mode",
+ { "PR_MODE", "gsm_rlcmac.dl.pua_pr_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dynamic_allocation_usf_granularity,
- { "USF_GRANULARITY", "gsm_rlcmac_dl.pua_usf_granularity",
+ { "USF_GRANULARITY", "gsm_rlcmac.dl.pua_usf_granularity",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dynamic_allocation_uplink_tfi_assignment,
- { "UPLINK_TFI_ASSIGNMENT", "gsm_rlcmac_dl.pua_uplink_tfi_assignment",
+ { "UPLINK_TFI_ASSIGNMENT", "gsm_rlcmac.dl.pua_uplink_tfi_assignment",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dynamic_allocation_rlc_data_blocks_granted,
- { "RLC_DATA_BLOCKS_GRANTED", "gsm_rlcmac_dl.pua_rlc_data_blocks_granted",
+ { "RLC_DATA_BLOCKS_GRANTED", "gsm_rlcmac.dl.pua_rlc_data_blocks_granted",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_single_block_allocation_timeslot_number,
- { "TIMESLOT_NUMBER", "gsm_rlcmac_dl.pua_timeslot_number",
+ { "TIMESLOT_NUMBER", "gsm_rlcmac.dl.pua_timeslot_number",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_single_block_allocation_alpha,
- { "ALPHA", "gsm_rlcmac_dl.pua_alpha",
+ { "ALPHA", "gsm_rlcmac.dl.pua_alpha",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_single_block_allocation_gamma_tn,
- { "GAMMA_TN", "gsm_rlcmac_dl.pua_gamma_tn",
+ { "GAMMA_TN", "gsm_rlcmac.dl.pua_gamma_tn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_single_block_allocation_p0,
- { "P0", "gsm_rlcmac_dl.pua_p0",
+ { "P0", "gsm_rlcmac.dl.pua_p0",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_single_block_allocation_bts_pwr_ctrl_mode,
- { "BTS_PWR_CTRL_MODE", "gsm_rlcmac_dl.pua_bts_pwr_ctrl_mode",
+ { "BTS_PWR_CTRL_MODE", "gsm_rlcmac.dl.pua_bts_pwr_ctrl_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_single_block_allocation_pr_mode,
- { "PR_MODE", "gsm_rlcmac_dl.pua_pr_mode",
+ { "PR_MODE", "gsm_rlcmac.dl.pua_pr_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dtm_dynamic_allocation_extended_dynamic_allocation,
- { "Extended_Dynamic_Allocation", "gsm_rlcmac_dl.pua_dtm_extended_dynamic_allocation",
+ { "Extended_Dynamic_Allocation", "gsm_rlcmac.dl.pua_dtm_extended_dynamic_allocation",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dtm_dynamic_allocation_p0,
- { "P0", "gsm_rlcmac_dl.pua_dtm_p0",
+ { "P0", "gsm_rlcmac.dl.pua_dtm_p0",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dtm_dynamic_allocation_pr_mode,
- { "PR_MODE", "gsm_rlcmac_dl.pua_dtm_pr_mode",
+ { "PR_MODE", "gsm_rlcmac.dl.pua_dtm_pr_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dtm_dynamic_allocation_usf_granularity,
- { "USF_GRANULARITY", "gsm_rlcmac_dl.pua_dtm_usf_granularity",
+ { "USF_GRANULARITY", "gsm_rlcmac.dl.pua_dtm_usf_granularity",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dtm_dynamic_allocation_uplink_tfi_assignment,
- { "UPLINK_TFI_ASSIGNMENT", "gsm_rlcmac_dl.pua_dtm_uplink_tfi_assignment",
+ { "UPLINK_TFI_ASSIGNMENT", "gsm_rlcmac.dl.pua_dtm_uplink_tfi_assignment",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dtm_dynamic_allocation_rlc_data_blocks_granted,
- { "RLC_DATA_BLOCKS_GRANTED", "gsm_rlcmac_dl.pua_dtm_rlc_data_blocks_granted",
+ { "RLC_DATA_BLOCKS_GRANTED", "gsm_rlcmac.dl.pua_dtm_rlc_data_blocks_granted",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dtm_single_block_allocation_timeslot_number,
- { "TIMESLOT_NUMBER", "gsm_rlcmac_dl.pua_dtm_timeslot_number",
+ { "TIMESLOT_NUMBER", "gsm_rlcmac.dl.pua_dtm_timeslot_number",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dtm_single_block_allocation_alpha,
- { "ALPHA", "gsm_rlcmac_dl.pua_dtm_alpha",
+ { "ALPHA", "gsm_rlcmac.dl.pua_dtm_alpha",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dtm_single_block_allocation_gamma_tn,
- { "GAMMA_TN", "gsm_rlcmac_dl.pua_dtm_gamma_tn",
+ { "GAMMA_TN", "gsm_rlcmac.dl.pua_dtm_gamma_tn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dtm_single_block_allocation_p0,
- { "P0", "gsm_rlcmac_dl.pua_dtm_p0",
+ { "P0", "gsm_rlcmac.dl.pua_dtm_p0",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dtm_single_block_allocation_bts_pwr_ctrl_mode,
- { "BTS_PWR_CTRL_MODE", "gsm_rlcmac_dl.pua_dtm_bts_pwr_ctrl_mode",
+ { "BTS_PWR_CTRL_MODE", "gsm_rlcmac.dl.pua_dtm_bts_pwr_ctrl_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dtm_single_block_allocation_pr_mode,
- { "PR_MODE", "gsm_rlcmac_dl.pua_dtm_pr_mode",
+ { "PR_MODE", "gsm_rlcmac.dl.pua_dtm_pr_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_h10lli_t_tlli,
- { "TLLI", "gsm_rlcmac_dl.h10lli_tlli",
+ { "TLLI", "gsm_rlcmac.dl.h10lli_tlli",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_h110qi_t_tqi,
- { "TQI", "gsm_rlcmac_dl.h110qi_tqi",
+ { "TQI", "gsm_rlcmac.dl.h110qi_tqi",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packetuplinkid_tlli,
- { "TLLI", "gsm_rlcmac_dl.pu_id_tlli",
+ { "TLLI", "gsm_rlcmac.dl.pu_id_tlli",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packetuplinkid_tqi,
- { "TQI", "gsm_rlcmac_dl.pu_id_tqi",
+ { "TQI", "gsm_rlcmac.dl.pu_id_tqi",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pua_gprs_additionsr99_packet_extended_timing_advance,
- { "Packet_Extended_Timing_Advance", "gsm_rlcmac_dl.pua_packet_extended_timing_advance",
+ { "Packet_Extended_Timing_Advance", "gsm_rlcmac.dl.pua_packet_extended_timing_advance",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pua_gprs_channel_coding_command,
- { "CHANNEL_CODING_COMMAND", "gsm_rlcmac_dl.pua_channel_coding_command",
+ { "CHANNEL_CODING_COMMAND", "gsm_rlcmac.dl.pua_channel_coding_command",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pua_gprs_tlli_block_channel_coding,
- { "TLLI_BLOCK_CHANNEL_CODING", "gsm_rlcmac_dl.pua_tlli_pua_gprs_block_channel_coding",
+ { "TLLI_BLOCK_CHANNEL_CODING", "gsm_rlcmac.dl.pua_tlli_pua_gprs_block_channel_coding",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_compact_reducedma_bitmaplength,
- { "BitmapLength", "gsm_rlcmac_dl.pua_bitmaplength",
+ { "BitmapLength", "gsm_rlcmac.dl.pua_bitmaplength",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_compact_reducedma_maio_2,
- { "MAIO_2", "gsm_rlcmac_dl.pua_maio_2",
+ { "MAIO_2", "gsm_rlcmac.dl.pua_maio_2",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_multiblock_allocation_timeslot_number,
- { "TIMESLOT_NUMBER", "gsm_rlcmac_dl.pua_multiblock_timeslot_number",
+ { "TIMESLOT_NUMBER", "gsm_rlcmac.dl.pua_multiblock_timeslot_number",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_multiblock_allocation_alpha,
- { "ALPHA", "gsm_rlcmac_dl.pua_multiblock_alpha",
+ { "ALPHA", "gsm_rlcmac.dl.pua_multiblock_alpha",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_multiblock_allocation_gamma_tn,
- { "GAMMA_TN", "gsm_rlcmac_dl.pua_multiblock_gamma_tn",
+ { "GAMMA_TN", "gsm_rlcmac.dl.pua_multiblock_gamma_tn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_multiblock_allocation_p0,
- { "P0", "gsm_rlcmac_dl.pua_multiblock_p0",
+ { "P0", "gsm_rlcmac.dl.pua_multiblock_p0",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_multiblock_allocation_bts_pwr_ctrl_mode,
- { "BTS_PWR_CTRL_MODE", "gsm_rlcmac_dl.pua_multiblock_bts_pwr_ctrl_mode",
+ { "BTS_PWR_CTRL_MODE", "gsm_rlcmac.dl.pua_multiblock_bts_pwr_ctrl_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_multiblock_allocation_pr_mode,
- { "PR_MODE", "gsm_rlcmac_dl.pua_multiblock_pr_mode",
+ { "PR_MODE", "gsm_rlcmac.dl.pua_multiblock_pr_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_multiblock_allocation_number_of_radio_blocks_allocated,
- { "NUMBER_OF_RADIO_BLOCKS_ALLOCATED", "gsm_rlcmac_dl.pua_multiblock_number_of_radio_blocks_allocated",
+ { "NUMBER_OF_RADIO_BLOCKS_ALLOCATED", "gsm_rlcmac.dl.pua_multiblock_number_of_radio_blocks_allocated",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pua_egprs_00_contention_resolution_tlli,
- { "CONTENTION_RESOLUTION_TLLI", "gsm_rlcmac_dl.egprs_00_contention_resolution_tlli",
+ { "CONTENTION_RESOLUTION_TLLI", "gsm_rlcmac.dl.egprs_00_contention_resolution_tlli",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pua_egprs_00_egprs_channel_coding_command,
- { "EGPRS_CHANNEL_CODING_COMMAND", "gsm_rlcmac_dl.egprs_00_channel_coding_command",
+ { "EGPRS_CHANNEL_CODING_COMMAND", "gsm_rlcmac.dl.egprs_00_channel_coding_command",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pua_egprs_00_resegment,
- { "RESEGMENT", "gsm_rlcmac_dl.pua_egprs_00_resegment",
+ { "RESEGMENT", "gsm_rlcmac.dl.pua_egprs_00_resegment",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pua_egprs_00_egprs_windowsize,
- { "EGPRS_WindowSize", "gsm_rlcmac_dl.pua_egprs00_egprs_windowsize",
+ { "EGPRS_WindowSize", "gsm_rlcmac.dl.pua_egprs00_egprs_windowsize",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pua_egprs_00_arac_retransmission_request,
- { "ARAC_RETRANSMISSION_REQUEST", "gsm_rlcmac_dl.pua_egprs_00_arac_retransmission_request",
+ { "ARAC_RETRANSMISSION_REQUEST", "gsm_rlcmac.dl.pua_egprs_00_arac_retransmission_request",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pua_egprs_00_tlli_block_channel_coding,
- { "TLLI_BLOCK_CHANNEL_CODING", "gsm_rlcmac_dl.pua_egprs_00_tlli_block_channel_coding",
+ { "TLLI_BLOCK_CHANNEL_CODING", "gsm_rlcmac.dl.pua_egprs_00_tlli_block_channel_coding",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pua_egprs_00_bep_period2,
- { "BEP_PERIOD2", "gsm_rlcmac_dl.pua_egprs_00_bep_period2",
+ { "BEP_PERIOD2", "gsm_rlcmac.dl.pua_egprs_00_bep_period2",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pua_egprs_00_packet_extended_timing_advance,
- { "Packet_Extended_Timing_Advance", "gsm_rlcmac_dl.pua_egprs_00_packet_extended_timing_advance",
+ { "Packet_Extended_Timing_Advance", "gsm_rlcmac.dl.pua_egprs_00_packet_extended_timing_advance",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_uplink_assignment_message_type,
- { "MESSAGE_TYPE", "gsm_rlcmac_dl.pua_message_type",
+ { "MESSAGE_TYPE", "gsm_rlcmac.dl.pua_message_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_uplink_assignment_page_mode,
- { "PAGE_MODE", "gsm_rlcmac_dl.pua_page_mode",
+ { "PAGE_MODE", "gsm_rlcmac.dl.pua_page_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -9415,223 +9415,223 @@ proto_register_gsm_rlcmac(void)
/*< Packet Downlink Assignment message content > */
{ &hf_measurement_mapping_struct_measurement_interval,
- { "MEASUREMENT_INTERVAL", "gsm_rlcmac_dl.pda_measurement_interval",
+ { "MEASUREMENT_INTERVAL", "gsm_rlcmac.dl.pda_measurement_interval",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_measurement_mapping_struct_measurement_bitmap,
- { "MEASUREMENT_BITMAP", "gsm_rlcmac_dl.pda_measurement_bitmap",
+ { "MEASUREMENT_BITMAP", "gsm_rlcmac.dl.pda_measurement_bitmap",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packetdownlinkid_tlli,
- { "TLLI", "gsm_rlcmac_dl.pda_pd_id_tlli",
+ { "TLLI", "gsm_rlcmac.dl.pda_pd_id_tlli",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pda_additionsr99_egprs_windowsize,
- { "EGPRS_WindowSize", "gsm_rlcmac_dl.pda_egprs_windowsize",
+ { "EGPRS_WindowSize", "gsm_rlcmac.dl.pda_egprs_windowsize",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pda_additionsr99_link_quality_measurement_mode,
- { "LINK_QUALITY_MEASUREMENT_MODE", "gsm_rlcmac_dl.pda_link_quality_measurement_mode",
+ { "LINK_QUALITY_MEASUREMENT_MODE", "gsm_rlcmac.dl.pda_link_quality_measurement_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pda_additionsr99_bep_period2,
- { "BEP_PERIOD2", "gsm_rlcmac_dl.pda_bep_period2",
+ { "BEP_PERIOD2", "gsm_rlcmac.dl.pda_bep_period2",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pda_additionsr99_packet_extended_timing_advance,
- { "Packet_Extended_Timing_Advance", "gsm_rlcmac_dl.pda_packet_extended_timing_advance",
+ { "Packet_Extended_Timing_Advance", "gsm_rlcmac.dl.pda_packet_extended_timing_advance",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_downlink_assignment_message_type,
- { "MESSAGE_TYPE", "gsm_rlcmac_dl.pda_message_type",
+ { "MESSAGE_TYPE", "gsm_rlcmac.dl.pda_message_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_downlink_assignment_page_mode,
- { "PAGE_MODE", "gsm_rlcmac_dl.pda_page_mode",
+ { "PAGE_MODE", "gsm_rlcmac.dl.pda_page_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_downlink_assignment_mac_mode,
- { "MAC_MODE", "gsm_rlcmac_dl.pda_mac_mode",
+ { "MAC_MODE", "gsm_rlcmac.dl.pda_mac_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_downlink_assignment_rlc_mode,
- { "RLC_MODE", "gsm_rlcmac_dl.pda_rlc_mode",
+ { "RLC_MODE", "gsm_rlcmac.dl.pda_rlc_mode",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_downlink_assignment_control_ack,
- { "CONTROL_ACK", "gsm_rlcmac_dl.pda_control_ack",
+ { "CONTROL_ACK", "gsm_rlcmac.dl.pda_control_ack",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_downlink_assignment_timeslot_allocation,
- { "TIMESLOT_ALLOCATION", "gsm_rlcmac_dl.pda_timeslot_allocation",
+ { "TIMESLOT_ALLOCATION", "gsm_rlcmac.dl.pda_timeslot_allocation",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_downlink_assignment_p0,
- { "P0", "gsm_rlcmac_dl.pda_p0",
+ { "P0", "gsm_rlcmac.dl.pda_p0",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_downlink_assignment_bts_pwr_ctrl_mode,
- { "BTS_PWR_CTRL_MODE", "gsm_rlcmac_dl.pda_bts_pwr_ctrl_mode",
+ { "BTS_PWR_CTRL_MODE", "gsm_rlcmac.dl.pda_bts_pwr_ctrl_mode",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_downlink_assignment_pr_mode,
- { "PR_MODE", "gsm_rlcmac_dl.pda_pr_mode",
+ { "PR_MODE", "gsm_rlcmac.dl.pda_pr_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_downlink_assignment_downlink_tfi_assignment,
- { "DOWNLINK_TFI_ASSIGNMENT", "gsm_rlcmac_dl.pda_downlink_tfi_assignment",
+ { "DOWNLINK_TFI_ASSIGNMENT", "gsm_rlcmac.dl.pda_downlink_tfi_assignment",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pdlacheck_message_type,
- { "MESSAGE_TYPE", "gsm_rlcmac_dl.pda_message_type",
+ { "MESSAGE_TYPE", "gsm_rlcmac.dl.pda_message_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pdlacheck_page_mode,
- { "PAGE_MODE", "gsm_rlcmac_dl.pda_page_mode",
+ { "PAGE_MODE", "gsm_rlcmac.dl.pda_page_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dtm_packet_uplink_assignment_channel_coding_command,
- { "CHANNEL_CODING_COMMAND", "gsm_rlcmac_dl.pda_dtm_channel_coding_command",
+ { "CHANNEL_CODING_COMMAND", "gsm_rlcmac.dl.pda_dtm_channel_coding_command",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dtm_packet_uplink_assignment_tlli_block_channel_coding,
- { "TLLI_BLOCK_CHANNEL_CODING", "gsm_rlcmac_dl.pda_tlli_dtm_pua_block_channel_coding",
+ { "TLLI_BLOCK_CHANNEL_CODING", "gsm_rlcmac.dl.pda_tlli_dtm_pua_block_channel_coding",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dtm_packet_uplink_assignment_egprs_channel_coding_command,
- { "EGPRS_CHANNEL_CODING_COMMAND", "gsm_rlcmac_dl.pda_dtm_egprs_channel_coding_command",
+ { "EGPRS_CHANNEL_CODING_COMMAND", "gsm_rlcmac.dl.pda_dtm_egprs_channel_coding_command",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dtm_packet_uplink_assignment_resegment,
- { "RESEGMENT", "gsm_rlcmac_dl.pda_dtm_pua_resegment",
+ { "RESEGMENT", "gsm_rlcmac.dl.pda_dtm_pua_resegment",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dtm_packet_uplink_assignment_egprs_windowsize,
- { "EGPRS_WindowSize", "gsm_rlcmac_dl.pda_dtm_pua_egprs_windowsize",
+ { "EGPRS_WindowSize", "gsm_rlcmac.dl.pda_dtm_pua_egprs_windowsize",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dtm_packet_uplink_assignment_packet_extended_timing_advance,
- { "Packet_Extended_Timing_Advance", "gsm_rlcmac_dl.pda_dtm_packet_extended_timing_advance",
+ { "Packet_Extended_Timing_Advance", "gsm_rlcmac.dl.pda_dtm_packet_extended_timing_advance",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dtm_packet_downlink_assignment_mac_mode,
- { "MAC_MODE", "gsm_rlcmac_dl.pda_dtm_mac_mode",
+ { "MAC_MODE", "gsm_rlcmac.dl.pda_dtm_mac_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dtm_packet_downlink_assignment_rlc_mode,
- { "RLC_MODE", "gsm_rlcmac_dl.pda_dtm_rlc_mode",
+ { "RLC_MODE", "gsm_rlcmac.dl.pda_dtm_rlc_mode",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dtm_packet_downlink_assignment_timeslot_allocation,
- { "TIMESLOT_ALLOCATION", "gsm_rlcmac_dl.pda_dtm_timeslot_allocation",
+ { "TIMESLOT_ALLOCATION", "gsm_rlcmac.dl.pda_dtm_timeslot_allocation",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dtm_packet_downlink_assignment_p0,
- { "P0", "gsm_rlcmac_dl.pda_dtm_p0",
+ { "P0", "gsm_rlcmac.dl.pda_dtm_p0",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dtm_packet_downlink_assignment_bts_pwr_ctrl_mode,
- { "BTS_PWR_CTRL_MODE", "gsm_rlcmac_dl.pda_dtm_bts_pwr_ctrl_mode",
+ { "BTS_PWR_CTRL_MODE", "gsm_rlcmac.dl.pda_dtm_bts_pwr_ctrl_mode",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dtm_packet_downlink_assignment_pr_mode,
- { "PR_MODE", "gsm_rlcmac_dl.pda_dtm_pr_mode",
+ { "PR_MODE", "gsm_rlcmac.dl.pda_dtm_pr_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dtm_packet_downlink_assignment_downlink_tfi_assignment,
- { "DOWNLINK_TFI_ASSIGNMENT", "gsm_rlcmac_dl.pda_dtm_downlink_tfi_assignment",
+ { "DOWNLINK_TFI_ASSIGNMENT", "gsm_rlcmac.dl.pda_dtm_downlink_tfi_assignment",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dtm_packet_downlink_assignment_egprs_windowsize,
- { "EGPRS_WindowSize", "gsm_rlcmac_dl.pda_dtm_pda_egprs_windowsize",
+ { "EGPRS_WindowSize", "gsm_rlcmac.dl.pda_dtm_pda_egprs_windowsize",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dtm_packet_downlink_assignment_link_quality_measurement_mode,
- { "LINK_QUALITY_MEASUREMENT_MODE", "gsm_rlcmac_dl.pda_dtm_link_quality_measurement_mode",
+ { "LINK_QUALITY_MEASUREMENT_MODE", "gsm_rlcmac.dl.pda_dtm_link_quality_measurement_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dtm_packet_downlink_assignment_packet_extended_timing_advance,
- { "Packet_Extended_Timing_Advance", "gsm_rlcmac_dl.pda_dtm_packet_extended_timing_advance",
+ { "Packet_Extended_Timing_Advance", "gsm_rlcmac.dl.pda_dtm_packet_extended_timing_advance",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dtm_channel_request_description_dtm_pkt_est_cause,
- { "DTM_Pkt_Est_Cause", "gsm_rlcmac_dl.pda_dtm_pkt_est_cause",
+ { "DTM_Pkt_Est_Cause", "gsm_rlcmac.dl.pda_dtm_pkt_est_cause",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_dtm_channel_request_description_pfi,
- { "PFI", "gsm_rlcmac_dl.pda_dtm_pfi",
+ { "PFI", "gsm_rlcmac.dl.pda_dtm_pfi",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -9639,74 +9639,74 @@ proto_register_gsm_rlcmac(void)
/*< Packet Paging Request message content > */
{ &hf_mobile_identity_length_of_mobile_identity_contents,
- { "Length_of_Mobile_Identity_contents", "gsm_rlcmac_dl.ppr_length_of_mobile_identity_contents",
+ { "Length_of_Mobile_Identity_contents", "gsm_rlcmac.dl.ppr_length_of_mobile_identity_contents",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_page_request_for_rr_conn_channel_needed,
- { "CHANNEL_NEEDED", "gsm_rlcmac_dl.ppr_channel_needed",
+ { "CHANNEL_NEEDED", "gsm_rlcmac.dl.ppr_channel_needed",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_page_request_for_rr_conn_emlpp_priority,
- { "eMLPP_PRIORITY", "gsm_rlcmac_dl.ppr_emlpp_priority",
+ { "eMLPP_PRIORITY", "gsm_rlcmac.dl.ppr_emlpp_priority",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_paging_request_message_type,
- { "MESSAGE_TYPE", "gsm_rlcmac_dl.ppr_message_type",
+ { "MESSAGE_TYPE", "gsm_rlcmac.dl.ppr_message_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_paging_request_page_mode,
- { "PAGE_MODE", "gsm_rlcmac_dl.ppr_page_mode",
+ { "PAGE_MODE", "gsm_rlcmac.dl.ppr_page_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_paging_request_nln,
- { "NLN", "gsm_rlcmac_dl.ppr_nln",
+ { "NLN", "gsm_rlcmac.dl.ppr_nln",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_pdch_release_message_type,
- { "MESSAGE_TYPE", "gsm_rlcmac_dl.ppr_message_type",
+ { "MESSAGE_TYPE", "gsm_rlcmac.dl.ppr_message_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_pdch_release_page_mode,
- { "PAGE_MODE", "gsm_rlcmac_dl.ppr_page_mode",
+ { "PAGE_MODE", "gsm_rlcmac.dl.ppr_page_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_pdch_release_timeslots_available,
- { "TIMESLOTS_AVAILABLE", "gsm_rlcmac_dl.ppr_timeslots_available",
+ { "TIMESLOTS_AVAILABLE", "gsm_rlcmac.dl.ppr_timeslots_available",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packetpowercontroltimingadvanceid_tqi,
- { "TQI", "gsm_rlcmac_dl.ppr_tqi",
+ { "TQI", "gsm_rlcmac.dl.ppr_tqi",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
/*< Packet Power Control/Timing Advance message content >*/
{ &hf_packet_power_control_timing_advance_message_type,
- { "MESSAGE_TYPE", "gsm_rlcmac_dl.ppcta_message_type",
+ { "MESSAGE_TYPE", "gsm_rlcmac.dl.ppcta_message_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_power_control_timing_advance_page_mode,
- { "PAGE_MODE", "gsm_rlcmac_dl.ppcta_page_mode",
+ { "PAGE_MODE", "gsm_rlcmac.dl.ppcta_page_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -9714,49 +9714,49 @@ proto_register_gsm_rlcmac(void)
/*< Packet Queueing Notification message content > */
{ &hf_packet_queueing_notification_message_type,
- { "MESSAGE_TYPE", "gsm_rlcmac_dl.pqn_message_type",
+ { "MESSAGE_TYPE", "gsm_rlcmac.dl.pqn_message_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_queueing_notification_page_mode,
- { "PAGE_MODE", "gsm_rlcmac_dl.pqn_page_mode",
+ { "PAGE_MODE", "gsm_rlcmac.dl.pqn_page_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_queueing_notification_tqi,
- { "TQI", "gsm_rlcmac_dl.pqn_tqi",
+ { "TQI", "gsm_rlcmac.dl.pqn_tqi",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_trdynamic_allocation_extended_dynamic_allocation,
- { "Extended_Dynamic_Allocation", "gsm_rlcmac_dl.pqn_extended_dynamic_allocation",
+ { "Extended_Dynamic_Allocation", "gsm_rlcmac.dl.pqn_extended_dynamic_allocation",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_trdynamic_allocation_p0,
- { "P0", "gsm_rlcmac_dl.pqn_p0",
+ { "P0", "gsm_rlcmac.dl.pqn_p0",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_trdynamic_allocation_pr_mode,
- { "PR_MODE", "gsm_rlcmac_dl.pqn_pr_mode",
+ { "PR_MODE", "gsm_rlcmac.dl.pqn_pr_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_trdynamic_allocation_usf_granularity,
- { "USF_GRANULARITY", "gsm_rlcmac_dl.pqn_usf_granularity",
+ { "USF_GRANULARITY", "gsm_rlcmac.dl.pqn_usf_granularity",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_trdynamic_allocation_rlc_data_blocks_granted,
- { "RLC_DATA_BLOCKS_GRANTED", "gsm_rlcmac_dl.pqn_rlc_data_blocks_granted",
+ { "RLC_DATA_BLOCKS_GRANTED", "gsm_rlcmac.dl.pqn_rlc_data_blocks_granted",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -9764,133 +9764,133 @@ proto_register_gsm_rlcmac(void)
/*< Packet Timeslot Reconfigure message content > */
{ &hf_ptr_gprs_additionsr99_packet_extended_timing_advance,
- { "Packet_Extended_Timing_Advance", "gsm_rlcmac_dl.ptr_packet_extended_timing_advance",
+ { "Packet_Extended_Timing_Advance", "gsm_rlcmac.dl.ptr_packet_extended_timing_advance",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ptr_gprs_channel_coding_command,
- { "CHANNEL_CODING_COMMAND", "gsm_rlcmac_dl.ptr_channel_coding_command",
+ { "CHANNEL_CODING_COMMAND", "gsm_rlcmac.dl.ptr_channel_coding_command",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ptr_gprs_common_timeslot_reconfigure_data_downlink_rlc_mode,
- { "Common_Timeslot_Reconfigure_Data.DOWNLINK_RLC_MODE", "gsm_rlcmac_dl.ptr_common_timeslot_reconfigure_data_downlink_rlc_mode",
+ { "Common_Timeslot_Reconfigure_Data.DOWNLINK_RLC_MODE", "gsm_rlcmac.dl.ptr_common_timeslot_reconfigure_data_downlink_rlc_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ptr_gprs_common_timeslot_reconfigure_data_control_ack,
- { "Common_Timeslot_Reconfigure_Data.CONTROL_ACK", "gsm_rlcmac_dl.ptr_common_timeslot_reconfigure_data_control_ack",
+ { "Common_Timeslot_Reconfigure_Data.CONTROL_ACK", "gsm_rlcmac.dl.ptr_common_timeslot_reconfigure_data_control_ack",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ptr_gprs_common_timeslot_reconfigure_data_downlink_tfi_assignment,
- { "Common_Timeslot_Reconfigure_Data.DOWNLINK_TFI_ASSIGNMENT", "gsm_rlcmac_dl.ptr_common_timeslot_reconfigure_data_downlink_tfi_assignment",
+ { "Common_Timeslot_Reconfigure_Data.DOWNLINK_TFI_ASSIGNMENT", "gsm_rlcmac.dl.ptr_common_timeslot_reconfigure_data_downlink_tfi_assignment",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ptr_gprs_common_timeslot_reconfigure_data_uplink_tfi_assignment,
- { "Common_Timeslot_Reconfigure_Data.UPLINK_TFI_ASSIGNMENT", "gsm_rlcmac_dl.ptr_common_timeslot_reconfigure_data_uplink_tfi_assignment",
+ { "Common_Timeslot_Reconfigure_Data.UPLINK_TFI_ASSIGNMENT", "gsm_rlcmac.dl.ptr_common_timeslot_reconfigure_data_uplink_tfi_assignment",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ptr_gprs_common_timeslot_reconfigure_data_downlink_timeslot_allocation,
- { "Common_Timeslot_Reconfigure_Data.DOWNLINK_TIMESLOT_ALLOCATION", "gsm_rlcmac_dl.ptr_common_timeslot_reconfigure_data_downlink_timeslot_allocation",
+ { "Common_Timeslot_Reconfigure_Data.DOWNLINK_TIMESLOT_ALLOCATION", "gsm_rlcmac.dl.ptr_common_timeslot_reconfigure_data_downlink_timeslot_allocation",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ptr_egprs_00_egprs_channelcodingcommand,
- { "EGPRS_ChannelCodingCommand", "gsm_rlcmac_dl.ptr_egprs_channelcodingcommand",
+ { "EGPRS_ChannelCodingCommand", "gsm_rlcmac.dl.ptr_egprs_channelcodingcommand",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ptr_egprs_00_resegment,
- { "RESEGMENT", "gsm_rlcmac_dl.ptr_egprs_resegment",
+ { "RESEGMENT", "gsm_rlcmac.dl.ptr_egprs_resegment",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ptr_egprs_00_downlink_egprs_windowsize,
- { "DOWNLINK_EGPRS_WindowSize", "gsm_rlcmac_dl.ptr_downlink_egprs_windowsize",
+ { "DOWNLINK_EGPRS_WindowSize", "gsm_rlcmac.dl.ptr_downlink_egprs_windowsize",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ptr_egprs_00_uplink_egprs_windowsize,
- { "UPLINK_EGPRS_WindowSize", "gsm_rlcmac_dl.ptr_uplink_egprs_windowsize",
+ { "UPLINK_EGPRS_WindowSize", "gsm_rlcmac.dl.ptr_uplink_egprs_windowsize",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ptr_egprs_00_link_quality_measurement_mode,
- { "LINK_QUALITY_MEASUREMENT_MODE", "gsm_rlcmac_dl.ptr_link_quality_measurement_mode",
+ { "LINK_QUALITY_MEASUREMENT_MODE", "gsm_rlcmac.dl.ptr_link_quality_measurement_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ptr_egprs_00_packet_extended_timing_advance,
- { "Packet_Extended_Timing_Advance", "gsm_rlcmac_dl.ptr_packet_extended_timing_advance",
+ { "Packet_Extended_Timing_Advance", "gsm_rlcmac.dl.ptr_packet_extended_timing_advance",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ptr_egprs_00_common_timeslot_reconfigure_data_downlink_rlc_mode,
- { "Common_Timeslot_Reconfigure_Data.DOWNLINK_RLC_MODE", "gsm_rlcmac_dl.ptr_common_timeslot_reconfigure_data_downlink_rlc_mode",
+ { "Common_Timeslot_Reconfigure_Data.DOWNLINK_RLC_MODE", "gsm_rlcmac.dl.ptr_common_timeslot_reconfigure_data_downlink_rlc_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ptr_egprs_00_common_timeslot_reconfigure_data_control_ack,
- { "Common_Timeslot_Reconfigure_Data.CONTROL_ACK", "gsm_rlcmac_dl.ptr_common_timeslot_reconfigure_data_control_ack",
+ { "Common_Timeslot_Reconfigure_Data.CONTROL_ACK", "gsm_rlcmac.dl.ptr_common_timeslot_reconfigure_data_control_ack",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ptr_egprs_00_common_timeslot_reconfigure_data_downlink_tfi_assignment,
- { "Common_Timeslot_Reconfigure_Data.DOWNLINK_TFI_ASSIGNMENT", "gsm_rlcmac_dl.ptr_common_timeslot_reconfigure_data_downlink_tfi_assignment",
+ { "Common_Timeslot_Reconfigure_Data.DOWNLINK_TFI_ASSIGNMENT", "gsm_rlcmac.dl.ptr_common_timeslot_reconfigure_data_downlink_tfi_assignment",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ptr_egprs_00_common_timeslot_reconfigure_data_uplink_tfi_assignment,
- { "Common_Timeslot_Reconfigure_Data.UPLINK_TFI_ASSIGNMENT", "gsm_rlcmac_dl.ptr_common_timeslot_reconfigure_data_uplink_tfi_assignment",
+ { "Common_Timeslot_Reconfigure_Data.UPLINK_TFI_ASSIGNMENT", "gsm_rlcmac.dl.ptr_common_timeslot_reconfigure_data_uplink_tfi_assignment",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ptr_egprs_00_common_timeslot_reconfigure_data_downlink_timeslot_allocation,
- { "Common_Timeslot_Reconfigure_Data.DOWNLINK_TIMESLOT_ALLOCATION", "gsm_rlcmac_dl.ptr_common_timeslot_reconfigure_data_downlink_timeslot_allocation",
+ { "Common_Timeslot_Reconfigure_Data.DOWNLINK_TIMESLOT_ALLOCATION", "gsm_rlcmac.dl.ptr_common_timeslot_reconfigure_data_downlink_timeslot_allocation",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packetimeslot_reconfigure_t_message_type,
- { "MESSAGE_TYPE", "gsm_rlcmac_dl.ptr_message_type",
+ { "MESSAGE_TYPE", "gsm_rlcmac.dl.ptr_message_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packetimeslot_reconfigure_t_page_mode,
- { "PAGE_MODE", "gsm_rlcmac_dl.ptr_page_mode",
+ { "PAGE_MODE", "gsm_rlcmac.dl.ptr_page_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ptrcheck_message_type,
- { "MESSAGE_TYPE", "gsm_rlcmac_dl.ptr_message_type",
+ { "MESSAGE_TYPE", "gsm_rlcmac.dl.ptr_message_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ptrcheck_page_mode,
- { "PAGE_MODE", "gsm_rlcmac_dl.ptr_page_mode",
+ { "PAGE_MODE", "gsm_rlcmac.dl.ptr_page_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -9898,169 +9898,169 @@ proto_register_gsm_rlcmac(void)
/*< Packet PRACH Parameters message content > */
{ &hf_prach_control_s,
- { "S", "gsm_rlcmac_dl.prach_s",
+ { "S", "gsm_rlcmac.dl.prach_s",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_prach_control_tx_int,
- { "TX_INT", "gsm_rlcmac_dl.prach_tx_int",
+ { "TX_INT", "gsm_rlcmac.dl.prach_tx_int",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_hcs_priority_class,
- { "PRIORITY_CLASS", "gsm_rlcmac_dl.hcs_priority_class",
+ { "PRIORITY_CLASS", "gsm_rlcmac.dl.hcs_priority_class",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_hcs_hcs_thr,
- { "HCS_THR", "gsm_rlcmac_dl.hcs_thr",
+ { "HCS_THR", "gsm_rlcmac.dl.hcs_thr",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_location_repeat_pbcch_location,
- { "PBCCH_LOCATION", "gsm_rlcmac_dl.pbcch_location",
+ { "PBCCH_LOCATION", "gsm_rlcmac.dl.pbcch_location",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_location_repeat_psi1_repeat_period,
- { "PSI1_REPEAT_PERIOD", "gsm_rlcmac_dl.psi1_repeat_period",
+ { "PSI1_REPEAT_PERIOD", "gsm_rlcmac.dl.psi1_repeat_period",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_si13_pbcch_location_si13_location,
- { "SI13_LOCATION", "gsm_rlcmac_dl.si13_location",
+ { "SI13_LOCATION", "gsm_rlcmac.dl.si13_location",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_cell_selection_bsic,
- { "BSIC", "gsm_rlcmac_dl.cell_selection_bsic",
+ { "BSIC", "gsm_rlcmac.dl.cell_selection_bsic",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_cell_selection_cell_bar_access_2,
- { "CELL_BAR_ACCESS_2", "gsm_rlcmac_dl.cell_selection_cell_bar_access_2",
+ { "CELL_BAR_ACCESS_2", "gsm_rlcmac.dl.cell_selection_cell_bar_access_2",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_cell_selection_exc_acc,
- { "EXC_ACC", "gsm_rlcmac_dl.cell_selection_exc_acc",
+ { "EXC_ACC", "gsm_rlcmac.dl.cell_selection_exc_acc",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_cell_selection_same_ra_as_serving_cell,
- { "SAME_RA_AS_SERVING_CELL", "gsm_rlcmac_dl.cell_selection_same_ra_as_serving_cell",
+ { "SAME_RA_AS_SERVING_CELL", "gsm_rlcmac.dl.cell_selection_same_ra_as_serving_cell",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_cell_selection_gprs_rxlev_access_min,
- { "GPRS_RXLEV_ACCESS_MIN", "gsm_rlcmac_dl.cell_selection_gprs_rxlev_access_min",
+ { "GPRS_RXLEV_ACCESS_MIN", "gsm_rlcmac.dl.cell_selection_gprs_rxlev_access_min",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_cell_selection_gprs_ms_txpwr_max_cch,
- { "GPRS_MS_TXPWR_MAX_CCH", "gsm_rlcmac_dl.cell_selection_gprs_ms_txpwr_max_cch",
+ { "GPRS_MS_TXPWR_MAX_CCH", "gsm_rlcmac.dl.cell_selection_gprs_ms_txpwr_max_cch",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_cell_selection_gprs_temporary_offset,
- { "GPRS_TEMPORARY_OFFSET", "gsm_rlcmac_dl.cell_selection_gprs_temporary_offset",
+ { "GPRS_TEMPORARY_OFFSET", "gsm_rlcmac.dl.cell_selection_gprs_temporary_offset",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_cell_selection_gprs_penalty_time,
- { "GPRS_PENALTY_TIME", "gsm_rlcmac_dl.cell_selection_gprs_penalty_time",
+ { "GPRS_PENALTY_TIME", "gsm_rlcmac.dl.cell_selection_gprs_penalty_time",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_cell_selection_gprs_reselect_offset,
- { "GPRS_RESELECT_OFFSET", "gsm_rlcmac_dl.cell_selection_gprs_reselect_offset",
+ { "GPRS_RESELECT_OFFSET", "gsm_rlcmac.dl.cell_selection_gprs_reselect_offset",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_neighbourcellparameters_start_frequency,
- { "START_FREQUENCY", "gsm_rlcmac_dl.cell_selection_start_frequency",
+ { "START_FREQUENCY", "gsm_rlcmac.dl.cell_selection_start_frequency",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_neighbourcellparameters_nr_of_remaining_cells,
- { "NR_OF_REMAINING_CELLS", "gsm_rlcmac_dl.cell_selection_nr_of_remaining_cells",
+ { "NR_OF_REMAINING_CELLS", "gsm_rlcmac.dl.cell_selection_nr_of_remaining_cells",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_cell_selection_2_cell_bar_access_2,
- { "CELL_BAR_ACCESS_2", "gsm_rlcmac_dl.cell_selection2_cell_bar_access_2",
+ { "CELL_BAR_ACCESS_2", "gsm_rlcmac.dl.cell_selection2_cell_bar_access_2",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_cell_selection_2_exc_acc,
- { "EXC_ACC", "gsm_rlcmac_dl.cell_selection2_exc_acc",
+ { "EXC_ACC", "gsm_rlcmac.dl.cell_selection2_exc_acc",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_cell_selection_2_same_ra_as_serving_cell,
- { "SAME_RA_AS_SERVING_CELL", "gsm_rlcmac_dl.cell_selection2_same_ra_as_serving_cell",
+ { "SAME_RA_AS_SERVING_CELL", "gsm_rlcmac.dl.cell_selection2_same_ra_as_serving_cell",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_cell_selection_2_gprs_rxlev_access_min,
- { "GPRS_RXLEV_ACCESS_MIN", "gsm_rlcmac_dl.cell_selection2_gprs_rxlev_access_min",
+ { "GPRS_RXLEV_ACCESS_MIN", "gsm_rlcmac.dl.cell_selection2_gprs_rxlev_access_min",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_cell_selection_2_gprs_ms_txpwr_max_cch,
- { "GPRS_MS_TXPWR_MAX_CCH", "gsm_rlcmac_dl.cell_selection2_gprs_ms_txpwr_max_cch",
+ { "GPRS_MS_TXPWR_MAX_CCH", "gsm_rlcmac.dl.cell_selection2_gprs_ms_txpwr_max_cch",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_cell_selection_2_gprs_temporary_offset,
- { "GPRS_TEMPORARY_OFFSET", "gsm_rlcmac_dl.cell_selection2_gprs_temporary_offset",
+ { "GPRS_TEMPORARY_OFFSET", "gsm_rlcmac.dl.cell_selection2_gprs_temporary_offset",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_cell_selection_2_gprs_penalty_time,
- { "GPRS_PENALTY_TIME", "gsm_rlcmac_dl.cell_selection2_gprs_penalty_time",
+ { "GPRS_PENALTY_TIME", "gsm_rlcmac.dl.cell_selection2_gprs_penalty_time",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_cell_selection_2_gprs_reselect_offset,
- { "GPRS_RESELECT_OFFSET", "gsm_rlcmac_dl.cell_selection2_gprs_reselect_offset",
+ { "GPRS_RESELECT_OFFSET", "gsm_rlcmac.dl.cell_selection2_gprs_reselect_offset",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_prach_parameters_message_type,
- { "MESSAGE_TYPE", "gsm_rlcmac_dl.prach_message_type",
+ { "MESSAGE_TYPE", "gsm_rlcmac.dl.prach_message_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_prach_parameters_page_mode,
- { "PAGE_MODE", "gsm_rlcmac_dl.prach_page_mode",
+ { "PAGE_MODE", "gsm_rlcmac.dl.prach_page_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -10068,31 +10068,31 @@ proto_register_gsm_rlcmac(void)
/* < Packet Access Reject message content > */
{ &hf_rejectid_tlli,
- { "TLLI", "gsm_rlcmac_dl.par_rejected_id_tlli",
+ { "TLLI", "gsm_rlcmac.dl.par_rejected_id_tlli",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_reject_wait_indication,
- { "WAIT_INDICATION", "gsm_rlcmac_dl.par_wait_indication",
+ { "WAIT_INDICATION", "gsm_rlcmac.dl.par_wait_indication",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_reject_wait_indication_size,
- { "WAIT_INDICATION_SIZE", "gsm_rlcmac_dl.par_wait_indication_size",
+ { "WAIT_INDICATION_SIZE", "gsm_rlcmac.dl.par_wait_indication_size",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_access_reject_message_type,
- { "MESSAGE_TYPE", "gsm_rlcmac_dl.par_message_type",
+ { "MESSAGE_TYPE", "gsm_rlcmac.dl.par_message_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_access_reject_page_mode,
- { "PAGE_MODE", "gsm_rlcmac_dl.par_page_mode",
+ { "PAGE_MODE", "gsm_rlcmac.dl.par_page_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -10100,91 +10100,91 @@ proto_register_gsm_rlcmac(void)
/* < Packet Cell Change Order message content > */
{ &hf_packetcellchangeorderid_tlli,
- { "TLLI", "gsm_rlcmac_dl.pcco_tlli",
+ { "TLLI", "gsm_rlcmac.dl.pcco_tlli",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_h_freqbsiccell_bsic,
- { "BSIC", "gsm_rlcmac_dl.pcco_bsic",
+ { "BSIC", "gsm_rlcmac.dl.pcco_bsic",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_cellselectionparamswithfreqdiff_bsic,
- { "BSIC", "gsm_rlcmac_dl.pcco_bsic",
+ { "BSIC", "gsm_rlcmac.dl.pcco_bsic",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_add_frequency_list_start_frequency,
- { "START_FREQUENCY", "gsm_rlcmac_dl.add_frequency_list_start_frequency",
+ { "START_FREQUENCY", "gsm_rlcmac.dl.add_frequency_list_start_frequency",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_add_frequency_list_bsic,
- { "BSIC", "gsm_rlcmac_dl.add_frequency_list_bsic",
+ { "BSIC", "gsm_rlcmac.dl.add_frequency_list_bsic",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_add_frequency_list_nr_of_frequencies,
- { "NR_OF_FREQUENCIES", "gsm_rlcmac_dl.add_frequency_list_nr_of_frequencies",
+ { "NR_OF_FREQUENCIES", "gsm_rlcmac.dl.add_frequency_list_nr_of_frequencies",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_removed_freq_index_removed_freq_index,
- { "REMOVED FREQUENCIES", "gsm_rlcmac_dl.removed_freq_index",
+ { "REMOVED FREQUENCIES", "gsm_rlcmac.dl.removed_freq_index",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_nc_measurement_parameters_network_control_order,
- { "NETWORK_CONTROL_ORDER", "gsm_rlcmac_dl.nc_measurement_parameters_network_control_order",
+ { "NETWORK_CONTROL_ORDER", "gsm_rlcmac.dl.nc_measurement_parameters_network_control_order",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_nc_measurement_parameters_nc_non_drx_period,
- { "NC_NON_DRX_PERIOD", "gsm_rlcmac_dl.nc_measurement_parameters_nc_non_drx_period",
+ { "NC_NON_DRX_PERIOD", "gsm_rlcmac.dl.nc_measurement_parameters_nc_non_drx_period",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_nc_measurement_parameters_nc_reporting_period_i,
- { "NC_REPORTING_PERIOD_I", "gsm_rlcmac_dl.nc_measurement_parameters_nc_reporting_period_i",
+ { "NC_REPORTING_PERIOD_I", "gsm_rlcmac.dl.nc_measurement_parameters_nc_reporting_period_i",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_nc_measurement_parameters_nc_reporting_period_t,
- { "NC_REPORTING_PERIOD_T", "gsm_rlcmac_dl.nc_measurement_parameters_nc_reporting_period_t",
+ { "NC_REPORTING_PERIOD_T", "gsm_rlcmac.dl.nc_measurement_parameters_nc_reporting_period_t",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_nc_measurement_parameters_with_frequency_list_network_control_order,
- { "NETWORK_CONTROL_ORDER", "gsm_rlcmac_dl.nc_measurement_parameters_network_control_order",
+ { "NETWORK_CONTROL_ORDER", "gsm_rlcmac.dl.nc_measurement_parameters_network_control_order",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_nc_measurement_parameters_with_frequency_list_nc_non_drx_period,
- { "NC_NON_DRX_PERIOD", "gsm_rlcmac_dl.nc_measurement_parameters_nc_non_drx_period",
+ { "NC_NON_DRX_PERIOD", "gsm_rlcmac.dl.nc_measurement_parameters_nc_non_drx_period",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_nc_measurement_parameters_with_frequency_list_nc_reporting_period_i,
- { "NC_REPORTING_PERIOD_I", "gsm_rlcmac_dl.nc_measurement_parameters_nc_reporting_period_i",
+ { "NC_REPORTING_PERIOD_I", "gsm_rlcmac.dl.nc_measurement_parameters_nc_reporting_period_i",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_nc_measurement_parameters_with_frequency_list_nc_reporting_period_t,
- { "NC_REPORTING_PERIOD_T", "gsm_rlcmac_dl.nc_measurement_parameters_nc_reporting_period_t",
+ { "NC_REPORTING_PERIOD_T", "gsm_rlcmac.dl.nc_measurement_parameters_nc_reporting_period_t",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -10192,907 +10192,907 @@ proto_register_gsm_rlcmac(void)
/*< Packet Cell Change Order message contents >*/
{ &hf_ba_ind_ba_ind,
- { "BA_IND", "gsm_rlcmac_dl.pcco_ba_ind",
+ { "BA_IND", "gsm_rlcmac.dl.pcco_ba_ind",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ba_ind_ba_ind_3g,
- { "BA_IND_3G", "gsm_rlcmac_dl.pcco_ba_ind_3g",
+ { "BA_IND_3G", "gsm_rlcmac.dl.pcco_ba_ind_3g",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprsreportpriority_number_cells,
- { "NUMBER_CELLS", "gsm_rlcmac_dl.gprsreportpriority_number_cells",
+ { "NUMBER_CELLS", "gsm_rlcmac.dl.gprsreportpriority_number_cells",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_offsetthreshold_reporting_offset,
- { "REPORTING_OFFSET", "gsm_rlcmac_dl.offsetthreshold_reporting_offset",
+ { "REPORTING_OFFSET", "gsm_rlcmac.dl.offsetthreshold_reporting_offset",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_offsetthreshold_reporting_threshold,
- { "REPORTING_THRESHOLD", "gsm_rlcmac_dl.offsetthreshold_reporting_threshold",
+ { "REPORTING_THRESHOLD", "gsm_rlcmac.dl.offsetthreshold_reporting_threshold",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprsmeasurementparams_pmo_pcco_multi_band_reporting,
- { "MULTI_BAND_REPORTING", "gsm_rlcmac_dl.gprsmeasurementparams_pmo_pcco_multi_band_reporting",
+ { "MULTI_BAND_REPORTING", "gsm_rlcmac.dl.gprsmeasurementparams_pmo_pcco_multi_band_reporting",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprsmeasurementparams_pmo_pcco_serving_band_reporting,
- { "SERVING_BAND_REPORTING", "gsm_rlcmac_dl.gprsmeasurementparams_pmo_pcco_serving_band_reporting",
+ { "SERVING_BAND_REPORTING", "gsm_rlcmac.dl.gprsmeasurementparams_pmo_pcco_serving_band_reporting",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprsmeasurementparams_pmo_pcco_scale_ord,
- { "SCALE_ORD", "gsm_rlcmac_dl.gprsmeasurementparams_pmo_pcco_scale_ord",
+ { "SCALE_ORD", "gsm_rlcmac.dl.gprsmeasurementparams_pmo_pcco_scale_ord",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprsmeasurementparams3g_qsearch_p,
- { "Qsearch_p", "gsm_rlcmac_dl.gprsmeasurementparams3g_qsearch_p",
+ { "Qsearch_p", "gsm_rlcmac.dl.gprsmeasurementparams3g_qsearch_p",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprsmeasurementparams3g_searchprio3g,
- { "SearchPrio3G", "gsm_rlcmac_dl.gprsmeasurementparams3g_searchprio3g",
+ { "SearchPrio3G", "gsm_rlcmac.dl.gprsmeasurementparams3g_searchprio3g",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprsmeasurementparams3g_repquantfdd,
- { "RepQuantFDD", "gsm_rlcmac_dl.gprsmeasurementparams3g_repquantfdd",
+ { "RepQuantFDD", "gsm_rlcmac.dl.gprsmeasurementparams3g_repquantfdd",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprsmeasurementparams3g_multiratreportingfdd,
- { "MultiratReportingFDD", "gsm_rlcmac_dl.gprsmeasurementparams3g_multiratreportingfdd",
+ { "MultiratReportingFDD", "gsm_rlcmac.dl.gprsmeasurementparams3g_multiratreportingfdd",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprsmeasurementparams3g_reportingoffsetfdd,
- { "ReportingOffsetFDD", "gsm_rlcmac_dl.gprsmeasurementparams3g_reportingoffsetfdd",
+ { "ReportingOffsetFDD", "gsm_rlcmac.dl.gprsmeasurementparams3g_reportingoffsetfdd",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprsmeasurementparams3g_reportingthresholdfdd,
- { "ReportingThresholdFDD", "gsm_rlcmac_dl.gprsmeasurementparams3g_reportingthresholdfdd",
+ { "ReportingThresholdFDD", "gsm_rlcmac.dl.gprsmeasurementparams3g_reportingthresholdfdd",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprsmeasurementparams3g_multiratreportingtdd,
- { "MultiratReportingTDD", "gsm_rlcmac_dl.gprsmeasurementparams3g_multiratreportingtdd",
+ { "MultiratReportingTDD", "gsm_rlcmac.dl.gprsmeasurementparams3g_multiratreportingtdd",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprsmeasurementparams3g_reportingoffsettdd,
- { "ReportingOffsetTDD", "gsm_rlcmac_dl.gprsmeasurementparams3g_reportingoffsettdd",
+ { "ReportingOffsetTDD", "gsm_rlcmac.dl.gprsmeasurementparams3g_reportingoffsettdd",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprsmeasurementparams3g_reportingthresholdtdd,
- { "ReportingThresholdTDD", "gsm_rlcmac_dl.gprsmeasurementparams3g_reportingthresholdtdd",
+ { "ReportingThresholdTDD", "gsm_rlcmac.dl.gprsmeasurementparams3g_reportingthresholdtdd",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_multiratparams3g_multiratreporting,
- { "MultiratReporting", "gsm_rlcmac_dl.multiratparams3g_multiratreporting",
+ { "MultiratReporting", "gsm_rlcmac.dl.multiratparams3g_multiratreporting",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_enh_gprsmeasurementparams3g_pmo_qsearch_p,
- { "Qsearch_P", "gsm_rlcmac_dl.enh_gprsmeasurementparams3g_pmo_qsearch_p",
+ { "Qsearch_P", "gsm_rlcmac.dl.enh_gprsmeasurementparams3g_pmo_qsearch_p",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_enh_gprsmeasurementparams3g_pmo_searchprio3g,
- { "SearchPrio3G", "gsm_rlcmac_dl.enh_gprsmeasurementparams3g_pmo_searchprio3g",
+ { "SearchPrio3G", "gsm_rlcmac.dl.enh_gprsmeasurementparams3g_pmo_searchprio3g",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_enh_gprsmeasurementparams3g_pmo_repquantfdd,
- { "RepQuantFDD", "gsm_rlcmac_dl.enh_gprsmeasurementparams3g_pmo_repquantfdd",
+ { "RepQuantFDD", "gsm_rlcmac.dl.enh_gprsmeasurementparams3g_pmo_repquantfdd",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_enh_gprsmeasurementparams3g_pmo_multiratreportingfdd,
- { "MultiratReportingFDD", "gsm_rlcmac_dl.enh_gprsmeasurementparams3g_pmo_multiratreportingfdd",
+ { "MultiratReportingFDD", "gsm_rlcmac.dl.enh_gprsmeasurementparams3g_pmo_multiratreportingfdd",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_enh_gprsmeasurementparams3g_pcco_qsearch_p,
- { "Qsearch_P", "gsm_rlcmac_dl.enh_gprsmeasurementparams3g_pcco_qsearch_p",
+ { "Qsearch_P", "gsm_rlcmac.dl.enh_gprsmeasurementparams3g_pcco_qsearch_p",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_enh_gprsmeasurementparams3g_pcco_searchprio3g,
- { "SearchPrio3G", "gsm_rlcmac_dl.enh_gprsmeasurementparams3g_pcco_searchprio3g",
+ { "SearchPrio3G", "gsm_rlcmac.dl.enh_gprsmeasurementparams3g_pcco_searchprio3g",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_enh_gprsmeasurementparams3g_pcco_repquantfdd,
- { "RepQuantFDD", "gsm_rlcmac_dl.enh_gprsmeasurementparams3g_pcco_repquantfdd",
+ { "RepQuantFDD", "gsm_rlcmac.dl.enh_gprsmeasurementparams3g_pcco_repquantfdd",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_enh_gprsmeasurementparams3g_pcco_multiratreportingfdd,
- { "MultiratReportingFDD", "gsm_rlcmac_dl.enh_gprsmeasurementparams3g_pcco_multiratreportingfdd",
+ { "MultiratReportingFDD", "gsm_rlcmac.dl.enh_gprsmeasurementparams3g_pcco_multiratreportingfdd",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_n2_removed_3gcell_index,
- { "REMOVED_3GCELL_INDEX", "gsm_rlcmac_dl.removed_3gcell_index",
+ { "REMOVED_3GCELL_INDEX", "gsm_rlcmac.dl.removed_3gcell_index",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_n2_cell_diff_length_3g,
- { "CELL_DIFF_LENGTH_3G", "gsm_rlcmac_dl.cell_diff_length_3g",
+ { "CELL_DIFF_LENGTH_3G", "gsm_rlcmac.dl.cell_diff_length_3g",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_cdma2000_description_complete_this,
- { "Complete_This", "gsm_rlcmac_dl.complete_this",
+ { "Complete_This", "gsm_rlcmac.dl.complete_this",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_utran_fdd_neighbourcells_zero,
- { "ZERO", "gsm_rlcmac_dl.utran_fdd_neighbourcells_zero",
+ { "ZERO", "gsm_rlcmac.dl.utran_fdd_neighbourcells_zero",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_utran_fdd_neighbourcells_uarfcn,
- { "UARFCN", "gsm_rlcmac_dl.utran_fdd_neighbourcells_uarfcn",
+ { "UARFCN", "gsm_rlcmac.dl.utran_fdd_neighbourcells_uarfcn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_utran_fdd_neighbourcells_indic0,
- { "Indic0", "gsm_rlcmac_dl.utran_fdd_neighbourcells_indic0",
+ { "Indic0", "gsm_rlcmac.dl.utran_fdd_neighbourcells_indic0",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_utran_fdd_neighbourcells_nrofcells,
- { "NrOfCells", "gsm_rlcmac_dl.utran_fdd_neighbourcells_nrofcells",
+ { "NrOfCells", "gsm_rlcmac.dl.utran_fdd_neighbourcells_nrofcells",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_utran_fdd_description_bandwidth,
- { "Bandwidth", "gsm_rlcmac_dl.utran_fdd_neighbourcells_bandwidth",
+ { "Bandwidth", "gsm_rlcmac.dl.utran_fdd_neighbourcells_bandwidth",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_utran_tdd_neighbourcells_zero,
- { "ZERO", "gsm_rlcmac_dl.utran_tdd_neighbourcells_zero",
+ { "ZERO", "gsm_rlcmac.dl.utran_tdd_neighbourcells_zero",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_utran_tdd_neighbourcells_uarfcn,
- { "UARFCN", "gsm_rlcmac_dl.utran_tdd_neighbourcells_uarfcn",
+ { "UARFCN", "gsm_rlcmac.dl.utran_tdd_neighbourcells_uarfcn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_utran_tdd_neighbourcells_indic0,
- { "Indic0", "gsm_rlcmac_dl.utran_tdd_neighbourcells_indic0",
+ { "Indic0", "gsm_rlcmac.dl.utran_tdd_neighbourcells_indic0",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_utran_tdd_neighbourcells_nrofcells,
- { "NrOfCells", "gsm_rlcmac_dl.utran_tdd_neighbourcells_nrofcells",
+ { "NrOfCells", "gsm_rlcmac.dl.utran_tdd_neighbourcells_nrofcells",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_utran_tdd_description_bandwidth,
- { "Bandwidth", "gsm_rlcmac_dl.utran_tdd_description_bandwidth",
+ { "Bandwidth", "gsm_rlcmac.dl.utran_tdd_description_bandwidth",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_neighbourcelldescription3g_pmo_index_start_3g,
- { "Index_Start_3G", "gsm_rlcmac_dl.neighbourcelldescription3g_pmo_index_start_3g",
+ { "Index_Start_3G", "gsm_rlcmac.dl.neighbourcelldescription3g_pmo_index_start_3g",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_neighbourcelldescription3g_pmo_absolute_index_start_emr,
- { "Absolute_Index_Start_EMR", "gsm_rlcmac_dl.neighbourcelldescription3g_pmo_absolute_index_start_emr",
+ { "Absolute_Index_Start_EMR", "gsm_rlcmac.dl.neighbourcelldescription3g_pmo_absolute_index_start_emr",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_neighbourcelldescription3g_pcco_index_start_3g,
- { "Index_Start_3G", "gsm_rlcmac_dl.neighbourcelldescription3g_pcco_index_start_3g",
+ { "Index_Start_3G", "gsm_rlcmac.dl.neighbourcelldescription3g_pcco_index_start_3g",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_neighbourcelldescription3g_pcco_absolute_index_start_emr,
- { "Absolute_Index_Start_EMR", "gsm_rlcmac_dl.neighbourcelldescription3g_pcco_absolute_index_start_emr",
+ { "Absolute_Index_Start_EMR", "gsm_rlcmac.dl.neighbourcelldescription3g_pcco_absolute_index_start_emr",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_enh_measurement_parameters_pmo_psi3_change_mark,
- { "PSI3_CHANGE_MARK", "gsm_rlcmac_dl.enh_measurement_parameters_pmo_psi3_change_mark",
+ { "PSI3_CHANGE_MARK", "gsm_rlcmac.dl.enh_measurement_parameters_pmo_psi3_change_mark",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_enh_measurement_parameters_pmo_pmo_ind,
- { "PMO_IND", "gsm_rlcmac_dl.enh_measurement_parameters_pmo_pmo_ind",
+ { "PMO_IND", "gsm_rlcmac.dl.enh_measurement_parameters_pmo_pmo_ind",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_enh_measurement_parameters_pmo_report_type,
- { "REPORT_TYPE", "gsm_rlcmac_dl.enh_measurement_parameters_pmo_report_type",
+ { "REPORT_TYPE", "gsm_rlcmac.dl.enh_measurement_parameters_pmo_report_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_enh_measurement_parameters_pmo_reporting_rate,
- { "REPORTING_RATE", "gsm_rlcmac_dl.enh_measurement_parameters_pmo_reporting_rate",
+ { "REPORTING_RATE", "gsm_rlcmac.dl.enh_measurement_parameters_pmo_reporting_rate",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_enh_measurement_parameters_pmo_invalid_bsic_reporting,
- { "INVALID_BSIC_REPORTING", "gsm_rlcmac_dl.enh_measurement_parameters_pmo_invalid_bsic_reporting",
+ { "INVALID_BSIC_REPORTING", "gsm_rlcmac.dl.enh_measurement_parameters_pmo_invalid_bsic_reporting",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_enh_measurement_parameters_pcco_psi3_change_mark,
- { "PSI3_CHANGE_MARK", "gsm_rlcmac_dl.enh_measurement_parameters_pcco_psi3_change_mark",
+ { "PSI3_CHANGE_MARK", "gsm_rlcmac.dl.enh_measurement_parameters_pcco_psi3_change_mark",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_enh_measurement_parameters_pcco_pmo_ind,
- { "PMO_IND", "gsm_rlcmac_dl.enh_measurement_parameters_pcco_pmo_ind",
+ { "PMO_IND", "gsm_rlcmac.dl.enh_measurement_parameters_pcco_pmo_ind",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_enh_measurement_parameters_pcco_report_type,
- { "REPORT_TYPE", "gsm_rlcmac_dl.enh_measurement_parameters_pcco_report_type",
+ { "REPORT_TYPE", "gsm_rlcmac.dl.enh_measurement_parameters_pcco_report_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_enh_measurement_parameters_pcco_reporting_rate,
- { "REPORTING_RATE", "gsm_rlcmac_dl.enh_measurement_parameters_pcco_reporting_rate",
+ { "REPORTING_RATE", "gsm_rlcmac.dl.enh_measurement_parameters_pcco_reporting_rate",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_enh_measurement_parameters_pcco_invalid_bsic_reporting,
- { "INVALID_BSIC_REPORTING", "gsm_rlcmac_dl.enh_measurement_parameters_pcco_invalid_bsic_reporting",
+ { "INVALID_BSIC_REPORTING", "gsm_rlcmac.dl.enh_measurement_parameters_pcco_invalid_bsic_reporting",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ccn_support_description_number_cells,
- { "NUMBER_CELLS", "gsm_rlcmac_dl.ccn_support_description_number_cells",
+ { "NUMBER_CELLS", "gsm_rlcmac.dl.ccn_support_description_number_cells",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_lu_modecellselectionparameters_cell_bar_qualify_3,
- { "CELL_BAR_QUALIFY_3", "gsm_rlcmac_dl.lu_modecellselectionparameters_cell_bar_qualify_3",
+ { "CELL_BAR_QUALIFY_3", "gsm_rlcmac.dl.lu_modecellselectionparameters_cell_bar_qualify_3",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_lu_modeneighbourcellparams_nr_of_frequencies,
- { "NR_OF_FREQUENCIES", "gsm_rlcmac_dl.lu_modecellselectionparameters_nr_of_frequencies",
+ { "NR_OF_FREQUENCIES", "gsm_rlcmac.dl.lu_modecellselectionparameters_nr_of_frequencies",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_lu_modeonlycellselection_cell_bar_qualify_3,
- { "CELL_BAR_QUALIFY_3", "gsm_rlcmac_dl.lu_modeonlycellselection_cell_bar_qualify_3",
+ { "CELL_BAR_QUALIFY_3", "gsm_rlcmac.dl.lu_modeonlycellselection_cell_bar_qualify_3",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_lu_modeonlycellselection_same_ra_as_serving_cell,
- { "SAME_RA_AS_SERVING_CELL", "gsm_rlcmac_dl.lu_modeonlycellselection_same_ra_as_serving_cell",
+ { "SAME_RA_AS_SERVING_CELL", "gsm_rlcmac.dl.lu_modeonlycellselection_same_ra_as_serving_cell",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_lu_modeonlycellselection_gprs_rxlev_access_min,
- { "GPRS_RXLEV_ACCESS_MIN", "gsm_rlcmac_dl.lu_modeonlycellselection_gprs_rxlev_access_min",
+ { "GPRS_RXLEV_ACCESS_MIN", "gsm_rlcmac.dl.lu_modeonlycellselection_gprs_rxlev_access_min",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_lu_modeonlycellselection_gprs_ms_txpwr_max_cch,
- { "GPRS_MS_TXPWR_MAX_CCH", "gsm_rlcmac_dl.lu_modeonlycellselection_gprs_ms_txpwr_max_cch",
+ { "GPRS_MS_TXPWR_MAX_CCH", "gsm_rlcmac.dl.lu_modeonlycellselection_gprs_ms_txpwr_max_cch",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_lu_modeonlycellselection_gprs_temporary_offset,
- { "GPRS_TEMPORARY_OFFSET", "gsm_rlcmac_dl.lu_modeonlycellselection_gprs_temporary_offset",
+ { "GPRS_TEMPORARY_OFFSET", "gsm_rlcmac.dl.lu_modeonlycellselection_gprs_temporary_offset",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_lu_modeonlycellselection_gprs_penalty_time,
- { "GPRS_PENALTY_TIME", "gsm_rlcmac_dl.lu_modeonlycellselection_gprs_penalty_time",
+ { "GPRS_PENALTY_TIME", "gsm_rlcmac.dl.lu_modeonlycellselection_gprs_penalty_time",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_lu_modeonlycellselection_gprs_reselect_offset,
- { "GPRS_RESELECT_OFFSET", "gsm_rlcmac_dl.lu_modeonlycellselection_gprs_reselect_offset",
+ { "GPRS_RESELECT_OFFSET", "gsm_rlcmac.dl.lu_modeonlycellselection_gprs_reselect_offset",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_lu_modeonlycellselectionparamswithfreqdiff_bsic,
- { "BSIC", "gsm_rlcmac_dl.lu_modeonlycellselectionparamswithfreqdiff_bsic",
+ { "BSIC", "gsm_rlcmac.dl.lu_modeonlycellselectionparamswithfreqdiff_bsic",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_add_lu_modeonlyfrequencylist_start_frequency,
- { "START_FREQUENCY", "gsm_rlcmac_dl.dd_lu_modeonlyfrequencylist_start_frequency",
+ { "START_FREQUENCY", "gsm_rlcmac.dl.dd_lu_modeonlyfrequencylist_start_frequency",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_add_lu_modeonlyfrequencylist_bsic,
- { "BSIC", "gsm_rlcmac_dl.dd_lu_modeonlyfrequencylist_bsic",
+ { "BSIC", "gsm_rlcmac.dl.dd_lu_modeonlyfrequencylist_bsic",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_add_lu_modeonlyfrequencylist_nr_of_frequencies,
- { "NR_OF_FREQUENCIES", "gsm_rlcmac_dl.dd_lu_modeonlyfrequencylist_nr_of_frequencies",
+ { "NR_OF_FREQUENCIES", "gsm_rlcmac.dl.dd_lu_modeonlyfrequencylist_nr_of_frequencies",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_add_lu_modeonlyfrequencylist_freq_diff_length,
- { "FREQ_DIFF_LENGTH", "gsm_rlcmac_dl.dd_lu_modeonlyfrequencylist_freq_diff_length",
+ { "FREQ_DIFF_LENGTH", "gsm_rlcmac.dl.dd_lu_modeonlyfrequencylist_freq_diff_length",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprs_additionalmeasurementparams3g_fdd_reporting_threshold_2,
- { "FDD_REPORTING_THRESHOLD_2", "gsm_rlcmac_dl.gprs_additionalmeasurementparams3g_fdd_reporting_threshold_2",
+ { "FDD_REPORTING_THRESHOLD_2", "gsm_rlcmac.dl.gprs_additionalmeasurementparams3g_fdd_reporting_threshold_2",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_servingcellpriorityparametersdescription_geran_priority,
- { "GERAN_PRIORITY", "gsm_rlcmac_dl.servingcellpriorityparametersdescription_geran_priority",
+ { "GERAN_PRIORITY", "gsm_rlcmac.dl.servingcellpriorityparametersdescription_geran_priority",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_servingcellpriorityparametersdescription_thresh_priority_search,
- { "THRESH_Priority_Search", "gsm_rlcmac_dl.servingcellpriorityparametersdescription_thresh_priority_search",
+ { "THRESH_Priority_Search", "gsm_rlcmac.dl.servingcellpriorityparametersdescription_thresh_priority_search",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_servingcellpriorityparametersdescription_thresh_gsm_low,
- { "THRESH_GSM_low", "gsm_rlcmac_dl.servingcellpriorityparametersdescription_thresh_gsm_low",
+ { "THRESH_GSM_low", "gsm_rlcmac.dl.servingcellpriorityparametersdescription_thresh_gsm_low",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_servingcellpriorityparametersdescription_h_prio,
- { "H_PRIO", "gsm_rlcmac_dl.servingcellpriorityparametersdescription_h_prio",
+ { "H_PRIO", "gsm_rlcmac.dl.servingcellpriorityparametersdescription_h_prio",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_servingcellpriorityparametersdescription_t_reselection,
- { "T_Reselection", "gsm_rlcmac_dl.servingcellpriorityparametersdescription_t_reselection",
+ { "T_Reselection", "gsm_rlcmac.dl.servingcellpriorityparametersdescription_t_reselection",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_repeatedutran_priorityparameters_utran_priority,
- { "UTRAN_PRIORITY", "gsm_rlcmac_dl.repeatedutran_priorityparameters_utran_priority",
+ { "UTRAN_PRIORITY", "gsm_rlcmac.dl.repeatedutran_priorityparameters_utran_priority",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_repeatedutran_priorityparameters_thresh_utran_high,
- { "THRESH_UTRAN_high", "gsm_rlcmac_dl.repeatedutran_priorityparameters_thresh_utran_high",
+ { "THRESH_UTRAN_high", "gsm_rlcmac.dl.repeatedutran_priorityparameters_thresh_utran_high",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_repeatedutran_priorityparameters_thresh_utran_low,
- { "THRESH_UTRAN_low", "gsm_rlcmac_dl.repeatedutran_priorityparameters_thresh_utran_low",
+ { "THRESH_UTRAN_low", "gsm_rlcmac.dl.repeatedutran_priorityparameters_thresh_utran_low",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_repeatedutran_priorityparameters_utran_qrxlevmin,
- { "UTRAN_QRXLEVMIN", "gsm_rlcmac_dl.repeatedutran_priorityparameters_utran_qrxlevmin",
+ { "UTRAN_QRXLEVMIN", "gsm_rlcmac.dl.repeatedutran_priorityparameters_utran_qrxlevmin",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_priorityparametersdescription3g_pmo_default_utran_priority,
- { "DEFAULT_UTRAN_PRIORITY", "gsm_rlcmac_dl.priorityparametersdescription3g_pmo_default_utran_priority",
+ { "DEFAULT_UTRAN_PRIORITY", "gsm_rlcmac.dl.priorityparametersdescription3g_pmo_default_utran_priority",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_priorityparametersdescription3g_pmo_default_thresh_utran,
- { "DEFAULT_THRESH_UTRAN", "gsm_rlcmac_dl.priorityparametersdescription3g_pmo_default_thresh_utran",
+ { "DEFAULT_THRESH_UTRAN", "gsm_rlcmac.dl.priorityparametersdescription3g_pmo_default_thresh_utran",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_priorityparametersdescription3g_pmo_default_utran_qrxlevmin,
- { "DEFAULT_UTRAN_QRXLEVMIN", "gsm_rlcmac_dl.priorityparametersdescription3g_pmo_default_utran_qrxlevmin",
+ { "DEFAULT_UTRAN_QRXLEVMIN", "gsm_rlcmac.dl.priorityparametersdescription3g_pmo_default_utran_qrxlevmin",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_eutran_reportinghreshold_offset_t_eutran_fdd_reporting_threshold,
- { "EUTRAN_FDD_REPORTING_THRESHOLD", "gsm_rlcmac_dl.eutran_fdd_reporting_threshold",
+ { "EUTRAN_FDD_REPORTING_THRESHOLD", "gsm_rlcmac.dl.eutran_fdd_reporting_threshold",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_eutran_reportinghreshold_offset_t_eutran_fdd_reporting_threshold_2,
- { "EUTRAN_FDD_REPORTING_THRESHOLD_2", "gsm_rlcmac_dl.eutran_fdd_reporting_threshold_2",
+ { "EUTRAN_FDD_REPORTING_THRESHOLD_2", "gsm_rlcmac.dl.eutran_fdd_reporting_threshold_2",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_eutran_reportinghreshold_offset_t_eutran_fdd_reporting_offset,
- { "EUTRAN_FDD_REPORTING_OFFSET", "gsm_rlcmac_dl.eutran_fdd_reporting_offset",
+ { "EUTRAN_FDD_REPORTING_OFFSET", "gsm_rlcmac.dl.eutran_fdd_reporting_offset",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_eutran_reportinghreshold_offset_t_eutran_tdd_reporting_threshold,
- { "EUTRAN_TDD_REPORTING_THRESHOLD", "gsm_rlcmac_dl.eutran_tdd_reporting_threshold",
+ { "EUTRAN_TDD_REPORTING_THRESHOLD", "gsm_rlcmac.dl.eutran_tdd_reporting_threshold",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_eutran_reportinghreshold_offset_t_eutran_tdd_reporting_threshold_2,
- { "EUTRAN_TDD_REPORTING_THRESHOLD_2", "gsm_rlcmac_dl.eutran_tdd_reporting_threshold_2",
+ { "EUTRAN_TDD_REPORTING_THRESHOLD_2", "gsm_rlcmac.dl.eutran_tdd_reporting_threshold_2",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_eutran_reportinghreshold_offset_t_eutran_tdd_reporting_offset,
- { "EUTRAN_TDD_REPORTING_OFFSET", "gsm_rlcmac_dl.eutran_tdd_reporting_offset",
+ { "EUTRAN_TDD_REPORTING_OFFSET", "gsm_rlcmac.dl.eutran_tdd_reporting_offset",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprs_eutran_measurementparametersdescription_qsearch_p_eutran,
- { "Qsearch_P_EUTRAN", "gsm_rlcmac_dl.qsearch_p_eutran",
+ { "Qsearch_P_EUTRAN", "gsm_rlcmac.dl.qsearch_p_eutran",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprs_eutran_measurementparametersdescription_eutran_rep_quant,
- { "EUTRAN_REP_QUANT", "gsm_rlcmac_dl.eutran_rep_quant",
+ { "EUTRAN_REP_QUANT", "gsm_rlcmac.dl.eutran_rep_quant",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprs_eutran_measurementparametersdescription_eutran_multirat_reporting,
- { "EUTRAN_MULTIRAT_REPORTING", "gsm_rlcmac_dl.eutran_multirat_reporting",
+ { "EUTRAN_MULTIRAT_REPORTING", "gsm_rlcmac.dl.eutran_multirat_reporting",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_repeatedeutran_cells_earfcn,
- { "EARFCN", "gsm_rlcmac_dl.repeatedeutran_cells_earfcn",
+ { "EARFCN", "gsm_rlcmac.dl.repeatedeutran_cells_earfcn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_repeatedeutran_cells_measurementbandwidth,
- { "MeasurementBandwidth", "gsm_rlcmac_dl.repeatedeutran_cells_measurementbandwidth",
+ { "MeasurementBandwidth", "gsm_rlcmac.dl.repeatedeutran_cells_measurementbandwidth",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_repeatedeutran_neighbourcells_eutran_priority,
- { "EUTRAN_PRIORITY", "gsm_rlcmac_dl.repeatedeutran_neighbourcells_eutran_priority",
+ { "EUTRAN_PRIORITY", "gsm_rlcmac.dl.repeatedeutran_neighbourcells_eutran_priority",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_repeatedeutran_neighbourcells_thresh_eutran_high,
- { "THRESH_EUTRAN_high", "gsm_rlcmac_dl.repeatedeutran_neighbourcells_thresh_eutran_high",
+ { "THRESH_EUTRAN_high", "gsm_rlcmac.dl.repeatedeutran_neighbourcells_thresh_eutran_high",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_repeatedeutran_neighbourcells_thresh_eutran_low,
- { "THRESH_EUTRAN_low", "gsm_rlcmac_dl.repeatedeutran_neighbourcells_thresh_eutran_low",
+ { "THRESH_EUTRAN_low", "gsm_rlcmac.dl.repeatedeutran_neighbourcells_thresh_eutran_low",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_repeatedeutran_neighbourcells_eutran_qrxlevmin,
- { "EUTRAN_QRXLEVMIN", "gsm_rlcmac_dl.repeatedeutran_neighbourcells_eutran_qrxlevmin",
+ { "EUTRAN_QRXLEVMIN", "gsm_rlcmac.dl.repeatedeutran_neighbourcells_eutran_qrxlevmin",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pcid_pattern_pcid_pattern_length,
- { "PCID_Pattern_length", "gsm_rlcmac_dl.pcid_pattern_pcid_pattern_length",
+ { "PCID_Pattern_length", "gsm_rlcmac.dl.pcid_pattern_pcid_pattern_length",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pcid_pattern_pcid_pattern_sense,
- { "PCID_Pattern_sense", "gsm_rlcmac_dl.pcid_pattern_pcid_pattern_sense",
+ { "PCID_Pattern_sense", "gsm_rlcmac.dl.pcid_pattern_pcid_pattern_sense",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pcid_group_ie_pcid_bitmap_group,
- { "PCID_BITMAP_GROUP", "gsm_rlcmac_dl.pcid_group_ie_pcid_bitmap_group",
+ { "PCID_BITMAP_GROUP", "gsm_rlcmac.dl.pcid_group_ie_pcid_bitmap_group",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_eutran_frequency_index_eutran_frequency_index,
- { "EUTRAN_FREQUENCY_INDEX", "gsm_rlcmac_dl.eutran_frequency_index_eutran_frequency_index",
+ { "EUTRAN_FREQUENCY_INDEX", "gsm_rlcmac.dl.eutran_frequency_index_eutran_frequency_index",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_psc_pattern_length,
- { "PSC_pattern_length", "gsm_rlcmac_dl.psc_pattern_length",
+ { "PSC_pattern_length", "gsm_rlcmac.dl.psc_pattern_length",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_psc_pattern_sense,
- { "PSC_pattern_sense", "gsm_rlcmac_dl.psc_pattern_sense",
+ { "PSC_pattern_sense", "gsm_rlcmac.dl.psc_pattern_sense",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_meas_ctrl_param_meas_ctrl_eutran,
- { "Measurement_Control_E-UTRAN", "gsm_rlcmac_dl.meas_ctrl_param_eutran",
+ { "Measurement_Control_E-UTRAN", "gsm_rlcmac.dl.meas_ctrl_param_eutran",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_meas_ctrl_param_eutran_freq_idx,
- { "EUTRAN_FREQUENCY_INDEX", "gsm_rlcmac_dl.meas_ctrl_param_eutran_freq_idx",
+ { "EUTRAN_FREQUENCY_INDEX", "gsm_rlcmac.dl.meas_ctrl_param_eutran_freq_idx",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_meas_ctrl_param_meas_ctrl_utran,
- { "Measurement_Control_UTRAN", "gsm_rlcmac_dl.meas_ctrl_param_utran",
+ { "Measurement_Control_UTRAN", "gsm_rlcmac.dl.meas_ctrl_param_utran",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_meas_ctrl_param_utran_freq_idx,
- { "UTRAN_FREQUENCY_INDEX", "gsm_rlcmac_dl.meas_ctrl_param_utran_freq_idx",
+ { "UTRAN_FREQUENCY_INDEX", "gsm_rlcmac.dl.meas_ctrl_param_utran_freq_idx",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_rept_eutran_enh_cell_resel_param_eutran_qmin,
- { "E-UTRAN_Qmin", "gsm_rlcmac_dl.enh_cell_resel_param_eutran_qmin",
+ { "E-UTRAN_Qmin", "gsm_rlcmac.dl.enh_cell_resel_param_eutran_qmin",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_rept_eutran_enh_cell_resel_param_thresh_eutran_high_q,
- { "THRESH_E-UTRAN_high_Q", "gsm_rlcmac_dl.enh_cell_resel_param_eutran_high_q",
+ { "THRESH_E-UTRAN_high_Q", "gsm_rlcmac.dl.enh_cell_resel_param_eutran_high_q",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_rept_eutran_enh_cell_resel_param_thresh_eutran_low_q,
- { "THRESH_E-UTRAN_low_Q", "gsm_rlcmac_dl.enh_cell_resel_param_eutran_low_q",
+ { "THRESH_E-UTRAN_low_Q", "gsm_rlcmac.dl.enh_cell_resel_param_eutran_low_q",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_rept_eutran_enh_cell_resel_param_thresh_eutran_qqualmin,
- { "E-UTRAN_QQUALMIN", "gsm_rlcmac_dl.enh_cell_resel_param_eutran_qqualmin",
+ { "E-UTRAN_QQUALMIN", "gsm_rlcmac.dl.enh_cell_resel_param_eutran_qqualmin",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_rept_eutran_enh_cell_resel_param_thresh_eutran_rsrpmin,
- { "E-UTRAN_RSRPmin", "gsm_rlcmac_dl.enh_cell_resel_param_eutran_rsrpmin",
+ { "E-UTRAN_RSRPmin", "gsm_rlcmac.dl.enh_cell_resel_param_eutran_rsrpmin",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_utran_csg_fdd_reporting_threshold,
- { "UTRAN_CSG_FDD_REPORTING_THRESHOLD", "gsm_rlcmac_dl.utran_csg_fdd_reporting_threshold",
+ { "UTRAN_CSG_FDD_REPORTING_THRESHOLD", "gsm_rlcmac.dl.utran_csg_fdd_reporting_threshold",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_utran_csg_fdd_reporting_threshold2,
- { "UTRAN_CSG_FDD_REPORTING_THRESHOLD_2", "gsm_rlcmac_dl.utran_csg_fdd_reporting_threshold2",
+ { "UTRAN_CSG_FDD_REPORTING_THRESHOLD_2", "gsm_rlcmac.dl.utran_csg_fdd_reporting_threshold2",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_utran_csg_tdd_reporting_threshold,
- { "UTRAN_CSG_TDD_REPORTING_THRESHOLD", "gsm_rlcmac_dl.utran_csg_tdd_reporting_threshold",
+ { "UTRAN_CSG_TDD_REPORTING_THRESHOLD", "gsm_rlcmac.dl.utran_csg_tdd_reporting_threshold",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_eutran_csg_fdd_reporting_threshold,
- { "E-UTRAN_CSG_FDD_REPORTING_THRESHOLD", "gsm_rlcmac_dl.eutran_csg_fdd_reporting_threshold",
+ { "E-UTRAN_CSG_FDD_REPORTING_THRESHOLD", "gsm_rlcmac.dl.eutran_csg_fdd_reporting_threshold",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_eutran_csg_fdd_reporting_threshold2,
- { "E-UTRAN_CSG_FDD_REPORTING_THRESHOLD_2", "gsm_rlcmac_dl.eutran_csg_fdd_reporting_threshold2",
+ { "E-UTRAN_CSG_FDD_REPORTING_THRESHOLD_2", "gsm_rlcmac.dl.eutran_csg_fdd_reporting_threshold2",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_eutran_csg_tdd_reporting_threshold,
- { "E-UTRAN_CSG_TDD_REPORTING_THRESHOLD", "gsm_rlcmac_dl.eutran_csg_tdd_reporting_threshold",
+ { "E-UTRAN_CSG_TDD_REPORTING_THRESHOLD", "gsm_rlcmac.dl.eutran_csg_tdd_reporting_threshold",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_eutran_csg_tdd_reporting_threshold2,
- { "E-UTRAN_CSG_TDD_REPORTING_THRESHOLD_2", "gsm_rlcmac_dl.eutran_csg_tdd_reporting_threshold2",
+ { "E-UTRAN_CSG_TDD_REPORTING_THRESHOLD_2", "gsm_rlcmac.dl.eutran_csg_tdd_reporting_threshold2",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_eutran_parametersdescription_pmo_eutran_ccn_active,
- { "EUTRAN_CCN_ACTIVE", "gsm_rlcmac_dl.eutran_parametersdescription_pmo_eutran_ccn_active",
+ { "EUTRAN_CCN_ACTIVE", "gsm_rlcmac.dl.eutran_parametersdescription_pmo_eutran_ccn_active",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pmo_additionsr8_ba_ind_3g,
- { "BA_IND_3G", "gsm_rlcmac_dl.pmo_additionsr8_ba_ind_3g",
+ { "BA_IND_3G", "gsm_rlcmac.dl.pmo_additionsr8_ba_ind_3g",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pmo_additionsr8_pmo_ind,
- { "PMO_IND", "gsm_rlcmac_dl.pmo_additionsr8_pmo_ind",
+ { "PMO_IND", "gsm_rlcmac.dl.pmo_additionsr8_pmo_ind",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pmo_additionsr7_reporting_offset_700,
- { "REPORTING_OFFSET_700", "gsm_rlcmac_dl.pmo_additionsr7_reporting_offset_700",
+ { "REPORTING_OFFSET_700", "gsm_rlcmac.dl.pmo_additionsr7_reporting_offset_700",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pmo_additionsr7_reporting_threshold_700,
- { "REPORTING_THRESHOLD_700", "gsm_rlcmac_dl.pmo_additionsr7_reporting_threshold_700",
+ { "REPORTING_THRESHOLD_700", "gsm_rlcmac.dl.pmo_additionsr7_reporting_threshold_700",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pmo_additionsr7_reporting_offset_810,
- { "REPORTING_OFFSET_810", "gsm_rlcmac_dl.pmo_additionsr7_reporting_offset_810",
+ { "REPORTING_OFFSET_810", "gsm_rlcmac.dl.pmo_additionsr7_reporting_offset_810",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pmo_additionsr7_reporting_threshold_810,
- { "REPORTING_THRESHOLD_810", "gsm_rlcmac_dl.pmo_additionsr7_reporting_threshold_810",
+ { "REPORTING_THRESHOLD_810", "gsm_rlcmac.dl.pmo_additionsr7_reporting_threshold_810",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pmo_additionsr6_ccn_active_3g,
- { "CCN_ACTIVE_3G", "gsm_rlcmac_dl.pmo_additionsr6_ccn_active_3g",
+ { "CCN_ACTIVE_3G", "gsm_rlcmac.dl.pmo_additionsr6_ccn_active_3g",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pcco_additionsr6_ccn_active_3g,
- { "CCN_ACTIVE_3G", "gsm_rlcmac_dl.pcco_additionsr6_ccn_active_3g",
+ { "CCN_ACTIVE_3G", "gsm_rlcmac.dl.pcco_additionsr6_ccn_active_3g",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pmo_additionsr5_grnti,
- { "GRNTI", "gsm_rlcmac_dl.pmo_additionsr5_grnti",
+ { "GRNTI", "gsm_rlcmac.dl.pmo_additionsr5_grnti",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pcco_additionsr5_grnti,
- { "GRNTI", "gsm_rlcmac_dl.pcco_additionsr5_grnti",
+ { "GRNTI", "gsm_rlcmac.dl.pcco_additionsr5_grnti",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pmo_additionsr4_ccn_active,
- { "CCN_ACTIVE", "gsm_rlcmac_dl.pmo_additionsr4_ccn_active",
+ { "CCN_ACTIVE", "gsm_rlcmac.dl.pmo_additionsr4_ccn_active",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pcco_additionsr4_ccn_active,
- { "CCN_ACTIVE", "gsm_rlcmac_dl.pcco_additionsr4_ccn_active",
+ { "CCN_ACTIVE", "gsm_rlcmac.dl.pcco_additionsr4_ccn_active",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pcco_additionsr4_container_id,
- { "CONTAINER_ID", "gsm_rlcmac_dl.pcco_additionsr4_container_id",
+ { "CONTAINER_ID", "gsm_rlcmac.dl.pcco_additionsr4_container_id",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_lsa_id_info_element_lsa_id,
- { "LSA_ID", "gsm_rlcmac_dl.lsa_id",
+ { "LSA_ID", "gsm_rlcmac.dl.lsa_id",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_lsa_id_info_element_shortlsa_id,
- { "ShortLSA_ID", "gsm_rlcmac_dl.lsa_shortlsa_id",
+ { "ShortLSA_ID", "gsm_rlcmac.dl.lsa_shortlsa_id",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_lsa_parameters_nr_of_freq_or_cells,
- { "NR_OF_FREQ_OR_CELLS", "gsm_rlcmac_dl.lsa_nr_of_freq_or_cells",
+ { "NR_OF_FREQ_OR_CELLS", "gsm_rlcmac.dl.lsa_nr_of_freq_or_cells",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_target_cell_gsm_immediate_rel,
- { "IMMEDIATE_REL", "gsm_rlcmac_dl.taget_cell_immediate_rel",
+ { "IMMEDIATE_REL", "gsm_rlcmac.dl.taget_cell_immediate_rel",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_target_cell_gsm_arfcn,
- { "ARFCN", "gsm_rlcmac_dl.taget_cell_gsm_arfcn",
+ { "ARFCN", "gsm_rlcmac.dl.taget_cell_gsm_arfcn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_target_cell_gsm_bsic,
- { "BSIC", "gsm_rlcmac_dl.taget_cell_gsm_bsic",
+ { "BSIC", "gsm_rlcmac.dl.taget_cell_gsm_bsic",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_target_cell_3g_immediate_rel,
- { "IMMEDIATE_REL", "gsm_rlcmac_dl.immediate_rel",
+ { "IMMEDIATE_REL", "gsm_rlcmac.dl.immediate_rel",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_cell_change_order_message_type,
- { "MESSAGE_TYPE", "gsm_rlcmac_dl.pcco_message_type",
+ { "MESSAGE_TYPE", "gsm_rlcmac.dl.pcco_message_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_cell_change_order_page_mode,
- { "PAGE_MODE", "gsm_rlcmac_dl.pcco_page_mode",
+ { "PAGE_MODE", "gsm_rlcmac.dl.pcco_page_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_target_cell_eutran_earfcn,
- { "EARFCN", "gsm_rlcmac_dl.pcco_target_cell_eutran_earfcn",
+ { "EARFCN", "gsm_rlcmac.dl.pcco_target_cell_eutran_earfcn",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_target_cell_eutran_measurement_bandwidth,
- { "Measurement Bandwidth", "gsm_rlcmac_dl.pcco_target_cell_eutran_meas_bw",
+ { "Measurement Bandwidth", "gsm_rlcmac.dl.pcco_target_cell_eutran_meas_bw",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_target_cell_eutran_pl_cell_id,
- { "Physical Layer Cell Identity", "gsm_rlcmac_dl.pcco_target_cell_eutran_cell_id",
+ { "Physical Layer Cell Identity", "gsm_rlcmac.dl.pcco_target_cell_eutran_cell_id",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_idvd_default_utran_priority,
- { "DEFAULT_UTRAN_PRIORITY", "gsm_rlcmac_dl.idvl_prio_dlft_geran_prio",
+ { "DEFAULT_UTRAN_PRIORITY", "gsm_rlcmac.dl.idvl_prio_dlft_geran_prio",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_idvd_utran_priority,
- { "UTRAN_PRIORITY", "gsm_rlcmac_dl.idvl_prio_geran_prio",
+ { "UTRAN_PRIORITY", "gsm_rlcmac.dl.idvl_prio_geran_prio",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_idvd_default_eutran_priority,
- { "DEFAULT_E-UTRAN_PRIORITY", "gsm_rlcmac_dl.idvl_prio_dlft_eutran_prio",
+ { "DEFAULT_E-UTRAN_PRIORITY", "gsm_rlcmac.dl.idvl_prio_dlft_eutran_prio",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_idvd_eutran_priority,
- { "E-UTRAN_PRIORITY", "gsm_rlcmac_dl.idvl_prio_eutran_prio",
+ { "E-UTRAN_PRIORITY", "gsm_rlcmac.dl.idvl_prio_eutran_prio",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_idvd_prio_geran_priority,
- { "GERAN_PRIORITY", "gsm_rlcmac_dl.idvl_prio_dlft_geran_prio",
+ { "GERAN_PRIORITY", "gsm_rlcmac.dl.idvl_prio_dlft_geran_prio",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_idvd_prio_t3230_timeout_value,
- { "T3230 timeout value", "gsm_rlcmac_dl.idvl_prio_t3230",
+ { "T3230 timeout value", "gsm_rlcmac.dl.idvl_prio_t3230",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_target_cell_g_rnti_ext,
- { "G-RNTI extension", "gsm_rlcmac_dl.pcco_g_rnti_ext",
+ { "G-RNTI extension", "gsm_rlcmac.dl.pcco_g_rnti_ext",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -11100,337 +11100,337 @@ proto_register_gsm_rlcmac(void)
/*< Packet (Enhanced) Measurement Report message contents > */
{ &hf_ba_used_ba_used,
- { "BA_USED", "gsm_rlcmac_ul.ba_used",
+ { "BA_USED", "gsm_rlcmac.ul.ba_used",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ba_used_ba_used_3g,
- { "BA_USED_3G", "gsm_rlcmac_ul.ba_used_3g",
+ { "BA_USED_3G", "gsm_rlcmac.ul.ba_used_3g",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_serving_cell_data_rxlev_serving_cell,
- { "RXLEV_SERVING_CELL", "gsm_rlcmac_ul.rxlev_serving_cell",
+ { "RXLEV_SERVING_CELL", "gsm_rlcmac.ul.rxlev_serving_cell",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_nc_measurements_frequency_n,
- { "FREQUENCY_N", "gsm_rlcmac_ul.frequency_n",
+ { "FREQUENCY_N", "gsm_rlcmac.ul.frequency_n",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_nc_measurements_bsic_n,
- { "BSIC_N", "gsm_rlcmac_ul.bsic_n",
+ { "BSIC_N", "gsm_rlcmac.ul.bsic_n",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_nc_measurements_rxlev_n,
- { "RXLEV_N", "gsm_rlcmac_ul.rxlev_n",
+ { "RXLEV_N", "gsm_rlcmac.ul.rxlev_n",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_repeatedinvalid_bsic_info_bcch_freq_n,
- { "BCCH_FREQ_N", "gsm_rlcmac_ul.bcch_freq_n",
+ { "BCCH_FREQ_N", "gsm_rlcmac.ul.bcch_freq_n",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_repeatedinvalid_bsic_info_bsic_n,
- { "BSIC_N", "gsm_rlcmac_ul.bsic_n",
+ { "BSIC_N", "gsm_rlcmac.ul.bsic_n",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_repeatedinvalid_bsic_info_rxlev_n,
- { "RXLEV_N", "gsm_rlcmac_ul.rxlev_n",
+ { "RXLEV_N", "gsm_rlcmac.ul.rxlev_n",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_reporting_quantity_instance_reporting_quantity,
- { "REPORTING_QUANTITY", "gsm_rlcmac_ul.reporting_quantity",
+ { "REPORTING_QUANTITY", "gsm_rlcmac.ul.reporting_quantity",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_nc_measurement_report_nc_mode,
- { "NC_MODE", "gsm_rlcmac_ul.nc_mode",
+ { "NC_MODE", "gsm_rlcmac.ul.nc_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_nc_measurement_report_number_of_nc_measurements,
- { "NUMBER_OF_NC_MEASUREMENTS", "gsm_rlcmac_ul.number_of_nc_measurements",
+ { "NUMBER_OF_NC_MEASUREMENTS", "gsm_rlcmac.ul.number_of_nc_measurements",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_enh_nc_measurement_report_nc_mode,
- { "NC_MODE", "gsm_rlcmac_ul.nc_mode",
+ { "NC_MODE", "gsm_rlcmac.ul.nc_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_enh_nc_measurement_report_psi3_change_mark,
- { "PSI3_CHANGE_MARK", "gsm_rlcmac_ul.psi3_change_mark",
+ { "PSI3_CHANGE_MARK", "gsm_rlcmac.ul.psi3_change_mark",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_enh_nc_measurement_report_pmo_used,
- { "PMO_USED", "gsm_rlcmac_ul.pmo_used",
+ { "PMO_USED", "gsm_rlcmac.ul.pmo_used",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_enh_nc_measurement_report_bsic_seen,
- { "BSIC_Seen", "gsm_rlcmac_ul.bsic_seen",
+ { "BSIC_Seen", "gsm_rlcmac.ul.bsic_seen",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_enh_nc_measurement_report_scale,
- { "SCALE", "gsm_rlcmac_ul.scale",
+ { "SCALE", "gsm_rlcmac.ul.scale",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ext_measurement_report_ext_reporting_type,
- { "EXT_REPORTING_TYPE", "gsm_rlcmac_ul.ext_reporting_type",
+ { "EXT_REPORTING_TYPE", "gsm_rlcmac.ul.ext_reporting_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ext_measurement_report_slot0_i_level,
- { "Slot[0].I_LEVEL", "gsm_rlcmac_ul.slot0_i_level",
+ { "Slot[0].I_LEVEL", "gsm_rlcmac.ul.slot0_i_level",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ext_measurement_report_slot1_i_level,
- { "Slot[1].I_LEVEL", "gsm_rlcmac_ul.slot1_i_level",
+ { "Slot[1].I_LEVEL", "gsm_rlcmac.ul.slot1_i_level",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ext_measurement_report_slot2_i_level,
- { "Slot[2].I_LEVEL", "gsm_rlcmac_ul.slot2_i_level",
+ { "Slot[2].I_LEVEL", "gsm_rlcmac.ul.slot2_i_level",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ext_measurement_report_slot3_i_level,
- { "Slot[3].I_LEVEL", "gsm_rlcmac_ul.slot3_i_level",
+ { "Slot[3].I_LEVEL", "gsm_rlcmac.ul.slot3_i_level",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ext_measurement_report_slot4_i_level,
- { "Slot[4].I_LEVEL", "gsm_rlcmac_ul.slot4_i_level",
+ { "Slot[4].I_LEVEL", "gsm_rlcmac.ul.slot4_i_level",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ext_measurement_report_slot5_i_level,
- { "Slot[5].I_LEVEL", "gsm_rlcmac_ul.slot5_i_level",
+ { "Slot[5].I_LEVEL", "gsm_rlcmac.ul.slot5_i_level",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ext_measurement_report_slot6_i_level,
- { "Slot[6].I_LEVEL", "gsm_rlcmac_ul.slot6_i_level",
+ { "Slot[6].I_LEVEL", "gsm_rlcmac.ul.slot6_i_level",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ext_measurement_report_slot7_i_level,
- { "Slot[7].I_LEVEL", "gsm_rlcmac_ul.slot7_i_level",
+ { "Slot[7].I_LEVEL", "gsm_rlcmac.ul.slot7_i_level",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ext_measurement_report_number_of_ext_measurements,
- { "NUMBER_OF_EXT_MEASUREMENTS", "gsm_rlcmac_ul.number_of_ext_measurements",
+ { "NUMBER_OF_EXT_MEASUREMENTS", "gsm_rlcmac.ul.number_of_ext_measurements",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_measurements_3g_cell_list_index_3g,
- { "CELL_LIST_INDEX_3G", "gsm_rlcmac_ul.measurements_3g_cell_list_index_3g",
+ { "CELL_LIST_INDEX_3G", "gsm_rlcmac.ul.measurements_3g_cell_list_index_3g",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_measurements_3g_reporting_quantity,
- { "REPORTING_QUANTITY", "gsm_rlcmac_ul.measurements_3g_reporting_quantity",
+ { "REPORTING_QUANTITY", "gsm_rlcmac.ul.measurements_3g_reporting_quantity",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pmr_additionsr99_psi3_change_mark,
- { "PSI3_CHANGE_MARK", "gsm_rlcmac_ul.pmr_additionsr99_psi3_change_mark",
+ { "PSI3_CHANGE_MARK", "gsm_rlcmac.ul.pmr_additionsr99_psi3_change_mark",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pmr_additionsr99_pmo_used,
- { "PMO_USED", "gsm_rlcmac_ul.pmr_additionsr99_pmo_used",
+ { "PMO_USED", "gsm_rlcmac.ul.pmr_additionsr99_pmo_used",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pmr_eutran_meas_rpt_freq_idx,
- { "E-UTRAN_FREQUENCY_INDEX", "gsm_rlcmac_ul.pmr_eutran_meas_rpt_freq_idx",
+ { "E-UTRAN_FREQUENCY_INDEX", "gsm_rlcmac.ul.pmr_eutran_meas_rpt_freq_idx",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pmr_eutran_meas_rpt_cell_id,
- { "CELL IDENTITY", "gsm_rlcmac_ul.pmr_eutran_meas_rpt_cell_id",
+ { "CELL IDENTITY", "gsm_rlcmac.ul.pmr_eutran_meas_rpt_cell_id",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pmr_eutran_meas_rpt_quantity,
- { "REPORTING_QUANTITY", "gsm_rlcmac_ul.pmr_eutran_meas_rpt_quantity",
+ { "REPORTING_QUANTITY", "gsm_rlcmac.ul.pmr_eutran_meas_rpt_quantity",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_emr_servingcell_dtx_used,
- { "DTX_USED", "gsm_rlcmac_ul.emr_servingcell_dtx_used",
+ { "DTX_USED", "gsm_rlcmac.ul.emr_servingcell_dtx_used",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_emr_servingcell_rxlev_val,
- { "RXLEV_VAL", "gsm_rlcmac_ul.emr_servingcell_rxlev_val",
+ { "RXLEV_VAL", "gsm_rlcmac.ul.emr_servingcell_rxlev_val",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_emr_servingcell_rx_qual_full,
- { "RX_QUAL_FULL", "gsm_rlcmac_ul.emr_servingcell_rx_qual_full",
+ { "RX_QUAL_FULL", "gsm_rlcmac.ul.emr_servingcell_rx_qual_full",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_emr_servingcell_mean_bep,
- { "MEAN_BEP", "gsm_rlcmac_ul.emr_mean_bep",
+ { "MEAN_BEP", "gsm_rlcmac.ul.emr_mean_bep",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_emr_servingcell_cv_bep,
- { "CV_BEP", "gsm_rlcmac_ul.emr_cv_bep",
+ { "CV_BEP", "gsm_rlcmac.ul.emr_cv_bep",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_emr_servingcell_nbr_rcvd_blocks,
- { "NBR_RCVD_BLOCKS", "gsm_rlcmac_ul.emr_nbr_rcvd_blocks",
+ { "NBR_RCVD_BLOCKS", "gsm_rlcmac.ul.emr_nbr_rcvd_blocks",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_enhancedmeasurementreport_rr_short_pd,
- { "RR_Short_PD", "gsm_rlcmac_ul.emr_rr_short_pd",
+ { "RR_Short_PD", "gsm_rlcmac.ul.emr_rr_short_pd",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_enhancedmeasurementreport_message_type,
- { "MESSAGE_TYPE", "gsm_rlcmac_ul.emr_message_type",
+ { "MESSAGE_TYPE", "gsm_rlcmac.ul.emr_message_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_enhancedmeasurementreport_shortlayer2_header,
- { "ShortLayer2_Header", "gsm_rlcmac_ul.emr_shortlayer2_header",
+ { "ShortLayer2_Header", "gsm_rlcmac.ul.emr_shortlayer2_header",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_enhancedmeasurementreport_bsic_seen,
- { "BSIC_Seen", "gsm_rlcmac_ul.emr_bsic_seen",
+ { "BSIC_Seen", "gsm_rlcmac.ul.emr_bsic_seen",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_enhancedmeasurementreport_scale,
- { "SCALE", "gsm_rlcmac_ul.emr_scale",
+ { "SCALE", "gsm_rlcmac.ul.emr_scale",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_measurement_report_payloadtype,
- { "PayloadType", "gsm_rlcmac_ul.pmr_payloadtype",
+ { "PayloadType", "gsm_rlcmac.ul.pmr_payloadtype",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_measurement_report_spare,
- { "spare", "gsm_rlcmac_ul.pmr_spare",
+ { "spare", "gsm_rlcmac.ul.pmr_spare",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_measurement_report_r,
- { "R", "gsm_rlcmac_ul.pmr_r",
+ { "R", "gsm_rlcmac.ul.pmr_r",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_measurement_report_message_type,
- { "MESSAGE_TYPE", "gsm_rlcmac_ul.pmr_message_type",
+ { "MESSAGE_TYPE", "gsm_rlcmac.ul.pmr_message_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_measurement_report_tlli,
- { "TLLI", "gsm_rlcmac_ul.pmr_tlli",
+ { "TLLI", "gsm_rlcmac.ul.pmr_tlli",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_measurement_report_psi5_change_mark,
- { "PSI5_CHANGE_MARK", "gsm_rlcmac_ul.pmr_psi5_change_mark",
+ { "PSI5_CHANGE_MARK", "gsm_rlcmac.ul.pmr_psi5_change_mark",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_enh_measurement_report_payloadtype,
- { "PayloadType", "gsm_rlcmac_ul.pemr_payloadtype",
+ { "PayloadType", "gsm_rlcmac.ul.pemr_payloadtype",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_enh_measurement_report_spare,
- { "spare", "gsm_rlcmac_ul.pemr_spare",
+ { "spare", "gsm_rlcmac.ul.pemr_spare",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_enh_measurement_report_r,
- { "R", "gsm_rlcmac_ul.pemr_r",
+ { "R", "gsm_rlcmac.ul.pemr_r",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_enh_measurement_report_message_type,
- { "MESSAGE_TYPE", "gsm_rlcmac_ul.pemr_message_type",
+ { "MESSAGE_TYPE", "gsm_rlcmac.ul.pemr_message_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_enh_measurement_report_tlli,
- { "TLLI", "gsm_rlcmac_ul.pemr_tlli",
+ { "TLLI", "gsm_rlcmac.ul.pemr_tlli",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -11438,97 +11438,97 @@ proto_register_gsm_rlcmac(void)
/*< Packet Measurement Order message contents >*/
{ &hf_ext_frequency_list_start_frequency,
- { "START_FREQUENCY", "gsm_rlcmac_dl.ext_frequency_list_start_frequency",
+ { "START_FREQUENCY", "gsm_rlcmac.dl.ext_frequency_list_start_frequency",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ext_frequency_list_nr_of_frequencies,
- { "NR_OF_FREQUENCIES", "gsm_rlcmac_dl.ext_frequency_list_nr_of_frequencies",
+ { "NR_OF_FREQUENCIES", "gsm_rlcmac.dl.ext_frequency_list_nr_of_frequencies",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ext_frequency_list_freq_diff_length,
- { "FREQ_DIFF_LENGTH", "gsm_rlcmac_dl.ext_frequency_list_freq_diff_length",
+ { "FREQ_DIFF_LENGTH", "gsm_rlcmac.dl.ext_frequency_list_freq_diff_length",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_measurement_order_message_type,
- { "MESSAGE_TYPE", "gsm_rlcmac_dl.pmo_message_type",
+ { "MESSAGE_TYPE", "gsm_rlcmac.dl.pmo_message_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_measurement_order_page_mode,
- { "PAGE_MODE", "gsm_rlcmac_dl.pmo_page_mode",
+ { "PAGE_MODE", "gsm_rlcmac.dl.pmo_page_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_measurement_order_pmo_index,
- { "PMO_INDEX", "gsm_rlcmac_dl.pmo_index",
+ { "PMO_INDEX", "gsm_rlcmac.dl.pmo_index",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_measurement_order_pmo_count,
- { "PMO_COUNT", "gsm_rlcmac_dl.pmo_count",
+ { "PMO_COUNT", "gsm_rlcmac.dl.pmo_count",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ccn_measurement_report_rxlev_serving_cell,
- { "RXLEV_SERVING_CELL", "gsm_rlcmac_dl.rxlev_serving_cell",
+ { "RXLEV_SERVING_CELL", "gsm_rlcmac.dl.rxlev_serving_cell",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ccn_measurement_report_number_of_nc_measurements,
- { "NUMBER_OF_NC_MEASUREMENTS", "gsm_rlcmac_dl.number_of_nc_measurements",
+ { "NUMBER_OF_NC_MEASUREMENTS", "gsm_rlcmac.dl.number_of_nc_measurements",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_target_cell_gsm_notif_arfcn,
- { "ARFCN", "gsm_rlcmac_dl.target_cell_gsm_notif_arfcn",
+ { "ARFCN", "gsm_rlcmac.dl.target_cell_gsm_notif_arfcn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_target_cell_gsm_notif_bsic,
- { "BSIC", "gsm_rlcmac_dl.target_cell_gsm_notif_bsic",
+ { "BSIC", "gsm_rlcmac.dl.target_cell_gsm_notif_bsic",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_fdd_target_cell_notif_fdd_arfcn,
- { "FDD_ARFCN", "gsm_rlcmac_dl.fdd_target_cell_notif_fdd_arfcn",
+ { "FDD_ARFCN", "gsm_rlcmac.dl.fdd_target_cell_notif_fdd_arfcn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_fdd_target_cell_notif_bandwith_fdd,
- { "BANDWITH_FDD", "gsm_rlcmac_dl.fdd_target_cell_notif_bandwith_fdd",
+ { "BANDWITH_FDD", "gsm_rlcmac.dl.fdd_target_cell_notif_bandwith_fdd",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_fdd_target_cell_notif_scrambling_code,
- { "SCRAMBLING_CODE", "gsm_rlcmac_dl.fdd_target_cell_notif_scrambling_code",
+ { "SCRAMBLING_CODE", "gsm_rlcmac.dl.fdd_target_cell_notif_scrambling_code",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_target_cell_3g_notif_reporting_quantity,
- { "REPORTING_QUANTITY", "gsm_rlcmac_dl.target_cell_3g_notif_reporting_quantity",
+ { "REPORTING_QUANTITY", "gsm_rlcmac.dl.target_cell_3g_notif_reporting_quantity",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pccn_additionsr6_ba_used_3g,
- { "BA_USED_3G", "gsm_rlcmac_dl.pccn_additionsr6_ba_used_3g",
+ { "BA_USED_3G", "gsm_rlcmac.dl.pccn_additionsr6_ba_used_3g",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -11536,133 +11536,133 @@ proto_register_gsm_rlcmac(void)
/*< Packet Cell Change Notification message contents > */
{ &hf_packet_cell_change_notification_payloadtype,
- { "PayloadType", "gsm_rlcmac_ul.pccn_payloadtype",
+ { "PayloadType", "gsm_rlcmac.ul.pccn_payloadtype",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_cell_change_notification_spare,
- { "spare", "gsm_rlcmac_ul.pccn_spare",
+ { "spare", "gsm_rlcmac.ul.pccn_spare",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_cell_change_notification_r,
- { "R", "gsm_rlcmac_ul.pccn_r",
+ { "R", "gsm_rlcmac.ul.pccn_r",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_cell_change_notification_message_type,
- { "MESSAGE_TYPE", "gsm_rlcmac_ul.pccn_message_type",
+ { "MESSAGE_TYPE", "gsm_rlcmac.ul.pccn_message_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_cell_change_notification_ba_ind,
- { "BA_IND", "gsm_rlcmac_ul.pccn_ba_ind",
+ { "BA_IND", "gsm_rlcmac.ul.pccn_ba_ind",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_cell_change_notification_psi3_change_mark,
- { "PSI3_CHANGE_MARK", "gsm_rlcmac_ul.pccn_psi3_change_mark",
+ { "PSI3_CHANGE_MARK", "gsm_rlcmac.ul.pccn_psi3_change_mark",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_cell_change_notification_pmo_used,
- { "PMO_USED", "gsm_rlcmac_ul.pccn_pmo_used",
+ { "PMO_USED", "gsm_rlcmac.ul.pccn_pmo_used",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_cell_change_notification_pccn_sending,
- { "PCCN_SENDING", "gsm_rlcmac_ul.pccn_pccn_sending",
+ { "PCCN_SENDING", "gsm_rlcmac.ul.pccn_pccn_sending",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_cell_change_notification_lte_reporting_quantity,
- { "REPORTING_QUANTITY", "gsm_rlcmac_ul.pccn_lte_reporting_quantity",
+ { "REPORTING_QUANTITY", "gsm_rlcmac.ul.pccn_lte_reporting_quantity",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_eutran_ccn_meas_rpt_3g_ba_used,
- { "3G_BA_USED", "gsm_rlcmac_ul.pccn_eutran_ccn_meas_rpt_3g_ba_used",
+ { "3G_BA_USED", "gsm_rlcmac.ul.pccn_eutran_ccn_meas_rpt_3g_ba_used",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_eutran_ccn_meas_rpt_freq_idx,
- { "E-UTRAN_FREQUENCY_INDEX", "gsm_rlcmac_ul.pccn_eutran_ccn_meas_rpt_freq_idx",
+ { "E-UTRAN_FREQUENCY_INDEX", "gsm_rlcmac.ul.pccn_eutran_ccn_meas_rpt_freq_idx",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_eutran_ccn_meas_cell_id,
- { "CELL IDENTITY", "gsm_rlcmac_ul.pccn_eutran_ccn_meas_rpt_cell_id",
+ { "CELL IDENTITY", "gsm_rlcmac.ul.pccn_eutran_ccn_meas_rpt_cell_id",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_eutran_ccn_meas_rpt_quantity,
- { "REPORTING_QUANTITY", "gsm_rlcmac_ul.pccn_eutran_ccn_meas_rpt_rpt_quantity",
+ { "REPORTING_QUANTITY", "gsm_rlcmac.ul.pccn_eutran_ccn_meas_rpt_rpt_quantity",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_utran_csg_meas_rpt_cgi,
- { "UTRAN_CGI", "gsm_rlcmac_ul.utran_csg_meas_rpt_cgi",
+ { "UTRAN_CGI", "gsm_rlcmac.ul.utran_csg_meas_rpt_cgi",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_utran_csg_meas_rpt_csg_id,
- { "CSG_ID", "gsm_rlcmac_ul.utran_csg_meas_rpt_csg_id",
+ { "CSG_ID", "gsm_rlcmac.ul.utran_csg_meas_rpt_csg_id",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_utran_csg_meas_rpt_access_mode,
- { "Access Mode", "gsm_rlcmac_ul.utran_csg_meas_rpt_access_mode",
+ { "Access Mode", "gsm_rlcmac.ul.utran_csg_meas_rpt_access_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_utran_csg_meas_rpt_quantity,
- { "REPORTING_QUANTITY", "gsm_rlcmac_ul.utran_csg_meas_rpt_quantity",
+ { "REPORTING_QUANTITY", "gsm_rlcmac.ul.utran_csg_meas_rpt_quantity",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_eutran_csg_meas_rpt_cgi,
- { "EUTRAN_CGI", "gsm_rlcmac_ul.eutran_csg_meas_rpt_cgi",
+ { "EUTRAN_CGI", "gsm_rlcmac.ul.eutran_csg_meas_rpt_cgi",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_eutran_csg_meas_rpt_ta,
- { "Tracking Area Code", "gsm_rlcmac_ul.eutran_csg_meas_rpt_ta",
+ { "Tracking Area Code", "gsm_rlcmac.ul.eutran_csg_meas_rpt_ta",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_eutran_csg_meas_rpt_csg_id,
- { "CSG_ID", "gsm_rlcmac_ul.eutran_csg_meas_rpt_csg_id",
+ { "CSG_ID", "gsm_rlcmac.ul.eutran_csg_meas_rpt_csg_id",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_eutran_csg_meas_rpt_access_mode,
- { "Access Mode", "gsm_rlcmac_ul.eutran_csg_meas_rpt_access_mode",
+ { "Access Mode", "gsm_rlcmac.ul.eutran_csg_meas_rpt_access_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_eutran_csg_meas_rpt_quantity,
- { "REPORTING_QUANTITY", "gsm_rlcmac_ul.eutran_csg_meas_rpt_quantity",
+ { "REPORTING_QUANTITY", "gsm_rlcmac.ul.eutran_csg_meas_rpt_quantity",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -11672,31 +11672,31 @@ proto_register_gsm_rlcmac(void)
/*< Packet Cell Change Continue message contents > */
{ &hf_packet_cell_change_continue_message_type,
- { "MESSAGE_TYPE", "gsm_rlcmac_dl.pccc_message_type",
+ { "MESSAGE_TYPE", "gsm_rlcmac.dl.pccc_message_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_cell_change_continue_page_mode,
- { "PAGE_MODE", "gsm_rlcmac_dl.pccc_page_mode",
+ { "PAGE_MODE", "gsm_rlcmac.dl.pccc_page_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_cell_change_continue_arfcn,
- { "ARFCN", "gsm_rlcmac_dl.pccc_arfcn",
+ { "ARFCN", "gsm_rlcmac.dl.pccc_arfcn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_cell_change_continue_bsic,
- { "BSIC", "gsm_rlcmac_dl.pccc_bsic",
+ { "BSIC", "gsm_rlcmac.dl.pccc_bsic",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_cell_change_continue_container_id,
- { "CONTAINER_ID", "gsm_rlcmac_dl.pccc_container_id",
+ { "CONTAINER_ID", "gsm_rlcmac.dl.pccc_container_id",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -11704,43 +11704,43 @@ proto_register_gsm_rlcmac(void)
/*< Packet Neighbour Cell Data message contents > */
{ &hf_pncd_container_with_id_arfcn,
- { "ARFCN", "gsm_rlcmac_dl.pncd_arfcn",
+ { "ARFCN", "gsm_rlcmac.dl.pncd_arfcn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pncd_container_with_id_bsic,
- { "BSIC", "gsm_rlcmac_dl.pncd_bsic",
+ { "BSIC", "gsm_rlcmac.dl.pncd_bsic",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_neighbour_cell_data_message_type,
- { "MESSAGE_TYPE", "gsm_rlcmac_dl.pncd_message_type",
+ { "MESSAGE_TYPE", "gsm_rlcmac.dl.pncd_message_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_neighbour_cell_data_page_mode,
- { "PAGE_MODE", "gsm_rlcmac_dl.pncd_page_mode",
+ { "PAGE_MODE", "gsm_rlcmac.dl.pncd_page_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_neighbour_cell_data_container_id,
- { "CONTAINER_ID", "gsm_rlcmac_dl.pncd_container_id",
+ { "CONTAINER_ID", "gsm_rlcmac.dl.pncd_container_id",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_neighbour_cell_data_spare,
- { "spare", "gsm_rlcmac_dl.pncd_spare",
+ { "spare", "gsm_rlcmac.dl.pncd_spare",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_neighbour_cell_data_container_index,
- { "CONTAINER_INDEX", "gsm_rlcmac_dl.pncd_container_index",
+ { "CONTAINER_INDEX", "gsm_rlcmac.dl.pncd_container_index",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -11748,79 +11748,79 @@ proto_register_gsm_rlcmac(void)
/*< Packet Serving Cell Data message contents > */
{ &hf_packet_serving_cell_data_message_type,
- { "MESSAGE_TYPE", "gsm_rlcmac_dl.pscd_message_type",
+ { "MESSAGE_TYPE", "gsm_rlcmac.dl.pscd_message_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_serving_cell_data_page_mode,
- { "PAGE_MODE", "gsm_rlcmac_dl.pscd_page_mode",
+ { "PAGE_MODE", "gsm_rlcmac.dl.pscd_page_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_serving_cell_data_spare,
- { "spare", "gsm_rlcmac_dl.pscd_spare",
+ { "spare", "gsm_rlcmac.dl.pscd_spare",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_serving_cell_data_container_index,
- { "CONTAINER_INDEX", "gsm_rlcmac_dl.pscd_container_index",
+ { "CONTAINER_INDEX", "gsm_rlcmac.dl.pscd_container_index",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_servingcelldata_rxlev_serving_cell,
- { "RXLEV_SERVING_CELL", "gsm_rlcmac_dl.servingcelldata_rxlev_serving_cell",
+ { "RXLEV_SERVING_CELL", "gsm_rlcmac.dl.servingcelldata_rxlev_serving_cell",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_repeated_invalid_bsic_info_bcch_freq_ncell,
- { "BCCH_FREQ_NCELL", "gsm_rlcmac_dl.repeated_invalid_bsic_info_bcch_freq_ncell",
+ { "BCCH_FREQ_NCELL", "gsm_rlcmac.dl.repeated_invalid_bsic_info_bcch_freq_ncell",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_repeated_invalid_bsic_info_bsic,
- { "BSIC", "gsm_rlcmac_dl.repeated_invalid_bsic_info_bsic",
+ { "BSIC", "gsm_rlcmac.dl.repeated_invalid_bsic_info_bsic",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_repeated_invalid_bsic_info_rxlev_ncell,
- { "RXLEV_NCELL", "gsm_rlcmac_dl.repeated_invalid_bsic_info_rxlev_ncell",
+ { "RXLEV_NCELL", "gsm_rlcmac.dl.repeated_invalid_bsic_info_rxlev_ncell",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_reporting_quantity_reporting_quantity,
- { "REPORTING_QUANTITY", "gsm_rlcmac_dl.repeated_invalid_bsic_info_reporting_quantity",
+ { "REPORTING_QUANTITY", "gsm_rlcmac.dl.repeated_invalid_bsic_info_reporting_quantity",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_nc_measurementreport_nc_mode,
- { "NC_MODE", "gsm_rlcmac_dl.nc_measurementreport_nc_mode",
+ { "NC_MODE", "gsm_rlcmac.dl.nc_measurementreport_nc_mode",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_nc_measurementreport_psi3_change_mark,
- { "PSI3_CHANGE_MARK", "gsm_rlcmac_dl.nc_measurementreport_psi3_change_mark",
+ { "PSI3_CHANGE_MARK", "gsm_rlcmac.dl.nc_measurementreport_psi3_change_mark",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_nc_measurementreport_pmo_used,
- { "PMO_USED", "gsm_rlcmac_dl.nc_measurementreport_pmo_used",
+ { "PMO_USED", "gsm_rlcmac.dl.nc_measurementreport_pmo_used",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_nc_measurementreport_scale,
- { "SCALE", "gsm_rlcmac_dl.nc_measurementreport_scale",
+ { "SCALE", "gsm_rlcmac.dl.nc_measurementreport_scale",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
@@ -11828,259 +11828,259 @@ proto_register_gsm_rlcmac(void)
/*< Packet Handover Command message content > */
{ &hf_globaltimeslotdescription_ms_timeslotallocation,
- { "MS_TimeslotAllocation", "gsm_rlcmac_dl.pho_ms_timeslotallocation",
+ { "MS_TimeslotAllocation", "gsm_rlcmac.dl.pho_ms_timeslotallocation",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pho_downlinkassignment_timeslotallocation,
- { "TimeslotAllocation", "gsm_rlcmac_dl.pho_timeslotallocation",
+ { "TimeslotAllocation", "gsm_rlcmac.dl.pho_timeslotallocation",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pho_downlinkassignment_pfi,
- { "PFI", "gsm_rlcmac_dl.pho_downlinkassignment_pfi",
+ { "PFI", "gsm_rlcmac.dl.pho_downlinkassignment_pfi",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pho_downlinkassignment_rlc_mode,
- { "RLC_Mode", "gsm_rlcmac_dl.pho_downlinkassignment_rlc_mode",
+ { "RLC_Mode", "gsm_rlcmac.dl.pho_downlinkassignment_rlc_mode",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pho_downlinkassignment_tfi_assignment,
- { "TFI_Assignment", "gsm_rlcmac_dl.pho_downlinkassignment_tfi_assignment",
+ { "TFI_Assignment", "gsm_rlcmac.dl.pho_downlinkassignment_tfi_assignment",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pho_downlinkassignment_controlack,
- { "ControlACK", "gsm_rlcmac_dl.pho_downlinkassignment_controlack",
+ { "ControlACK", "gsm_rlcmac.dl.pho_downlinkassignment_controlack",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pho_downlinkassignment_egprs_windowsize,
- { "EGPRS_WindowSize", "gsm_rlcmac_dl.pho_downlinkassignment_egprs_windowsize",
+ { "EGPRS_WindowSize", "gsm_rlcmac.dl.pho_downlinkassignment_egprs_windowsize",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pho_usf_1_7_usf,
- { "USF", "gsm_rlcmac_dl.pho_usf",
+ { "USF", "gsm_rlcmac.dl.pho_usf",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_usf_allocationarray_usf_0,
- { "USF_0", "gsm_rlcmac_dl.pho_usf_0",
+ { "USF_0", "gsm_rlcmac.dl.pho_usf_0",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pho_uplinkassignment_pfi,
- { "PFI", "gsm_rlcmac_dl.pho_uplinkassignment_pfi",
+ { "PFI", "gsm_rlcmac.dl.pho_uplinkassignment_pfi",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pho_uplinkassignment_rlc_mode,
- { "RLC_Mode", "gsm_rlcmac_dl.pho_uplinkassignment_rlc_mode",
+ { "RLC_Mode", "gsm_rlcmac.dl.pho_uplinkassignment_rlc_mode",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pho_uplinkassignment_tfi_assignment,
- { "TFI_Assignment", "gsm_rlcmac_dl.pho_uplinkassignment_tfi_assignment",
+ { "TFI_Assignment", "gsm_rlcmac.dl.pho_uplinkassignment_tfi_assignment",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pho_uplinkassignment_channelcodingcommand,
- { "ChannelCodingCommand", "gsm_rlcmac_dl.pho_uplinkassignment_channelcodingcommand",
+ { "ChannelCodingCommand", "gsm_rlcmac.dl.pho_uplinkassignment_channelcodingcommand",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pho_uplinkassignment_egprs_channelcodingcommand,
- { "EGPRS_ChannelCodingCommand", "gsm_rlcmac_dl.pho_uplinkassignment_egprs_channelcodingcommand",
+ { "EGPRS_ChannelCodingCommand", "gsm_rlcmac.dl.pho_uplinkassignment_egprs_channelcodingcommand",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pho_uplinkassignment_egprs_windowsize,
- { "EGPRS_WindowSize", "gsm_rlcmac_dl.pho_uplinkassignment_egprs_windowsize",
+ { "EGPRS_WindowSize", "gsm_rlcmac.dl.pho_uplinkassignment_egprs_windowsize",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pho_uplinkassignment_usf_granularity,
- { "USF_Granularity", "gsm_rlcmac_dl.pho_uplinkassignment_usf_granularity",
+ { "USF_Granularity", "gsm_rlcmac.dl.pho_uplinkassignment_usf_granularity",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pho_uplinkassignment_usf_singleallocation,
- { "USF_SingleAllocation", "gsm_rlcmac_dl.pho_uplinkassignment_usf_singleallocation",
+ { "USF_SingleAllocation", "gsm_rlcmac.dl.pho_uplinkassignment_usf_singleallocation",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pho_gprs_channelcodingcommand,
- { "ChannelCodingCommand", "gsm_rlcmac_dl.pho_uplinkassignment_gprs_channelcodingcommand",
+ { "ChannelCodingCommand", "gsm_rlcmac.dl.pho_uplinkassignment_gprs_channelcodingcommand",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_egprs_description_egprs_windowsize,
- { "EGPRS_WindowSize", "gsm_rlcmac_dl.egprs_desc_egprs_windowsize",
+ { "EGPRS_WindowSize", "gsm_rlcmac.dl.egprs_desc_egprs_windowsize",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_egprs_description_linkqualitymeasurementmode,
- { "LinkQualityMeasurementMode", "gsm_rlcmac_dl.linkqualitymeasurementmode",
+ { "LinkQualityMeasurementMode", "gsm_rlcmac.dl.linkqualitymeasurementmode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_egprs_description_bep_period2,
- { "BEP_Period2", "gsm_rlcmac_dl.bep_period2",
+ { "BEP_Period2", "gsm_rlcmac.dl.bep_period2",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pho_egprs_egprs_windowsize,
- { "EGPRS_WindowSize", "gsm_rlcmac_dl.pho_egprs_windowsize",
+ { "EGPRS_WindowSize", "gsm_rlcmac.dl.pho_egprs_windowsize",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pho_egprs_egprs_channelcodingcommand,
- { "EGPRS_ChannelCodingCommand", "gsm_rlcmac_dl.pho_egprs_channelcodingcommand",
+ { "EGPRS_ChannelCodingCommand", "gsm_rlcmac.dl.pho_egprs_channelcodingcommand",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pho_egprs_bep_period2,
- { "BEP_Period2", "gsm_rlcmac_dl.pho_egprs_bep_period2",
+ { "BEP_Period2", "gsm_rlcmac.dl.pho_egprs_bep_period2",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pho_timingadvance_packetextendedtimingadvance,
- { "PacketExtendedTimingAdvance", "gsm_rlcmac_dl.pho_packetextendedtimingadvance",
+ { "PacketExtendedTimingAdvance", "gsm_rlcmac.dl.pho_packetextendedtimingadvance",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_nas_container_nas_containerlength,
- { "NAS_ContainerLength", "gsm_rlcmac_dl.nas_containerlength",
+ { "NAS_ContainerLength", "gsm_rlcmac.dl.nas_containerlength",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_ps_handoverto_utran_payload_rrc_containerlength,
- { "RRC_ContainerLength", "gsm_rlcmac_dl.ps_handoverto_utran_payload_rrc_containerlength",
+ { "RRC_ContainerLength", "gsm_rlcmac.dl.ps_handoverto_utran_payload_rrc_containerlength",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pho_radioresources_handoverreference,
- { "HandoverReference", "gsm_rlcmac_dl.pho_radioresources_handoverreference",
+ { "HandoverReference", "gsm_rlcmac.dl.pho_radioresources_handoverreference",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pho_radioresources_arfcn,
- { "ARFCN", "gsm_rlcmac_dl.pho_radioresources_arfcn",
+ { "ARFCN", "gsm_rlcmac.dl.pho_radioresources_arfcn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pho_radioresources_si,
- { "SI", "gsm_rlcmac_dl.pho_radioresources_si",
+ { "SI", "gsm_rlcmac.dl.pho_radioresources_si",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pho_radioresources_nci,
- { "NCI", "gsm_rlcmac_dl.pho_radioresources_nci",
+ { "NCI", "gsm_rlcmac.dl.pho_radioresources_nci",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pho_radioresources_bsic,
- { "BSIC", "gsm_rlcmac_dl.pho_radioresources_bsic",
+ { "BSIC", "gsm_rlcmac.dl.pho_radioresources_bsic",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pho_radioresources_ccn_active,
- { "CCN_Active", "gsm_rlcmac_dl.pho_radioresources_ccn_active",
+ { "CCN_Active", "gsm_rlcmac.dl.pho_radioresources_ccn_active",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pho_radioresources_ccn_active_3g,
- { "CCN_Active_3G", "gsm_rlcmac_dl.pho_radioresources_ccn_active_3g",
+ { "CCN_Active_3G", "gsm_rlcmac.dl.pho_radioresources_ccn_active_3g",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pho_radioresources_networkcontrolorder,
- { "NetworkControlOrder", "gsm_rlcmac_dl.pho_radioresources_networkcontrolorder",
+ { "NetworkControlOrder", "gsm_rlcmac.dl.pho_radioresources_networkcontrolorder",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pho_radioresources_extended_dynamic_allocation,
- { "Extended_Dynamic_Allocation", "gsm_rlcmac_dl.pho_radioresources_extended_dynamic_allocation",
+ { "Extended_Dynamic_Allocation", "gsm_rlcmac.dl.pho_radioresources_extended_dynamic_allocation",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pho_radioresources_rlc_reset,
- { "RLC_Reset", "gsm_rlcmac_dl.pho_radioresources_rlc_reset",
+ { "RLC_Reset", "gsm_rlcmac.dl.pho_radioresources_rlc_reset",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pho_radioresources_po,
- { "PO", "gsm_rlcmac_dl.pho_radioresources_po",
+ { "PO", "gsm_rlcmac.dl.pho_radioresources_po",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pho_radioresources_pr_mode,
- { "PR_Mode", "gsm_rlcmac_dl.pho_radioresources_pr_mode",
+ { "PR_Mode", "gsm_rlcmac.dl.pho_radioresources_pr_mode",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pho_radioresources_uplinkcontroltimeslot,
- { "UplinkControlTimeslot", "gsm_rlcmac_dl.pho_radioresources_uplinkcontroltimeslot",
+ { "UplinkControlTimeslot", "gsm_rlcmac.dl.pho_radioresources_uplinkcontroltimeslot",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_handover_command_messagetype,
- { "MessageType", "gsm_rlcmac_dl.pho_messagetype",
+ { "MessageType", "gsm_rlcmac.dl.pho_messagetype",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_handover_command_pagemode,
- { "PageMode", "gsm_rlcmac_dl.pho_pagemode",
+ { "PageMode", "gsm_rlcmac.dl.pho_pagemode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_handover_command_containerid,
- { "ContainerID", "gsm_rlcmac_dl.pho_containerid",
+ { "ContainerID", "gsm_rlcmac.dl.pho_containerid",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -12089,19 +12089,19 @@ proto_register_gsm_rlcmac(void)
/*< Packet Physical Information message content > */
{ &hf_packet_physicalinformation_messagetype,
- { "MessageType", "gsm_rlcmac_dl.packet_physicalinformation_messagetype",
+ { "MessageType", "gsm_rlcmac.dl.packet_physicalinformation_messagetype",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_physicalinformation_pagemode,
- { "PageMode", "gsm_rlcmac_dl.packet_physicalinformation_pagemode",
+ { "PageMode", "gsm_rlcmac.dl.packet_physicalinformation_pagemode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_physicalinformation_timingadvance,
- { "TimingAdvance", "gsm_rlcmac_dl.packet_physicalinformation_timingadvance",
+ { "TimingAdvance", "gsm_rlcmac.dl.packet_physicalinformation_timingadvance",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -12109,158 +12109,158 @@ proto_register_gsm_rlcmac(void)
/*< End Packet Physical Information > */
{ &hf_si1_restoctet_nch_position,
- { "NCH_Position", "gsm_rlcmac_dl.i1_restoctet_nch_position",
+ { "NCH_Position", "gsm_rlcmac.dl.i1_restoctet_nch_position",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_si1_restoctet_bandindicator,
- { "BandIndicator", "gsm_rlcmac_dl.i1_restoctet_bandindicator",
+ { "BandIndicator", "gsm_rlcmac.dl.i1_restoctet_bandindicator",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_selection_parameters_cbq,
- { "CBQ", "gsm_rlcmac_dl.selection_parameters_cbq",
+ { "CBQ", "gsm_rlcmac.dl.selection_parameters_cbq",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_selection_parameters_cell_reselect_offset,
- { "CELL_RESELECT_OFFSET", "gsm_rlcmac_dl.cell_reselect_offset",
+ { "CELL_RESELECT_OFFSET", "gsm_rlcmac.dl.cell_reselect_offset",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_selection_parameters_temporary_offset,
- { "TEMPORARY_OFFSET", "gsm_rlcmac_dl.selection_parameters_temporary_offset",
+ { "TEMPORARY_OFFSET", "gsm_rlcmac.dl.selection_parameters_temporary_offset",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_selection_parameters_penalty_time,
- { "PENALTY_TIME", "gsm_rlcmac_dl.selection_parameters_penalty_time",
+ { "PENALTY_TIME", "gsm_rlcmac.dl.selection_parameters_penalty_time",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_si3_rest_octet_power_offset,
- { "Power_Offset", "gsm_rlcmac_dl.si3_rest_octet_power_offset",
+ { "Power_Offset", "gsm_rlcmac.dl.si3_rest_octet_power_offset",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_si3_rest_octet_system_information_2ter_indicator,
- { "System_Information_2ter_Indicator", "gsm_rlcmac_dl.si3_rest_octet_system_information_2ter_indicator",
+ { "System_Information_2ter_Indicator", "gsm_rlcmac.dl.si3_rest_octet_system_information_2ter_indicator",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_si3_rest_octet_early_classmark_sending_control,
- { "Early_Classmark_Sending_Control", "gsm_rlcmac_dl.si3_rest_octet_early_classmark_sending_control",
+ { "Early_Classmark_Sending_Control", "gsm_rlcmac.dl.si3_rest_octet_early_classmark_sending_control",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_si3_rest_octet_where,
- { "WHERE", "gsm_rlcmac_dl.si3_rest_octet_where",
+ { "WHERE", "gsm_rlcmac.dl.si3_rest_octet_where",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_si3_rest_octet_ra_colour,
- { "RA_COLOUR", "gsm_rlcmac_dl.si3_rest_octet_ra_colour",
+ { "RA_COLOUR", "gsm_rlcmac.dl.si3_rest_octet_ra_colour",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_si3_rest_octet_si13_position,
- { "SI13_POSITION", "gsm_rlcmac_dl.si3_rest_octet_si13_position",
+ { "SI13_POSITION", "gsm_rlcmac.dl.si3_rest_octet_si13_position",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_si3_rest_octet_ecs_restriction3g,
- { "ECS_Restriction3G", "gsm_rlcmac_dl.si3_rest_octet_ecs_restriction3g",
+ { "ECS_Restriction3G", "gsm_rlcmac.dl.si3_rest_octet_ecs_restriction3g",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_si3_rest_octet_si2quaterindicator,
- { "SI2quaterIndicator", "gsm_rlcmac_dl.si3_rest_octet_si2quaterindicator",
+ { "SI2quaterIndicator", "gsm_rlcmac.dl.si3_rest_octet_si2quaterindicator",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_si4_rest_octet_power_offset,
- { "Power_Offset", "gsm_rlcmac_dl.si4_rest_octet_power_offset",
+ { "Power_Offset", "gsm_rlcmac.dl.si4_rest_octet_power_offset",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_si4_rest_octet_ra_colour,
- { "RA_COLOUR", "gsm_rlcmac_dl.si4_rest_octet_ra_colour",
+ { "RA_COLOUR", "gsm_rlcmac.dl.si4_rest_octet_ra_colour",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_si4_rest_octet_si13_position,
- { "SI13_POSITION", "gsm_rlcmac_dl.si4_rest_octet_si13_position",
+ { "SI13_POSITION", "gsm_rlcmac.dl.si4_rest_octet_si13_position",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pch_and_nch_info_pagingchannelrestructuring,
- { "PagingChannelRestructuring", "gsm_rlcmac_dl.pch_and_nch_info_pagingchannelrestructuring",
+ { "PagingChannelRestructuring", "gsm_rlcmac.dl.pch_and_nch_info_pagingchannelrestructuring",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pch_and_nch_info_nln_sacch,
- { "NLN_SACCH", "gsm_rlcmac_dl.pch_and_nch_info_nln_sacch",
+ { "NLN_SACCH", "gsm_rlcmac.dl.pch_and_nch_info_nln_sacch",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pch_and_nch_info_callpriority,
- { "CallPriority", "gsm_rlcmac_dl.pch_and_nch_info_callpriority",
+ { "CallPriority", "gsm_rlcmac.dl.pch_and_nch_info_callpriority",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pch_and_nch_info_nln_status,
- { "NLN_Status", "gsm_rlcmac_dl.pch_and_nch_info_nln_status",
+ { "NLN_Status", "gsm_rlcmac.dl.pch_and_nch_info_nln_status",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_si6_restoctet_vbs_vgcs_options,
- { "VBS_VGCS_Options", "gsm_rlcmac_dl.si6_restoctet_vbs_vgcs_options",
+ { "VBS_VGCS_Options", "gsm_rlcmac.dl.si6_restoctet_vbs_vgcs_options",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_si6_restoctet_rac,
- { "RAC", "gsm_rlcmac_dl.si6_restoctet_rac",
+ { "RAC", "gsm_rlcmac.dl.si6_restoctet_rac",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_si6_restoctet_max_lapdm,
- { "MAX_LAPDm", "gsm_rlcmac_dl.si6_restoctet_max_lapdm",
+ { "MAX_LAPDm", "gsm_rlcmac.dl.si6_restoctet_max_lapdm",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_si6_restoctet_bandindicator,
- { "BandIndicator", "gsm_rlcmac_dl.si6_restoctet_bandindicator",
+ { "BandIndicator", "gsm_rlcmac.dl.si6_restoctet_bandindicator",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
/*< Additional MS Radio Access Capability message content > */
{ &hf_additionalmsradcap_tlli,
- { "TLLI", "gsm_rlcmac_ul.arac_tlli",
+ { "TLLI", "gsm_rlcmac.ul.arac_tlli",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -12269,13 +12269,13 @@ proto_register_gsm_rlcmac(void)
/*< Packet Pause message content > */
{ &hf_packet_pause_message_type,
- { "MessageType", "gsm_rlcmac_dl.packet_pause_messagetype",
+ { "MessageType", "gsm_rlcmac.dl.packet_pause_messagetype",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_pause_tlli,
- { "TLLI", "gsm_rlcmac_ul.packet_pause_tlli",
+ { "TLLI", "gsm_rlcmac.ul.packet_pause_tlli",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -12284,97 +12284,97 @@ proto_register_gsm_rlcmac(void)
/* < Packet System Information Type 1 message content > */
{ &hf_packet_system_info_type1_message_type,
- { "MessageType", "gsm_rlcmac_dl.packet_psi1_messagetype",
+ { "MessageType", "gsm_rlcmac.dl.packet_psi1_messagetype",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type1_page_mode,
- { "PageMode", "gsm_rlcmac_dl.psi1_pagemode",
+ { "PageMode", "gsm_rlcmac.dl.psi1_pagemode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type1_pbcch_change_mark,
- { "PBCCH_CHANGE_MARK", "gsm_rlcmac_dl.psi1_pbcch_change_mark",
+ { "PBCCH_CHANGE_MARK", "gsm_rlcmac.dl.psi1_pbcch_change_mark",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type1_psi_change_field,
- { "PSI_CHANGE_FIELD", "gsm_rlcmac_dl.psi1_psi_change_field",
+ { "PSI_CHANGE_FIELD", "gsm_rlcmac.dl.psi1_psi_change_field",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type1_psi1_repeat_period,
- { "PSI1_REPEAT_PERIOD", "gsm_rlcmac_dl.psi1_psi1_repeat_period",
+ { "PSI1_REPEAT_PERIOD", "gsm_rlcmac.dl.psi1_psi1_repeat_period",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type1_psi_count_lr,
- { "PSI_COUNT_LR", "gsm_rlcmac_dl.psi1_psi_count_lr",
+ { "PSI_COUNT_LR", "gsm_rlcmac.dl.psi1_psi_count_lr",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type1_psi_count_hr,
- { "PSI_COUNT_HR", "gsm_rlcmac_dl.psi1_psi_count_hr",
+ { "PSI_COUNT_HR", "gsm_rlcmac.dl.psi1_psi_count_hr",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type1_measurement_order,
- { "MEASUREMENT_ORDER", "gsm_rlcmac_dl.psi1_measurement_order",
+ { "MEASUREMENT_ORDER", "gsm_rlcmac.dl.psi1_measurement_order",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type1_psi_status_ind,
- { "PSI_STATUS_IND", "gsm_rlcmac_dl.psi1_psi_status_ind",
+ { "PSI_STATUS_IND", "gsm_rlcmac.dl.psi1_psi_status_ind",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type1_mscr,
- { "MSCR", "gsm_rlcmac_dl.psi1_mscr",
+ { "MSCR", "gsm_rlcmac.dl.psi1_mscr",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type1_sgsnr,
- { "SGSNR", "gsm_rlcmac_dl.psi1_sgsnr",
+ { "SGSNR", "gsm_rlcmac.dl.psi1_sgsnr",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type1_band_indicator,
- { "BAND_INDICATOR", "gsm_rlcmac_dl.psi1_band_indicator",
+ { "BAND_INDICATOR", "gsm_rlcmac.dl.psi1_band_indicator",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pccch_org_bs_pcc_rel,
- { "BS_PCC_REL", "gsm_rlcmac_dl.pccch_org_bs_pcc_rel",
+ { "BS_PCC_REL", "gsm_rlcmac.dl.pccch_org_bs_pcc_rel",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pccch_org_pbcch_blks,
- { "PBCCH_BLKS", "gsm_rlcmac_dl.pccch_org_pbcch_blks",
+ { "PBCCH_BLKS", "gsm_rlcmac.dl.pccch_org_pbcch_blks",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pccch_org_pag_blks_res,
- { "PAG_BLKS_RES", "gsm_rlcmac_dl.pccch_org_pag_blks_res",
+ { "PAG_BLKS_RES", "gsm_rlcmac.dl.pccch_org_pag_blks_res",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_pccch_org_prach_blks,
- { "PRACH_BLKS", "gsm_rlcmac_dl.pccch_org_prach_blks",
+ { "PRACH_BLKS", "gsm_rlcmac.dl.pccch_org_prach_blks",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -12383,223 +12383,223 @@ proto_register_gsm_rlcmac(void)
/* < Packet System Information Type 2 message content > */
{ &hf_packet_system_info_type2_message_type,
- { "MessageType", "gsm_rlcmac_dl.packet_psi2_messagetype",
+ { "MessageType", "gsm_rlcmac.dl.packet_psi2_messagetype",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type2_page_mode,
- { "PageMode", "gsm_rlcmac_dl.psi2_pagemode",
+ { "PageMode", "gsm_rlcmac.dl.psi2_pagemode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type2_change_mark,
- { "PSI2_CHANGE_MARK", "gsm_rlcmac_dl.psi2_change_mark",
+ { "PSI2_CHANGE_MARK", "gsm_rlcmac.dl.psi2_change_mark",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type2_index,
- { "PSI2_INDEX", "gsm_rlcmac_dl.psi2_INDEX",
+ { "PSI2_INDEX", "gsm_rlcmac.dl.psi2_INDEX",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type2_count,
- { "PSI2_COUNT", "gsm_rlcmac_dl.psi2_COUNT",
+ { "PSI2_COUNT", "gsm_rlcmac.dl.psi2_COUNT",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_cell_id_rac,
- { "RAC", "gsm_rlcmac_dl.cell_id_rac",
+ { "RAC", "gsm_rlcmac.dl.cell_id_rac",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_cell_id_cell_idneity,
- { "CELL_IDENTITY", "gsm_rlcmac_dl.cell_id_cell_identity",
+ { "CELL_IDENTITY", "gsm_rlcmac.dl.cell_id_cell_identity",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_lai_lac,
- { "LAC", "gsm_rlcmac_dl.lai_lac",
+ { "LAC", "gsm_rlcmac.dl.lai_lac",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_plmn_mcc1,
- { "MCC1", "gsm_rlcmac_dl.plmn_mcc1",
+ { "MCC1", "gsm_rlcmac.dl.plmn_mcc1",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_plmn_mcc2,
- { "MCC2", "gsm_rlcmac_dl.plmn_mcc2",
+ { "MCC2", "gsm_rlcmac.dl.plmn_mcc2",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_plmn_mcc3,
- { "MCC3", "gsm_rlcmac_dl.plmn_mcc3",
+ { "MCC3", "gsm_rlcmac.dl.plmn_mcc3",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_plmn_mnc1,
- { "MNC1", "gsm_rlcmac_dl.plmn_mnc1",
+ { "MNC1", "gsm_rlcmac.dl.plmn_mnc1",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_plmn_mnc2,
- { "MNC2", "gsm_rlcmac_dl.plmn_mnc2",
+ { "MNC2", "gsm_rlcmac.dl.plmn_mnc2",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_plmn_mnc3,
- { "MNC3", "gsm_rlcmac_dl.plmn_mnc3",
+ { "MNC3", "gsm_rlcmac.dl.plmn_mnc3",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_non_gprs_cell_opt_att,
- { "ATT", "gsm_rlcmac_dl.non_gprs_cell_opt_att",
+ { "ATT", "gsm_rlcmac.dl.non_gprs_cell_opt_att",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_non_gprs_cell_opt_t3212,
- { "T3212", "gsm_rlcmac_dl.non_gprs_cell_opt_t3212",
+ { "T3212", "gsm_rlcmac.dl.non_gprs_cell_opt_t3212",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_non_gprs_cell_opt_neci,
- { "NECI", "gsm_rlcmac_dl.non_gprs_cell_opt_neci",
+ { "NECI", "gsm_rlcmac.dl.non_gprs_cell_opt_neci",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_non_gprs_cell_opt_pwrc,
- { "PWRC", "gsm_rlcmac_dl.non_gprs_cell_opt_pwrc",
+ { "PWRC", "gsm_rlcmac.dl.non_gprs_cell_opt_pwrc",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_non_gprs_cell_opt_dtx,
- { "DTX", "gsm_rlcmac_dl.non_gprs_cell_opt_dtx",
+ { "DTX", "gsm_rlcmac.dl.non_gprs_cell_opt_dtx",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_non_gprs_cell_opt_radio_link_timeout,
- { "RADIO_LINK_TIMEOUT", "gsm_rlcmac_dl.non_gprs_cell_opt_radio_link_timeout",
+ { "RADIO_LINK_TIMEOUT", "gsm_rlcmac.dl.non_gprs_cell_opt_radio_link_timeout",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_non_gprs_cell_opt_bs_ag_blks_res,
- { "BS_AG_BLKS_RES", "gsm_rlcmac_dl.non_gprs_cell_opt_bs_ag_blks_res",
+ { "BS_AG_BLKS_RES", "gsm_rlcmac.dl.non_gprs_cell_opt_bs_ag_blks_res",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_non_gprs_cell_opt_ccch_conf,
- { "CCCH_CONF", "gsm_rlcmac_dl.non_gprs_cell_opt_ccch_conf",
+ { "CCCH_CONF", "gsm_rlcmac.dl.non_gprs_cell_opt_ccch_conf",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_non_gprs_cell_opt_bs_pa_mfrms,
- { "BS_PA_MFRMS", "gsm_rlcmac_dl.non_gprs_cell_opt_bs_pa_mfrms",
+ { "BS_PA_MFRMS", "gsm_rlcmac.dl.non_gprs_cell_opt_bs_pa_mfrms",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_non_gprs_cell_opt_max_retrans,
- { "MAX_RETRANS", "gsm_rlcmac_dl.non_gprs_cell_opt_max_retrans",
+ { "MAX_RETRANS", "gsm_rlcmac.dl.non_gprs_cell_opt_max_retrans",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_non_gprs_cell_opt_tx_int,
- { "TX_INTEGER", "gsm_rlcmac_dl.non_gprs_cell_opt_tx_integer",
+ { "TX_INTEGER", "gsm_rlcmac.dl.non_gprs_cell_opt_tx_integer",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_non_gprs_cell_opt_ec,
- { "EC", "gsm_rlcmac_dl.non_gprs_cell_opt_ec",
+ { "EC", "gsm_rlcmac.dl.non_gprs_cell_opt_ec",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_non_gprs_cell_opt_ms_txpwr_max_ccch,
- { "MS_TXPWR_MAX_CCCH", "gsm_rlcmac_dl.non_gprs_cell_opt_ms_txpwr_max_ccch",
+ { "MS_TXPWR_MAX_CCCH", "gsm_rlcmac.dl.non_gprs_cell_opt_ms_txpwr_max_ccch",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_non_gprs_cell_opt_ext_len,
- { "Extention_Length", "gsm_rlcmac_dl.non_gprs_cell_opt_extention_length",
+ { "Extention_Length", "gsm_rlcmac.dl.non_gprs_cell_opt_extention_length",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type2_ref_freq_num,
- { "RFL_NUMBER", "gsm_rlcmac_dl.psi2_ref_freq_number",
+ { "RFL_NUMBER", "gsm_rlcmac.dl.psi2_ref_freq_number",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type2_ma_number,
- { "MA_NUMBER", "gsm_rlcmac_dl.psi2_ma_number",
+ { "MA_NUMBER", "gsm_rlcmac.dl.psi2_ma_number",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type2_ma_hsn,
- { "HSN", "gsm_rlcmac_dl.psi2_ma_hsn",
+ { "HSN", "gsm_rlcmac.dl.psi2_ma_hsn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type2_pcch_desc_tsc,
- { "TSC", "gsm_rlcmac_dl.psi2_pccch_desc_tsc",
+ { "TSC", "gsm_rlcmac.dl.psi2_pccch_desc_tsc",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type2_non_hopping_arfcn,
- { "ARFCN", "gsm_rlcmac_dl.psi2_pccch_desc_non_hopping_arfcn",
+ { "ARFCN", "gsm_rlcmac.dl.psi2_pccch_desc_non_hopping_arfcn",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type2_non_hopping_timeslot,
- { "TIMESLOT", "gsm_rlcmac_dl.psi2_pccch_desc_non_hopping_timeslot",
+ { "TIMESLOT", "gsm_rlcmac.dl.psi2_pccch_desc_non_hopping_timeslot",
FT_UINT8, BASE_HEX, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type2_hopping_ma_num,
- { "MA_NUMBER", "gsm_rlcmac_dl.psi2_pccch_desc_hopping_ma_num",
+ { "MA_NUMBER", "gsm_rlcmac.dl.psi2_pccch_desc_hopping_ma_num",
FT_UINT8, BASE_HEX, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type2_hopping_maio,
- { "MAIO", "gsm_rlcmac_dl.psi2_pccch_desc_hopping_maio",
+ { "MAIO", "gsm_rlcmac.dl.psi2_pccch_desc_hopping_maio",
FT_UINT8, BASE_HEX, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type2_hopping_timeslot,
- { "TIMESLOT", "gsm_rlcmac_dl.psi2_pccch_desc_hopping_timeslot",
+ { "TIMESLOT", "gsm_rlcmac.dl.psi2_pccch_desc_hopping_timeslot",
FT_UINT8, BASE_HEX, NULL, 0x0,
NULL, HFILL
}
@@ -12609,163 +12609,163 @@ proto_register_gsm_rlcmac(void)
/* < Packet System Information Type 3 message content > */
{ &hf_packet_system_info_type3_message_type,
- { "MESSAGE_TYPE", "gsm_rlcmac_dl.psi3_message_type",
+ { "MESSAGE_TYPE", "gsm_rlcmac.dl.psi3_message_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type3_page_mode,
- { "PAGE_MODE", "gsm_rlcmac_dl.psi3_page_mode",
+ { "PAGE_MODE", "gsm_rlcmac.dl.psi3_page_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type3_change_mark,
- { "PSI3_CHANGE_MARK", "gsm_rlcmac_dl.psi3_change_mark",
+ { "PSI3_CHANGE_MARK", "gsm_rlcmac.dl.psi3_change_mark",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type3_bis_count,
- { "PSI3_BIS_COUNT", "gsm_rlcmac_dl.psi3_bis_count",
+ { "PSI3_BIS_COUNT", "gsm_rlcmac.dl.psi3_bis_count",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_scell_param_cell_bar_access_2,
- { "CELL_BAR_ACCESS_2", "gsm_rlcmac_dl.psi3_scell_param_cell_bar_access_2",
+ { "CELL_BAR_ACCESS_2", "gsm_rlcmac.dl.psi3_scell_param_cell_bar_access_2",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_scell_param_exc_acc,
- { "EXC_ACC", "gsm_rlcmac_dl.psi3_scell_param_exc_acc",
+ { "EXC_ACC", "gsm_rlcmac.dl.psi3_scell_param_exc_acc",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_scell_param_gprs_rxlev_access_min,
- { "RXLEV_ACCESS_MIN", "gsm_rlcmac_dl.psi3_scell_param_gprs_rxlev_access_min",
+ { "RXLEV_ACCESS_MIN", "gsm_rlcmac.dl.psi3_scell_param_gprs_rxlev_access_min",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_scell_param_gprs_ms_txpwr_max_cch,
- { "MS_TXPWR_MAX_CCH", "gsm_rlcmac_dl.psi3_scell_param_ms_txpwr_max_cch",
+ { "MS_TXPWR_MAX_CCH", "gsm_rlcmac.dl.psi3_scell_param_ms_txpwr_max_cch",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_scell_param_multiband_reporting,
- { "MULTIBAND_REPORTING", "gsm_rlcmac_dl.psi3_scell_param_multiband_reporting",
+ { "MULTIBAND_REPORTING", "gsm_rlcmac.dl.psi3_scell_param_multiband_reporting",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_gen_cell_sel_gprs_cell_resl_hyst,
- { "GPRS_CELL_RESELECT_HYSTERESIS", "gsm_rlcmac_dl.psi3_gen_cell_sel_resel_hyst",
+ { "GPRS_CELL_RESELECT_HYSTERESIS", "gsm_rlcmac.dl.psi3_gen_cell_sel_resel_hyst",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_gen_cell_sel_c31_hyst,
- { "C31_HYST", "gsm_rlcmac_dl.psi3_gen_cell_sel_c31_hyst",
+ { "C31_HYST", "gsm_rlcmac.dl.psi3_gen_cell_sel_c31_hyst",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_gen_cell_sel_c32_qual,
- { "C32_QUAL", "gsm_rlcmac_dl.psi3_gen_cell_sel_c32_qual",
+ { "C32_QUAL", "gsm_rlcmac.dl.psi3_gen_cell_sel_c32_qual",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_gen_cell_sel_t_resel,
- { "T_RESEL", "gsm_rlcmac_dl.psi3_gen_cell_sel_t_resel",
+ { "T_RESEL", "gsm_rlcmac.dl.psi3_gen_cell_sel_t_resel",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_gen_cell_sel_ra_resel_hyst,
- { "RA_RESELECT_HYSTERESIS", "gsm_rlcmac_dl.psi3_gen_cell_sel_ra_resel_hyst",
+ { "RA_RESELECT_HYSTERESIS", "gsm_rlcmac.dl.psi3_gen_cell_sel_ra_resel_hyst",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_compact_cell_sel_bsic,
- { "BSIC", "gsm_rlcmac_dl.psi3_compact_cell_sel_bsic",
+ { "BSIC", "gsm_rlcmac.dl.psi3_compact_cell_sel_bsic",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_compact_cell_sel_cell_bar_access_2,
- { "CELL_BAR_ACCESS_2", "gsm_rlcmac_dl.psi3_compact_cell_sel_cell_bar_access_2",
+ { "CELL_BAR_ACCESS_2", "gsm_rlcmac.dl.psi3_compact_cell_sel_cell_bar_access_2",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_compact_cell_sel_exc_acc,
- { "EXC_ACC", "gsm_rlcmac_dl.psi3_compact_cell_sel_exc_acc",
+ { "EXC_ACC", "gsm_rlcmac.dl.psi3_compact_cell_sel_exc_acc",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_compact_cell_sel_same_as_scell,
- { "SAME_AS_SERVING_CELL", "gsm_rlcmac_dl.psi3_compact_cell_sel_same_as_scell",
+ { "SAME_AS_SERVING_CELL", "gsm_rlcmac.dl.psi3_compact_cell_sel_same_as_scell",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_compact_cell_sel_gprs_rxlev_access_min,
- { "GPRS_RXLEV_ACCESS_MIN", "gsm_rlcmac_dl.psi3_compact_cell_sel_gprs_rxlev_access_min",
+ { "GPRS_RXLEV_ACCESS_MIN", "gsm_rlcmac.dl.psi3_compact_cell_sel_gprs_rxlev_access_min",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_compact_cell_sel_gprs_ms_txpwr_max_cch,
- { "GPRS_MS_TXPWR_MAX_CCH", "gsm_rlcmac_dl.psi3_compact_cell_sel_gprs_ms_txpwr_cch",
+ { "GPRS_MS_TXPWR_MAX_CCH", "gsm_rlcmac.dl.psi3_compact_cell_sel_gprs_ms_txpwr_cch",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_compact_cell_sel_gprs_temp_offset,
- { "GPRS_TEMP_OFFSET", "gsm_rlcmac_dl.psi3_compact_cell_sel_gprs_temp_offset",
+ { "GPRS_TEMP_OFFSET", "gsm_rlcmac.dl.psi3_compact_cell_sel_gprs_temp_offset",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_compact_cell_sel_gprs_penalty_time,
- { "GPRS_PENALTY_TIME", "gsm_rlcmac_dl.psi3_compact_cell_sel_gprs_panelty_time",
+ { "GPRS_PENALTY_TIME", "gsm_rlcmac.dl.psi3_compact_cell_sel_gprs_panelty_time",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_compact_cell_sel_gprs_resel_offset,
- { "GPRS_RESEL_OFFSET", "gsm_rlcmac_dl.psi3_compact_cell_sel_gprs_resel_offset",
+ { "GPRS_RESEL_OFFSET", "gsm_rlcmac.dl.psi3_compact_cell_sel_gprs_resel_offset",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_compact_cell_sel_time_group,
- { "TIME_GROUP", "gsm_rlcmac_dl.psi3_compact_cell_sel_time_group",
+ { "TIME_GROUP", "gsm_rlcmac.dl.psi3_compact_cell_sel_time_group",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_compact_cell_sel_guar_const_pwr_blks,
- { "GUAR_CONSTANT_PWR_BLKS", "gsm_rlcmac_dl.psi3_compact_cell_sel_guar_const_pwr_blks",
+ { "GUAR_CONSTANT_PWR_BLKS", "gsm_rlcmac.dl.psi3_compact_cell_sel_guar_const_pwr_blks",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_compact_ncell_param_start_freq,
- { "START_FREQUENCY", "gsm_rlcmac_dl.psi3_compact_ncell_start_freq",
+ { "START_FREQUENCY", "gsm_rlcmac.dl.psi3_compact_ncell_start_freq",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_compact_ncell_param_nr_of_remaining_cells,
- { "NR_OF_REMAINING_CELLS", "gsm_rlcmac_dl.psi3_compact_ncell_nr_of_remaining_cells",
+ { "NR_OF_REMAINING_CELLS", "gsm_rlcmac.dl.psi3_compact_ncell_nr_of_remaining_cells",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -12774,97 +12774,97 @@ proto_register_gsm_rlcmac(void)
/* < Packet System Information Type 5 message content > */
{ &hf_gprsmeasurementparams3g_psi5_repquantfdd,
- { "FDD_REP_QUANT", "gsm_rlcmac_dl.psi5_rep_quant_fdd",
+ { "FDD_REP_QUANT", "gsm_rlcmac.dl.psi5_rep_quant_fdd",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprsmeasurementparams3g_psi5_multiratreportingfdd,
- { "FDD_MULTIRAT_REPORTING", "gsm_rlcmac_dl.psi5_multirat_reporting_fdd",
+ { "FDD_MULTIRAT_REPORTING", "gsm_rlcmac.dl.psi5_multirat_reporting_fdd",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprsmeasurementparams3g_psi5_reportingoffsetfdd,
- { "FDD_REPORTING_OFFSET", "gsm_rlcmac_dl.psi5_reporting_offset_fdd",
+ { "FDD_REPORTING_OFFSET", "gsm_rlcmac.dl.psi5_reporting_offset_fdd",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprsmeasurementparams3g_psi5_reportingthresholdfdd,
- { "FDD_REPORTING_THRESHOLD", "gsm_rlcmac_dl.psi5_reporting_threshold_fdd",
+ { "FDD_REPORTING_THRESHOLD", "gsm_rlcmac.dl.psi5_reporting_threshold_fdd",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprsmeasurementparams3g_psi5_multiratreportingtdd,
- { "TDD_MULTIRAT_REPORTING", "gsm_rlcmac_dl.psi5_multirat_reporting_tdd",
+ { "TDD_MULTIRAT_REPORTING", "gsm_rlcmac.dl.psi5_multirat_reporting_tdd",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprsmeasurementparams3g_psi5_reportingoffsettdd,
- { "TDD_REPORTING_OFFSET", "gsm_rlcmac_dl.psi5_reporting_offset_tdd",
+ { "TDD_REPORTING_OFFSET", "gsm_rlcmac.dl.psi5_reporting_offset_tdd",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_gprsmeasurementparams3g_psi5_reportingthresholdtdd,
- { "TDD_REPORTING_THRESHOLD", "gsm_rlcmac_dl.psi5_reporting_threshold_tdd",
+ { "TDD_REPORTING_THRESHOLD", "gsm_rlcmac.dl.psi5_reporting_threshold_tdd",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_enh_reporting_parameters_report_type,
- { "Report_Type", "gsm_rlcmac_dl.psi5_enh_reporting_param_report_type",
+ { "Report_Type", "gsm_rlcmac.dl.psi5_enh_reporting_param_report_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_enh_reporting_parameters_reporting_rate,
- { "REPORTING_RATE", "gsm_rlcmac_dl.psi5_enh_reporting_param_reporting_rate",
+ { "REPORTING_RATE", "gsm_rlcmac.dl.psi5_enh_reporting_param_reporting_rate",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_enh_reporting_parameters_invalid_bsic_reporting,
- { "INVALID_BSIC_REPORTING", "gsm_rlcmac_dl.psi5_enh_reporting_param_invalid_bsic_reporting",
+ { "INVALID_BSIC_REPORTING", "gsm_rlcmac.dl.psi5_enh_reporting_param_invalid_bsic_reporting",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_enh_reporting_parameters_ncc_permitted,
- { "NCC_PERMITTED", "gsm_rlcmac_dl.psi5_enh_reporting_param_ncc_permitted",
+ { "NCC_PERMITTED", "gsm_rlcmac.dl.psi5_enh_reporting_param_ncc_permitted",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type5_message_type,
- { "MESSAGE_TYPE", "gsm_rlcmac_dl.psi5_message_type",
+ { "MESSAGE_TYPE", "gsm_rlcmac.dl.psi5_message_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type5_page_mode,
- { "PAGE_MODE", "gsm_rlcmac_dl.psi5_page_mode",
+ { "PAGE_MODE", "gsm_rlcmac.dl.psi5_page_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type5_change_mark,
- { "PSI5_CHANGE_MARK", "gsm_rlcmac_dl.psi5_change_mark",
+ { "PSI5_CHANGE_MARK", "gsm_rlcmac.dl.psi5_change_mark",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type5_index,
- { "PSI5_INDEX", "gsm_rlcmac_dl.psi5_index",
+ { "PSI5_INDEX", "gsm_rlcmac.dl.psi5_index",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type5_count,
- { "PSI5_COUNT", "gsm_rlcmac_dl.psi5_count",
+ { "PSI5_COUNT", "gsm_rlcmac.dl.psi5_count",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -12873,55 +12873,55 @@ proto_register_gsm_rlcmac(void)
/* < Packet System Information Type 13 message content > */
{ &hf_packet_system_info_type13_lb_ms_mxpwr_max_cch,
- { "LB_MS_TXPWR_MAX_CCH", "gsm_rlcmac_dl.psi13_lb_ms_txpwr_max_cch",
+ { "LB_MS_TXPWR_MAX_CCH", "gsm_rlcmac.dl.psi13_lb_ms_txpwr_max_cch",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type13_si2n_support,
- { "SI2n_SUPPORT", "gsm_rlcmac_dl.psi13_si2n_support",
+ { "SI2n_SUPPORT", "gsm_rlcmac.dl.psi13_si2n_support",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type13_si_status_ind,
- { "SI_STATUS_IND", "gsm_rlcmac_dl.psi13_si_status_ind",
+ { "SI_STATUS_IND", "gsm_rlcmac.dl.psi13_si_status_ind",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type13_sgsnr,
- { "SGSNR", "gsm_rlcmac_dl.psi13_sgsnr",
+ { "SGSNR", "gsm_rlcmac.dl.psi13_sgsnr",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type13_message_type,
- { "MESSAGE_TYPE", "gsm_rlcmac_dl.psi13_message_type",
+ { "MESSAGE_TYPE", "gsm_rlcmac.dl.psi13_message_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type13_page_mode,
- { "PAGE_MODE", "gsm_rlcmac_dl.psi13_page_mode",
+ { "PAGE_MODE", "gsm_rlcmac.dl.psi13_page_mode",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type13_bcch_change_mark,
- { "BCCH_CHANGE_MARK", "gsm_rlcmac_dl.psi13_bcch_change_mark",
+ { "BCCH_CHANGE_MARK", "gsm_rlcmac.dl.psi13_bcch_change_mark",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type13_si_change_field,
- { "SI_CHANGE_FIELD", "gsm_rlcmac_dl.psi13_si_change_field",
+ { "SI_CHANGE_FIELD", "gsm_rlcmac.dl.psi13_si_change_field",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
{ &hf_packet_system_info_type13_change_mark,
- { "SI13_CHANGE_MARK", "gsm_rlcmac_dl.psi13_change_mark",
+ { "SI13_CHANGE_MARK", "gsm_rlcmac.dl.psi13_change_mark",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
diff --git a/epan/dissectors/packet-gsm_sim.c b/epan/dissectors/packet-gsm_sim.c
index 7eb8027c7e..1256737a2e 100644
--- a/epan/dissectors/packet-gsm_sim.c
+++ b/epan/dissectors/packet-gsm_sim.c
@@ -1030,82 +1030,82 @@ proto_register_gsm_sim(void)
{
static hf_register_info hf[] = {
{ &hf_apdu_cla,
- { "Class", "iso7816.apdu.cla",
+ { "Class", "gsm_sim.apdu.cla",
FT_UINT8, BASE_HEX, VALS(apdu_cla_vals), 0,
"ISO 7816-4 APDU CLA (Class) Byte", HFILL }
},
{ &hf_apdu_ins,
- { "Instruction", "iso7816.apdu.ins",
+ { "Instruction", "gsm_sim.apdu.ins",
FT_UINT8, BASE_HEX, VALS(apdu_ins_vals), 0,
"ISO 7816-4 APDU INS (Instruction) Byte", HFILL }
},
{ &hf_apdu_p1,
- { "Parameter 1", "iso7816.apdu.p1",
+ { "Parameter 1", "gsm_sim.apdu.p1",
FT_UINT8, BASE_HEX, NULL, 0,
"ISO 7816-4 APDU P1 (Parameter 1) Byte", HFILL }
},
{ &hf_apdu_p2,
- { "Parameter 2", "iso7816.apdu.p2",
+ { "Parameter 2", "gsm_sim.apdu.p2",
FT_UINT8, BASE_HEX, NULL, 0,
"ISO 7816-4 APDU P2 (Parameter 2) Byte", HFILL }
},
{ &hf_apdu_p3,
- { "Length (Parameter 3)", "iso7816.apdu.p3",
+ { "Length (Parameter 3)", "gsm_sim.apdu.p3",
FT_UINT8, BASE_HEX, NULL, 0,
"ISO 7816-4 APDU P3 (Parameter 3) Byte", HFILL }
},
{ &hf_apdu_data,
- { "APDU Payload", "iso7816.apdu.data",
+ { "APDU Payload", "gsm_sim.apdu.data",
FT_BYTES, BASE_NONE, NULL, 0,
"ISO 7816-4 APDU Data Payload", HFILL }
},
{ &hf_apdu_sw,
- { "Status Word (SW1:SW2)", "iso7816.apdu.sw",
+ { "Status Word (SW1:SW2)", "gsm_sim.apdu.sw",
FT_UINT16, BASE_HEX, VALS(sw_vals), 0,
"ISO 7816-4 APDU Status Word", HFILL }
},
{ &hf_file_id,
- { "File ID", "iso7816.file_id",
+ { "File ID", "gsm_sim.file_id",
FT_UINT16, BASE_HEX, VALS(mf_dfs), 0,
"ISO 7816-4 File ID", HFILL }
},
{ &hf_aid,
- { "Application ID", "iso7816.aid",
+ { "Application ID", "gsm_sim.aid",
FT_BYTES, BASE_NONE, NULL, 0,
"ISO 7816-4 Application ID", HFILL }
},
{ &hf_bin_offset,
- { "Offset", "iso7816.bin_offset",
+ { "Offset", "gsm_sim.bin_offset",
FT_UINT16, BASE_DEC, NULL, 0,
"Offset into binary file", HFILL }
},
{ &hf_record_nr,
- { "Record number", "iso7816.record_nr",
+ { "Record number", "gsm_sim.record_nr",
FT_UINT8, BASE_DEC, NULL, 0,
"Offset into binary file", HFILL }
},
{ &hf_auth_rand,
- { "Random Challenge", "iso7816.auth_rand",
+ { "Random Challenge", "gsm_sim.auth_rand",
FT_BYTES, BASE_NONE, NULL, 0,
"GSM Authentication Random Challenge", HFILL }
},
{ &hf_auth_sres,
- { "SRES", "iso7816.auth_sres",
+ { "SRES", "gsm_sim.auth_sres",
FT_BYTES, BASE_NONE, NULL, 0,
"GSM Authentication SRES Response", HFILL }
},
{ &hf_auth_kc,
- { "Kc", "iso7816.auth_kc",
+ { "Kc", "gsm_sim.auth_kc",
FT_BYTES, BASE_NONE, NULL, 0,
"GSM Authentication Kc result", HFILL }
},
{ &hf_chan_nr,
- { "Channel Number", "iso7816.chan_nr",
+ { "Channel Number", "gsm_sim.chan_nr",
FT_UINT8, BASE_DEC, NULL, 0,
"ISO 7816-4 Logical Channel Number", HFILL }
},
{ &hf_chan_op,
- { "Channel Operation", "iso7816.chan_op",
+ { "Channel Operation", "gsm_sim.chan_op",
FT_UINT8, BASE_HEX, VALS(chan_op_vals), 0,
"ISO 7816-4 Logical Channel Operation", HFILL }
},
@@ -1113,410 +1113,410 @@ proto_register_gsm_sim(void)
/* Terminal Profile Byte 1 */
{ &hf_tprof_b1,
- { "Terminal Profile Byte 1 (Download)", "iso7816.tp.b1",
+ { "Terminal Profile Byte 1 (Download)", "gsm_sim.tp.b1",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL },
},
{ &hf_tp_prof_dld,
- { "Profile Download", "iso7816.tp.prof_dld",
+ { "Profile Download", "gsm_sim.tp.prof_dld",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x01,
"TP Profile Downolad", HFILL }
},
{ &hf_tp_sms_data_dld,
- { "SMS-PP Data Download", "iso7816.tp.sms_data_dld",
+ { "SMS-PP Data Download", "gsm_sim.tp.sms_data_dld",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x02,
"TP SMS-PP Data Downolad", HFILL }
},
{ &hf_tp_cb_data_dld,
- { "CB Data Download", "iso7816.tp.cb_data_dld",
+ { "CB Data Download", "gsm_sim.tp.cb_data_dld",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x04,
"TP Cell Broadcast Data Downolad", HFILL }
},
{ &hf_tp_menu_sel,
- { "Menu Selection", "iso7816.tp.menu_sel",
+ { "Menu Selection", "gsm_sim.tp.menu_sel",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x08,
"TP Menu Selection", HFILL }
},
{ &hf_tp_9e_err,
- { "Menu Selection", "iso7816.tp.9e_err",
+ { "Menu Selection", "gsm_sim.tp.9e_err",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x10,
"TP 9EXX response code for SIM data download error", HFILL }
},
{ &hf_tp_timer_exp,
- { "Timer expiration", "iso7816.tp.timer_exp",
+ { "Timer expiration", "gsm_sim.tp.timer_exp",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x20,
"TP Timer expiration", HFILL }
},
{ &hf_tp_ussd_cc,
- { "USSD string data in Call Control", "iso7816.tp.ussd_cc",
+ { "USSD string data in Call Control", "gsm_sim.tp.ussd_cc",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x40,
"TP USSD string data object in Call Control", HFILL }
},
{ &hf_tp_auto_redial,
- { "Envelope CC during automatic redial", "iso7816.tp.auto_redial",
+ { "Envelope CC during automatic redial", "gsm_sim.tp.auto_redial",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x80,
"TP Envelope CC always sent to SIM during automatic redial", HFILL }
},
/* Terminal Profile Byte 2 */
{ &hf_tprof_b2,
- { "Terminal Profile Byte 2 (Other)", "iso7816.tp.b2",
+ { "Terminal Profile Byte 2 (Other)", "gsm_sim.tp.b2",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL },
},
{ &hf_tp_cmd_res,
- { "Command result", "iso7816.tp.cmd_res",
+ { "Command result", "gsm_sim.tp.cmd_res",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x01,
"TP Command result", HFILL }
},
{ &hf_tp_cc_sim,
- { "Call Control by SIM", "iso7816.tp.cc_sim",
+ { "Call Control by SIM", "gsm_sim.tp.cc_sim",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x02,
"TP Call Control by SIM", HFILL }
},
{ &hf_tp_cc_sim_cellid,
- { "Cell ID in Call Control by SIM", "iso7816.tp.cc_sim_cellid",
+ { "Cell ID in Call Control by SIM", "gsm_sim.tp.cc_sim_cellid",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x04,
"TP Cell ID included in Call Control by SIM", HFILL }
},
{ &hf_tp_mo_sms_sim,
- { "MO SMS control by SIM", "iso7816.tp.mo_sms_sim",
+ { "MO SMS control by SIM", "gsm_sim.tp.mo_sms_sim",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x08,
"TP MO short message control by SIM", HFILL }
},
{ &hf_tp_alpha_id,
- { "Alpha identifier according 9.1.3", "iso7816.tp.alpha_id",
+ { "Alpha identifier according 9.1.3", "gsm_sim.tp.alpha_id",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x10,
"TP Handling of alpha identifier according to 9.1.3", HFILL }
},
{ &hf_tp_ucs2_entry,
- { "UCS2 Entry", "iso7816.tp.ucs2_entry",
+ { "UCS2 Entry", "gsm_sim.tp.ucs2_entry",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x20,
"TP UCS2 Entry", HFILL }
},
{ &hf_tp_ucs2_display,
- { "UCS2 Display", "iso7816.tp.ucs2_display",
+ { "UCS2 Display", "gsm_sim.tp.ucs2_display",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x40,
"TP UCS2 Display", HFILL }
},
{ &hf_tp_display_ext,
- { "Display of Extension Text", "iso7816.tp.display_ext",
+ { "Display of Extension Text", "gsm_sim.tp.display_ext",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x80,
"TP Display of the Extension Text", HFILL }
},
/* Terminal Profile Byte 3 */
{ &hf_tprof_b3,
- { "Terminal Profile Byte 3 (Proactive SIM)", "iso7816.tp.b3",
+ { "Terminal Profile Byte 3 (Proactive SIM)", "gsm_sim.tp.b3",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL },
},
{ &hf_tp_pa_display_text,
- { "Proactive SIM: DISPLAY TEXT", "iso7816.tp.pa.display_text",
+ { "Proactive SIM: DISPLAY TEXT", "gsm_sim.tp.pa.display_text",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x01,
NULL, HFILL }
},
{ &hf_tp_pa_get_inkey,
- { "Proactive SIM: GET INKEY", "iso7816.tp.pa.get_inkey",
+ { "Proactive SIM: GET INKEY", "gsm_sim.tp.pa.get_inkey",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x02,
NULL, HFILL }
},
{ &hf_tp_pa_get_input,
- { "Proactive SIM: GET INPUT", "iso7816.tp.pa.get_input",
+ { "Proactive SIM: GET INPUT", "gsm_sim.tp.pa.get_input",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x04,
NULL, HFILL }
},
{ &hf_tp_pa_more_time,
- { "Proactive SIM: MORE TIME", "iso7816.tp.pa.more_time",
+ { "Proactive SIM: MORE TIME", "gsm_sim.tp.pa.more_time",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x08,
NULL, HFILL }
},
{ &hf_tp_pa_play_tone,
- { "Proactive SIM: PLAY TONE", "iso7816.tp.pa.play_tone",
+ { "Proactive SIM: PLAY TONE", "gsm_sim.tp.pa.play_tone",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x10,
NULL, HFILL }
},
{ &hf_tp_pa_poll_intv,
- { "Proactive SIM: POLL INTERVAL", "iso7816.tp.pa.poll_intv",
+ { "Proactive SIM: POLL INTERVAL", "gsm_sim.tp.pa.poll_intv",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x20,
NULL, HFILL }
},
{ &hf_tp_pa_polling_off,
- { "Proactive SIM: POLLING OFF", "iso7816.tp.pa.polling_off",
+ { "Proactive SIM: POLLING OFF", "gsm_sim.tp.pa.polling_off",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x40,
NULL, HFILL }
},
{ &hf_tp_pa_refresh,
- { "Proactive SIM: REFRESH", "iso7816.tp.pa.refresh",
+ { "Proactive SIM: REFRESH", "gsm_sim.tp.pa.refresh",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x80,
NULL, HFILL }
},
/* Terminal Profile Byte 4 */
{ &hf_tprof_b4,
- { "Terminal Profile Byte 4 (Proactive SIM)", "iso7816.tp.b4",
+ { "Terminal Profile Byte 4 (Proactive SIM)", "gsm_sim.tp.b4",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL },
},
{ &hf_tp_pa_select_item,
- { "Proactive SIM: SELECT ITEM", "iso7816.tp.pa.select_item",
+ { "Proactive SIM: SELECT ITEM", "gsm_sim.tp.pa.select_item",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x01,
NULL, HFILL }
},
{ &hf_tp_pa_send_sms,
- { "Proactive SIM: SEND SHORT MESSAGE", "iso7816.tp.pa.send_sms",
+ { "Proactive SIM: SEND SHORT MESSAGE", "gsm_sim.tp.pa.send_sms",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x02,
NULL, HFILL }
},
{ &hf_tp_pa_send_ss,
- { "Proactive SIM: SEND SS", "iso7816.tp.pa.send_ss",
+ { "Proactive SIM: SEND SS", "gsm_sim.tp.pa.send_ss",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x04,
NULL, HFILL }
},
{ &hf_tp_pa_send_ussd,
- { "Proactive SIM: SEND USSD", "iso7816.tp.pa.send_ussd",
+ { "Proactive SIM: SEND USSD", "gsm_sim.tp.pa.send_ussd",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x08,
NULL, HFILL }
},
{ &hf_tp_pa_set_up_call,
- { "Proactive SIM: SET UP CALL", "iso7816.tp.pa.set_up_call",
+ { "Proactive SIM: SET UP CALL", "gsm_sim.tp.pa.set_up_call",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x10,
NULL, HFILL }
},
{ &hf_tp_pa_set_up_menu,
- { "Proactive SIM: SET UP MENU", "iso7816.tp.pa.set_up_menu",
+ { "Proactive SIM: SET UP MENU", "gsm_sim.tp.pa.set_up_menu",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x20,
NULL, HFILL }
},
{ &hf_tp_pa_prov_loci,
- { "Proactive SIM: PROVIDE LOCAL INFORMATION", "iso7816.tp.pa.prov_loci",
+ { "Proactive SIM: PROVIDE LOCAL INFORMATION", "gsm_sim.tp.pa.prov_loci",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x40,
NULL, HFILL }
},
{ &hf_tp_pa_prov_loci_nmr,
- { "Proactive SIM: PROVIDE LOCAL INFORMATION (NMR)", "iso7816.tp.pa.prov_loci_nmr",
+ { "Proactive SIM: PROVIDE LOCAL INFORMATION (NMR)", "gsm_sim.tp.pa.prov_loci_nmr",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x80,
NULL, HFILL }
},
/* Terminal Profile Byte 5 */
{ &hf_tprof_b5,
- { "Terminal Profile Byte 5 (Event driven information)", "iso7816.tp.b5",
+ { "Terminal Profile Byte 5 (Event driven information)", "gsm_sim.tp.b5",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL },
},
{ &hf_tp_pa_evt_list,
- { "Proactive SIM: SET UP EVENT LIST", "iso7816.tp.pa.set_up_evt_list",
+ { "Proactive SIM: SET UP EVENT LIST", "gsm_sim.tp.pa.set_up_evt_list",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x01,
NULL, HFILL }
},
{ &hf_tp_ev_mt_call,
- { "Event: MT call", "iso7816.tp.evt.mt_call",
+ { "Event: MT call", "gsm_sim.tp.evt.mt_call",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x02,
NULL, HFILL }
},
{ &hf_tp_ev_call_connected,
- { "Event: Call connected", "iso7816.tp.evt.call_conn",
+ { "Event: Call connected", "gsm_sim.tp.evt.call_conn",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x04,
NULL, HFILL }
},
{ &hf_tp_ev_call_disconnected,
- { "Event: Call disconnected", "iso7816.tp.evt.call_disc",
+ { "Event: Call disconnected", "gsm_sim.tp.evt.call_disc",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x08,
NULL, HFILL }
},
{ &hf_tp_ev_location_status,
- { "Event: Location status", "iso7816.tp.evt.loc_status",
+ { "Event: Location status", "gsm_sim.tp.evt.loc_status",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x10,
NULL, HFILL }
},
{ &hf_tp_ev_user_activity,
- { "Event: User activity", "iso7816.tp.evt.user_activity",
+ { "Event: User activity", "gsm_sim.tp.evt.user_activity",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x20,
NULL, HFILL }
},
{ &hf_tp_ev_idle_screen,
- { "Event: Idle screen available", "iso7816.tp.evt.idle_screen",
+ { "Event: Idle screen available", "gsm_sim.tp.evt.idle_screen",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x40,
NULL, HFILL }
},
{ &hf_tp_ev_cardreader_status,
- { "Event: Cardreader status", "iso7816.tp.evt.card_status",
+ { "Event: Cardreader status", "gsm_sim.tp.evt.card_status",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x80,
NULL, HFILL }
},
/* Terminal Profile Byte 6 */
{ &hf_tprof_b6,
- { "Terminal Profile Byte 6 (Event driven information extension)", "iso7816.tp.b6",
+ { "Terminal Profile Byte 6 (Event driven information extension)", "gsm_sim.tp.b6",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL },
},
{ &hf_tp_ev_lang_sel,
- { "Event: Language Selection", "iso7816.tp.evt.lang_sel",
+ { "Event: Language Selection", "gsm_sim.tp.evt.lang_sel",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x01,
NULL, HFILL }
},
{ &hf_tp_ev_brows_term,
- { "Event: Browser Termination", "iso7816.tp.evt.brows_term",
+ { "Event: Browser Termination", "gsm_sim.tp.evt.brows_term",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x02,
NULL, HFILL }
},
{ &hf_tp_ev_data_avail,
- { "Event: Data Available", "iso7816.tp.evt.data_avail",
+ { "Event: Data Available", "gsm_sim.tp.evt.data_avail",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x04,
NULL, HFILL }
},
{ &hf_tp_ev_chan_status,
- { "Event: Channel Status", "iso7816.tp.evt.chan_status",
+ { "Event: Channel Status", "gsm_sim.tp.evt.chan_status",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x08,
NULL, HFILL }
},
/* Terminal Profile Byte 7 */
{ &hf_tprof_b7,
- { "Terminal Profile Byte 7 (Multiple card proactive commands)", "iso7816.tp.b7",
+ { "Terminal Profile Byte 7 (Multiple card proactive commands)", "gsm_sim.tp.b7",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL },
},
{ &hf_tp_pa_power_on,
- { "Proactive SIM: POWER ON CARD", "iso7816.tp.pa.power_on_card",
+ { "Proactive SIM: POWER ON CARD", "gsm_sim.tp.pa.power_on_card",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x01,
NULL, HFILL }
},
{ &hf_tp_pa_power_off,
- { "Proactive SIM: POWER OFF CARD", "iso7816.tp.pa.power_off_card",
+ { "Proactive SIM: POWER OFF CARD", "gsm_sim.tp.pa.power_off_card",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x02,
NULL, HFILL }
},
{ &hf_tp_pa_perform_card_apdu,
- { "Proactive SIM: PERFORM CARD APDU", "iso7816.tp.pa.perf_card_apdu",
+ { "Proactive SIM: PERFORM CARD APDU", "gsm_sim.tp.pa.perf_card_apdu",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x04,
NULL, HFILL }
},
{ &hf_tp_pa_get_reader_status,
- { "Proactive SIM: GET READER STATUS (status)", "iso7816.tp.pa.get_rdr_status",
+ { "Proactive SIM: GET READER STATUS (status)", "gsm_sim.tp.pa.get_rdr_status",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x08,
NULL, HFILL }
},
{ &hf_tp_pa_get_reader_status_id,
- { "Proactive SIM: GET READER STATUS (identifier)", "iso7816.tp.pa.get_rdr_status_id",
+ { "Proactive SIM: GET READER STATUS (identifier)", "gsm_sim.tp.pa.get_rdr_status_id",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x10,
NULL, HFILL }
},
/* Terminal Profile Byte 8 */
{ &hf_tprof_b8,
- { "Terminal Profile Byte 8 (Proactive SIM)", "iso7816.tp.b8",
+ { "Terminal Profile Byte 8 (Proactive SIM)", "gsm_sim.tp.b8",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL },
},
{ &hf_tp_pa_timer_start_stop,
- { "Proactive SIM: TIMER MANAGEMENT (start, stop)", "iso7816.tp.pa.timer_start_stop",
+ { "Proactive SIM: TIMER MANAGEMENT (start, stop)", "gsm_sim.tp.pa.timer_start_stop",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x01,
NULL, HFILL }
},
{ &hf_tp_pa_timer_get_current,
- { "Proactive SIM: TIMER MANAGEMENT (get current value)", "iso7816.tp.pa.timer_get_current",
+ { "Proactive SIM: TIMER MANAGEMENT (get current value)", "gsm_sim.tp.pa.timer_get_current",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x02,
NULL, HFILL }
},
{ &hf_tp_pa_prov_loci_date_tz,
- { "Proactive SIM: PROVIDE LOCAL INFORMATION (date, time, tz)", "iso7816.tp.pa.prov_loci_date",
+ { "Proactive SIM: PROVIDE LOCAL INFORMATION (date, time, tz)", "gsm_sim.tp.pa.prov_loci_date",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x04,
NULL, HFILL }
},
{ &hf_tp_pa_get_inkey_binary,
- { "Proactive SIM: Binary choice in GET INKEY", "iso7816.tp.pa.get_inkey_bin",
+ { "Proactive SIM: Binary choice in GET INKEY", "gsm_sim.tp.pa.get_inkey_bin",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x08,
NULL, HFILL }
},
{ &hf_tp_pa_set_up_idle_mode_text,
- { "Proactive SIM: SET UP IDLE MODE TEXT", "iso7816.tp.pa.set_up_idle_text",
+ { "Proactive SIM: SET UP IDLE MODE TEXT", "gsm_sim.tp.pa.set_up_idle_text",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x10,
NULL, HFILL }
},
{ &hf_tp_pa_run_at_command,
- { "Proactive SIM: RUN AT COMMAND", "iso7816.tp.pa.run_at_command",
+ { "Proactive SIM: RUN AT COMMAND", "gsm_sim.tp.pa.run_at_command",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x20,
NULL, HFILL }
},
{ &hf_tp_pa_2nd_alpha_setup_call,
- { "Proactive SIM: 2nd alpha identifier in SET UP CALL", "iso7816.tp.pa.2nd_alpha_id",
+ { "Proactive SIM: 2nd alpha identifier in SET UP CALL", "gsm_sim.tp.pa.2nd_alpha_id",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x40,
NULL, HFILL }
},
{ &hf_tp_pa_2nd_capability_param,
- { "Proactive SIM: 2nd capability config param", "iso7816.tp.pa.2nd_capa_conf",
+ { "Proactive SIM: 2nd capability config param", "gsm_sim.tp.pa.2nd_capa_conf",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x80,
NULL, HFILL }
},
/* Terminal Profile Byte 9 */
{ &hf_tprof_b9,
- { "Terminal Profile Byte 9", "iso7816.tp.b9",
+ { "Terminal Profile Byte 9", "gsm_sim.tp.b9",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL },
},
/* Terminal Profile Byte 10 */
{ &hf_tprof_b10,
- { "Terminal Profile Byte 10", "iso7816.tp.b10",
+ { "Terminal Profile Byte 10", "gsm_sim.tp.b10",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL },
},
/* Terminal Profile Byte 11 */
{ &hf_tprof_b11,
- { "Terminal Profile Byte 11", "iso7816.tp.b11",
+ { "Terminal Profile Byte 11", "gsm_sim.tp.b11",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL },
},
/* Terminal Profile Byte 12 */
{ &hf_tprof_b12,
- { "Terminal Profile Byte 12", "iso7816.tp.b12",
+ { "Terminal Profile Byte 12", "gsm_sim.tp.b12",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL },
},
{ &hf_tp_pa_open_chan,
- { "Proactive SIM: OPEN CHANNEL", "iso7816.tp.pa.open_chan",
+ { "Proactive SIM: OPEN CHANNEL", "gsm_sim.tp.pa.open_chan",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x01,
NULL, HFILL }
},
{ &hf_tp_pa_close_chan,
- { "Proactive SIM: CLOSE CHANNEL", "iso7816.tp.pa.close_chan",
+ { "Proactive SIM: CLOSE CHANNEL", "gsm_sim.tp.pa.close_chan",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x02,
NULL, HFILL }
},
{ &hf_tp_pa_recv_data,
- { "Proactive SIM: RECEIVE DATA", "iso7816.tp.pa.recv_data",
+ { "Proactive SIM: RECEIVE DATA", "gsm_sim.tp.pa.recv_data",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x04,
NULL, HFILL }
},
{ &hf_tp_pa_send_data,
- { "Proactive SIM: SEND DATA", "iso7816.tp.pa.send_data",
+ { "Proactive SIM: SEND DATA", "gsm_sim.tp.pa.send_data",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x08,
NULL, HFILL }
},
{ &hf_tp_pa_get_chan_status,
- { "Proactive SIM: GET CHANNEL STATUS", "iso7816.tp.pa.get_chan_status",
+ { "Proactive SIM: GET CHANNEL STATUS", "gsm_sim.tp.pa.get_chan_status",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x10,
NULL, HFILL }
},
/* Terminal Profile Byte 13 */
{ &hf_tprof_b13,
- { "Terminal Profile Byte 13 (Bearer Independent protocol)", "iso7816.tp.b13",
+ { "Terminal Profile Byte 13 (Bearer Independent protocol)", "gsm_sim.tp.b13",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL },
},
{ &hf_tp_bip_csd,
- { "CSD bearer", "iso7816.tp.bip.csd",
+ { "CSD bearer", "gsm_sim.tp.bip.csd",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x01,
NULL, HFILL }
},
{ &hf_tp_bip_gprs,
- { "GPRS bearer", "iso7816.tp.bip.gprs",
+ { "GPRS bearer", "gsm_sim.tp.bip.gprs",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x02,
NULL, HFILL }
},
{ &hf_tp_num_chans,
- { "Number of Channels", "iso7816.tp.num_chans",
+ { "Number of Channels", "gsm_sim.tp.num_chans",
FT_UINT8, BASE_DEC, NULL, 0xe0,
NULL, HFILL }
},
@@ -1524,97 +1524,97 @@ proto_register_gsm_sim(void)
/* Terminal Profile Byte 14 */
{ &hf_tprof_b14,
- { "Terminal Profile Byte 14 (Screen height)", "iso7816.tp.b14",
+ { "Terminal Profile Byte 14 (Screen height)", "gsm_sim.tp.b14",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL },
},
{ &hf_tp_char_height,
- { "Display height (chars)", "iso7816.tp.display.height",
+ { "Display height (chars)", "gsm_sim.tp.display.height",
FT_UINT8, BASE_DEC, NULL, 0x1f,
NULL, HFILL },
},
{ &hf_tp_sizing_supp,
- { "Screen Sizing", "iso7816.tp.disp_sizing",
+ { "Screen Sizing", "gsm_sim.tp.disp_sizing",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x80,
NULL, HFILL },
},
/* Terminal Profile Byte 15 */
{ &hf_tprof_b15,
- { "Terminal Profile Byte 15 (Screen width)", "iso7816.tp.b15",
+ { "Terminal Profile Byte 15 (Screen width)", "gsm_sim.tp.b15",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL },
},
{ &hf_tp_char_width,
- { "Display width (chars)", "iso7816.tp.display.width",
+ { "Display width (chars)", "gsm_sim.tp.display.width",
FT_UINT8, BASE_DEC, NULL, 0x3f,
NULL, HFILL },
},
{ &hf_tp_var_fonts,
- { "Variable-size fonts", "iso7816.tp.var_fonts",
+ { "Variable-size fonts", "gsm_sim.tp.var_fonts",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x80,
NULL, HFILL },
},
/* Terminal Profile Byte 16 */
{ &hf_tprof_b16,
- { "Terminal Profile Byte 16 (Screen effects)", "iso7816.tp.b16",
+ { "Terminal Profile Byte 16 (Screen effects)", "gsm_sim.tp.b16",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL },
},
{ &hf_tp_display_resize,
- { "Display resize", "iso7816.tp.display.resize",
+ { "Display resize", "gsm_sim.tp.display.resize",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x01,
NULL, HFILL },
},
{ &hf_tp_text_wrapping,
- { "Text Wrapping", "iso7816.tp.display.wrapping",
+ { "Text Wrapping", "gsm_sim.tp.display.wrapping",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x02,
NULL, HFILL },
},
{ &hf_tp_text_scrolling,
- { "Text Scrolling", "iso7816.tp.display.scrolling",
+ { "Text Scrolling", "gsm_sim.tp.display.scrolling",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x04,
NULL, HFILL },
},
{ &hf_tp_width_red_menu,
- { "Width reduction when in menu", "iso7816.tp.display.width_red_menu",
+ { "Width reduction when in menu", "gsm_sim.tp.display.width_red_menu",
FT_UINT8, BASE_DEC, NULL, 0xe0,
NULL, HFILL },
},
/* Terminal Profile Byte 17 */
{ &hf_tprof_b17,
- { "Terminal Profile Byte 17 (Bearer independent protocol)", "iso7816.tp.b17",
+ { "Terminal Profile Byte 17 (Bearer independent protocol)", "gsm_sim.tp.b17",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL },
},
{ &hf_tp_bip_tcp,
- { "TCP transport", "iso7816.tp.bip.tcp",
+ { "TCP transport", "gsm_sim.tp.bip.tcp",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x01,
NULL, HFILL }
},
{ &hf_tp_bip_udp,
- { "UDP transport", "iso7816.tp.bip.udp",
+ { "UDP transport", "gsm_sim.tp.bip.udp",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x02,
NULL, HFILL }
},
/* Terminal Profile Byte 18 */
{ &hf_tprof_b18,
- { "Terminal Profile Byte 18 (Bearer independent protocol)", "iso7816.tp.b18",
+ { "Terminal Profile Byte 18 (Bearer independent protocol)", "gsm_sim.tp.b18",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL },
},
/* Terminal Profile Byte 19 */
{ &hf_tprof_b19,
- { "Terminal Profile Byte 19", "iso7816.tp.b19",
+ { "Terminal Profile Byte 19", "gsm_sim.tp.b19",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL },
},
{ &hf_tp_tia_eia_version,
- { "TIA/EIA Version", "iso7816.tp.tia_eia_version",
+ { "TIA/EIA Version", "gsm_sim.tp.tia_eia_version",
FT_UINT8, BASE_DEC, NULL, 0x0f,
NULL, HFILL }
},
@@ -1626,17 +1626,17 @@ proto_register_gsm_sim(void)
},
{ &hf_seek_mode,
- { "Seek Mode", "iso7816.seek_mode",
+ { "Seek Mode", "gsm_sim.seek_mode",
FT_UINT8, BASE_HEX, VALS(seek_mode_vals), 0x0F,
NULL, HFILL },
},
{ &hf_seek_type,
- { "Seek Type", "iso7816.seek_type",
+ { "Seek Type", "gsm_sim.seek_type",
FT_UINT8, BASE_DEC, VALS(seek_type_vals), 0x0F,
NULL, HFILL },
},
{ &hf_seek_rec_nr,
- { "Seek Record Number", "iso7816.seek_rec_nr",
+ { "Seek Record Number", "gsm_sim.seek_rec_nr",
FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL },
},
};
diff --git a/epan/dissectors/packet-gsm_sms.c b/epan/dissectors/packet-gsm_sms.c
index c434f74ff0..8d80c667b7 100644
--- a/epan/dissectors/packet-gsm_sms.c
+++ b/epan/dissectors/packet-gsm_sms.c
@@ -3606,17 +3606,17 @@ proto_register_gsm_sms(void)
"The total length of the reassembled payload", HFILL }
},
{ &hf_gsm_sms_ud_multiple_messages_msg_id,
- { "Message identifier", "gsm-sms.udh.mm.msg_id",
+ { "Message identifier", "gsm_sms.udh.mm.msg_id",
FT_UINT16, BASE_DEC, NULL, 0x00,
"Identification of the message", HFILL }
},
{ &hf_gsm_sms_ud_multiple_messages_msg_parts,
- { "Message parts", "gsm-sms.udh.mm.msg_parts",
+ { "Message parts", "gsm_sms.udh.mm.msg_parts",
FT_UINT8, BASE_DEC, NULL, 0x00,
"Total number of message parts (fragments)", HFILL }
},
{ &hf_gsm_sms_ud_multiple_messages_msg_part,
- { "Message part number", "gsm-sms.udh.mm.msg_part",
+ { "Message part number", "gsm_sms.udh.mm.msg_part",
FT_UINT8, BASE_DEC, NULL, 0x00,
"Message part (fragment) sequence number", HFILL }
},
@@ -3759,7 +3759,7 @@ proto_register_gsm_sms(void)
proto_register_subtree_array(ett, array_length(ett));
- gsm_sms_dissector_tbl = register_dissector_table("gsm-sms.udh.port",
+ gsm_sms_dissector_tbl = register_dissector_table("gsm_sms.udh.port",
"GSM SMS port IE in UDH", FT_UINT16, BASE_DEC);
gsm_sms_module = prefs_register_protocol (proto_gsm_sms, NULL);
@@ -3771,7 +3771,7 @@ proto_register_gsm_sms(void)
"Whether the dissector should reassemble SMS spanning multiple packets",
&reassemble_sms);
- /* register_dissector("gsm-sms", dissect_gsm_sms, proto_gsm_sms); */
+ /* register_dissector("gsm_sms", dissect_gsm_sms, proto_gsm_sms); */
/* GSM SMS UD dissector initialization routines */
register_init_routine (gsm_sms_defragment_init);
diff --git a/epan/dissectors/packet-gsm_sms_ud.c b/epan/dissectors/packet-gsm_sms_ud.c
index 6b1e9aa871..83d3752cf2 100644
--- a/epan/dissectors/packet-gsm_sms_ud.c
+++ b/epan/dissectors/packet-gsm_sms_ud.c
@@ -455,63 +455,63 @@ proto_register_gsm_sms_ud(void)
* User Data Header
*/
{ &hf_gsm_sms_udh_iei,
- { "IE Id", "gsm-sms-ud.udh.iei",
+ { "IE Id", "gsm_sms_ud.udh.iei",
FT_UINT8, BASE_HEX, VALS(vals_udh_iei), 0x00,
"Name of the User Data Header Information Element.",
HFILL
}
},
{ &hf_gsm_sms_udh_length,
- { "UDH Length", "gsm-sms-ud.udh.len",
+ { "UDH Length", "gsm_sms_ud.udh.len",
FT_UINT8, BASE_DEC, NULL, 0x00,
"Length of the User Data Header (bytes)",
HFILL
}
},
{ &hf_gsm_sms_udh_multiple_messages,
- { "Multiple messages UDH", "gsm-sms-ud.udh.mm",
+ { "Multiple messages UDH", "gsm_sms_ud.udh.mm",
FT_NONE, BASE_NONE, NULL, 0x00,
"Multiple messages User Data Header",
HFILL
}
},
{ &hf_gsm_sms_udh_multiple_messages_msg_id,
- { "Message identifier", "gsm-sms-ud.udh.mm.msg_id",
+ { "Message identifier", "gsm_sms_ud.udh.mm.msg_id",
FT_UINT16, BASE_DEC, NULL, 0x00,
"Identification of the message",
HFILL
}
},
{ &hf_gsm_sms_udh_multiple_messages_msg_parts,
- { "Message parts", "gsm-sms-ud.udh.mm.msg_parts",
+ { "Message parts", "gsm_sms_ud.udh.mm.msg_parts",
FT_UINT8, BASE_DEC, NULL, 0x00,
"Total number of message parts (fragments)",
HFILL
}
},
{ &hf_gsm_sms_udh_multiple_messages_msg_part,
- { "Message part number", "gsm-sms-ud.udh.mm.msg_part",
+ { "Message part number", "gsm_sms_ud.udh.mm.msg_part",
FT_UINT8, BASE_DEC, NULL, 0x00,
"Message part (fragment) sequence number",
HFILL
}
},
{ &hf_gsm_sms_udh_ports,
- { "Port number UDH", "gsm-sms-ud.udh.ports",
+ { "Port number UDH", "gsm_sms_ud.udh.ports",
FT_NONE, BASE_NONE, NULL, 0x00,
"Port number User Data Header",
HFILL
}
},
{ &hf_gsm_sms_udh_ports_src,
- { "Source port", "gsm-sms-ud.udh.ports.src",
+ { "Source port", "gsm_sms_ud.udh.ports.src",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL,
HFILL
}
},
{ &hf_gsm_sms_udh_ports_dst,
- { "Destination port", "gsm-sms-ud.udh.ports.dst",
+ { "Destination port", "gsm_sms_ud.udh.ports.dst",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL,
HFILL
@@ -521,21 +521,21 @@ proto_register_gsm_sms_ud(void)
* Short Message fragment reassembly
*/
{ &hf_gsm_sms_ud_fragments,
- { "Short Message fragments", "gsm-sms-ud.fragments",
+ { "Short Message fragments", "gsm_sms_ud.fragments",
FT_NONE, BASE_NONE, NULL, 0x00,
"GSM Short Message fragments",
HFILL
}
},
{ &hf_gsm_sms_ud_fragment,
- { "Short Message fragment", "gsm-sms-ud.fragment",
+ { "Short Message fragment", "gsm_sms_ud.fragment",
FT_FRAMENUM, BASE_NONE, NULL, 0x00,
"GSM Short Message fragment",
HFILL
}
},
{ &hf_gsm_sms_ud_fragment_overlap,
- { "Short Message fragment overlap", "gsm-sms-ud.fragment.overlap",
+ { "Short Message fragment overlap", "gsm_sms_ud.fragment.overlap",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
"GSM Short Message fragment overlaps with other fragment(s)",
HFILL
@@ -543,7 +543,7 @@ proto_register_gsm_sms_ud(void)
},
{ &hf_gsm_sms_ud_fragment_overlap_conflicts,
{ "Short Message fragment overlapping with conflicting data",
- "gsm-sms-ud.fragment.overlap.conflicts",
+ "gsm_sms_ud.fragment.overlap.conflicts",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
"GSM Short Message fragment overlaps with conflicting data",
HFILL
@@ -551,7 +551,7 @@ proto_register_gsm_sms_ud(void)
},
{ &hf_gsm_sms_ud_fragment_multiple_tails,
{ "Short Message has multiple tail fragments",
- "gsm-sms-ud.fragment.multiple_tails",
+ "gsm_sms_ud.fragment.multiple_tails",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
"GSM Short Message fragment has multiple tail fragments",
HFILL
@@ -559,21 +559,21 @@ proto_register_gsm_sms_ud(void)
},
{ &hf_gsm_sms_ud_fragment_too_long_fragment,
{ "Short Message fragment too long",
- "gsm-sms-ud.fragment.too_long_fragment",
+ "gsm_sms_ud.fragment.too_long_fragment",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
"GSM Short Message fragment data goes beyond the packet end",
HFILL
}
},
{ &hf_gsm_sms_ud_fragment_error,
- { "Short Message defragmentation error", "gsm-sms-ud.fragment.error",
+ { "Short Message defragmentation error", "gsm_sms_ud.fragment.error",
FT_FRAMENUM, BASE_NONE, NULL, 0x00,
"GSM Short Message defragmentation error due to illegal fragments",
HFILL
}
},
{ &hf_gsm_sms_ud_fragment_count,
- { "Short Message fragment count", "gsm-sms-ud.fragment.count",
+ { "Short Message fragment count", "gsm_sms_ud.fragment.count",
FT_UINT32, BASE_DEC, NULL, 0x00,
NULL,
HFILL
@@ -581,7 +581,7 @@ proto_register_gsm_sms_ud(void)
},
{ &hf_gsm_sms_ud_reassembled_in,
{ "Reassembled in",
- "gsm-sms-ud.reassembled.in",
+ "gsm_sms_ud.reassembled.in",
FT_FRAMENUM, BASE_NONE, NULL, 0x00,
"GSM Short Message has been reassembled in this packet.",
HFILL
@@ -589,7 +589,7 @@ proto_register_gsm_sms_ud(void)
},
{ &hf_gsm_sms_ud_reassembled_length,
{ "Reassembled Short Message length",
- "gsm-sms-ud.reassembled.length",
+ "gsm_sms_ud.reassembled.length",
FT_UINT32, BASE_DEC, NULL, 0x00,
"The total length of the reassembled payload",
HFILL
@@ -608,14 +608,14 @@ proto_register_gsm_sms_ud(void)
proto_gsm_sms_ud = proto_register_protocol(
"GSM Short Message Service User Data", /* Name */
"GSM SMS UD", /* Short name */
- "gsm-sms-ud"); /* Filter name */
+ "gsm_sms_ud"); /* Filter name */
/* Required function calls to register header fields and subtrees used */
proto_register_field_array(proto_gsm_sms_ud, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
/* Subdissector code */
- gsm_sms_dissector_table = register_dissector_table("gsm-sms-ud.udh.port",
+ gsm_sms_dissector_table = register_dissector_table("gsm_sms_ud.udh.port",
"GSM SMS port IE in UDH", FT_UINT16, BASE_DEC);
/* Preferences for GSM SMS UD */
@@ -640,7 +640,7 @@ proto_register_gsm_sms_ud(void)
"own. Eg. Prevent WSP dissector overwriting SMPP information.",
&prevent_subdissectors_changing_columns);
- register_dissector("gsm-sms-ud", dissect_gsm_sms_ud, proto_gsm_sms_ud);
+ register_dissector("gsm_sms_ud", dissect_gsm_sms_ud, proto_gsm_sms_ud);
/* GSM SMS UD dissector initialization routines */
register_init_routine(gsm_sms_ud_defragment_init);
diff --git a/epan/dissectors/packet-rsl.c b/epan/dissectors/packet-rsl.c
index 2b9b48f28f..10dd34b1b7 100644
--- a/epan/dissectors/packet-rsl.c
+++ b/epan/dissectors/packet-rsl.c
@@ -3917,424 +3917,424 @@ void proto_register_rsl(void)
/* Setup list of header fields */
static hf_register_info hf[] = {
{ &hf_rsl_msg_dsc,
- { "Message discriminator", "rsl.msg_dsc",
+ { "Message discriminator", "gsm_a_rsl.msg_dsc",
FT_UINT8, BASE_DEC, VALS(rsl_msg_disc_vals), 0xfe,
NULL, HFILL }
},
{ &hf_rsl_T_bit,
- { "T bit", "rsl.T_bit",
+ { "T bit", "gsm_a_rsl.T_bit",
FT_BOOLEAN, 8, TFS(&rsl_t_bit_vals), 0x01,
NULL, HFILL }
},
{ &hf_rsl_msg_type,
- { "Message type", "rsl.msg_type",
+ { "Message type", "gsm_a_rsl.msg_type",
FT_UINT8, BASE_HEX_DEC|BASE_EXT_STRING, &rsl_msg_type_vals_ext, 0x7f,
NULL, HFILL }
},
{ &hf_rsl_ie_id,
- { "Element identifier", "rsl.ie_id",
+ { "Element identifier", "gsm_a_rsl.ie_id",
FT_UINT8, BASE_HEX_DEC|BASE_EXT_STRING, &rsl_ie_type_vals_ext, 0x0,
NULL, HFILL }
},
{ &hf_rsl_ie_length,
- { "Length", "rsl.ie_length",
+ { "Length", "gsm_a_rsl.ie_length",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_rsl_ch_no_Cbits,
- { "C-bits", "rsl.ch_no_Cbits",
+ { "C-bits", "gsm_a_rsl.ch_no_Cbits",
FT_UINT8, BASE_DEC|BASE_EXT_STRING, &rsl_ch_no_Cbits_vals_ext, 0xf8,
NULL, HFILL }
},
{ &hf_rsl_ch_no_TN,
- { "Time slot number (TN)", "rsl.ch_no_TN",
+ { "Time slot number (TN)", "gsm_a_rsl.ch_no_TN",
FT_UINT8, BASE_DEC, NULL, 0x07,
NULL, HFILL }
},
{ &hf_rsl_rtd,
- { "Round Trip Delay (RTD)", "rsl.rtd",
+ { "Round Trip Delay (RTD)", "gsm_a_rsl.rtd",
FT_UINT8, BASE_DEC, NULL, 0xfe,
NULL, HFILL }
},
{ &hf_rsl_delay_ind,
- { "Delay IND", "rsl.delay_ind",
+ { "Delay IND", "gsm_a_rsl.delay_ind",
FT_UINT8, BASE_DEC, rsl_delay_ind_vals, 0x01,
NULL, HFILL }
},
{ &hf_rsl_tfo,
- { "TFO", "rsl.tfo",
+ { "TFO", "gsm_a_rsl.tfo",
FT_BOOLEAN, 8, TFS(&rsl_tfo_vals), 0x01,
NULL, HFILL }
},
{ &hf_rsl_req_ref_ra,
- { "Random Access Information (RA)", "rsl.req_ref_ra",
+ { "Random Access Information (RA)", "gsm_a_rsl.req_ref_ra",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_rsl_req_ref_T1prim,
- { "T1'", "rsl.req_ref_T1prim",
+ { "T1'", "gsm_a_rsl.req_ref_T1prim",
FT_UINT8, BASE_DEC, NULL, 0xf8,
NULL, HFILL }
},
{ &hf_rsl_req_ref_T3,
- { "T3", "rsl.req_ref_T3",
+ { "T3", "gsm_a_rsl.req_ref_T3",
FT_UINT16, BASE_DEC, NULL, 0x07e0,
NULL, HFILL }
},
{ &hf_rsl_req_ref_T2,
- { "T2", "rsl.req_ref_T2",
+ { "T2", "gsm_a_rsl.req_ref_T2",
FT_UINT8, BASE_DEC, NULL, 0x1f,
NULL, HFILL }
},
{ &hf_rsl_timing_adv,
- { "Timing Advance", "rsl.timing_adv",
+ { "Timing Advance", "gsm_a_rsl.timing_adv",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_rsl_ho_ref,
- { "Hand-over reference", "rsl.ho_ref",
+ { "Hand-over reference", "gsm_a_rsl.ho_ref",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_rsl_l1inf_power_lev,
- { "MS power level", "rsl.ms_power_lev",
+ { "MS power level", "gsm_a_rsl.ms_power_lev",
FT_UINT8, BASE_DEC, NULL, 0xf8,
NULL, HFILL }
},
{ &hf_rsl_l1inf_fpc,
- { "FPC/EPC", "rsl.ms_fpc",
+ { "FPC/EPC", "gsm_a_rsl.ms_fpc",
FT_BOOLEAN, 8, TFS(&rsl_ms_fpc_epc_mode_vals), 0x04,
NULL, HFILL }
},
{ &hf_rsl_ms_power_lev,
- { "MS power level", "rsl.ms_power_lev",
+ { "MS power level", "gsm_a_rsl.ms_power_lev",
FT_UINT8, BASE_DEC, NULL, 0x1f,
NULL, HFILL }
},
{ &hf_rsl_ms_fpc,
- { "FPC/EPC", "rsl.ms_fpc",
+ { "FPC/EPC", "gsm_a_rsl.ms_fpc",
FT_BOOLEAN, 8, TFS(&rsl_ms_fpc_epc_mode_vals), 0x20,
NULL, HFILL }
},
{ &hf_rsl_act_timing_adv,
- { "Actual Timing Advance", "rsl.act_timing_adv",
+ { "Actual Timing Advance", "gsm_a_rsl.act_timing_adv",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_rsl_dtxd,
- { "DTXd", "rsl.dtxd",
+ { "DTXd", "gsm_a_rsl.dtxd",
FT_BOOLEAN, 8, TFS(&rsl_dtxd_vals), 0x40,
NULL, HFILL }
},
{ &hf_rsl_rxlev_full_up,
- { "RXLEV.FULL.up", "rsl.rxlev_full_up",
+ { "RXLEV.FULL.up", "gsm_a_rsl.rxlev_full_up",
FT_UINT8, BASE_DEC, NULL, 0x3f,
NULL, HFILL }
},
{ &hf_rsl_rxlev_sub_up,
- { "RXLEV.SUB.up", "rsl.rxlev_sub_up",
+ { "RXLEV.SUB.up", "gsm_a_rsl.rxlev_sub_up",
FT_UINT8, BASE_DEC, NULL, 0x3f,
NULL, HFILL }
},
{ &hf_rsl_rxqual_full_up,
- { "RXQUAL.FULL.up", "rsl.rxqual_full_up",
+ { "RXQUAL.FULL.up", "gsm_a_rsl.rxqual_full_up",
FT_UINT8, BASE_DEC, NULL, 0x38,
NULL, HFILL }
},
{ &hf_rsl_rxqual_sub_up,
- { "RXQUAL.SUB.up", "rsl.rxqual_sub_up",
+ { "RXQUAL.SUB.up", "gsm_a_rsl.rxqual_sub_up",
FT_UINT8, BASE_DEC, NULL, 0x07,
NULL, HFILL }
},
{ &hf_rsl_acc_delay,
- { "Access Delay", "rsl.acc_del",
+ { "Access Delay", "gsm_a_rsl.acc_del",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_rsl_rach_slot_cnt,
- { "RACH Slot Count", "rsl.rach_slot_cnt",
+ { "RACH Slot Count", "gsm_a_rsl.rach_slot_cnt",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_rsl_rach_busy_cnt,
- { "RACH Busy Count", "rsl.rach_busy_cnt",
+ { "RACH Busy Count", "gsm_a_rsl.rach_busy_cnt",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_rsl_rach_acc_cnt,
- { "RACH Access Count", "rsl.rach_acc_cnt",
+ { "RACH Access Count", "gsm_a_rsl.rach_acc_cnt",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_rsl_phy_ctx,
- { "Physical Context", "rsl.phy_ctx",
+ { "Physical Context", "gsm_a_rsl.phy_ctx",
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_rsl_na,
- { "Not applicable (NA)", "rsl.na",
+ { "Not applicable (NA)", "gsm_a_rsl.na",
FT_BOOLEAN, 8, TFS(&rsl_na_vals), 0x20,
NULL, HFILL }
},
{ &hf_rsl_ch_type,
- { "channel type", "rsl.ch_type",
+ { "channel type", "gsm_a_rsl.ch_type",
FT_UINT8, BASE_DEC, VALS(rsl_ch_type_vals), 0xc0,
NULL, HFILL }
},
{ &hf_rsl_prio,
- { "Priority", "rsl.prio",
+ { "Priority", "gsm_a_rsl.prio",
FT_UINT8, BASE_DEC, VALS(rsl_prio_vals), 0x18,
NULL, HFILL }
},
{ &hf_rsl_sapi,
- { "SAPI", "rsl.sapi",
+ { "SAPI", "gsm_a_rsl.sapi",
FT_UINT8, BASE_DEC, NULL, 0x07,
NULL, HFILL }
},
{ &hf_rsl_rbit,
- { "R", "rsl.rbit",
+ { "R", "gsm_a_rsl.rbit",
FT_BOOLEAN, 8, TFS(&rsl_rbit_vals), 0x80,
NULL, HFILL }
},
{ &hf_rsl_a3a2,
- { "A3A2", "rsl.a3a2",
+ { "A3A2", "gsm_a_rsl.a3a2",
FT_UINT8, BASE_DEC, VALS(rsl_a3a2_vals), 0x06,
NULL, HFILL }
},
{ &hf_rsl_a1_0,
- { "A1", "rsl.a1_0",
+ { "A1", "gsm_a_rsl.a1_0",
FT_BOOLEAN, 8, TFS(&rsl_a1_0_vals), 0x01,
NULL, HFILL }
},
{ &hf_rsl_a1_1,
- { "A1", "rsl.a1_1",
+ { "A1", "gsm_a_rsl.a1_1",
FT_BOOLEAN, 8, TFS(&rsl_a1_1_vals), 0x01,
NULL, HFILL }
},
{ &hf_rsl_a1_2,
- { "A1", "rsl.a2_0",
+ { "A1", "gsm_a_rsl.a2_0",
FT_BOOLEAN, 8, TFS(&rsl_a1_2_vals), 0x01,
NULL, HFILL }
},
{ &hf_rsl_epc_mode,
- { "EPC mode", "rsl.epc_mode",
+ { "EPC mode", "gsm_a_rsl.epc_mode",
FT_BOOLEAN, 8, TFS(&rsl_epc_mode_vals), 0x20,
NULL, HFILL }
},
{ &hf_rsl_bs_fpc_epc_mode,
- { "FPC-EPC mode", "rsl.fpc_epc_mode",
+ { "FPC-EPC mode", "gsm_a_rsl.fpc_epc_mode",
FT_BOOLEAN, 8, TFS(&rsl_fpc_epc_mode_vals), 0x10,
NULL, HFILL }
},
{ &hf_rsl_bs_power,
- { "Power Level", "rsl.bs_power",
+ { "Power Level", "gsm_a_rsl.bs_power",
FT_UINT8, BASE_DEC|BASE_EXT_STRING, &rsl_rlm_bs_power_vals_ext, 0x0f,
NULL, HFILL }
},
{ &hf_rsl_cm_dtxd,
- { "DTXd", "rsl.cm_dtxd",
+ { "DTXd", "gsm_a_rsl.cm_dtxd",
FT_BOOLEAN, 8, TFS(&rsl_dtx_vals), 0x02,
NULL, HFILL }
},
{ &hf_rsl_cm_dtxu,
- { "DTXu", "rsl.cm_dtxu",
+ { "DTXu", "gsm_a_rsl.cm_dtxu",
FT_BOOLEAN, 8, TFS(&rsl_dtx_vals), 0x01,
NULL, HFILL }
},
{ &hf_rsl_speech_or_data,
- { "Speech or data indicator", "rsl.speech_or_data",
+ { "Speech or data indicator", "gsm_a_rsl.speech_or_data",
FT_UINT8, BASE_DEC, VALS(rsl_speech_or_data_vals), 0x0,
NULL, HFILL }
},
{ &hf_rsl_ch_rate_and_type,
- { "Channel rate and type", "rsl.ch_rate_and_type",
+ { "Channel rate and type", "gsm_a_rsl.ch_rate_and_type",
FT_UINT8, BASE_DEC|BASE_EXT_STRING, &rsl_ch_rate_and_type_vals_ext, 0x0,
NULL, HFILL }
},
{ &hf_rsl_speech_coding_alg,
- { "Speech coding algorithm", "rsl.speech_coding_alg",
+ { "Speech coding algorithm", "gsm_a_rsl.speech_coding_alg",
FT_UINT8, BASE_DEC, VALS(rsl_speech_coding_alg_vals), 0x0,
NULL, HFILL }
},
{ &hf_rsl_t_nt_bit,
- { "Transparent indication", "rsl.t_nt_bit",
+ { "Transparent indication", "gsm_a_rsl.t_nt_bit",
FT_BOOLEAN, 8, TFS(&t_nt_bit_vals), 0x40,
NULL, HFILL }
},
{ &hf_rsl_ra_if_data_rte,
- { "Radio interface data rate", "rsl.ra_if_data_rte",
+ { "Radio interface data rate", "gsm_a_rsl.ra_if_data_rte",
FT_UINT8, BASE_DEC, VALS(rsl_ra_if_data_rte_vals), 0x3f,
NULL, HFILL }
},
{ &hf_rsl_data_rte,
- { "Data rate", "rsl.data_rte",
+ { "Data rate", "gsm_a_rsl.data_rte",
FT_UINT8, BASE_DEC, VALS(rsl_ra_if_data_rte_vals), 0x3f,
NULL, HFILL }
},
{ &hf_rsl_alg_id,
- { "Algorithm Identifier", "rsl.alg_id",
+ { "Algorithm Identifier", "gsm_a_rsl.alg_id",
FT_UINT8, BASE_DEC, VALS(rsl_algorithm_id_vals), 0x0,
NULL, HFILL }
},
{ &hf_rsl_key,
- { "KEY", "rsl.key",
+ { "KEY", "gsm_a_rsl.key",
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_rsl_cause,
- { "Cause", "rsl.cause",
+ { "Cause", "gsm_a_rsl.cause",
FT_UINT8, BASE_DEC|BASE_EXT_STRING, &rsl_rlm_cause_vals_ext, 0x7f,
NULL, HFILL }
},
{ &hf_rsl_rel_mode,
- { "Release Mode", "rsl.rel_mode",
+ { "Release Mode", "gsm_a_rsl.rel_mode",
FT_UINT8, BASE_DEC, VALS(rel_mode_vals), 0x01,
NULL, HFILL }
},
{ &hf_rsl_interf_band,
- { "Interf Band", "rsl.interf_band",
+ { "Interf Band", "gsm_a_rsl.interf_band",
FT_UINT8, BASE_DEC, NULL, 0xe0,
NULL, HFILL }
},
{ &hf_rsl_interf_band_reserved,
- { "Interf Band reserved bits", "rsl.interf_band_reserved",
+ { "Interf Band reserved bits", "gsm_a_rsl.interf_band_reserved",
FT_UINT8, BASE_DEC, NULL, 0x1f,
NULL, HFILL }
},
{ &hf_rsl_meas_res_no,
- { "Measurement result number", "rsl.meas_res_no",
+ { "Measurement result number", "gsm_a_rsl.meas_res_no",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_rsl_extension_bit,
- { "Extension", "rsl.extension_bit",
+ { "Extension", "gsm_a_rsl.extension_bit",
FT_BOOLEAN, 8, TFS(&rsl_extension_bit_value), 0x80,
NULL, HFILL }},
{ &hf_rsl_class,
- { "Class", "rsl.class",
+ { "Class", "gsm_a_rsl.class",
FT_UINT8, BASE_DEC, VALS(rsl_class_vals), 0x70,
NULL, HFILL }
},
{ &hf_rsl_paging_grp,
- { "Paging Group", "rsl.paging_grp",
+ { "Paging Group", "gsm_a_rsl.paging_grp",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_rsl_paging_load,
- { "Paging Buffer Space", "rsl.paging_load",
+ { "Paging Buffer Space", "gsm_a_rsl.paging_load",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_rsl_sys_info_type,
- { "System Info Type", "rsl.sys_info_type",
+ { "System Info Type", "gsm_a_rsl.sys_info_type",
FT_UINT8, BASE_DEC|BASE_EXT_STRING, &rsl_sys_info_type_vals_ext, 0x0,
NULL, HFILL }
},
{ &hf_rsl_timing_offset,
- { "Timing Offset", "rsl.timing_offset",
+ { "Timing Offset", "gsm_a_rsl.timing_offset",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_rsl_ch_needed,
- { "Channel Needed", "rsl.ch_needed",
+ { "Channel Needed", "gsm_a_rsl.ch_needed",
FT_UINT8, BASE_DEC, VALS(rsl_ch_needed_vals), 0x03,
NULL, HFILL }
},
{ &hf_rsl_cbch_load_type,
- { "CBCH Load Type", "rsl.cbch_load_type",
+ { "CBCH Load Type", "gsm_a_rsl.cbch_load_type",
FT_BOOLEAN, 8, TFS(&rsl_cbch_load_type_vals), 0x80,
NULL, HFILL }
},
{ &hf_rsl_msg_slt_cnt,
- { "Message Slot Count", "rsl.sg_slt_cnt",
+ { "Message Slot Count", "gsm_a_rsl.sg_slt_cnt",
FT_UINT8, BASE_DEC, NULL, 0x0f,
NULL, HFILL }
},
{ &hf_rsl_ch_ind,
- { "Channel Ind", "rsl.ch_ind",
+ { "Channel Ind", "gsm_a_rsl.ch_ind",
FT_UINT8, BASE_DEC, VALS(rsl_ch_ind_vals), 0x0f,
NULL, HFILL }
},
{ &hf_rsl_command,
- { "Command", "rsl.cmd",
+ { "Command", "gsm_a_rsl.cmd",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_rsl_emlpp_prio,
- { "eMLPP Priority", "rsl.emlpp_prio",
+ { "eMLPP Priority", "gsm_a_rsl.emlpp_prio",
FT_UINT8, BASE_DEC, VALS(rsl_emlpp_prio_vals), 0x03,
NULL, HFILL }
},
{ &hf_rsl_speech_mode_s,
- { "ip.access Speech Mode S", "rsl.ipacc.speech_mode_s",
+ { "ip.access Speech Mode S", "gsm_a_rsl.ipacc.speech_mode_s",
FT_UINT8, BASE_HEX, VALS(rsl_ipacc_spm_s_vals),
0xf, NULL, HFILL }
},
{ &hf_rsl_speech_mode_m,
- { "ip.access Speech Mode M", "rsl.ipacc.speech_mode_m",
+ { "ip.access Speech Mode M", "gsm_a_rsl.ipacc.speech_mode_m",
FT_UINT8, BASE_HEX, VALS(rsl_ipacc_spm_m_vals),
0xf0, NULL, HFILL }
},
{ &hf_rsl_conn_id,
- { "ip.access Connection ID", "rsl.ipacc.conn_id",
+ { "ip.access Connection ID", "gsm_a_rsl.ipacc.conn_id",
FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
},
{ &hf_rsl_rtp_payload,
- { "ip.access RTP Payload Type", "rsl.ipacc.rtp_payload",
+ { "ip.access RTP Payload Type", "gsm_a_rsl.ipacc.rtp_payload",
FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }
},
{ &hf_rsl_rtp_csd_fmt_d,
- { "ip.access RTP CSD Format D", "rsl.ipacc.rtp_csd_fmt_d",
+ { "ip.access RTP CSD Format D", "gsm_a_rsl.ipacc.rtp_csd_fmt_d",
FT_UINT8, BASE_HEX, VALS(rsl_ipacc_rtp_csd_fmt_d_vals),
0x0f, NULL, HFILL },
},
{ &hf_rsl_rtp_csd_fmt_ir,
- { "ip.access RTP CSD Format IR", "rsl.ipacc.rtp_csd_fmt_ir",
+ { "ip.access RTP CSD Format IR", "gsm_a_rsl.ipacc.rtp_csd_fmt_ir",
FT_UINT8, BASE_HEX, VALS(rsl_ipacc_rtp_csd_fmt_ir_vals),
0xf0, NULL, HFILL },
},
{ &hf_rsl_local_port,
- { "ip.access Local RTP Port", "rsl.ipacc.local_port",
+ { "ip.access Local RTP Port", "gsm_a_rsl.ipacc.local_port",
FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
},
{ &hf_rsl_remote_port,
- { "ip.access Remote RTP Port", "rsl.ipacc.remote_port",
+ { "ip.access Remote RTP Port", "gsm_a_rsl.ipacc.remote_port",
FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
},
{ &hf_rsl_local_ip,
- { "ip.access Local IP Address", "rsl.ipacc.local_ip",
+ { "ip.access Local IP Address", "gsm_a_rsl.ipacc.local_ip",
FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL },
},
{ &hf_rsl_remote_ip,
- { "ip.access Remote IP Address", "rsl.ipacc.remote_ip",
+ { "ip.access Remote IP Address", "gsm_a_rsl.ipacc.remote_ip",
FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL },
},
{ &hf_rsl_cstat_tx_pkts,
- { "Packets Sent", "rsl.ipacc.cstat.tx_pkts",
+ { "Packets Sent", "gsm_a_rsl.ipacc.cstat.tx_pkts",
FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }
},
{ &hf_rsl_cstat_tx_octs,
- { "Octets Sent", "rsl.ipacc.cstat.tx_octets",
+ { "Octets Sent", "gsm_a_rsl.ipacc.cstat.tx_octets",
FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }
},
{ &hf_rsl_cstat_rx_pkts,
- { "Packets Received", "rsl.ipacc.cstat.rx_pkts",
+ { "Packets Received", "gsm_a_rsl.ipacc.cstat.rx_pkts",
FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }
},
{ &hf_rsl_cstat_rx_octs,
- { "Octets Received", "rsl.ipacc.cstat.rx_octets",
+ { "Octets Received", "gsm_a_rsl.ipacc.cstat.rx_octets",
FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }
},
{ &hf_rsl_cstat_lost_pkts,
- { "Packets Lost", "rsl.ipacc.cstat.lost_pkts",
+ { "Packets Lost", "gsm_a_rsl.ipacc.cstat.lost_pkts",
FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }
},
{ &hf_rsl_cstat_ia_jitter,
- { "Inter-arrival Jitter", "rsl.ipacc.cstat.ia_jitter",
+ { "Inter-arrival Jitter", "gsm_a_rsl.ipacc.cstat.ia_jitter",
FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }
},
{ &hf_rsl_cstat_avg_tx_dly,
- { "Average Tx Delay", "rsl.ipacc.cstat.avg_tx_delay",
+ { "Average Tx Delay", "gsm_a_rsl.ipacc.cstat.avg_tx_delay",
FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }
},
};
@@ -4484,12 +4484,12 @@ void proto_register_rsl(void)
RSL_ATT_TLVDEF(RSL_IE_IPAC_RTP_CSD_FMT, TLV_TYPE_TV, 0);
/* Register the protocol name and description */
- proto_rsl = proto_register_protocol("Radio Signalling Link (RSL)", "RSL", "rsl");
+ proto_rsl = proto_register_protocol("Radio Signalling Link (RSL)", "RSL", "gsm_a_rsl");
proto_register_field_array(proto_rsl, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
- new_register_dissector("gsm_abis_rsl", dissect_rsl, proto_rsl);
+ new_register_dissector("gsm_a_rsl", dissect_rsl, proto_rsl);
rsl_module = prefs_register_protocol(proto_rsl, proto_reg_handoff_rsl);
prefs_register_bool_preference(rsl_module, "use_ipaccess_rsl",
diff --git a/epan/dissectors/packet-smpp.c b/epan/dissectors/packet-smpp.c
index 8feb86ffc5..34929a3641 100644
--- a/epan/dissectors/packet-smpp.c
+++ b/epan/dissectors/packet-smpp.c
@@ -3807,8 +3807,8 @@ proto_reg_handoff_smpp(void)
heur_dissector_add("x.25", dissect_smpp_heur, proto_smpp);
/* Required for call_dissector() */
- DebugLog(("Finding gsm-sms-ud subdissector\n"));
- gsm_sms_handle = find_dissector("gsm-sms-ud");
+ DebugLog(("Finding gsm_sms_ud subdissector\n"));
+ gsm_sms_handle = find_dissector("gsm_sms_ud");
DISSECTOR_ASSERT(gsm_sms_handle);
/* Tapping setup */
diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c
index 46435e69a8..0e743eb185 100644
--- a/epan/dissectors/packet-wsp.c
+++ b/epan/dissectors/packet-wsp.c
@@ -7372,12 +7372,12 @@ proto_reg_handoff_wsp(void)
dissector_add_uint("udp.port", UDP_PORT_WSP_PUSH, wsp_fromudp_handle);
/* GSM SMS UD dissector can also carry WSP */
- dissector_add_uint("gsm-sms-ud.udh.port", UDP_PORT_WSP, wsp_fromudp_handle);
- dissector_add_uint("gsm-sms-ud.udh.port", UDP_PORT_WSP_PUSH, wsp_fromudp_handle);
+ dissector_add_uint("gsm_sms_ud.udh.port", UDP_PORT_WSP, wsp_fromudp_handle);
+ dissector_add_uint("gsm_sms_ud.udh.port", UDP_PORT_WSP_PUSH, wsp_fromudp_handle);
/* GSM SMS dissector can also carry WSP */
- dissector_add_uint("gsm-sms.udh.port", UDP_PORT_WSP, wsp_fromudp_handle);
- dissector_add_uint("gsm-sms.udh.port", UDP_PORT_WSP_PUSH, wsp_fromudp_handle);
+ dissector_add_uint("gsm_sms.udh.port", UDP_PORT_WSP, wsp_fromudp_handle);
+ dissector_add_uint("gsm_sms.udh.port", UDP_PORT_WSP_PUSH, wsp_fromudp_handle);
/* As the media types for WSP and HTTP are the same, the WSP dissector
* uses the same string dissector table as the HTTP protocol. */
diff --git a/epan/dissectors/packet-wtp.c b/epan/dissectors/packet-wtp.c
index 74a8ec3216..27c62e68e7 100644
--- a/epan/dissectors/packet-wtp.c
+++ b/epan/dissectors/packet-wtp.c
@@ -1113,6 +1113,6 @@ proto_reg_handoff_wtp(void)
wtp_fromudp_handle = find_dissector("wtp-udp");
dissector_add_uint("udp.port", UDP_PORT_WTP_WSP, wtp_fromudp_handle);
- dissector_add_uint("gsm-sms-ud.udh.port", UDP_PORT_WTP_WSP, wtp_fromudp_handle);
- dissector_add_uint("gsm-sms.udh.port", UDP_PORT_WTP_WSP, wtp_fromudp_handle);
+ dissector_add_uint("gsm_sms_ud.udh.port", UDP_PORT_WTP_WSP, wtp_fromudp_handle);
+ dissector_add_uint("gsm_sms.udh.port", UDP_PORT_WTP_WSP, wtp_fromudp_handle);
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-22 01:10:36 +0000