update GMR-1 protocols display filers

svn path=/trunk/; revision=44161

1 files changed, 100 insertions, 100 deletions

diff --git a/epan/dissectors/packet-gmr1_rr.c b/epan/dissectors/packet-gmr1_rr.c
index ab961fd93a..653d77bfb5 100644
--- a/epan/dissectors/packet-gmr1_rr.c
+++ b/epan/dissectors/packet-gmr1_rr.c
@@ -1842,502 +1842,502 @@ proto_register_gmr1_rr(void)
 {
 	static hf_register_info hf[] = {
 		{ &hf_rr_msg_type,
-		  { "Radio Resources Management Message Type", "gmr1.rr.msg_type",
+		  { "Radio Resources Management Message Type", "gmr1_ccch.msg_type",
 		    FT_UINT8, BASE_HEX, VALS(gmr1_msg_rr_strings), 0x00,
 		    NULL, HFILL }	/* FIXME handle CCCH/DCCH conflicts */
 		},
 		{ &hf_rr_chan_desc_kab_loc,
-		  { "KAB Location", "gmr1.rr.chan_desc.kab_loc",
+		  { "KAB Location", "gmr1_ccch.chan_desc.kab_loc",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_chan_desc_rx_tn,
-		  { "RX Timeslot", "gmr1.rr.chan_desc.rx_tn",
+		  { "RX Timeslot", "gmr1_ccch.chan_desc.rx_tn",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_chan_desc_arfcn,
-		  { "ARFCN", "gmr1.rr.chan_desc.arfcn",
+		  { "ARFCN", "gmr1_ccch.chan_desc.arfcn",
 		    FT_UINT16, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_chan_desc_tx_tn,
-		  { "TX Timeslot", "gmr1.rr.chan_desc.tx_tn",
+		  { "TX Timeslot", "gmr1_ccch.chan_desc.tx_tn",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_chan_desc_chan_type,
-		  { "Channel Type", "gmr1.rr.chan_desc.chan_type",
+		  { "Channel Type", "gmr1_ccch.chan_desc.chan_type",
 		    FT_UINT8, BASE_DEC, VALS(rr_chan_desc_chan_type_vals), 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_chan_mode,
-		  { "Channel Mode", "gmr1.rr.chan_mode",
+		  { "Channel Mode", "gmr1_ccch.chan_mode",
 		    FT_UINT8, BASE_DEC, VALS(rr_chan_mode_vals), 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_ciph_mode_setting_sc,
-		  { "SC", "gmr1.rr.ciph_mode_setting.sc",
+		  { "SC", "gmr1_ccch.ciph_mode_setting.sc",
 		    FT_UINT8, BASE_DEC, VALS(rr_ciph_mode_setting_sc_vals), 0x01,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_ciph_mode_setting_algo,
-		  { "Algorithm", "gmr1.rr.ciph_mode_setting.algo",
+		  { "Algorithm", "gmr1_ccch.ciph_mode_setting.algo",
 		    FT_UINT8, BASE_DEC, VALS(rr_ciph_mode_setting_algo_vals), 0x0e,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_ciph_resp_cr,
-		  { "CR", "gmr1.rr.ciph_resp.cr",
+		  { "CR", "gmr1_ccch.ciph_resp.cr",
 		    FT_UINT8, BASE_DEC, VALS(rr_ciph_resp_cr_vals), 0x10,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_ciph_resp_spare,
-		  { "Spare", "gmr1.rr.ciph_resp.spare",
+		  { "Spare", "gmr1_ccch.ciph_resp.spare",
 		    FT_UINT8, BASE_DEC, NULL, 0xe0,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_l2_pseudo_len,
-		  { "L2 Pseudo Length value", "gmr1.rr.l2_pseudo_len",
+		  { "L2 Pseudo Length value", "gmr1_ccch.l2_pseudo_len",
 		    FT_UINT8, BASE_DEC, NULL, 0xfc,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_page_mode,
-		  { "Page Mode", "gmr1.rr.page_mode.mode",
+		  { "Page Mode", "gmr1_ccch.page_mode.mode",
 		    FT_UINT8, BASE_DEC, VALS(rr_page_mode_vals), 0x03,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_page_mode_spare,
-		  { "Spare", "gmr1.rr.page_mode.spare",
+		  { "Spare", "gmr1_ccch.page_mode.spare",
 		    FT_UINT8, BASE_DEC, NULL, 0x0c,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_req_ref_est_cause,
-		  { "Establishment cause group ID", "gmr1.rr.req_ref.est_cause",
+		  { "Establishment cause group ID", "gmr1_ccch.req_ref.est_cause",
 		    FT_UINT8, BASE_DEC, VALS(rr_req_ref_est_cause_vals), 0xe0,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_req_ref_ra,
-		  { "Random Access Information", "gmr1.rr.req_ref.ra",
+		  { "Random Access Information", "gmr1_ccch.req_ref.ra",
 		    FT_UINT8, BASE_HEX, NULL, 0x1f,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_req_ref_fn,
-		  { "Frame Number mod 256", "gmr1.rr.req_ref.fn",
+		  { "Frame Number mod 256", "gmr1_ccch.req_ref.fn",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_cause,
-		  { "RR Cause", "gmr1.rr.cause",
+		  { "RR Cause", "gmr1_ccch.cause",
 		    FT_UINT8, BASE_DEC, VALS(rr_cause_vals), 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_timing_ofs_ti,
-		  { "TI", "gmr1.rr.timing_offset.ti",
+		  { "TI", "gmr1_ccch.timing_offset.ti",
 		    FT_UINT8, BASE_DEC, VALS(rr_timing_ofs_ti_vals), 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_timing_ofs_value,
-		  { "Timing Offset value", "gmr1.rr.timing_offset.value",
+		  { "Timing Offset value", "gmr1_ccch.timing_offset.value",
 		    FT_INT16, BASE_CUSTOM, rr_timing_ofs_value_fmt, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_tmsi_ptmsi,
-		  { "TMSI/P-TMSI Value","gmr1.rr.tmsi_ptmsi",
+		  { "TMSI/P-TMSI Value","gmr1_ccch.tmsi_ptmsi",
 		    FT_UINT32,BASE_HEX,  NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_wait_ind_timeout,
-		  { "T3122/T3142 timeout", "gmr1.rr.wait_ind.timeout",
+		  { "T3122/T3142 timeout", "gmr1_ccch.wait_ind.timeout",
 		    FT_UINT8, BASE_CUSTOM, rr_gen_ie_seconds_fmt, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_mif_mes1_ab,
-		  { "MES1 - Assignment Type", "gmr1.rr.mes_info_flag.1.ab",
+		  { "MES1 - Assignment Type", "gmr1_ccch.mes_info_flag.1.ab",
 		    FT_UINT8, BASE_DEC, VALS(rr_mif_mes1_ab_vals), 0x03,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_mif_mes1_i,
-		  { "MES1 - Idle mode position update", "gmr1.rr.mes_info_flag.1.i",
+		  { "MES1 - Idle mode position update", "gmr1_ccch.mes_info_flag.1.i",
 		    FT_UINT8, BASE_DEC, VALS(rr_gen_ie_presence_vals), 0x04,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_mif_mes1_d,
-		  { "MES1 - Dedicated mode position update", "gmr1.rr.mes_info_flag.1.d",
+		  { "MES1 - Dedicated mode position update", "gmr1_ccch.mes_info_flag.1.d",
 		    FT_UINT8, BASE_DEC, VALS(rr_gen_ie_presence_vals), 0x08,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_mif_mes2,
-		  { "MES2", "gmr1.rr.mes_info_flag.2",
+		  { "MES2", "gmr1_ccch.mes_info_flag.2",
 		    FT_UINT8, BASE_DEC, VALS(rr_mif_mes234_vals), 0x10,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_mif_mes3,
-		  { "MES3", "gmr1.rr.mes_info_flag.3",
+		  { "MES3", "gmr1_ccch.mes_info_flag.3",
 		    FT_UINT8, BASE_DEC, VALS(rr_mif_mes234_vals), 0x20,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_mif_mes4,
-		  { "MES4", "gmr1.rr.mes_info_flag.4",
+		  { "MES4", "gmr1_ccch.mes_info_flag.4",
 		    FT_UINT8, BASE_DEC, VALS(rr_mif_mes234_vals), 0x40,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_mif_pv,
-		  { "Position Verification indicator", "gmr1.rr.mes_info_flag.pv",
+		  { "Position Verification indicator", "gmr1_ccch.mes_info_flag.pv",
 		    FT_UINT8, BASE_DEC, VALS(rr_mif_pv_vals), 0x80,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_freq_ofs_fi,
-		  { "FI", "gmr1.rr.frequency_offset.fi",
+		  { "FI", "gmr1_ccch.frequency_offset.fi",
 		    FT_UINT8, BASE_DEC, VALS(rr_freq_ofs_fi_vals), 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_freq_ofs_value,
-		  { "Frequency Offset value", "gmr1.rr.frequency_offset.value",
+		  { "Frequency Offset value", "gmr1_ccch.frequency_offset.value",
 		    FT_INT16, BASE_CUSTOM, rr_freq_ofs_value_fmt, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_freq_ofs_spare,
-		  { "Spare", "gmr1.rr.frequency_offset.spare",
+		  { "Spare", "gmr1_ccch.frequency_offset.spare",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_page_info_msc_id,
-		  { "MSC ID", "gmr1.rr.paging_info.msc_id",
+		  { "MSC ID", "gmr1_ccch.paging_info.msc_id",
 		    FT_UINT8, BASE_DEC, NULL, 0xfc,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_page_info_chan_needed,
-		  { "Channel Needed", "gmr1.rr.paging_info.chan_needed",
+		  { "Channel Needed", "gmr1_ccch.paging_info.chan_needed",
 		    FT_UINT8, BASE_DEC, VALS(rr_page_info_chan_needed_vals), 0x03,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pos_display_flag,
-		  { "Display Information Flag", "gmr1.rr.pos_display.flag",
+		  { "Display Information Flag", "gmr1_ccch.pos_display.flag",
 		    FT_UINT8, BASE_DEC, VALS(rr_pos_display_flag_vals), 0xf0,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pos_display_text,
-		  { "Country and Region name", "gmr1.rr.pos_display.text",
+		  { "Country and Region name", "gmr1_ccch.pos_display.text",
 		    FT_STRING, BASE_NONE, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pos_upd_info_v,
-		  { "Valid", "gmr1.rr.pos_upd_info.valid",
+		  { "Valid", "gmr1_ccch.pos_upd_info.valid",
 		    FT_UINT8, BASE_DEC, VALS(rr_pos_upd_info_v_vals), 0x01,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pos_upd_info_dist,
-		  { "GPS Update Distance", "gmr1.rr.pos_upd_info.distance",
+		  { "GPS Update Distance", "gmr1_ccch.pos_upd_info.distance",
 		    FT_UINT8, BASE_CUSTOM, rr_pos_upd_info_dist_fmt, 0xfe,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pos_upd_info_time,
-		  { "GPS Update Timer", "gmr1.rr.pos_upd_info.time",
+		  { "GPS Update Timer", "gmr1_ccch.pos_upd_info.time",
 		    FT_UINT8, BASE_CUSTOM, rr_pos_upd_info_time_fmt, 0xff,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_bcch_carrier_arfcn,
-		  { "ARFCN", "gmr1.rr.bcch_carrier.arfcn",
+		  { "ARFCN", "gmr1_ccch.bcch_carrier.arfcn",
 		    FT_UINT16, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_bcch_carrier_si,
-		  { "Satellite Indication", "gmr1.rr.bcch_carrier.si",
+		  { "Satellite Indication", "gmr1_ccch.bcch_carrier.si",
 		    FT_UINT8, BASE_DEC, VALS(rr_bcch_carrier_si_vals), 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_bcch_carrier_ri,
-		  { "Reselection Indication", "gmr1.rr.bcch_carrier.ri",
+		  { "Reselection Indication", "gmr1_ccch.bcch_carrier.ri",
 		    FT_UINT8, BASE_DEC, VALS(rr_bcch_carrier_ri_vals), 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_bcch_carrier_spare,
-		  { "Spare", "gmr1.rr.bcch_carrier.spare",
+		  { "Spare", "gmr1_ccch.bcch_carrier.spare",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_reject_cause,
-		  { "Cause", "gmr1.rr.reject_cause.cause",
+		  { "Cause", "gmr1_ccch.reject_cause.cause",
 		    FT_UINT8, BASE_DEC, VALS(rr_reject_cause_vals), 0xfc,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_reject_cause_b,
-		  { "BCCH Carrier IE presence", "gmr1.rr.reject_cause.b",
+		  { "BCCH Carrier IE presence", "gmr1_ccch.reject_cause.b",
 		    FT_UINT8, BASE_DEC, VALS(rr_gen_ie_presence_vals), 0x01,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_gps_timestamp,
-		  { "GPS timestamp", "gmr1.rr.gps_timestamp",
+		  { "GPS timestamp", "gmr1_ccch.gps_timestamp",
 		    FT_UINT16, BASE_CUSTOM, rr_gps_timestamp_fmt, 0xffff,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_tmsi_avail_msk_tmsi[0],
-		  { "TMSI 1 Presence", "gmr1.rr.tmsi_avail_msk.tmsi1",
+		  { "TMSI 1 Presence", "gmr1_ccch.tmsi_avail_msk.tmsi1",
 		    FT_UINT8, BASE_DEC, VALS(rr_gen_ie_presence_vals), 0x10,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_tmsi_avail_msk_tmsi[1],
-		  { "TMSI 2 Presence", "gmr1.rr.tmsi_avail_msk.tmsi2",
+		  { "TMSI 2 Presence", "gmr1_ccch.tmsi_avail_msk.tmsi2",
 		    FT_UINT8, BASE_DEC, VALS(rr_gen_ie_presence_vals), 0x20,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_tmsi_avail_msk_tmsi[2],
-		  { "TMSI 3 Presence", "gmr1.rr.tmsi_avail_msk.tmsi3",
+		  { "TMSI 3 Presence", "gmr1_ccch.tmsi_avail_msk.tmsi3",
 		    FT_UINT8, BASE_DEC, VALS(rr_gen_ie_presence_vals), 0x40,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_tmsi_avail_msk_tmsi[3],
-		  { "TMSI 4 Presence", "gmr1.rr.tmsi_avail_msk.tmsi4",
+		  { "TMSI 4 Presence", "gmr1_ccch.tmsi_avail_msk.tmsi4",
 		    FT_UINT8, BASE_DEC, VALS(rr_gen_ie_presence_vals), 0x80,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_gps_almanac_pn,
-		  { "Page Number", "gmr1.rr.gps_almanac.pn",
+		  { "Page Number", "gmr1_ccch.gps_almanac.pn",
 		    FT_UINT8, BASE_CUSTOM, rr_gps_almanac_pn_fmt, 0xf8,
 		    "See ICD-GPS-200", HFILL }
 		},
 		{ &hf_rr_gps_almanac_wn,
-		  { "Word Number", "gmr1.rr.gps_almanac.wn",
+		  { "Word Number", "gmr1_ccch.gps_almanac.wn",
 		    FT_UINT8, BASE_DEC, NULL, 0x07,
 		    "See ICD-GPS-200", HFILL }
 		},
 		{ &hf_rr_gps_almanac_word,
-		  { "GPS Almanac Word", "gmr1.rr.gps_almanac.word",
+		  { "GPS Almanac Word", "gmr1_ccch.gps_almanac.word",
 		    FT_UINT24, BASE_HEX, NULL, 0x00,
 		    "See ICD-GPS-200", HFILL }
 		},
 		{ &hf_rr_gps_almanac_sfn,
-		  { "Sub Frame Number", "gmr1.rr.gps_almanac.sfn",
+		  { "Sub Frame Number", "gmr1_ccch.gps_almanac.sfn",
 		    FT_UINT8, BASE_DEC, VALS(rr_gps_almanac_sfn_vals), 0x80,
 		    "See ICD-GPS-200", HFILL }
 		},
 		{ &hf_rr_gps_almanac_co,
-		  { "CO", "gmr1.rr.gps_almanac.co",
+		  { "CO", "gmr1_ccch.gps_almanac.co",
 		    FT_UINT8, BASE_DEC, NULL, 0x40,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_gps_almanac_spare,
-		  { "Spare", "gmr1.rr.gps_almanac.spare",
+		  { "Spare", "gmr1_ccch.gps_almanac.spare",
 		    FT_UINT8, BASE_DEC, NULL, 0x3f,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_msc_id,
-		  { "MSC ID", "gmr1.rr.msc_id",
+		  { "MSC ID", "gmr1_ccch.msc_id",
 		    FT_UINT8, BASE_DEC, NULL, 0xfc,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_msc_id_spare,
-		  { "Spare", "gmr1.rr.msc_id.spare",
+		  { "Spare", "gmr1_ccch.msc_id.spare",
 		    FT_UINT8, BASE_DEC, NULL, 0x03,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_gps_discr,
-		  { "GPS Position field CRC-16", "gmr1.rr.gps_discriminator",
+		  { "GPS Position field CRC-16", "gmr1_ccch.gps_discriminator",
 		    FT_UINT16, BASE_HEX, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_3_prm_rlc_mode,
-		  { "RLC Mode", "gmr1.rr._pkt_imm_ass_3_prm.",
+		  { "RLC Mode", "gmr1_ccch.pkt_imm_ass_3_prm",
 		    FT_UINT8, BASE_DEC, VALS(rr_pkt_imm_ass_3_prm_rlc_mode_vals), 0x01,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_3_prm_spare,
-		  { "Spare", "gmr1.rr._pkt_imm_ass_3_prm.spare",
+		  { "Spare", "gmr1_ccch.pkt_imm_ass_3_prm.spare",
 		    FT_UINT8, BASE_DEC, NULL, 0x1e,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_3_prm_dl_tfi,
-		  { "Downlink TFI", "gmr1.rr._pkt_imm_ass_3_prm.tfi",
+		  { "Downlink TFI", "gmr1_ccch.pkt_imm_ass_3_prm.tfi",
 		    FT_UINT8, BASE_HEX, NULL, 0x00,
 		    "Temporary Flow Identifier", HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_3_prm_start_fn,
-		  { "Start Framenumber", "gmr1.rr._pkt_imm_ass_3_prm.start_fn",
+		  { "Start Framenumber", "gmr1_ccch.pkt_imm_ass_3_prm.start_fn",
 		    FT_UINT8, BASE_DEC, NULL, 0xf0,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_3_prm_mac_slot_alloc,
-		  { "MAC-slot Allocation", "gmr1.rr._pkt_imm_ass_3_prm.mac_slot_alloc",
+		  { "MAC-slot Allocation", "gmr1_ccch.pkt_imm_ass_3_prm.mac_slot_alloc",
 		    FT_UINT8, BASE_HEX, NULL, 0xff,
 		    "LSB=slot 0, MSB=slot 7", HFILL }
 		},
 		{ &hf_rr_pkt_freq_prm_arfcn,
-		  { "ARFCN", "gmr1.rr.pkt_freq_prm.arfcn",
+		  { "ARFCN", "gmr1_ccch.pkt_freq_prm.arfcn",
 		    FT_UINT16, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_freq_prm_dl_freq_plan_id,
-		  { "Downlink Freq. Plan ID", "gmr1.rr.pkt_freq_prm.dl_freq_plan_id",
+		  { "Downlink Freq. Plan ID", "gmr1_ccch.pkt_freq_prm.dl_freq_plan_id",
 		    FT_UINT8, BASE_DEC, VALS(rr_pkt_freq_prm_dl_freq_plan_id_vals), 0x08,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_freq_prm_dl_bw,
-		  { "Downlink Bandwidth", "gmr1.rr.pkt_freq_prm.dl_bw",
+		  { "Downlink Bandwidth", "gmr1_ccch.pkt_freq_prm.dl_bw",
 		    FT_UINT8, BASE_CUSTOM, rr_pkt_freq_prm_xx_bw_fmt, 0x70,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_freq_prm_ul_freq_dist,
-		  { "Uplink Freq. Distance", "gmr1.rr.pkt_freq_prm.ul_freq_dist",
+		  { "Uplink Freq. Distance", "gmr1_ccch.pkt_freq_prm.ul_freq_dist",
 		    FT_INT8, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_freq_prm_ul_bw,
-		  { "Uplink Bandwidth", "gmr1.rr.pkt_freq_prm.ul_bw",
+		  { "Uplink Bandwidth", "gmr1_ccch.pkt_freq_prm.ul_bw",
 		    FT_UINT8, BASE_CUSTOM, rr_pkt_freq_prm_xx_bw_fmt, 0x70,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_freq_prm_spare,
-		  { "Spare", "gmr1.rr.pkt_freq_prm.spare",
+		  { "Spare", "gmr1_ccch.pkt_freq_prm.spare",
 		    FT_UINT8, BASE_DEC, NULL, 0x80,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_2_prm_ac_spare1,
-		  { "Spare", "gmr1.rr._pkt_imm_ass_2_prm.ac.spare1",
+		  { "Spare", "gmr1_ccch.pkt_imm_ass_2_prm.ac.spare1",
 		    FT_UINT8, BASE_DEC, NULL, 0x01,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_2_prm_ac_final_alloc,
-		  { "Final Allocation", "gmr1.rr._pkt_imm_ass_2_prm.ac.final_alloc",
+		  { "Final Allocation", "gmr1_ccch.pkt_imm_ass_2_prm.ac.final_alloc",
 		    FT_UINT8, BASE_DEC, NULL, 0x02,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_2_prm_ac_usf_granularity,
-		  { "USF Granularity", "gmr1.rr._pkt_imm_ass_2_prm.ac.usf_granularity",
+		  { "USF Granularity", "gmr1_ccch.pkt_imm_ass_2_prm.ac.usf_granularity",
 		    FT_UINT8, BASE_DEC, NULL, 0x04,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_2_prm_ac_dl_ctl_mac_slot,
-		  { "Downlink Control MAC-slot", "gmr1.rr._pkt_imm_ass_2_prm.ac.dl_ctl_mac_slot",
+		  { "Downlink Control MAC-slot", "gmr1_ccch.pkt_imm_ass_2_prm.ac.dl_ctl_mac_slot",
 		    FT_UINT8, BASE_DEC, NULL, 0x38,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_2_prm_ac_mac_mode,
-		  { "MAC mode", "gmr1.rr._pkt_imm_ass_2_prm.ac.mac_mode",
+		  { "MAC mode", "gmr1_ccch.pkt_imm_ass_2_prm.ac.mac_mode",
 		    FT_UINT8, BASE_DEC, VALS(rr_pkt_imm_ass_2_prm_ac_mac_mode_vals), 0xc0,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_2_prm_ac_start_fn,
-		  { "Starting Frame Number", "gmr1.rr._pkt_imm_ass_2_prm.ac.start_fn",
+		  { "Starting Frame Number", "gmr1_ccch.pkt_imm_ass_2_prm.ac.start_fn",
 		    FT_UINT8, BASE_DEC, NULL, 0x0f,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_2_prm_ac_rlc_dblk_gnt,
-		  { "RLC Data Blocks Granted", "gmr1.rr._pkt_imm_ass_2_prm.ac.rlc_dblk_gnt",
+		  { "RLC Data Blocks Granted", "gmr1_ccch.pkt_imm_ass_2_prm.ac.rlc_dblk_gnt",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_2_prm_ac_mcs,
-		  { "MCS", "gmr1.rr._pkt_imm_ass_2_prm.ac.mcs",
+		  { "MCS", "gmr1_ccch.pkt_imm_ass_2_prm.ac.mcs",
 		    FT_UINT8, BASE_DEC, NULL, 0xf8,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_2_prm_ac_tfi,
-		  { "TFI", "gmr1.rr._pkt_imm_ass_2_prm.ac.tfi",
+		  { "TFI", "gmr1_ccch.pkt_imm_ass_2_prm.ac.tfi",
 		    FT_UINT8, BASE_HEX, NULL, 0x7f,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_2_prm_ac_spare2,
-		  { "Spare", "gmr1.rr._pkt_imm_ass_2_prm.ac.spare2",
+		  { "Spare", "gmr1_ccch.pkt_imm_ass_2_prm.ac.spare2",
 		    FT_UINT8, BASE_HEX, NULL, 0x80,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_2_prm_ac_mac_slot_alloc,
-		  { "MAC-slot Allocation", "gmr1.rr._pkt_imm_ass_2_prm.ac.mac_slot_alloc",
+		  { "MAC-slot Allocation", "gmr1_ccch.pkt_imm_ass_2_prm.ac.mac_slot_alloc",
 		    FT_UINT8, BASE_HEX, NULL, 0xff,
 		    "LSB=slot 0, MSB=slot 7", HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_2_prm_d_chan_mcs_cmd,
-		  { "Channel MCS Command", "gmr1.rr._pkt_imm_ass_2_prm.d.chan_mcs_cmd",
+		  { "Channel MCS Command", "gmr1_ccch.pkt_imm_ass_2_prm.d.chan_mcs_cmd",
 		    FT_UINT8, BASE_HEX, NULL, 0x0f,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_2_prm_d_chan_mcs_cmd_pnb512,
-		  { "Channel MCS Command PNB 5,12", "gmr1.rr._pkt_imm_ass_2_prm.d.chan_mcs_cmd_pnb512",
+		  { "Channel MCS Command PNB 5,12", "gmr1_ccch.pkt_imm_ass_2_prm.d.chan_mcs_cmd_pnb512",
 		    FT_UINT8, BASE_HEX, NULL, 0xf0,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_2_prm_d_spare1,
-		  { "Spare", "gmr1.rr._pkt_imm_ass_2_prm.d.spare1",
+		  { "Spare", "gmr1_ccch.pkt_imm_ass_2_prm.d.spare1",
 		    FT_UINT8, BASE_HEX, NULL, 0xff,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_2_prm_d_rlc_dblk_gnt,
-		  { "RLC Data Blocks Granted", "gmr1.rr._pkt_imm_ass_2_prm.d.rlc_dblk_gnt",
+		  { "RLC Data Blocks Granted", "gmr1_ccch.pkt_imm_ass_2_prm.d.rlc_dblk_gnt",
 		    FT_UINT8, BASE_DEC, NULL, 0x7f,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_2_prm_d_spare2,
-		  { "Spare", "gmr1.rr._pkt_imm_ass_2_prm.d.spare2",
+		  { "Spare", "gmr1_ccch.pkt_imm_ass_2_prm.d.spare2",
 		    FT_UINT8, BASE_HEX, NULL, 0x80,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_2_prm_d_tfi,
-		  { "TFI", "gmr1.rr._pkt_imm_ass_2_prm.d.tfi",
+		  { "TFI", "gmr1_ccch.pkt_imm_ass_2_prm.d.tfi",
 		    FT_UINT8, BASE_HEX, NULL, 0x7f,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_2_prm_d_usf_granularity,
-		  { "USF Granularity", "gmr1.rr._pkt_imm_ass_2_prm.ac.usf_granularity",
+		  { "USF Granularity", "gmr1_ccch.pkt_imm_ass_2_prm.ac.usf_granularity",
 		    FT_UINT8, BASE_DEC, NULL, 0x80,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_2_prm_d_mac_slot_alloc,
-		  { "MAC-slot Allocation", "gmr1.rr._pkt_imm_ass_2_prm.d.mac_slot_alloc",
+		  { "MAC-slot Allocation", "gmr1_ccch.pkt_imm_ass_2_prm.d.mac_slot_alloc",
 		    FT_UINT8, BASE_HEX, NULL, 0xff,
 		    "LSB=slot 0, MSB=slot 7", HFILL }
 		},
 		{ &hf_rr_usf_value,
-		  { "Uplink state flag (USF)", "gmr1.rr.usf.value",
+		  { "Uplink state flag (USF)", "gmr1_ccch.usf.value",
 		    FT_UINT8, BASE_HEX, NULL, 0x3f,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_usf_spare,
-		  { "Spare", "gmr1.rr.usf.spare",
+		  { "Spare", "gmr1_ccch.usf.spare",
 		    FT_UINT24, BASE_DEC, NULL, 0xffffc0,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_timing_adv_idx_value,
-		  { "TAI Value", "gmr1.rr.timing_adv_idx.tai",
+		  { "TAI Value", "gmr1_ccch.timing_adv_idx.tai",
 		    FT_UINT8, BASE_DEC, NULL, 0x7f,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_timing_adv_idx_spare,
-		  { "Spare", "gmr1.rr.timing_adv_idx.spare",
+		  { "Spare", "gmr1_ccch.timing_adv_idx.spare",
 		    FT_UINT8, BASE_DEC, NULL, 0x80,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_tlli,
-		  { "TLLI", "gmr1.rr.tlli",
+		  { "TLLI", "gmr1_ccch.tlli",
 		    FT_UINT32, BASE_HEX,  NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_pwr_ctrl_prm_par,
-		  { "Power Attenuation Request (PAR)", "gmr1.rr.pkt_pwr_ctrl_prm.par",
+		  { "Power Attenuation Request (PAR)", "gmr1_ccch.pkt_pwr_ctrl_prm.par",
 		    FT_UINT8, BASE_CUSTOM, rr_pkt_pwr_ctrl_prm_par_fmt, 0x3f,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_pwr_ctrl_prm_spare,
-		  { "Spare", "gmr1.rr.pkt_pwr_ctrl_prm.spare",
+		  { "Spare", "gmr1_ccch.pkt_pwr_ctrl_prm.spare",
 		    FT_UINT8, BASE_DEC, NULL, 0xc0,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_persistence_lvl[0],
-		  { "for Radio priority 1", "gmr1.rr.persistence_lvl.p1",
+		  { "for Radio priority 1", "gmr1_ccch.persistence_lvl.p1",
 		    FT_UINT8, BASE_DEC, NULL, 0xf0,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_persistence_lvl[1],
-		  { "for Radio priority 2", "gmr1.rr.persistence_lvl.p2",
+		  { "for Radio priority 2", "gmr1_ccch.persistence_lvl.p2",
 		    FT_UINT8, BASE_DEC, NULL, 0x0f,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_persistence_lvl[2],
-		  { "for Radio priority 3", "gmr1.rr.persistence_lvl.p3",
+		  { "for Radio priority 3", "gmr1_ccch.persistence_lvl.p3",
 		    FT_UINT8, BASE_DEC, NULL, 0xf0,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_persistence_lvl[3],
-		  { "for Radio priority 4", "gmr1.rr.persistence_lvl.p4",
+		  { "for Radio priority 4", "gmr1_ccch.persistence_lvl.p4",
 		    FT_UINT8, BASE_DEC, NULL, 0x0f,
 		    NULL, HFILL }
 		},