diff --git a/lib/include/srslte/asn1/rrc.h b/lib/include/srslte/asn1/rrc.h index d31155ea6..b31e98a42 100644 --- a/lib/include/srslte/asn1/rrc.h +++ b/lib/include/srslte/asn1/rrc.h @@ -56,7 +56,7 @@ struct mib_mbms_r14_s { }; // BCCH-BCH-MessageType-MBMS-r14 ::= MasterInformationBlock-MBMS-r14 -typedef mib_mbms_r14_s bcch_bch_msg_type_mbms_r14_s; +using bcch_bch_msg_type_mbms_r14_s = mib_mbms_r14_s; // BCCH-BCH-Message-MBMS ::= SEQUENCE struct bcch_bch_msg_mbms_s { @@ -69,7 +69,7 @@ struct bcch_bch_msg_mbms_s { }; // SystemInformation-MBMS-r14 ::= SystemInformation -typedef sys_info_s sys_info_mbms_r14_s; +using sys_info_mbms_r14_s = sys_info_s; // BCCH-DL-SCH-MessageType-MBMS-r14 ::= CHOICE struct bcch_dl_sch_msg_type_mbms_r14_c { @@ -181,7 +181,7 @@ struct bcch_dl_sch_msg_mbms_s { }; // ThresholdEUTRA-v1250 ::= INTEGER (0..97) -typedef uint8_t thres_eutra_v1250; +using thres_eutra_v1250 = uint8_t; // MBMS-SessionInfo-r9 ::= SEQUENCE struct mbms_session_info_r9_s { @@ -2188,7 +2188,7 @@ using meas_result_serv_cell_list_scg_ext_r13_l = dyn_array; // SBCCH-SL-BCH-MessageType ::= MasterInformationBlock-SL -typedef mib_sl_s sbcch_sl_bch_msg_type_s; +using sbcch_sl_bch_msg_type_s = mib_sl_s; // SBCCH-SL-BCH-Message ::= SEQUENCE struct sbcch_sl_bch_msg_s { @@ -2201,7 +2201,7 @@ struct sbcch_sl_bch_msg_s { }; // SBCCH-SL-BCH-MessageType-V2X-r14 ::= MasterInformationBlock-SL-V2X-r14 -typedef mib_sl_v2x_r14_s sbcch_sl_bch_msg_type_v2x_r14_s; +using sbcch_sl_bch_msg_type_v2x_r14_s = mib_sl_v2x_r14_s; // SBCCH-SL-BCH-Message-V2X-r14 ::= SEQUENCE struct sbcch_sl_bch_msg_v2x_r14_s { @@ -2383,7 +2383,7 @@ struct scg_cfg_info_r12_s { types type_; scg_cfg_info_r12_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -3073,7 +3073,7 @@ using var_meas_report_list_l = dyn_array; using var_meas_report_list_r12_l = dyn_array; // VarMobilityHistoryReport-r12 ::= VisitedCellInfoList-r12 -typedef visited_cell_info_list_r12_l var_mob_history_report_r12_l; +using var_mob_history_report_r12_l = visited_cell_info_list_r12_l; // VarRLF-Report-r10 ::= SEQUENCE struct var_rlf_report_r10_s { @@ -3110,7 +3110,7 @@ struct var_short_inactive_mac_input_r15_s { }; // VarShortMAC-Input-NB-r13 ::= VarShortMAC-Input -typedef var_short_mac_input_s var_short_mac_input_nb_r13_s; +using var_short_mac_input_nb_r13_s = var_short_mac_input_s; // VarShortResumeMAC-Input-r13 ::= SEQUENCE struct var_short_resume_mac_input_r13_s { @@ -3126,7 +3126,7 @@ struct var_short_resume_mac_input_r13_s { }; // VarShortResumeMAC-Input-NB-r13 ::= VarShortResumeMAC-Input-r13 -typedef var_short_resume_mac_input_r13_s var_short_resume_mac_input_nb_r13_s; +using var_short_resume_mac_input_nb_r13_s = var_short_resume_mac_input_r13_s; // VarWLAN-MobilityConfig ::= SEQUENCE struct var_wlan_mob_cfg_s { diff --git a/lib/include/srslte/asn1/rrc/bcch_msg.h b/lib/include/srslte/asn1/rrc/bcch_msg.h index 91b28d785..36e7fef1e 100644 --- a/lib/include/srslte/asn1/rrc/bcch_msg.h +++ b/lib/include/srslte/asn1/rrc/bcch_msg.h @@ -30,7 +30,7 @@ namespace rrc { ******************************************************************************/ // BCCH-BCH-MessageType ::= MasterInformationBlock -typedef mib_s bcch_bch_msg_type_s; +using bcch_bch_msg_type_s = mib_s; // BCCH-BCH-Message ::= SEQUENCE struct bcch_bch_msg_s { @@ -3844,8 +3844,8 @@ private: // SystemInformation-r8-IEs ::= SEQUENCE struct sys_info_r8_ies_s { - typedef sib_info_item_c sib_type_and_info_item_c_; - using sib_type_and_info_l_ = dyn_array; + using sib_type_and_info_item_c_ = sib_info_item_c; + using sib_type_and_info_l_ = dyn_array; // member variables bool non_crit_ext_present = false; @@ -4073,10 +4073,10 @@ struct bcch_dl_sch_msg_s { }; // SystemInformation-BR-r13 ::= SystemInformation -typedef sys_info_s sys_info_br_r13_s; +using sys_info_br_r13_s = sys_info_s; // SystemInformationBlockType1-BR-r13 ::= SystemInformationBlockType1 -typedef sib_type1_s sib_type1_br_r13_s; +using sib_type1_br_r13_s = sib_type1_s; // BCCH-DL-SCH-MessageType-BR-r13 ::= CHOICE struct bcch_dl_sch_msg_type_br_r13_c { @@ -4741,7 +4741,7 @@ struct sib_type6_v8h0_ies_s { }; // SystemInformationBlockType16-NB-r13 ::= SystemInformationBlockType16-r11 -typedef sib_type16_r11_s sib_type16_nb_r13_s; +using sib_type16_nb_r13_s = sib_type16_r11_s; } // namespace rrc } // namespace asn1 diff --git a/lib/include/srslte/asn1/rrc/common_ext.h b/lib/include/srslte/asn1/rrc/common_ext.h index e1f990c8f..77d0235d1 100644 --- a/lib/include/srslte/asn1/rrc/common_ext.h +++ b/lib/include/srslte/asn1/rrc/common_ext.h @@ -958,7 +958,7 @@ struct sl_disc_res_pool_r12_s { uint8_t to_number() const; }; typedef enumerated setup_e_; - typedef setup_e types; + using types = setup_e; // choice methods disc_period_v1310_c_() = default; @@ -993,7 +993,7 @@ struct sl_disc_res_pool_r12_s { struct setup_s_ { pci_list_r13_l pci_r13; }; - typedef setup_e types; + using types = setup_e; // choice methods rx_params_add_neigh_freq_r13_c_() = default; @@ -1057,7 +1057,7 @@ struct sl_disc_res_pool_r12_s { int8_t ref_sig_pwr = -60; uint8_t sync_cfg_idx_r13 = 0; }; - typedef setup_e types; + using types = setup_e; // choice methods tx_params_add_neigh_freq_r13_c_() = default; @@ -1097,7 +1097,7 @@ struct sl_disc_res_pool_r12_s { // member variables freq_info_v1370_s_ freq_info_v1370; }; - typedef setup_e types; + using types = setup_e; // choice methods tx_params_add_neigh_freq_v1370_c_() = default; diff --git a/lib/include/srslte/asn1/rrc/dl_ccch_msg.h b/lib/include/srslte/asn1/rrc/dl_ccch_msg.h index dbaf6d80e..fc99cfb9b 100644 --- a/lib/include/srslte/asn1/rrc/dl_ccch_msg.h +++ b/lib/include/srslte/asn1/rrc/dl_ccch_msg.h @@ -590,7 +590,7 @@ struct rrc_conn_reest_s { types type_; rrc_conn_reest_r8_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -723,7 +723,7 @@ struct rrc_conn_reject_s { types type_; rrc_conn_reject_r8_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -810,7 +810,7 @@ struct rrc_conn_setup_s { types type_; rrc_conn_setup_r8_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; diff --git a/lib/include/srslte/asn1/rrc/dl_dcch_msg.h b/lib/include/srslte/asn1/rrc/dl_dcch_msg.h index a6f9eeb35..9334ea7f0 100644 --- a/lib/include/srslte/asn1/rrc/dl_dcch_msg.h +++ b/lib/include/srslte/asn1/rrc/dl_dcch_msg.h @@ -595,7 +595,7 @@ struct sl_disc_tx_res_r13_c { void destroy_(); }; - typedef setup_e types; + using types = setup_e; // choice methods sl_disc_tx_res_r13_c() = default; @@ -639,7 +639,7 @@ struct tdm_pattern_cfg_r15_c { sf_assign_r15_e sf_assign_r15; uint8_t harq_offset_r15 = 0; }; - typedef setup_e types; + using types = setup_e; // choice methods tdm_pattern_cfg_r15_c() = default; @@ -895,7 +895,7 @@ struct rrc_conn_recfg_v1510_ies_s { dyn_octstring nr_secondary_cell_group_cfg_r15; int8_t p_max_eutra_r15 = -30; }; - typedef setup_e types; + using types = setup_e; // choice methods nr_cfg_r15_c_() = default; @@ -1086,7 +1086,7 @@ struct sl_v2x_cfg_ded_r14_s { void destroy_(); }; - typedef setup_e types; + using types = setup_e; // choice methods comm_tx_res_r14_c_() = default; @@ -1184,7 +1184,7 @@ struct sl_v2x_cfg_ded_r14_s { void destroy_(); }; - typedef setup_e types; + using types = setup_e; // choice methods comm_tx_res_v1530_c_() = default; @@ -1248,7 +1248,7 @@ struct lwa_cfg_r13_c { struct setup_s_ { lwa_cfg_r13_s lwa_cfg_r13; }; - typedef setup_e types; + using types = setup_e; // choice methods lwa_cfg_r13_c() = default; @@ -1285,7 +1285,7 @@ struct lwip_cfg_r13_c { struct setup_s_ { lwip_cfg_r13_s lwip_cfg_r13; }; - typedef setup_e types; + using types = setup_e; // choice methods lwip_cfg_r13_c() = default; @@ -1392,7 +1392,7 @@ struct rclwi_cfg_r13_c { struct setup_s_ { rclwi_cfg_r13_s rclwi_cfg_r13; }; - typedef setup_e types; + using types = setup_e; // choice methods rclwi_cfg_r13_c() = default; @@ -1659,7 +1659,7 @@ struct scg_cfg_r12_c { scg_cfg_part_mcg_r12_s_ scg_cfg_part_mcg_r12; scg_cfg_part_scg_r12_s scg_cfg_part_scg_r12; }; - typedef setup_e types; + using types = setup_e; // choice methods scg_cfg_r12_c() = default; @@ -1768,7 +1768,7 @@ struct sl_comm_cfg_r12_s { void destroy_(); }; - typedef setup_e types; + using types = setup_e; // choice methods comm_tx_res_r12_c_() = default; @@ -1871,7 +1871,7 @@ struct sl_comm_cfg_r12_s { void destroy_(); }; - typedef setup_e types; + using types = setup_e; // choice methods comm_tx_res_v1310_c_() = default; @@ -1998,7 +1998,7 @@ struct sl_disc_cfg_r12_s { void destroy_(); }; - typedef setup_e types; + using types = setup_e; // choice methods disc_tx_res_r12_c_() = default; @@ -2033,7 +2033,7 @@ struct sl_disc_cfg_r12_s { struct setup_s_ { sl_tf_idx_pair_list_r12b_l disc_tf_idx_list_r12b; }; - typedef setup_e types; + using types = setup_e; // choice methods disc_tf_idx_list_v1260_c_() = default; @@ -2124,7 +2124,7 @@ struct sl_disc_cfg_r12_s { void destroy_(); }; - typedef setup_e types; + using types = setup_e; // choice methods disc_tx_res_ps_r13_c_() = default; @@ -2164,7 +2164,7 @@ struct sl_disc_cfg_r12_s { sl_disc_tx_ref_carrier_ded_r13_c disc_tx_ref_carrier_ded_r13; sl_disc_tx_info_inter_freq_list_add_r13_s disc_tx_info_inter_freq_list_add_r13; }; - typedef setup_e types; + using types = setup_e; // choice methods disc_tx_inter_freq_info_r13_c_() = default; @@ -2196,7 +2196,7 @@ struct sl_disc_cfg_r12_s { setup_s_ c; }; struct disc_rx_gap_cfg_r13_c_ { - typedef setup_e types; + using types = setup_e; // choice methods disc_rx_gap_cfg_r13_c_() = default; @@ -2228,7 +2228,7 @@ struct sl_disc_cfg_r12_s { sl_gap_cfg_r13_s c; }; struct disc_tx_gap_cfg_r13_c_ { - typedef setup_e types; + using types = setup_e; // choice methods disc_tx_gap_cfg_r13_c_() = default; @@ -2260,7 +2260,7 @@ struct sl_disc_cfg_r12_s { sl_gap_cfg_r13_s c; }; struct disc_sys_info_to_report_cfg_r13_c_ { - typedef setup_e types; + using types = setup_e; // choice methods disc_sys_info_to_report_cfg_r13_c_() = default; @@ -2354,7 +2354,7 @@ struct rrc_conn_recfg_v1250_ies_s { wlan_offload_cfg_r12_s wlan_offload_cfg_ded_r12; t350_r12_e_ t350_r12; }; - typedef setup_e types; + using types = setup_e; // choice methods wlan_offload_info_r12_c_() = default; @@ -2549,7 +2549,7 @@ struct idc_cfg_r11_s { autonomous_denial_validity_r11_e_ autonomous_denial_validity_r11; }; struct idc_ind_mrdc_r15_c_ { - typedef setup_e types; + using types = setup_e; // choice methods idc_ind_mrdc_r15_c_() = default; @@ -2644,7 +2644,7 @@ struct pwr_pref_ind_cfg_r11_c { // member variables pwr_pref_ind_timer_r11_e_ pwr_pref_ind_timer_r11; }; - typedef setup_e types; + using types = setup_e; // choice methods pwr_pref_ind_cfg_r11_c() = default; @@ -2848,7 +2848,7 @@ struct other_cfg_r9_s { // member variables delay_budget_report_prohibit_timer_r14_e_ delay_budget_report_prohibit_timer_r14; }; - typedef setup_e types; + using types = setup_e; // choice methods delay_budget_report_cfg_r14_c_() = default; @@ -2913,7 +2913,7 @@ struct other_cfg_r9_s { bool rlm_report_rep_mpdcch_r14_present = false; rlm_report_timer_r14_e_ rlm_report_timer_r14; }; - typedef setup_e types; + using types = setup_e; // choice methods rlm_report_cfg_r14_c_() = default; @@ -2977,7 +2977,7 @@ struct other_cfg_r9_s { // member variables overheat_ind_prohibit_timer_r14_e_ overheat_ind_prohibit_timer_r14; }; - typedef setup_e types; + using types = setup_e; // choice methods overheat_assist_cfg_r14_c_() = default; @@ -3021,7 +3021,7 @@ struct other_cfg_r9_s { bounded_octstring<1, 1000> meas_cfg_app_layer_container_r15; service_type_r15_e_ service_type_r15; }; - typedef setup_e types; + using types = setup_e; // choice methods meas_cfg_app_layer_r15_c_() = default; @@ -5085,7 +5085,7 @@ struct counter_check_s { types type_; counter_check_r8_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -5188,7 +5188,7 @@ struct dl_info_transfer_s { void destroy_(); }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -5272,7 +5272,7 @@ struct ho_from_eutra_prep_request_s { types type_; ho_from_eutra_prep_request_r8_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -5356,7 +5356,7 @@ struct logged_meas_cfg_r10_s { types type_; logged_meas_cfg_r10_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -5458,7 +5458,7 @@ struct mob_from_eutra_cmd_s { void destroy_(); }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -5542,7 +5542,7 @@ struct rn_recfg_r10_s { types type_; rn_recfg_r10_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -5630,7 +5630,7 @@ struct rrc_conn_recfg_s { types type_; rrc_conn_recfg_r8_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -5714,7 +5714,7 @@ struct rrc_conn_release_s { types type_; rrc_conn_release_r8_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -5798,7 +5798,7 @@ struct rrc_conn_resume_r13_s { types type_; rrc_conn_resume_r13_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -5882,7 +5882,7 @@ struct ue_info_request_r9_s { types type_; ue_info_request_r9_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -6272,7 +6272,7 @@ struct scg_cfg_v13c0_c { bool scg_cfg_part_scg_v13c0_present = false; scg_cfg_part_scg_v13c0_s scg_cfg_part_scg_v13c0; }; - typedef setup_e types; + using types = setup_e; // choice methods scg_cfg_v13c0_c() = default; @@ -6367,7 +6367,7 @@ struct scg_cfg_v12f0_c { bool scg_cfg_part_scg_v12f0_present = false; scg_cfg_part_scg_v12f0_s scg_cfg_part_scg_v12f0; }; - typedef setup_e types; + using types = setup_e; // choice methods scg_cfg_v12f0_c() = default; diff --git a/lib/include/srslte/asn1/rrc/ho_cmd.h b/lib/include/srslte/asn1/rrc/ho_cmd.h index 288121642..263e41de0 100644 --- a/lib/include/srslte/asn1/rrc/ho_cmd.h +++ b/lib/include/srslte/asn1/rrc/ho_cmd.h @@ -154,7 +154,7 @@ struct scg_cfg_r12_s { types type_; scg_cfg_r12_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -474,7 +474,7 @@ struct ho_cmd_s { types type_; ho_cmd_r8_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -799,7 +799,7 @@ struct ho_prep_info_s { types type_; ho_prep_info_r8_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -898,7 +898,7 @@ struct var_meas_cfg_s { mob_state_params_s mob_state_params; speed_state_scale_factors_s time_to_trigger_sf; }; - typedef setup_e types; + using types = setup_e; // choice methods speed_state_pars_c_() = default; diff --git a/lib/include/srslte/asn1/rrc/meascfg.h b/lib/include/srslte/asn1/rrc/meascfg.h index 2e0a0e2b5..7e6d1c50c 100644 --- a/lib/include/srslte/asn1/rrc/meascfg.h +++ b/lib/include/srslte/asn1/rrc/meascfg.h @@ -699,7 +699,7 @@ using alt_ttt_cells_to_add_mod_list_r12_l = dyn_array subcarrier_spacing_ssb_r15_e_; struct ssb_to_measure_r15_c_ { - typedef setup_e types; + using types = setup_e; // choice methods ssb_to_measure_r15_c_() = default; @@ -1590,7 +1590,7 @@ struct rs_cfg_ssb_nr_r15_s { // RSRQ-RangeConfig-r12 ::= CHOICE struct rsrq_range_cfg_r12_c { - typedef setup_e types; + using types = setup_e; // choice methods rsrq_range_cfg_r12_c() = default; @@ -1947,7 +1947,7 @@ struct ul_delay_cfg_r13_c { // member variables delay_thres_r13_e_ delay_thres_r13; }; - typedef setup_e types; + using types = setup_e; // choice methods ul_delay_cfg_r13_c() = default; @@ -2013,7 +2013,7 @@ using wlan_id_list_r13_l = dyn_array; // WLAN-NameListConfig-r15 ::= CHOICE struct wlan_name_list_cfg_r15_c { - typedef setup_e types; + using types = setup_e; // choice methods wlan_name_list_cfg_r15_c() = default; @@ -2097,7 +2097,7 @@ struct meas_obj_eutra_s { uint16_t to_number() const; }; typedef enumerated setup_e_; - typedef setup_e types; + using types = setup_e; // choice methods t312_r12_c_() = default; @@ -2220,7 +2220,7 @@ struct meas_obj_geran_s { struct meas_obj_nr_r15_s { using cells_for_which_to_report_sftd_r15_l_ = bounded_array; struct band_nr_r15_c_ { - typedef setup_e types; + using types = setup_e; // choice methods band_nr_r15_c_() = default; @@ -2825,7 +2825,7 @@ struct eutra_event_s { // ReportConfigEUTRA ::= SEQUENCE struct report_cfg_eutra_s { struct trigger_type_c_ { - typedef eutra_event_s event_s_; + using event_s_ = eutra_event_s; struct periodical_s_ { struct purpose_opts { enum options { report_strongest_cells, report_cgi, nulltype } value; @@ -2915,7 +2915,7 @@ struct report_cfg_eutra_s { }; typedef enumerated report_amount_e_; struct alt_time_to_trigger_r12_c_ { - typedef setup_e types; + using types = setup_e; // choice methods alt_time_to_trigger_r12_c_() = default; @@ -2965,7 +2965,7 @@ struct report_cfg_eutra_s { uint8_t a5_thres2_r13 = 0; report_quant_v1310_e_ report_quant_v1310; }; - typedef setup_e types; + using types = setup_e; // choice methods rs_sinr_cfg_r13_c_() = default; @@ -3482,7 +3482,7 @@ struct report_cfg_inter_rat_s { }; typedef enumerated report_amount_e_; struct b2_thres1_v1250_c_ { - typedef setup_e types; + using types = setup_e; // choice methods b2_thres1_v1250_c_() = default; @@ -4485,7 +4485,7 @@ struct meas_gap_cfg_dense_prs_r15_c { // member variables gap_offset_dense_prs_r15_c_ gap_offset_dense_prs_r15; }; - typedef setup_e types; + using types = setup_e; // choice methods meas_gap_cfg_dense_prs_r15_c() = default; @@ -4525,7 +4525,7 @@ struct meas_gap_cfg_per_cc_list_r14_c { meas_gap_cfg_to_rem_list_r14_l meas_gap_cfg_to_rem_list_r14; meas_gap_cfg_to_add_mod_list_r14_l meas_gap_cfg_to_add_mod_list_r14; }; - typedef setup_e types; + using types = setup_e; // choice methods meas_gap_cfg_per_cc_list_r14_c() = default; @@ -4573,7 +4573,7 @@ struct meas_gap_sharing_cfg_r14_c { // member variables meas_gap_sharing_scheme_r14_e_ meas_gap_sharing_scheme_r14; }; - typedef setup_e types; + using types = setup_e; // choice methods meas_gap_sharing_cfg_r14_c() = default; @@ -4793,7 +4793,7 @@ struct meas_cfg_s { mob_state_params_s mob_state_params; speed_state_scale_factors_s time_to_trigger_sf; }; - typedef setup_e types; + using types = setup_e; // choice methods speed_state_pars_c_() = default; @@ -4825,7 +4825,7 @@ struct meas_cfg_s { setup_s_ c; }; struct meas_scale_factor_r12_c_ { - typedef setup_e types; + using types = setup_e; // choice methods meas_scale_factor_r12_c_() = default; @@ -4857,7 +4857,7 @@ struct meas_cfg_s { meas_scale_factor_r12_e c; }; struct height_thresh_ref_r15_c_ { - typedef setup_e types; + using types = setup_e; // choice methods height_thresh_ref_r15_c_() = default; @@ -6596,7 +6596,7 @@ struct meas_report_s { types type_; meas_report_r8_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; diff --git a/lib/include/srslte/asn1/rrc/paging.h b/lib/include/srslte/asn1/rrc/paging.h index 89e753c77..7f521eebc 100644 --- a/lib/include/srslte/asn1/rrc/paging.h +++ b/lib/include/srslte/asn1/rrc/paging.h @@ -371,7 +371,7 @@ struct ue_paging_coverage_info_s { types type_; ue_paging_coverage_info_r13_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -495,7 +495,7 @@ struct ue_radio_paging_info_s { types type_; ue_radio_paging_info_r12_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; diff --git a/lib/include/srslte/asn1/rrc/phy_ded.h b/lib/include/srslte/asn1/rrc/phy_ded.h index e92884ade..faf5b1815 100644 --- a/lib/include/srslte/asn1/rrc/phy_ded.h +++ b/lib/include/srslte/asn1/rrc/phy_ded.h @@ -199,7 +199,7 @@ struct csi_rs_cfg_nzp_r11_s { struct setup_s_ { mbsfn_sf_cfg_list_l sf_cfg_list; }; - typedef setup_e types; + using types = setup_e; // choice methods mbsfn_sf_cfg_list_r11_c_() = default; @@ -243,7 +243,7 @@ struct csi_rs_cfg_nzp_r11_s { struct setup_s_ { mbsfn_sf_cfg_list_v1430_l sf_cfg_list_v1430; }; - typedef setup_e types; + using types = setup_e; // choice methods mbsfn_sf_cfg_list_v1430_c_() = default; @@ -393,7 +393,7 @@ struct csi_rs_cfg_nzp_emimo_r13_c { nzp_res_cfg_list_r13_l_ nzp_res_cfg_list_r13; cdm_type_r13_e_ cdm_type_r13; }; - typedef setup_e types; + using types = setup_e; // choice methods csi_rs_cfg_nzp_emimo_r13_c() = default; @@ -505,7 +505,7 @@ struct csi_rs_cfg_bf_v1430_s { // CSI-RS-ConfigEMIMO2-r14 ::= CHOICE struct csi_rs_cfg_emimo2_r14_c { - typedef setup_e types; + using types = setup_e; // choice methods csi_rs_cfg_emimo2_r14_c() = default; @@ -748,7 +748,7 @@ struct cri_report_cfg_r13_c { uint16_t cri_cfg_idx_r13 = 0; uint16_t cri_cfg_idx2_r13 = 0; }; - typedef setup_e types; + using types = setup_e; // choice methods cri_report_cfg_r13_c() = default; @@ -790,7 +790,7 @@ struct csi_rs_cfg_emimo_hybrid_r14_c { uint16_t periodicity_offset_idx_r14 = 0; csi_rs_cfg_emimo2_r14_c emimo_type2_r14; }; - typedef setup_e types; + using types = setup_e; // choice methods csi_rs_cfg_emimo_hybrid_r14_c() = default; @@ -884,7 +884,7 @@ struct csi_rs_cfg_emimo_r13_c { void destroy_(); }; - typedef setup_e types; + using types = setup_e; // choice methods csi_rs_cfg_emimo_r13_c() = default; @@ -978,7 +978,7 @@ struct csi_rs_cfg_emimo_v1430_c { void destroy_(); }; - typedef setup_e types; + using types = setup_e; // choice methods csi_rs_cfg_emimo_v1430_c() = default; @@ -1072,7 +1072,7 @@ struct csi_rs_cfg_emimo_v1480_c { void destroy_(); }; - typedef setup_e types; + using types = setup_e; // choice methods csi_rs_cfg_emimo_v1480_c() = default; @@ -1130,7 +1130,7 @@ struct csi_rs_cfg_emimo_v1530_c { private: csi_rs_cfg_non_precoded_v1530_s c; }; - typedef setup_e types; + using types = setup_e; // choice methods csi_rs_cfg_emimo_v1530_c() = default; @@ -1261,7 +1261,7 @@ struct cqi_report_periodic_proc_ext_r11_s { uint16_t cqi_pmi_cfg_idx2_r11 = 0; uint16_t ri_cfg_idx2_r11 = 0; }; - typedef setup_e types; + using types = setup_e; // choice methods csi_cfg_idx_r11_c_() = default; @@ -1371,7 +1371,7 @@ struct csi_im_cfg_ext_r12_s { struct csi_process_r11_s { struct csi_im_cfg_id_list_r12_c_ { using setup_l_ = bounded_array; - typedef setup_e types; + using types = setup_e; // choice methods csi_im_cfg_id_list_r12_c_() = default; @@ -1405,7 +1405,7 @@ struct csi_process_r11_s { setup_l_ c; }; struct cqi_report_aperiodic_proc2_r12_c_ { - typedef setup_e types; + using types = setup_e; // choice methods cqi_report_aperiodic_proc2_r12_c_() = default; @@ -1439,7 +1439,7 @@ struct csi_process_r11_s { cqi_report_aperiodic_proc_r11_s c; }; struct cqi_report_aperiodic_proc_v1310_c_ { - typedef setup_e types; + using types = setup_e; // choice methods cqi_report_aperiodic_proc_v1310_c_() = default; @@ -1473,7 +1473,7 @@ struct csi_process_r11_s { cqi_report_aperiodic_proc_v1310_s c; }; struct cqi_report_aperiodic_proc2_v1310_c_ { - typedef setup_e types; + using types = setup_e; // choice methods cqi_report_aperiodic_proc2_v1310_c_() = default; @@ -1614,7 +1614,7 @@ struct cqi_report_aperiodic_r10_c { cqi_report_mode_aperiodic_e cqi_report_mode_aperiodic_r10; aperiodic_csi_trigger_r10_s_ aperiodic_csi_trigger_r10; }; - typedef setup_e types; + using types = setup_e; // choice methods cqi_report_aperiodic_r10_c() = default; @@ -1670,7 +1670,7 @@ struct cqi_report_aperiodic_v1250_c { // member variables aperiodic_csi_trigger_v1250_s_ aperiodic_csi_trigger_v1250; }; - typedef setup_e types; + using types = setup_e; // choice methods cqi_report_aperiodic_v1250_c() = default; @@ -1724,7 +1724,7 @@ struct cqi_report_aperiodic_v1310_c { fixed_bitstring<32> trigger5_sf_set_ind_r13; fixed_bitstring<32> trigger6_sf_set_ind_r13; }; - typedef setup_e types; + using types = setup_e; // choice methods aperiodic_csi_trigger2_r13_c_() = default; @@ -1764,7 +1764,7 @@ struct cqi_report_aperiodic_v1310_c { aperiodic_csi_trigger_v1310_s_ aperiodic_csi_trigger_v1310; aperiodic_csi_trigger2_r13_c_ aperiodic_csi_trigger2_r13; }; - typedef setup_e types; + using types = setup_e; // choice methods cqi_report_aperiodic_v1310_c() = default; @@ -2049,7 +2049,7 @@ struct cqi_report_periodic_r10_c { uint16_t cqi_pmi_cfg_idx2_r10 = 0; uint16_t ri_cfg_idx2_r10 = 0; }; - typedef setup_e types; + using types = setup_e; // choice methods csi_cfg_idx_r10_c_() = default; @@ -2096,7 +2096,7 @@ struct cqi_report_periodic_r10_c { bool simul_ack_nack_and_cqi = false; csi_cfg_idx_r10_c_ csi_cfg_idx_r10; }; - typedef setup_e types; + using types = setup_e; // choice methods cqi_report_periodic_r10_c() = default; @@ -2248,7 +2248,7 @@ struct spdcch_elems_r15_c { rate_matching_mode_r15_e_ rate_matching_mode_r15; // ... }; - typedef setup_e types; + using types = setup_e; // choice methods spdcch_elems_r15_c() = default; @@ -2311,7 +2311,7 @@ struct spucch_elems_r15_c { uint8_t n4max_coderate_multi_res_slot_pucch_r15 = 0; uint8_t n4max_coderate_multi_res_subslot_pucch_r15 = 0; }; - typedef setup_e types; + using types = setup_e; // choice methods spucch_elems_r15_c() = default; @@ -2407,7 +2407,7 @@ private: // ZeroTxPowerCSI-RS-Conf-r12 ::= CHOICE struct zero_tx_pwr_csi_rs_conf_r12_c { - typedef setup_e types; + using types = setup_e; // choice methods zero_tx_pwr_csi_rs_conf_r12_c() = default; @@ -2448,7 +2448,7 @@ struct cqi_report_cfg_r10_s { meas_sf_pattern_r10_c csi_meas_sf_set1_r10; meas_sf_pattern_r10_c csi_meas_sf_set2_r10; }; - typedef setup_e types; + using types = setup_e; // choice methods csi_sf_pattern_cfg_r10_c_() = default; @@ -2519,7 +2519,7 @@ struct cqi_report_cfg_v1250_s { struct setup_s_ { fixed_bitstring<10> csi_meas_sf_sets_r12; }; - typedef setup_e types; + using types = setup_e; // choice methods csi_sf_pattern_cfg_r12_c_() = default; @@ -2641,7 +2641,7 @@ struct csi_rs_cfg_r10_s { uint8_t sf_cfg_r10 = 0; int8_t p_c_r10 = -8; }; - typedef setup_e types; + using types = setup_e; // choice methods csi_rs_r10_c_() = default; @@ -2698,7 +2698,7 @@ struct csi_rs_cfg_v1250_s { // member variables zero_tx_pwr_csi_rs_list_r12_l_ zero_tx_pwr_csi_rs_list_r12; }; - typedef setup_e types; + using types = setup_e; // choice methods ds_zero_tx_pwr_csi_rs_r12_c_() = default; @@ -2866,7 +2866,7 @@ struct epdcch_set_cfg_r11_s { bounded_bitstring<4, 38> res_block_assign_r11; }; struct csi_rs_cfg_zp_id2_r12_c_ { - typedef setup_e types; + using types = setup_e; // choice methods csi_rs_cfg_zp_id2_r12_c_() = default; @@ -2900,7 +2900,7 @@ struct epdcch_set_cfg_r11_s { uint8_t c; }; struct num_prb_pairs_v1310_c_ { - typedef setup_e types; + using types = setup_e; // choice methods num_prb_pairs_v1310_c_() = default; @@ -3025,7 +3025,7 @@ struct epdcch_set_cfg_r11_s { mpdcch_num_repeat_r13_e_ mpdcch_num_repeat_r13; uint8_t mpdcch_nb_r13 = 1; }; - typedef setup_e types; + using types = setup_e; // choice methods mpdcch_cfg_r13_c_() = default; @@ -3153,7 +3153,7 @@ struct enable256_qam_r14_c { void destroy_(); }; - typedef setup_e types; + using types = setup_e; // choice methods enable256_qam_r14_c() = default; @@ -3202,7 +3202,7 @@ struct pdsch_re_map_qcl_cfg_r11_s { struct setup_s_ { mbsfn_sf_cfg_list_l sf_cfg_list; }; - typedef setup_e types; + using types = setup_e; // choice methods mbsfn_sf_cfg_list_r11_c_() = default; @@ -3255,7 +3255,7 @@ struct pdsch_re_map_qcl_cfg_r11_s { struct setup_s_ { mbsfn_sf_cfg_list_v1430_l sf_cfg_list_v1430; }; - typedef setup_e types; + using types = setup_e; // choice methods mbsfn_sf_cfg_list_v1430_c_() = default; @@ -3319,7 +3319,7 @@ struct pdsch_re_map_qcl_cfg_r11_s { uint8_t csi_rs_cfg_zp_id_v1530 = 1; uint8_t qcl_csi_rs_cfg_nzp_id_v1530 = 1; }; - typedef setup_e types; + using types = setup_e; // choice methods codeword_one_cfg_v1530_c_() = default; @@ -3408,7 +3408,7 @@ struct tpc_pdcch_cfg_c { fixed_bitstring<16> tpc_rnti; tpc_idx_c tpc_idx; }; - typedef setup_e types; + using types = setup_e; // choice methods tpc_pdcch_cfg_c() = default; @@ -3720,7 +3720,7 @@ struct ant_info_ded_stti_r15_c { bool slot_subslot_pdsch_tx_div_minus2_layer_r15 = false; bool slot_subslot_pdsch_tx_div_minus4_layer_r15 = false; }; - typedef setup_e types; + using types = setup_e; // choice methods ant_info_ded_stti_r15_c() = default; @@ -3805,7 +3805,7 @@ struct cqi_report_cfg_r15_c { cqi_report_cfg_v1430_s cqi_report_cfg_v1430; alt_cqi_table_minus1024_qam_r15_e_ alt_cqi_table_minus1024_qam_r15; }; - typedef setup_e types; + using types = setup_e; // choice methods cqi_report_cfg_r15_c() = default; @@ -3891,7 +3891,7 @@ struct cqi_report_periodic_c { uint16_t ri_cfg_idx = 0; bool simul_ack_nack_and_cqi = false; }; - typedef setup_e types; + using types = setup_e; // choice methods cqi_report_periodic_c() = default; @@ -3935,7 +3935,7 @@ struct csi_rs_cfg_r15_c { csi_rs_cfg_v1310_s csi_rs_cfg_v1310; csi_rs_cfg_v1430_s csi_rs_cfg_v1430; }; - typedef setup_e types; + using types = setup_e; // choice methods csi_rs_cfg_r15_c() = default; @@ -3978,7 +3978,7 @@ using csi_rs_cfg_nzp_to_release_list_r15_l = bounded_array; // CSI-RS-ConfigZP-ApList-r14 ::= CHOICE struct csi_rs_cfg_zp_ap_list_r14_c { using setup_l_ = dyn_array; - typedef setup_e types; + using types = setup_e; // choice methods csi_rs_cfg_zp_ap_list_r14_c() = default; @@ -4024,7 +4024,7 @@ struct dmrs_cfg_r11_c { uint16_t scrambling_id_r11 = 0; uint16_t scrambling_id2_r11 = 0; }; - typedef setup_e types; + using types = setup_e; // choice methods dmrs_cfg_r11_c() = default; @@ -4160,7 +4160,7 @@ struct eimta_main_cfg_r12_c { eimta_cmd_periodicity_r12_e_ eimta_cmd_periodicity_r12; fixed_bitstring<10> eimta_cmd_sf_set_r12; }; - typedef setup_e types; + using types = setup_e; // choice methods eimta_main_cfg_r12_c() = default; @@ -4209,7 +4209,7 @@ struct eimta_main_cfg_serv_cell_r12_c { struct setup_s_ { mbsfn_sf_cfg_list_l sf_cfg_list_r12; }; - typedef setup_e types; + using types = setup_e; // choice methods mbsfn_sf_cfg_list_v1250_c_() = default; @@ -4248,7 +4248,7 @@ struct eimta_main_cfg_serv_cell_r12_c { eimta_harq_ref_cfg_r12_e_ eimta_harq_ref_cfg_r12; mbsfn_sf_cfg_list_v1250_c_ mbsfn_sf_cfg_list_v1250; }; - typedef setup_e types; + using types = setup_e; // choice methods eimta_main_cfg_serv_cell_r12_c() = default; @@ -4360,7 +4360,7 @@ struct pucch_format3_conf_r13_s { // member variables n3_pucch_an_list_p1_r13_l_ n3_pucch_an_list_p1_r13; }; - typedef setup_e types; + using types = setup_e; // choice methods two_ant_port_activ_pucch_format3_r13_c_() = default; @@ -4432,7 +4432,7 @@ struct spdcch_cfg_r15_c { spdcch_l1_reuse_ind_r15_e_ spdcch_l1_reuse_ind_r15; spdcch_set_r15_l spdcch_set_cfg_r15; }; - typedef setup_e types; + using types = setup_e; // choice methods spdcch_cfg_r15_c() = default; @@ -4482,7 +4482,7 @@ struct spucch_cfg_r15_c { spucch_set_r15_l spucch_set_r15; dummy_s_ dummy; }; - typedef setup_e types; + using types = setup_e; // choice methods spucch_cfg_r15_c() = default; @@ -4666,7 +4666,7 @@ struct sched_request_cfg_v1530_c { uint8_t sr_cfg_idx_subslot_r15 = 0; dssr_trans_max_r15_e_ dssr_trans_max_r15; }; - typedef setup_e types; + using types = setup_e; // choice methods sched_request_cfg_v1530_c() = default; @@ -4756,7 +4756,7 @@ struct slot_or_subslot_pdsch_cfg_r15_c { res_alloc_r15_e_ res_alloc_r15; // ... }; - typedef setup_e types; + using types = setup_e; // choice methods slot_or_subslot_pdsch_cfg_r15_c() = default; @@ -4822,7 +4822,7 @@ struct slot_or_subslot_pusch_cfg_r15_c { bool ul_dmrs_ifdma_slot_or_subslot_r15 = false; // ... }; - typedef setup_e types; + using types = setup_e; // choice methods slot_or_subslot_pusch_cfg_r15_c() = default; @@ -4873,7 +4873,7 @@ struct tdd_pusch_up_pts_r14_c { bool dmrs_less_up_pts_cfg_r14_present = false; sym_pusch_up_pts_r14_e_ sym_pusch_up_pts_r14; }; - typedef setup_e types; + using types = setup_e; // choice methods tdd_pusch_up_pts_r14_c() = default; @@ -5093,7 +5093,7 @@ struct ant_info_ded_s { std::string to_string() const; }; typedef enumerated setup_e_; - typedef setup_e types; + using types = setup_e; // choice methods ue_tx_ant_sel_c_() = default; @@ -5172,7 +5172,7 @@ struct ant_info_ded_r10_s { std::string to_string() const; }; typedef enumerated setup_e_; - typedef setup_e types; + using types = setup_e; // choice methods ue_tx_ant_sel_c_() = default; @@ -5296,7 +5296,7 @@ struct ant_info_ded_v1530_c { types type_; ue_tx_ant_sel_srs_minus2_t4_r_nr_of_pairs_r15_e_ c; }; - typedef setup_e types; + using types = setup_e; // choice methods ant_info_ded_v1530_c() = default; @@ -5555,7 +5555,7 @@ struct epdcch_cfg_r11_s { struct setup_s_ { meas_sf_pattern_r10_c sf_pattern_r11; }; - typedef setup_e types; + using types = setup_e; // choice methods sf_pattern_cfg_r11_c_() = default; @@ -5599,7 +5599,7 @@ struct epdcch_cfg_r11_s { epdcch_set_cfg_to_release_list_r11_l set_cfg_to_release_list_r11; epdcch_set_cfg_to_add_mod_list_r11_l set_cfg_to_add_mod_list_r11; }; - typedef setup_e types; + using types = setup_e; // choice methods cfg_r11_c_() = default; @@ -5653,7 +5653,7 @@ struct pdcch_candidate_reductions_r13_c { pdcch_candidate_reduction_value_r13_e pdcch_candidate_reduction_al4_r13; pdcch_candidate_reduction_value_r13_e pdcch_candidate_reduction_al5_r13; }; - typedef setup_e types; + using types = setup_e; // choice methods pdcch_candidate_reductions_r13_c() = default; @@ -5853,7 +5853,7 @@ struct pucch_cfg_ded_s { repeat_factor_e_ repeat_factor; uint16_t n1_pucch_an_rep = 0; }; - typedef setup_e types; + using types = setup_e; // choice methods ack_nack_repeat_c_() = default; @@ -5919,7 +5919,7 @@ struct pucch_cfg_ded_r13_s { repeat_factor_r13_e_ repeat_factor_r13; uint16_t n1_pucch_an_rep_r13 = 0; }; - typedef setup_e types; + using types = setup_e; // choice methods ack_nack_repeat_r13_c_() = default; @@ -5968,7 +5968,7 @@ struct pucch_cfg_ded_r13_s { // member variables n3_pucch_an_list_p1_r13_l_ n3_pucch_an_list_p1_r13; }; - typedef setup_e types; + using types = setup_e; // choice methods two_ant_port_activ_pucch_format3_r13_c_() = default; @@ -6018,7 +6018,7 @@ struct pucch_cfg_ded_r13_s { n1_pucch_an_cs_list_r13_l_ n1_pucch_an_cs_list_r13; dummy1_l_ dummy1; }; - typedef setup_e types; + using types = setup_e; // choice methods n1_pucch_an_cs_r13_c_() = default; @@ -6167,7 +6167,7 @@ struct pucch_cfg_ded_r13_s { uint16_t npucch_id_r13 = 0; uint16_t n1_pucch_an_r13 = 0; }; - typedef setup_e types; + using types = setup_e; // choice methods npucch_param_r13_c_() = default; @@ -6204,7 +6204,7 @@ struct pucch_cfg_ded_r13_s { struct setup_s_ { uint16_t nka_pucch_an_r13 = 0; }; - typedef setup_e types; + using types = setup_e; // choice methods nka_pucch_param_r13_c_() = default; @@ -6346,7 +6346,7 @@ struct pucch_cfg_ded_r13_s { void destroy_(); }; - typedef setup_e types; + using types = setup_e; // choice methods pucch_num_repeat_ce_r13_c_() = default; @@ -6423,7 +6423,7 @@ struct pucch_cfg_ded_v1020_s { // member variables n1_pucch_an_cs_list_r10_l_ n1_pucch_an_cs_list_r10; }; - typedef setup_e types; + using types = setup_e; // choice methods n1_pucch_an_cs_r10_c_() = default; @@ -6540,7 +6540,7 @@ struct pucch_cfg_ded_v1130_s { // member variables n1_pucch_an_cs_list_p1_r11_l_ n1_pucch_an_cs_list_p1_r11; }; - typedef setup_e types; + using types = setup_e; // choice methods n1_pucch_an_cs_v1130_c_() = default; @@ -6576,7 +6576,7 @@ struct pucch_cfg_ded_v1130_s { uint16_t npucch_id_r11 = 0; uint16_t n1_pucch_an_r11 = 0; }; - typedef setup_e types; + using types = setup_e; // choice methods npucch_param_r11_c_() = default; @@ -6626,7 +6626,7 @@ struct pucch_cfg_ded_v1250_s { struct setup_s_ { uint16_t nka_pucch_an_r12 = 0; }; - typedef setup_e types; + using types = setup_e; // choice methods nka_pucch_param_r12_c_() = default; @@ -6714,7 +6714,7 @@ struct pusch_cfg_ded_r13_s { uint16_t npusch_id_r13 = 0; uint16_t ndmrs_csh_id_r13 = 0; }; - typedef setup_e types; + using types = setup_e; // choice methods pusch_dmrs_r11_c_() = default; @@ -6766,7 +6766,7 @@ struct pusch_cfg_ded_r13_s { uint8_t beta_offset_cqi_idx_sf_set2_r13 = 0; beta_offset_mc_r12_s_ beta_offset_mc_r12; }; - typedef setup_e types; + using types = setup_e; // choice methods uci_on_pusch_c_() = default; @@ -6851,7 +6851,7 @@ struct pusch_cfg_ded_v1130_s { uint16_t npusch_id_r11 = 0; uint16_t ndmrs_csh_id_r11 = 0; }; - typedef setup_e types; + using types = setup_e; // choice methods pusch_dmrs_r11_c_() = default; @@ -6913,7 +6913,7 @@ struct pusch_cfg_ded_v1250_s { uint8_t beta_offset_cqi_idx_sf_set2_r12 = 0; beta_offset_mc_r12_s_ beta_offset_mc_r12; }; - typedef setup_e types; + using types = setup_e; // choice methods uci_on_pusch_c_() = default; @@ -6977,7 +6977,7 @@ struct pusch_cfg_ded_v1530_s { bool offset_ce_mode_b_r15_present = false; int8_t offset_ce_mode_b_r15 = -1; }; - typedef setup_e types; + using types = setup_e; // choice methods ce_pusch_flex_start_prb_alloc_cfg_r15_c_() = default; @@ -7015,7 +7015,7 @@ struct pusch_cfg_ded_v1530_s { uint8_t six_tone_cyclic_shift_r15 = 0; uint8_t three_tone_cyclic_shift_r15 = 0; }; - typedef setup_e types; + using types = setup_e; // choice methods ce_pusch_sub_prb_cfg_r15_c_() = default; @@ -7140,7 +7140,7 @@ struct pusch_enhance_cfg_r14_c { uint8_t pusch_hop_offset_pusch_enh_r14 = 1; interv_ul_hop_pusch_enh_r14_c_ interv_ul_hop_pusch_enh_r14; }; - typedef setup_e types; + using types = setup_e; // choice methods pusch_enhance_cfg_r14_c() = default; @@ -7217,7 +7217,7 @@ struct phys_cfg_ded_stti_r15_c { bool short_processing_time_r15 = false; short_tti_r15_s short_tti_r15; }; - typedef setup_e types; + using types = setup_e; // choice methods phys_cfg_ded_stti_r15_c() = default; @@ -7264,7 +7264,7 @@ struct spucch_cfg_v1550_c { // member variables two_ant_port_activ_spucch_format3_v1550_s_ two_ant_port_activ_spucch_format3_v1550; }; - typedef setup_e types; + using types = setup_e; // choice methods spucch_cfg_v1550_c() = default; @@ -7310,7 +7310,7 @@ struct srs_tpc_pdcch_cfg_r14_c { uint8_t field_type_format3_b_r14 = 1; srs_cc_set_idxlist_r14_l_ srs_cc_set_idxlist_r14; }; - typedef setup_e types; + using types = setup_e; // choice methods srs_tpc_pdcch_cfg_r14_c() = default; @@ -7361,7 +7361,7 @@ struct sched_request_cfg_c { uint8_t sr_cfg_idx = 0; dsr_trans_max_e_ dsr_trans_max; }; - typedef setup_e types; + using types = setup_e; // choice methods sched_request_cfg_c() = default; @@ -7441,7 +7441,7 @@ struct srs_ul_cfg_ded_c { uint8_t tx_comb = 0; cyclic_shift_e_ cyclic_shift; }; - typedef setup_e types; + using types = setup_e; // choice methods srs_ul_cfg_ded_c() = default; @@ -7515,7 +7515,7 @@ struct srs_ul_cfg_ded_v1310_c { cyclic_shift_v1310_e_ cyclic_shift_v1310; tx_comb_num_r13_e_ tx_comb_num_r13; }; - typedef setup_e types; + using types = setup_e; // choice methods srs_ul_cfg_ded_v1310_c() = default; @@ -7560,7 +7560,7 @@ struct srs_ul_cfg_ded_aperiodic_r10_c { srs_cfg_ap_r10_s srs_cfg_ap_dci_format1a2b2c_r10; // ... }; - typedef setup_e types; + using types = setup_e; // choice methods srs_activ_ap_r10_c_() = default; @@ -7601,7 +7601,7 @@ struct srs_ul_cfg_ded_aperiodic_r10_c { srs_cfg_ap_dci_format4_r10_l_ srs_cfg_ap_dci_format4_r10; srs_activ_ap_r10_c_ srs_activ_ap_r10; }; - typedef setup_e types; + using types = setup_e; // choice methods srs_ul_cfg_ded_aperiodic_r10_c() = default; @@ -7646,7 +7646,7 @@ struct srs_ul_cfg_ded_aperiodic_v1310_c { srs_cfg_ap_v1310_s srs_cfg_ap_dci_format0_v1310; srs_cfg_ap_v1310_s srs_cfg_ap_dci_format1a2b2c_v1310; }; - typedef setup_e types; + using types = setup_e; // choice methods srs_activ_ap_v1310_c_() = default; @@ -7686,7 +7686,7 @@ struct srs_ul_cfg_ded_aperiodic_v1310_c { srs_cfg_ap_dci_format4_v1310_l_ srs_cfg_ap_dci_format4_v1310; srs_activ_ap_v1310_c_ srs_activ_ap_v1310; }; - typedef setup_e types; + using types = setup_e; // choice methods srs_ul_cfg_ded_aperiodic_v1310_c() = default; @@ -7737,7 +7737,7 @@ struct srs_ul_cfg_ded_aperiodic_up_pts_ext_r13_c { srs_cfg_ap_r13_s srs_cfg_ap_dci_format0_r13; srs_cfg_ap_r13_s srs_cfg_ap_dci_format1a2b2c_r13; }; - typedef setup_e types; + using types = setup_e; // choice methods srs_activ_ap_r13_c_() = default; @@ -7779,7 +7779,7 @@ struct srs_ul_cfg_ded_aperiodic_up_pts_ext_r13_c { srs_cfg_ap_dci_format4_r13_l_ srs_cfg_ap_dci_format4_r13; srs_activ_ap_r13_c_ srs_activ_ap_r13; }; - typedef setup_e types; + using types = setup_e; // choice methods srs_ul_cfg_ded_aperiodic_up_pts_ext_r13_c() = default; @@ -7869,7 +7869,7 @@ struct srs_ul_cfg_ded_up_pts_ext_r13_c { srs_ant_port_e srs_ant_port_r13; tx_comb_num_r13_e_ tx_comb_num_r13; }; - typedef setup_e types; + using types = setup_e; // choice methods srs_ul_cfg_ded_up_pts_ext_r13_c() = default; @@ -7968,7 +7968,7 @@ struct ul_pwr_ctrl_ded_v1250_s { alpha_r12_e alpha_sf_set2_r12; int8_t p0_ue_pusch_sf_set2_r12 = -8; }; - typedef setup_e types; + using types = setup_e; // choice methods set2_pwr_ctrl_param_c_() = default; @@ -8108,7 +8108,7 @@ struct phys_cfg_ded_s { struct setup_s_ { uint8_t add_spec_emission_pcell_r10 = 1; }; - typedef setup_e types; + using types = setup_e; // choice methods add_spec_emission_ca_r10_c_() = default; @@ -8146,7 +8146,7 @@ struct phys_cfg_ded_s { std::string to_string() const; }; typedef enumerated setup_e_; - typedef setup_e types; + using types = setup_e; // choice methods ce_mode_r13_c_() = default; @@ -8179,7 +8179,7 @@ struct phys_cfg_ded_s { }; struct type_a_srs_tpc_pdcch_group_r14_c_ { using setup_l_ = dyn_array; - typedef setup_e types; + using types = setup_e; // choice methods type_a_srs_tpc_pdcch_group_r14_c_() = default; @@ -8235,7 +8235,7 @@ struct phys_cfg_ded_s { k_max_r14_e_ k_max_r14; p_a_must_r14_e_ p_a_must_r14; }; - typedef setup_e types; + using types = setup_e; // choice methods must_cfg_r14_c_() = default; @@ -8327,7 +8327,7 @@ struct phys_cfg_ded_s { void destroy_(); }; - typedef setup_e types; + using types = setup_e; // choice methods semi_static_cfi_cfg_r15_c_() = default; @@ -8430,7 +8430,7 @@ struct phys_cfg_ded_s { mcs_restrict_sf_pdsch_repeats_r15_e_ mcs_restrict_sf_pdsch_repeats_r15; mcs_restrict_slot_subslot_pdsch_repeats_r15_e_ mcs_restrict_slot_subslot_pdsch_repeats_r15; }; - typedef setup_e types; + using types = setup_e; // choice methods blind_pdsch_repeat_cfg_r15_c_() = default; diff --git a/lib/include/srslte/asn1/rrc/rr_common.h b/lib/include/srslte/asn1/rrc/rr_common.h index 200853cb5..708808ffd 100644 --- a/lib/include/srslte/asn1/rrc/rr_common.h +++ b/lib/include/srslte/asn1/rrc/rr_common.h @@ -650,7 +650,7 @@ struct delta_flist_spucch_r15_c { delta_f_subslot_spucch_tbcc_format4_r15_e_ delta_f_subslot_spucch_tbcc_format4_r15; // ... }; - typedef setup_e types; + using types = setup_e; // choice methods delta_flist_spucch_r15_c() = default; @@ -1812,7 +1812,7 @@ struct srs_ul_cfg_common_c { srs_sf_cfg_e_ srs_sf_cfg; bool ack_nack_srs_simul_tx = false; }; - typedef setup_e types; + using types = setup_e; // choice methods srs_ul_cfg_common_c() = default; diff --git a/lib/include/srslte/asn1/rrc/rr_ded.h b/lib/include/srslte/asn1/rrc/rr_ded.h index 618b3c0c7..ca8cd4b06 100644 --- a/lib/include/srslte/asn1/rrc/rr_ded.h +++ b/lib/include/srslte/asn1/rrc/rr_ded.h @@ -505,7 +505,7 @@ struct lc_ch_cfg_s { bool short_tti_r15 = false; bool sf_tti_r15 = false; }; - typedef setup_e types; + using types = setup_e; // choice methods allowed_tti_lens_r15_c_() = default; @@ -545,7 +545,7 @@ struct lc_ch_cfg_s { std::string to_string() const; }; typedef enumerated setup_e_; - typedef setup_e types; + using types = setup_e; // choice methods lc_ch_sr_restrict_r15_c_() = default; @@ -579,7 +579,7 @@ struct lc_ch_cfg_s { setup_e_ c; }; struct ch_access_prio_r15_c_ { - typedef setup_e types; + using types = setup_e; // choice methods ch_access_prio_r15_c_() = default; @@ -1069,7 +1069,7 @@ struct pdcp_cfg_s { uint32_t to_number() const; }; typedef enumerated setup_e_; - typedef setup_e types; + using types = setup_e; // choice methods ul_data_split_thres_r13_c_() = default; @@ -1193,7 +1193,7 @@ struct pdcp_cfg_s { status_pdu_periodicity_type2_r13_e_ status_pdu_periodicity_type2_r13; status_pdu_periodicity_offset_r13_e_ status_pdu_periodicity_offset_r13; }; - typedef setup_e types; + using types = setup_e; // choice methods status_feedback_r13_c_() = default; @@ -1259,7 +1259,7 @@ struct pdcp_cfg_s { bool ul_lwa_drb_via_wlan_r14 = false; ul_lwa_data_split_thres_r14_e_ ul_lwa_data_split_thres_r14; }; - typedef setup_e types; + using types = setup_e; // choice methods ul_lwa_cfg_r14_c_() = default; @@ -1378,7 +1378,7 @@ struct pdcp_cfg_s { // member variables pdcp_dupl_r15_e_ pdcp_dupl_r15; }; - typedef setup_e types; + using types = setup_e; // choice methods pdcp_dupl_cfg_r15_c_() = default; @@ -1519,7 +1519,7 @@ struct rlc_bearer_cfg_r15_c { lc_ch_id_cfg_r15_c_ lc_ch_id_cfg_r15; lc_ch_cfg_s lc_ch_cfg_r15; }; - typedef setup_e types; + using types = setup_e; // choice methods rlc_bearer_cfg_r15_c() = default; @@ -1690,7 +1690,7 @@ struct rlc_cfg_v1430_c { struct setup_s_ { poll_byte_r14_e poll_byte_r14; }; - typedef setup_e types; + using types = setup_e; // choice methods rlc_cfg_v1430_c() = default; @@ -1737,7 +1737,7 @@ struct rlc_cfg_v1510_s { // RLC-Config-v1530 ::= CHOICE struct rlc_cfg_v1530_c { struct setup_s_ {}; - typedef setup_e types; + using types = setup_e; // choice methods rlc_cfg_v1530_c() = default; @@ -1841,7 +1841,7 @@ struct sps_cfg_ul_c { int8_t p0_nominal_pusch_persistent_sf_set2_r12 = -126; int8_t p0_ue_pusch_persistent_sf_set2_r12 = -8; }; - typedef setup_e types; + using types = setup_e; // choice methods p0_persistent_sf_set2_r12_c_() = default; @@ -1964,7 +1964,7 @@ struct sps_cfg_ul_c { bool operator==(const setup_s_& other) const; bool operator!=(const setup_s_& other) const { return not(*this == other); } }; - typedef setup_e types; + using types = setup_e; // choice methods sps_cfg_ul_c() = default; @@ -2044,7 +2044,7 @@ struct sps_cfg_ul_stti_r15_c { int8_t p0_nominal_spusch_persistent_sf_set2_r15 = -126; int8_t p0_ue_spusch_persistent_sf_set2_r15 = -8; }; - typedef setup_e types; + using types = setup_e; // choice methods p0_persistent_sf_set2_r15_c_() = default; @@ -2141,7 +2141,7 @@ struct sps_cfg_ul_stti_r15_c { total_num_pusch_sps_stti_ul_repeats_r15_e_ total_num_pusch_sps_stti_ul_repeats_r15; // ... }; - typedef setup_e types; + using types = setup_e; // choice methods sps_cfg_ul_stti_r15_c() = default; @@ -2665,7 +2665,7 @@ struct drx_cfg_c { long_drx_cycle_start_offset_c_ long_drx_cycle_start_offset; short_drx_s_ short_drx; }; - typedef setup_e types; + using types = setup_e; // choice methods drx_cfg_c() = default; @@ -2983,7 +2983,7 @@ struct sps_cfg_dl_c { struct setup_s_ { n1_pucch_an_persistent_list_l n1_pucch_an_persistent_list_p1_r10; }; - typedef setup_e types; + using types = setup_e; // choice methods two_ant_port_activ_r10_c_() = default; @@ -3033,7 +3033,7 @@ struct sps_cfg_dl_c { bool operator==(const setup_s_& other) const; bool operator!=(const setup_s_& other) const { return not(*this == other); } }; - typedef setup_e types; + using types = setup_e; // choice methods sps_cfg_dl_c() = default; @@ -3100,7 +3100,7 @@ struct sps_cfg_dl_stti_r15_c { struct setup_s_ { n1_spucch_an_persistent_list_r15_l n1_spucch_an_persistent_list_p1_r15; }; - typedef setup_e types; + using types = setup_e; // choice methods two_ant_port_activ_r15_c_() = default; @@ -3143,7 +3143,7 @@ struct sps_cfg_dl_stti_r15_c { tpc_pdcch_cfg_c tpc_pdcch_cfg_pucch_sps_r15; // ... }; - typedef setup_e types; + using types = setup_e; // choice methods sps_cfg_dl_stti_r15_c() = default; @@ -3375,7 +3375,7 @@ struct mac_main_cfg_s { prohibit_phr_timer_e_ prohibit_phr_timer; dl_pathloss_change_e_ dl_pathloss_change; }; - typedef setup_e types; + using types = setup_e; // choice methods phr_cfg_c_() = default; @@ -3434,7 +3434,7 @@ struct mac_main_cfg_s { // member variables phr_mode_other_cg_r12_e_ phr_mode_other_cg_r12; }; - typedef setup_e types; + using types = setup_e; // choice methods dual_connect_phr_c_() = default; @@ -3479,7 +3479,7 @@ struct mac_main_cfg_s { // member variables lc_ch_sr_prohibit_timer_r12_e_ lc_ch_sr_prohibit_timer_r12; }; - typedef setup_e types; + using types = setup_e; // choice methods lc_ch_sr_cfg_r12_c_() = default; @@ -3569,7 +3569,7 @@ struct mac_main_cfg_s { void destroy_(); }; - typedef setup_e types; + using types = setup_e; // choice methods edrx_cfg_cycle_start_offset_r13_c_() = default; @@ -3601,7 +3601,7 @@ struct mac_main_cfg_s { setup_c_ c; }; struct drx_cfg_r13_c_ { - typedef setup_e types; + using types = setup_e; // choice methods drx_cfg_r13_c_() = default; @@ -3637,7 +3637,7 @@ struct mac_main_cfg_s { bool skip_ul_tx_sps_r14_present = false; bool skip_ul_tx_dynamic_r14_present = false; }; - typedef setup_e types; + using types = setup_e; // choice methods skip_ul_tx_r14_c_() = default; @@ -3672,7 +3672,7 @@ struct mac_main_cfg_s { struct setup_s_ { data_inactivity_timer_r14_e data_inactivity_timer_r14; }; - typedef setup_e types; + using types = setup_e; // choice methods data_inactivity_timer_cfg_r14_c_() = default; @@ -3748,7 +3748,7 @@ struct mac_main_cfg_s { proc_timeline_r15_e_ proc_timeline_r15; uint8_t ssr_prohibit_timer_r15 = 0; }; - typedef setup_e types; + using types = setup_e; // choice methods short_tti_and_spt_r15_c_() = default; @@ -3822,7 +3822,7 @@ struct mac_main_cfg_s { scell_hibernation_timer_r15_e_ scell_hibernation_timer_r15; dormant_scell_deactivation_timer_r15_e_ dormant_scell_deactivation_timer_r15; }; - typedef setup_e types; + using types = setup_e; // choice methods dormant_state_timers_r15_c_() = default; @@ -3904,7 +3904,7 @@ struct mac_main_cfg_s { // MeasSubframePatternPCell-r10 ::= CHOICE struct meas_sf_pattern_pcell_r10_c { - typedef setup_e types; + using types = setup_e; // choice methods meas_sf_pattern_pcell_r10_c() = default; @@ -3946,7 +3946,7 @@ struct naics_assist_info_r12_c { neigh_cells_to_add_mod_list_r12_l neigh_cells_to_add_mod_list_r12; p_a_e serv_cellp_a_r12; }; - typedef setup_e types; + using types = setup_e; // choice methods naics_assist_info_r12_c() = default; @@ -3982,7 +3982,7 @@ private: // NeighCellsCRS-Info-r11 ::= CHOICE struct neigh_cells_crs_info_r11_c { - typedef setup_e types; + using types = setup_e; // choice methods neigh_cells_crs_info_r11_c() = default; @@ -4016,7 +4016,7 @@ private: // NeighCellsCRS-Info-r13 ::= CHOICE struct neigh_cells_crs_info_r13_c { - typedef setup_e types; + using types = setup_e; // choice methods neigh_cells_crs_info_r13_c() = default; @@ -4052,7 +4052,7 @@ private: // NeighCellsCRS-Info-r15 ::= CHOICE struct neigh_cells_crs_info_r15_c { - typedef setup_e types; + using types = setup_e; // choice methods neigh_cells_crs_info_r15_c() = default; @@ -4119,7 +4119,7 @@ struct rlf_timers_and_consts_r13_c { SRSASN_CODE unpack(cbit_ref& bref); void to_json(json_writer& j) const; }; - typedef setup_e types; + using types = setup_e; // choice methods rlf_timers_and_consts_r13_c() = default; @@ -4204,7 +4204,7 @@ struct rlf_timers_and_consts_r9_c { n311_r9_e_ n311_r9; // ... }; - typedef setup_e types; + using types = setup_e; // choice methods rlf_timers_and_consts_r9_c() = default; @@ -4397,7 +4397,7 @@ struct rr_cfg_ded_s { types type_; crs_intf_mitig_num_prbs_e_ c; }; - typedef setup_e types; + using types = setup_e; // choice methods crs_intf_mitig_cfg_r15_c_() = default; @@ -4496,7 +4496,7 @@ struct pdcch_candidate_reductions_laa_ul_r14_c { pdcch_candidate_reduction_value_r14_e pdcch_candidate_reduction_al4_r14; pdcch_candidate_reduction_value_r14_e pdcch_candidate_reduction_al5_r14; }; - typedef setup_e types; + using types = setup_e; // choice methods pdcch_candidate_reductions_laa_ul_r14_c() = default; @@ -4607,7 +4607,7 @@ struct aul_cfg_r15_c { uint8_t sf_offset_cot_sharing_r15 = 2; contention_win_size_timer_r15_e_ contention_win_size_timer_r15; }; - typedef setup_e types; + using types = setup_e; // choice methods aul_cfg_r15_c() = default; @@ -4649,7 +4649,7 @@ struct cqi_report_periodic_scell_r15_c { meas_sf_pattern_r10_c csi_meas_sf_set1_r15; meas_sf_pattern_r10_c csi_meas_sf_set2_r15; }; - typedef setup_e types; + using types = setup_e; // choice methods csi_sf_pattern_dormant_r15_c_() = default; @@ -4778,7 +4778,7 @@ struct cqi_report_periodic_scell_r15_c { csi_sf_pattern_dormant_r15_c_ csi_sf_pattern_dormant_r15; cqi_format_ind_dormant_r15_c_ cqi_format_ind_dormant_r15; }; - typedef setup_e types; + using types = setup_e; // choice methods cqi_report_periodic_scell_r15_c() = default; @@ -4948,7 +4948,7 @@ struct srs_ul_cfg_ded_aperiodic_v1430_c { bool srs_sf_ind_r14_present = false; uint8_t srs_sf_ind_r14 = 1; }; - typedef setup_e types; + using types = setup_e; // choice methods srs_ul_cfg_ded_aperiodic_v1430_c() = default; @@ -5121,7 +5121,7 @@ struct cqi_short_cfg_scell_r15_c { uint16_t ri_cfg_idx_short_r15 = 0; cqi_format_ind_short_r15_c_ cqi_format_ind_short_r15; }; - typedef setup_e types; + using types = setup_e; // choice methods cqi_short_cfg_scell_r15_c() = default; @@ -5344,7 +5344,7 @@ struct laa_scell_cfg_v1430_s { struct setup_s_ { cross_carrier_sched_cfg_laa_ul_r14_s cross_carrier_sched_cfg_laa_ul_r14; }; - typedef setup_e types; + using types = setup_e; // choice methods cross_carrier_sched_cfg_ul_r14_c_() = default; @@ -5439,7 +5439,7 @@ struct pdsch_cfg_ded_scell_v1430_s { // PUCCH-ConfigDedicated-v1370 ::= SEQUENCE struct pucch_cfg_ded_v1370_s { struct pucch_format_v1370_c_ { - typedef setup_e types; + using types = setup_e; // choice methods pucch_format_v1370_c_() = default; @@ -5516,7 +5516,7 @@ struct pusch_cfg_ded_scell_v1530_s { struct setup_s_ { uint8_t beta_offset_aul_r15 = 0; }; - typedef setup_e types; + using types = setup_e; // choice methods uci_on_pusch_r15_c_() = default; @@ -5580,7 +5580,7 @@ struct sched_request_cfg_scell_r13_c { uint8_t sr_cfg_idx_r13 = 0; dsr_trans_max_r13_e_ dsr_trans_max_r13; }; - typedef setup_e types; + using types = setup_e; // choice methods sched_request_cfg_scell_r13_c() = default; @@ -5653,7 +5653,7 @@ struct tpc_pdcch_cfg_scell_r13_c { struct setup_s_ { tpc_idx_c tpc_idx_pucch_scell_r13; }; - typedef setup_e types; + using types = setup_e; // choice methods tpc_pdcch_cfg_scell_r13_c() = default; @@ -5809,7 +5809,7 @@ struct phys_cfg_ded_scell_r10_s { pusch_cfg_ded_r13_s pusch_cfg_ded_r13; ul_pwr_ctrl_ded_scell_v1310_s ul_pwr_ctrl_ded_r13; }; - typedef setup_e types; + using types = setup_e; // choice methods pucch_scell_c_() = default; @@ -5871,7 +5871,7 @@ struct phys_cfg_ded_scell_r10_s { k_max_r14_e_ k_max_r14; p_a_must_r14_e_ p_a_must_r14; }; - typedef setup_e types; + using types = setup_e; // choice methods must_cfg_r14_c_() = default; @@ -5963,7 +5963,7 @@ struct phys_cfg_ded_scell_r10_s { void destroy_(); }; - typedef setup_e types; + using types = setup_e; // choice methods semi_static_cfi_cfg_r15_c_() = default; @@ -6068,7 +6068,7 @@ struct phys_cfg_ded_scell_r10_s { mcs_restrict_sf_pdsch_repeats_r15_e_ mcs_restrict_sf_pdsch_repeats_r15; mcs_restrict_slot_subslot_pdsch_repeats_r15_e_ mcs_restrict_slot_subslot_pdsch_repeats_r15; }; - typedef setup_e types; + using types = setup_e; // choice methods blind_pdsch_repeat_cfg_r15_c_() = default; @@ -6192,7 +6192,7 @@ struct phys_cfg_ded_scell_v1370_s { bool pucch_cfg_ded_v1370_present = false; pucch_cfg_ded_v1370_s pucch_cfg_ded_v1370; }; - typedef setup_e types; + using types = setup_e; // choice methods pucch_scell_v1370_c_() = default; @@ -6325,7 +6325,7 @@ struct pucch_cfg_ded_v13c0_s { // member variables n1_pucch_an_cs_list_p1_v13c0_l_ n1_pucch_an_cs_list_p1_v13c0; }; - typedef setup_e types; + using types = setup_e; // choice methods n1_pucch_an_cs_v13c0_c_() = default; @@ -6512,7 +6512,7 @@ struct rlf_timers_and_consts_scg_r12_c { n314_r12_e_ n314_r12; // ... }; - typedef setup_e types; + using types = setup_e; // choice methods rlf_timers_and_consts_scg_r12_c() = default; @@ -6664,7 +6664,7 @@ struct phys_cfg_ded_scell_v13c0_s { struct setup_s_ { pucch_cfg_ded_v13c0_s pucch_cfg_ded_v13c0; }; - typedef setup_e types; + using types = setup_e; // choice methods pucch_scell_v13c0_c_() = default; diff --git a/lib/include/srslte/asn1/rrc/security.h b/lib/include/srslte/asn1/rrc/security.h index 831ea1295..a01ab04bb 100644 --- a/lib/include/srslte/asn1/rrc/security.h +++ b/lib/include/srslte/asn1/rrc/security.h @@ -308,7 +308,7 @@ struct security_mode_cmd_s { types type_; security_mode_cmd_r8_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; diff --git a/lib/include/srslte/asn1/rrc/uecap.h b/lib/include/srslte/asn1/rrc/uecap.h index 3b66bd2ab..fc1cdecf6 100644 --- a/lib/include/srslte/asn1/rrc/uecap.h +++ b/lib/include/srslte/asn1/rrc/uecap.h @@ -233,7 +233,7 @@ struct ue_cap_enquiry_s { types type_; ue_cap_enquiry_r8_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -414,7 +414,7 @@ struct ue_cap_info_s { types type_; ue_cap_info_r8_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -652,10 +652,10 @@ struct ca_mimo_params_dl_r13_s { }; // BandParametersDL-r13 ::= CA-MIMO-ParametersDL-r13 -typedef ca_mimo_params_dl_r13_s band_params_dl_r13_s; +using band_params_dl_r13_s = ca_mimo_params_dl_r13_s; // BandParametersUL-r13 ::= CA-MIMO-ParametersUL-r10 -typedef ca_mimo_params_ul_r10_s band_params_ul_r13_s; +using band_params_ul_r13_s = ca_mimo_params_ul_r10_s; // BandParameters-r13 ::= SEQUENCE struct band_params_r13_s { @@ -5757,7 +5757,7 @@ struct ue_radio_access_cap_info_s { types type_; ue_radio_access_cap_info_r8_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; diff --git a/lib/include/srslte/asn1/rrc/ul_dcch_msg.h b/lib/include/srslte/asn1/rrc/ul_dcch_msg.h index 5cb9f3ad3..1665cc69e 100644 --- a/lib/include/srslte/asn1/rrc/ul_dcch_msg.h +++ b/lib/include/srslte/asn1/rrc/ul_dcch_msg.h @@ -593,7 +593,7 @@ struct mrdc_assist_info_r15_s { }; // MobilityHistoryReport-r12 ::= VisitedCellInfoList-r12 -typedef visited_cell_info_list_r12_l mob_history_report_r12_l; +using mob_history_report_r12_l = visited_cell_info_list_r12_l; // RRCConnectionReconfigurationComplete-v1430-IEs ::= SEQUENCE struct rrc_conn_recfg_complete_v1430_ies_s { @@ -3539,7 +3539,7 @@ struct in_dev_coex_ind_r11_s { types type_; in_dev_coex_ind_r11_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -3622,7 +3622,7 @@ struct inter_freq_rstd_meas_ind_r10_s { types type_; inter_freq_rstd_meas_ind_r10_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -3705,7 +3705,7 @@ struct mbms_count_resp_r10_s { types type_; mbms_count_resp_r10_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -3788,7 +3788,7 @@ struct mbms_interest_ind_r11_s { types type_; mbms_interest_ind_r11_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -3920,7 +3920,7 @@ struct proximity_ind_r9_s { types type_; proximity_ind_r9_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -4003,7 +4003,7 @@ struct rn_recfg_complete_r10_s { types type_; rn_recfg_complete_r10_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -4237,7 +4237,7 @@ struct rrc_conn_setup_complete_s { types type_; rrc_conn_setup_complete_r8_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -4321,7 +4321,7 @@ struct scg_fail_info_r12_s { types type_; scg_fail_info_r12_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -4404,7 +4404,7 @@ struct scg_fail_info_nr_r15_s { types type_; scg_fail_info_nr_r15_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -4487,7 +4487,7 @@ struct sidelink_ue_info_r12_s { types type_; sidelink_ue_info_r12_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -4570,7 +4570,7 @@ struct ueassist_info_r11_s { types type_; ueassist_info_r11_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -4653,7 +4653,7 @@ struct ue_info_resp_r9_s { types type_; ue_info_resp_r9_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -4737,7 +4737,7 @@ struct ul_ho_prep_transfer_s { types type_; ul_ho_prep_transfer_r8_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -4820,7 +4820,7 @@ struct ul_info_transfer_s { types type_; ul_info_transfer_r8_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -4903,7 +4903,7 @@ struct ul_info_transfer_mrdc_r15_s { types type_; ul_info_transfer_mrdc_r15_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -4986,7 +4986,7 @@ struct wlan_conn_status_report_r13_s { types type_; wlan_conn_status_report_r13_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; diff --git a/lib/include/srslte/asn1/rrc_nbiot.h b/lib/include/srslte/asn1/rrc_nbiot.h index a8f8a4009..de1d82d09 100644 --- a/lib/include/srslte/asn1/rrc_nbiot.h +++ b/lib/include/srslte/asn1/rrc_nbiot.h @@ -905,7 +905,7 @@ struct drx_cfg_nb_r13_c { uint16_t drx_start_offset_r13 = 0; drx_ul_retx_timer_r13_e_ drx_ul_retx_timer_r13; }; - typedef setup_e types; + using types = setup_e; // choice methods drx_cfg_nb_r13_c() = default; @@ -1065,7 +1065,7 @@ struct sr_sps_bsr_cfg_nb_r15_c { fixed_bitstring<16> semi_persist_sched_c_rnti_r15; semi_persist_sched_interv_ul_r15_e_ semi_persist_sched_interv_ul_r15; }; - typedef setup_e types; + using types = setup_e; // choice methods sr_sps_bsr_cfg_nb_r15_c() = default; @@ -1105,7 +1105,7 @@ struct sr_without_harq_ack_cfg_nb_r15_c { uint8_t sr_prohibit_timer_r15 = 0; sr_nprach_res_nb_r15_s sr_nprach_res_r15; }; - typedef setup_e types; + using types = setup_e; // choice methods sr_without_harq_ack_cfg_nb_r15_c() = default; @@ -1267,7 +1267,7 @@ struct mac_main_cfg_nb_r13_s { // member variables lc_ch_sr_prohibit_timer_r13_e_ lc_ch_sr_prohibit_timer_r13; }; - typedef setup_e types; + using types = setup_e; // choice methods lc_ch_sr_cfg_r13_c_() = default; @@ -1302,7 +1302,7 @@ struct mac_main_cfg_nb_r13_s { struct setup_s_ { data_inactivity_timer_r14_e data_inactivity_timer_r14; }; - typedef setup_e types; + using types = setup_e; // choice methods data_inactivity_timer_cfg_r14_c_() = default; @@ -1484,7 +1484,7 @@ struct rlf_timers_and_consts_nb_r13_c { SRSASN_CODE unpack(cbit_ref& bref); void to_json(json_writer& j) const; }; - typedef setup_e types; + using types = setup_e; // choice methods rlf_timers_and_consts_nb_r13_c() = default; @@ -1819,7 +1819,7 @@ struct mib_nb_s { }; // BCCH-BCH-MessageType-NB ::= MasterInformationBlock-NB -typedef mib_nb_s bcch_bch_msg_type_nb_s; +using bcch_bch_msg_type_nb_s = mib_nb_s; // BCCH-BCH-Message-NB ::= SEQUENCE struct bcch_bch_msg_nb_s { @@ -2192,7 +2192,7 @@ struct mib_tdd_nb_r15_s { }; // BCCH-BCH-MessageType-TDD-NB-r15 ::= MasterInformationBlock-TDD-NB-r15 -typedef mib_tdd_nb_r15_s bcch_bch_msg_type_tdd_nb_r15_s; +using bcch_bch_msg_type_tdd_nb_r15_s = mib_tdd_nb_r15_s; // BCCH-BCH-Message-TDD-NB ::= SEQUENCE struct bcch_bch_msg_tdd_nb_s { @@ -5758,7 +5758,7 @@ struct rrc_early_data_complete_nb_v1590_ies_s { }; // RedirectedCarrierInfo-NB-r13 ::= CarrierFreq-NB-r13 -typedef carrier_freq_nb_r13_s redirected_carrier_info_nb_r13_s; +using redirected_carrier_info_nb_r13_s = carrier_freq_nb_r13_s; // RedirectedCarrierInfo-NB-v1430 ::= SEQUENCE struct redirected_carrier_info_nb_v1430_s { @@ -5908,7 +5908,7 @@ struct rrc_conn_reest_nb_s { types type_; rrc_conn_reest_nb_r13_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -5990,7 +5990,7 @@ struct rrc_conn_reject_nb_s { types type_; rrc_conn_reject_nb_r13_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -6071,7 +6071,7 @@ struct rrc_conn_setup_nb_s { types type_; rrc_conn_setup_nb_r13_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -6344,7 +6344,7 @@ struct rrc_conn_release_nb_v15b0_ies_s { }; // RedirectedCarrierInfo-NB-v1550 ::= CarrierFreq-NB-v1550 -typedef carrier_freq_nb_v1550_s redirected_carrier_info_nb_v1550_s; +using redirected_carrier_info_nb_v1550_s = carrier_freq_nb_v1550_s; // RRCConnectionRelease-NB-v1550-IEs ::= SEQUENCE struct rrc_conn_release_nb_v1550_ies_s { @@ -6517,7 +6517,7 @@ struct dl_info_transfer_nb_s { types type_; dl_info_transfer_nb_r13_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -6599,7 +6599,7 @@ struct rrc_conn_recfg_nb_s { types type_; rrc_conn_recfg_nb_r13_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -6681,7 +6681,7 @@ struct rrc_conn_release_nb_s { types type_; rrc_conn_release_nb_r13_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -6763,7 +6763,7 @@ struct rrc_conn_resume_nb_s { types type_; rrc_conn_resume_nb_r13_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -6845,7 +6845,7 @@ struct ue_cap_enquiry_nb_s { types type_; ue_cap_enquiry_nb_r13_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -7339,7 +7339,7 @@ struct ho_prep_info_nb_s { types type_; ho_prep_info_nb_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -9101,7 +9101,7 @@ struct ue_paging_coverage_info_nb_s { types type_; ue_paging_coverage_info_nb_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -9221,7 +9221,7 @@ struct ue_radio_access_cap_info_nb_s { types type_; ue_radio_access_cap_info_nb_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; @@ -9315,7 +9315,7 @@ struct ue_radio_paging_info_nb_s { types type_; ue_radio_paging_info_nb_ies_s c; }; - typedef c1_or_crit_ext_e types; + using types = c1_or_crit_ext_e; // choice methods crit_exts_c_() = default; diff --git a/lib/include/srslte/asn1/rrc_nr.h b/lib/include/srslte/asn1/rrc_nr.h index 54a1e7133..4993276c5 100644 --- a/lib/include/srslte/asn1/rrc_nr.h +++ b/lib/include/srslte/asn1/rrc_nr.h @@ -2949,7 +2949,7 @@ struct plmn_id_info_s { }; // RangeToBestCell ::= Q-OffsetRange -typedef q_offset_range_e range_to_best_cell_e; +using range_to_best_cell_e = q_offset_range_e; // SI-RequestResources ::= SEQUENCE struct si_request_res_s { diff --git a/lib/include/srslte/asn1/s1ap.h b/lib/include/srslte/asn1/s1ap.h index bfb058965..c3f501f1e 100644 --- a/lib/include/srslte/asn1/s1ap.h +++ b/lib/include/srslte/asn1/s1ap.h @@ -606,13 +606,13 @@ struct s1ap_protocol_ext_empty_o { static presence_e get_presence(const uint32_t& id); }; // GUMMEI-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o gummei_ext_ies_o; +using gummei_ext_ies_o = s1ap_protocol_ext_empty_o; // PLMNidentity ::= OCTET STRING -typedef fixed_octstring<3, true> plm_nid; +using plm_nid = fixed_octstring<3, true>; // Additional-GUTI-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o add_guti_ext_ies_o; +using add_guti_ext_ies_o = s1ap_protocol_ext_empty_o; template struct protocol_ext_container_item_s { @@ -636,7 +636,7 @@ struct protocol_ext_container_empty_l { SRSASN_CODE unpack(cbit_ref& bref); void to_json(json_writer& j) const; }; -typedef protocol_ext_container_empty_l gummei_ext_ies_container; +using gummei_ext_ies_container = protocol_ext_container_empty_l; // GUMMEI ::= SEQUENCE struct gummei_s { @@ -654,7 +654,7 @@ struct gummei_s { void to_json(json_writer& j) const; }; -typedef protocol_ext_container_empty_l add_guti_ext_ies_container; +using add_guti_ext_ies_container = protocol_ext_container_empty_l; // Additional-GUTI ::= SEQUENCE struct add_guti_s { @@ -672,7 +672,7 @@ struct add_guti_s { }; // AllocationAndRetentionPriority-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o alloc_and_retention_prio_ext_ies_o; +using alloc_and_retention_prio_ext_ies_o = s1ap_protocol_ext_empty_o; // Pre-emptionCapability ::= ENUMERATED struct pre_emption_cap_opts { @@ -690,7 +690,7 @@ struct pre_emption_vulnerability_opts { }; typedef enumerated pre_emption_vulnerability_e; -typedef protocol_ext_container_empty_l alloc_and_retention_prio_ext_ies_container; +using alloc_and_retention_prio_ext_ies_container = protocol_ext_container_empty_l; // AllocationAndRetentionPriority ::= SEQUENCE struct alloc_and_retention_prio_s { @@ -709,12 +709,12 @@ struct alloc_and_retention_prio_s { }; // EUTRAN-CGI-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o eutran_cgi_ext_ies_o; +using eutran_cgi_ext_ies_o = s1ap_protocol_ext_empty_o; // TAI-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o tai_ext_ies_o; +using tai_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l eutran_cgi_ext_ies_container; +using eutran_cgi_ext_ies_container = protocol_ext_container_empty_l; // EUTRAN-CGI ::= SEQUENCE struct eutran_cgi_s { @@ -731,7 +731,7 @@ struct eutran_cgi_s { void to_json(json_writer& j) const; }; -typedef protocol_ext_container_empty_l tai_ext_ies_container; +using tai_ext_ies_container = protocol_ext_container_empty_l; // TAI ::= SEQUENCE struct tai_s { @@ -749,16 +749,16 @@ struct tai_s { }; // CellBasedMDT-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o cell_based_mdt_ext_ies_o; +using cell_based_mdt_ext_ies_o = s1ap_protocol_ext_empty_o; // CellIdListforMDT ::= SEQUENCE (SIZE (1..32)) OF EUTRAN-CGI using cell_id_listfor_mdt_l = dyn_array; // TABasedMDT-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o ta_based_mdt_ext_ies_o; +using ta_based_mdt_ext_ies_o = s1ap_protocol_ext_empty_o; // TAIBasedMDT-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o tai_based_mdt_ext_ies_o; +using tai_based_mdt_ext_ies_o = s1ap_protocol_ext_empty_o; // TAIListforMDT ::= SEQUENCE (SIZE (1..8)) OF TAI using tai_listfor_mdt_l = dyn_array; @@ -766,7 +766,7 @@ using tai_listfor_mdt_l = dyn_array; // TAListforMDT ::= SEQUENCE (SIZE (1..8)) OF OCTET STRING (SIZE (2)) using ta_listfor_mdt_l = bounded_array, 8>; -typedef protocol_ext_container_empty_l cell_based_mdt_ext_ies_container; +using cell_based_mdt_ext_ies_container = protocol_ext_container_empty_l; // CellBasedMDT ::= SEQUENCE struct cell_based_mdt_s { @@ -782,7 +782,7 @@ struct cell_based_mdt_s { void to_json(json_writer& j) const; }; -typedef protocol_ext_container_empty_l ta_based_mdt_ext_ies_container; +using ta_based_mdt_ext_ies_container = protocol_ext_container_empty_l; // TABasedMDT ::= SEQUENCE struct ta_based_mdt_s { @@ -798,7 +798,7 @@ struct ta_based_mdt_s { void to_json(json_writer& j) const; }; -typedef protocol_ext_container_empty_l tai_based_mdt_ext_ies_container; +using tai_based_mdt_ext_ies_container = protocol_ext_container_empty_l; // TAIBasedMDT ::= SEQUENCE struct tai_based_mdt_s { @@ -889,22 +889,22 @@ private: }; // CellBasedQMC-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o cell_based_qmc_ext_ies_o; +using cell_based_qmc_ext_ies_o = s1ap_protocol_ext_empty_o; // CellIdListforQMC ::= SEQUENCE (SIZE (1..32)) OF EUTRAN-CGI using cell_id_listfor_qmc_l = dyn_array; // PLMNAreaBasedQMC-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o plmn_area_based_qmc_ext_ies_o; +using plmn_area_based_qmc_ext_ies_o = s1ap_protocol_ext_empty_o; // PLMNListforQMC ::= SEQUENCE (SIZE (1..16)) OF OCTET STRING (SIZE (3)) using plmn_listfor_qmc_l = bounded_array, 16>; // TABasedQMC-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o ta_based_qmc_ext_ies_o; +using ta_based_qmc_ext_ies_o = s1ap_protocol_ext_empty_o; // TAIBasedQMC-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o tai_based_qmc_ext_ies_o; +using tai_based_qmc_ext_ies_o = s1ap_protocol_ext_empty_o; // TAIListforQMC ::= SEQUENCE (SIZE (1..8)) OF TAI using tai_listfor_qmc_l = dyn_array; @@ -912,7 +912,7 @@ using tai_listfor_qmc_l = dyn_array; // TAListforQMC ::= SEQUENCE (SIZE (1..8)) OF OCTET STRING (SIZE (2)) using ta_listfor_qmc_l = bounded_array, 8>; -typedef protocol_ext_container_empty_l cell_based_qmc_ext_ies_container; +using cell_based_qmc_ext_ies_container = protocol_ext_container_empty_l; // CellBasedQMC ::= SEQUENCE struct cell_based_qmc_s { @@ -928,7 +928,7 @@ struct cell_based_qmc_s { void to_json(json_writer& j) const; }; -typedef protocol_ext_container_empty_l plmn_area_based_qmc_ext_ies_container; +using plmn_area_based_qmc_ext_ies_container = protocol_ext_container_empty_l; // PLMNAreaBasedQMC ::= SEQUENCE struct plmn_area_based_qmc_s { @@ -944,7 +944,7 @@ struct plmn_area_based_qmc_s { void to_json(json_writer& j) const; }; -typedef protocol_ext_container_empty_l ta_based_qmc_ext_ies_container; +using ta_based_qmc_ext_ies_container = protocol_ext_container_empty_l; // TABasedQMC ::= SEQUENCE struct ta_based_qmc_s { @@ -960,7 +960,7 @@ struct ta_based_qmc_s { void to_json(json_writer& j) const; }; -typedef protocol_ext_container_empty_l tai_based_qmc_ext_ies_container; +using tai_based_qmc_ext_ies_container = protocol_ext_container_empty_l; // TAIBasedQMC ::= SEQUENCE struct tai_based_qmc_s { @@ -1065,9 +1065,9 @@ private: }; // CellIdentifierAndCELevelForCECapableUEs-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o cell_id_and_ce_level_for_ce_capable_ues_ext_ies_o; +using cell_id_and_ce_level_for_ce_capable_ues_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l cell_id_and_ce_level_for_ce_capable_ues_ext_ies_container; +using cell_id_and_ce_level_for_ce_capable_ues_ext_ies_container = protocol_ext_container_empty_l; // CellIdentifierAndCELevelForCECapableUEs ::= SEQUENCE struct cell_id_and_ce_level_for_ce_capable_ues_s { @@ -1085,9 +1085,9 @@ struct cell_id_and_ce_level_for_ce_capable_ues_s { }; // InformationForCECapableUEs-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o info_for_ce_capable_ues_ext_ies_o; +using info_for_ce_capable_ues_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l info_for_ce_capable_ues_ext_ies_container; +using info_for_ce_capable_ues_ext_ies_container = protocol_ext_container_empty_l; // AssistanceDataForCECapableUEs ::= SEQUENCE struct assist_data_for_ce_capable_ues_s { @@ -1104,9 +1104,9 @@ struct assist_data_for_ce_capable_ues_s { }; // RecommendedCellsForPagingItem-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o recommended_cells_for_paging_item_ext_ies_o; +using recommended_cells_for_paging_item_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l recommended_cells_for_paging_item_ext_ies_container; +using recommended_cells_for_paging_item_ext_ies_container = protocol_ext_container_empty_l; // RecommendedCellItem ::= SEQUENCE struct recommended_cell_item_s { @@ -1160,10 +1160,10 @@ struct recommended_cell_item_ies_o { using recommended_cell_list_l = bounded_array, 16>; // RecommendedCellsForPaging-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o recommended_cells_for_paging_ext_ies_o; +using recommended_cells_for_paging_ext_ies_o = s1ap_protocol_ext_empty_o; // AssistanceDataForRecommendedCells-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o assist_data_for_recommended_cells_ext_ies_o; +using assist_data_for_recommended_cells_ext_ies_o = s1ap_protocol_ext_empty_o; // NextPagingAreaScope ::= ENUMERATED struct next_paging_area_scope_opts { @@ -1174,9 +1174,9 @@ struct next_paging_area_scope_opts { typedef enumerated next_paging_area_scope_e; // PagingAttemptInformation-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o paging_attempt_info_ext_ies_o; +using paging_attempt_info_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l recommended_cells_for_paging_ext_ies_container; +using recommended_cells_for_paging_ext_ies_container = protocol_ext_container_empty_l; // RecommendedCellsForPaging ::= SEQUENCE struct recommended_cells_for_paging_s { @@ -1193,9 +1193,9 @@ struct recommended_cells_for_paging_s { }; // AssistanceDataForPaging-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o assist_data_for_paging_ext_ies_o; +using assist_data_for_paging_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l assist_data_for_recommended_cells_ext_ies_container; +using assist_data_for_recommended_cells_ext_ies_container = protocol_ext_container_empty_l; // AssistanceDataForRecommendedCells ::= SEQUENCE struct assist_data_for_recommended_cells_s { @@ -1211,7 +1211,7 @@ struct assist_data_for_recommended_cells_s { void to_json(json_writer& j) const; }; -typedef protocol_ext_container_empty_l paging_attempt_info_ext_ies_container; +using paging_attempt_info_ext_ies_container = protocol_ext_container_empty_l; // PagingAttemptInformation ::= SEQUENCE struct paging_attempt_info_s { @@ -1230,7 +1230,7 @@ struct paging_attempt_info_s { void to_json(json_writer& j) const; }; -typedef protocol_ext_container_empty_l assist_data_for_paging_ext_ies_container; +using assist_data_for_paging_ext_ies_container = protocol_ext_container_empty_l; // AssistanceDataForPaging ::= SEQUENCE struct assist_data_for_paging_s { @@ -1255,12 +1255,12 @@ struct assist_data_for_paging_s { using bplmns_l = bounded_array, 6>; // COUNTValueExtended-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o count_value_extended_ext_ies_o; +using count_value_extended_ext_ies_o = s1ap_protocol_ext_empty_o; // COUNTvaluePDCP-SNlength18-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o coun_tvalue_pdcp_snlen18_ext_ies_o; +using coun_tvalue_pdcp_snlen18_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l count_value_extended_ext_ies_container; +using count_value_extended_ext_ies_container = protocol_ext_container_empty_l; // COUNTValueExtended ::= SEQUENCE struct count_value_extended_s { @@ -1278,9 +1278,9 @@ struct count_value_extended_s { }; // COUNTvalue-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o coun_tvalue_ext_ies_o; +using coun_tvalue_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l coun_tvalue_pdcp_snlen18_ext_ies_container; +using coun_tvalue_pdcp_snlen18_ext_ies_container = protocol_ext_container_empty_l; // COUNTvaluePDCP-SNlength18 ::= SEQUENCE struct coun_tvalue_pdcp_snlen18_s { @@ -1359,7 +1359,7 @@ struct bearers_subject_to_status_transfer_item_ext_ies_o { static presence_e get_presence(const uint32_t& id); }; -typedef protocol_ext_container_empty_l coun_tvalue_ext_ies_container; +using coun_tvalue_ext_ies_container = protocol_ext_container_empty_l; // COUNTvalue ::= SEQUENCE struct coun_tvalue_s { @@ -1468,9 +1468,9 @@ struct bluetooth_meas_cfg_opts { typedef enumerated bluetooth_meas_cfg_e; // BluetoothMeasurementConfiguration-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o bluetooth_meas_cfg_ext_ies_o; +using bluetooth_meas_cfg_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l bluetooth_meas_cfg_ext_ies_container; +using bluetooth_meas_cfg_ext_ies_container = protocol_ext_container_empty_l; // BluetoothMeasurementConfiguration ::= SEQUENCE struct bluetooth_meas_cfg_s { @@ -1499,12 +1499,12 @@ struct bluetooth_meas_cfg_s { }; // CancelledCellinEAI-Item-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o cancelled_cellin_eai_item_ext_ies_o; +using cancelled_cellin_eai_item_ext_ies_o = s1ap_protocol_ext_empty_o; // CancelledCellinTAI-Item-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o cancelled_cellin_tai_item_ext_ies_o; +using cancelled_cellin_tai_item_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l cancelled_cellin_eai_item_ext_ies_container; +using cancelled_cellin_eai_item_ext_ies_container = protocol_ext_container_empty_l; // CancelledCellinEAI-Item ::= SEQUENCE struct cancelled_cellin_eai_item_s { @@ -1521,7 +1521,7 @@ struct cancelled_cellin_eai_item_s { void to_json(json_writer& j) const; }; -typedef protocol_ext_container_empty_l cancelled_cellin_tai_item_ext_ies_container; +using cancelled_cellin_tai_item_ext_ies_container = protocol_ext_container_empty_l; // CancelledCellinTAI-Item ::= SEQUENCE struct cancelled_cellin_tai_item_s { @@ -1545,15 +1545,15 @@ using cancelled_cellin_eai_l = dyn_array; using cancelled_cellin_tai_l = dyn_array; // CellID-Cancelled-Item-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o cell_id_cancelled_item_ext_ies_o; +using cell_id_cancelled_item_ext_ies_o = s1ap_protocol_ext_empty_o; // EmergencyAreaID-Cancelled-Item-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o emergency_area_id_cancelled_item_ext_ies_o; +using emergency_area_id_cancelled_item_ext_ies_o = s1ap_protocol_ext_empty_o; // TAI-Cancelled-Item-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o tai_cancelled_item_ext_ies_o; +using tai_cancelled_item_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l cell_id_cancelled_item_ext_ies_container; +using cell_id_cancelled_item_ext_ies_container = protocol_ext_container_empty_l; // CellID-Cancelled-Item ::= SEQUENCE struct cell_id_cancelled_item_s { @@ -1570,7 +1570,7 @@ struct cell_id_cancelled_item_s { void to_json(json_writer& j) const; }; -typedef protocol_ext_container_empty_l emergency_area_id_cancelled_item_ext_ies_container; +using emergency_area_id_cancelled_item_ext_ies_container = protocol_ext_container_empty_l; // EmergencyAreaID-Cancelled-Item ::= SEQUENCE struct emergency_area_id_cancelled_item_s { @@ -1587,7 +1587,7 @@ struct emergency_area_id_cancelled_item_s { void to_json(json_writer& j) const; }; -typedef protocol_ext_container_empty_l tai_cancelled_item_ext_ies_container; +using tai_cancelled_item_ext_ies_container = protocol_ext_container_empty_l; // TAI-Cancelled-Item ::= SEQUENCE struct tai_cancelled_item_s { @@ -1687,12 +1687,12 @@ private: }; // CompletedCellinEAI-Item-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o completed_cellin_eai_item_ext_ies_o; +using completed_cellin_eai_item_ext_ies_o = s1ap_protocol_ext_empty_o; // CompletedCellinTAI-Item-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o completed_cellin_tai_item_ext_ies_o; +using completed_cellin_tai_item_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l completed_cellin_eai_item_ext_ies_container; +using completed_cellin_eai_item_ext_ies_container = protocol_ext_container_empty_l; // CompletedCellinEAI-Item ::= SEQUENCE struct completed_cellin_eai_item_s { @@ -1708,7 +1708,7 @@ struct completed_cellin_eai_item_s { void to_json(json_writer& j) const; }; -typedef protocol_ext_container_empty_l completed_cellin_tai_item_ext_ies_container; +using completed_cellin_tai_item_ext_ies_container = protocol_ext_container_empty_l; // CompletedCellinTAI-Item ::= SEQUENCE struct completed_cellin_tai_item_s { @@ -1725,7 +1725,7 @@ struct completed_cellin_tai_item_s { }; // CellID-Broadcast-Item-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o cell_id_broadcast_item_ext_ies_o; +using cell_id_broadcast_item_ext_ies_o = s1ap_protocol_ext_empty_o; // CompletedCellinEAI ::= SEQUENCE (SIZE (1..65535)) OF CompletedCellinEAI-Item using completed_cellin_eai_l = dyn_array; @@ -1734,12 +1734,12 @@ using completed_cellin_eai_l = dyn_array; using completed_cellin_tai_l = dyn_array; // EmergencyAreaID-Broadcast-Item-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o emergency_area_id_broadcast_item_ext_ies_o; +using emergency_area_id_broadcast_item_ext_ies_o = s1ap_protocol_ext_empty_o; // TAI-Broadcast-Item-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o tai_broadcast_item_ext_ies_o; +using tai_broadcast_item_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l cell_id_broadcast_item_ext_ies_container; +using cell_id_broadcast_item_ext_ies_container = protocol_ext_container_empty_l; // CellID-Broadcast-Item ::= SEQUENCE struct cell_id_broadcast_item_s { @@ -1755,7 +1755,7 @@ struct cell_id_broadcast_item_s { void to_json(json_writer& j) const; }; -typedef protocol_ext_container_empty_l emergency_area_id_broadcast_item_ext_ies_container; +using emergency_area_id_broadcast_item_ext_ies_container = protocol_ext_container_empty_l; // EmergencyAreaID-Broadcast-Item ::= SEQUENCE struct emergency_area_id_broadcast_item_s { @@ -1772,7 +1772,7 @@ struct emergency_area_id_broadcast_item_s { void to_json(json_writer& j) const; }; -typedef protocol_ext_container_empty_l tai_broadcast_item_ext_ies_container; +using tai_broadcast_item_ext_ies_container = protocol_ext_container_empty_l; // TAI-Broadcast-Item ::= SEQUENCE struct tai_broadcast_item_s { @@ -1872,9 +1872,9 @@ private: }; // CGI-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o cgi_ext_ies_o; +using cgi_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l cgi_ext_ies_container; +using cgi_ext_ies_container = protocol_ext_container_empty_l; // CGI ::= SEQUENCE struct cgi_s { @@ -1905,9 +1905,9 @@ struct cn_type_opts { typedef enumerated cn_type_e; // CNTypeRestrictions-Item-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o cn_type_restricts_item_ext_ies_o; +using cn_type_restricts_item_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l cn_type_restricts_item_ext_ies_container; +using cn_type_restricts_item_ext_ies_container = protocol_ext_container_empty_l; // CNTypeRestrictions-Item ::= SEQUENCE struct cn_type_restricts_item_s { @@ -1928,9 +1928,9 @@ struct cn_type_restricts_item_s { using cn_type_restricts_l = dyn_array; // CSG-IdList-Item-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o csg_id_list_item_ext_ies_o; +using csg_id_list_item_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l csg_id_list_item_ext_ies_container; +using csg_id_list_item_ext_ies_container = protocol_ext_container_empty_l; // CSG-IdList-Item ::= SEQUENCE struct csg_id_list_item_s { @@ -1950,7 +1950,7 @@ struct csg_id_list_item_s { using csg_id_list_l = dyn_array; // CSGMembershipInfo-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o csg_membership_info_ext_ies_o; +using csg_membership_info_ext_ies_o = s1ap_protocol_ext_empty_o; // CSGMembershipStatus ::= ENUMERATED struct csg_membership_status_opts { @@ -1968,7 +1968,7 @@ struct cell_access_mode_opts { }; typedef enumerated cell_access_mode_e; -typedef protocol_ext_container_empty_l csg_membership_info_ext_ies_container; +using csg_membership_info_ext_ies_container = protocol_ext_container_empty_l; // CSGMembershipInfo ::= SEQUENCE struct csg_membership_info_s { @@ -2311,9 +2311,9 @@ private: }; // Cdma2000OneXSRVCCInfo-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o cdma2000_one_xsrvcc_info_ext_ies_o; +using cdma2000_one_xsrvcc_info_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l cdma2000_one_xsrvcc_info_ext_ies_container; +using cdma2000_one_xsrvcc_info_ext_ies_container = protocol_ext_container_empty_l; // Cdma2000OneXSRVCCInfo ::= SEQUENCE struct cdma2000_one_xsrvcc_info_s { @@ -2654,9 +2654,9 @@ struct cell_size_opts { typedef enumerated cell_size_e; // CellType-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o cell_type_ext_ies_o; +using cell_type_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l cell_type_ext_ies_container; +using cell_type_ext_ies_container = protocol_ext_container_empty_l; // CellType ::= SEQUENCE struct cell_type_s { @@ -2728,12 +2728,12 @@ struct supported_tas_item_s { }; // ConnectedengNBItem-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o connectedeng_nb_item_ext_ies_o; +using connectedeng_nb_item_ext_ies_o = s1ap_protocol_ext_empty_o; // SupportedTAs ::= SEQUENCE (SIZE (1..256)) OF SupportedTAs-Item using supported_tas_l = dyn_array; -typedef protocol_ext_container_empty_l connectedeng_nb_item_ext_ies_container; +using connectedeng_nb_item_ext_ies_container = protocol_ext_container_empty_l; // ConnectedengNBItem ::= SEQUENCE struct connectedeng_nb_item_s { @@ -2806,10 +2806,10 @@ struct gbr_qos_info_ext_ies_o { }; // ScheduledCommunicationTime-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o sched_communication_time_ext_ies_o; +using sched_communication_time_ext_ies_o = s1ap_protocol_ext_empty_o; // DL-CP-SecurityInformation-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o dl_cp_security_info_ext_ies_o; +using dl_cp_security_info_ext_ies_o = s1ap_protocol_ext_empty_o; // E-RABQoSParameters-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION struct erab_qos_params_ext_ies_o { @@ -2891,7 +2891,7 @@ struct gbr_qos_info_s { void to_json(json_writer& j) const; }; -typedef protocol_ext_container_empty_l sched_communication_time_ext_ies_container; +using sched_communication_time_ext_ies_container = protocol_ext_container_empty_l; // ScheduledCommunicationTime ::= SEQUENCE struct sched_communication_time_s { @@ -2913,7 +2913,7 @@ struct sched_communication_time_s { }; // Subscription-Based-UE-DifferentiationInfo-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o subscription_based_ue_differentiation_info_ext_ies_o; +using subscription_based_ue_differentiation_info_ext_ies_o = s1ap_protocol_ext_empty_o; // CE-ModeBRestricted ::= ENUMERATED struct ce_mode_brestricted_opts { @@ -2923,7 +2923,7 @@ struct ce_mode_brestricted_opts { }; typedef enumerated ce_mode_brestricted_e; -typedef protocol_ext_container_empty_l dl_cp_security_info_ext_ies_container; +using dl_cp_security_info_ext_ies_container = protocol_ext_container_empty_l; // DL-CP-SecurityInformation ::= SEQUENCE struct dl_cp_security_info_s { @@ -2989,7 +2989,7 @@ struct enhanced_coverage_restricted_opts { }; typedef enumerated enhanced_coverage_restricted_e; -typedef protocol_ext_container_empty_l subscription_based_ue_differentiation_info_ext_ies_container; +using subscription_based_ue_differentiation_info_ext_ies_container = protocol_ext_container_empty_l; // Subscription-Based-UE-DifferentiationInfo ::= SEQUENCE struct subscription_based_ue_differentiation_info_s { @@ -3270,15 +3270,15 @@ private: }; // Global-GNB-ID-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o global_gnb_id_ext_ies_o; +using global_gnb_id_ext_ies_o = s1ap_protocol_ext_empty_o; // GlobalENB-ID-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o global_enb_id_ext_ies_o; +using global_enb_id_ext_ies_o = s1ap_protocol_ext_empty_o; // GNB-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o gnb_ext_ies_o; +using gnb_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l global_enb_id_ext_ies_container; +using global_enb_id_ext_ies_container = protocol_ext_container_empty_l; // Global-ENB-ID ::= SEQUENCE struct global_enb_id_s { @@ -3295,7 +3295,7 @@ struct global_enb_id_s { void to_json(json_writer& j) const; }; -typedef protocol_ext_container_empty_l global_gnb_id_ext_ies_container; +using global_gnb_id_ext_ies_container = protocol_ext_container_empty_l; // Global-GNB-ID ::= SEQUENCE struct global_gnb_id_s { @@ -3313,9 +3313,9 @@ struct global_gnb_id_s { }; // NG-eNB-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o ng_enb_ext_ies_o; +using ng_enb_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l gnb_ext_ies_container; +using gnb_ext_ies_container = protocol_ext_container_empty_l; // GNB ::= SEQUENCE struct gnb_s { @@ -3331,7 +3331,7 @@ struct gnb_s { void to_json(json_writer& j) const; }; -typedef protocol_ext_container_empty_l ng_enb_ext_ies_container; +using ng_enb_ext_ies_container = protocol_ext_container_empty_l; // NG-eNB ::= SEQUENCE struct ng_enb_s { @@ -3348,7 +3348,7 @@ struct ng_enb_s { }; // ContextatSource-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o contextat_source_ext_ies_o; +using contextat_source_ext_ies_o = s1ap_protocol_ext_empty_o; // Global-RAN-NODE-ID ::= CHOICE struct global_ran_node_id_c { @@ -3408,7 +3408,7 @@ private: void destroy_(); }; -typedef protocol_ext_container_empty_l contextat_source_ext_ies_container; +using contextat_source_ext_ies_container = protocol_ext_container_empty_l; // ContextatSource ::= SEQUENCE struct contextat_source_s { @@ -3426,7 +3426,7 @@ struct contextat_source_s { }; // CriticalityDiagnostics-IE-Item-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o crit_diagnostics_ie_item_ext_ies_o; +using crit_diagnostics_ie_item_ext_ies_o = s1ap_protocol_ext_empty_o; // TypeOfError ::= ENUMERATED struct type_of_error_opts { @@ -3436,7 +3436,7 @@ struct type_of_error_opts { }; typedef enumerated type_of_error_e; -typedef protocol_ext_container_empty_l crit_diagnostics_ie_item_ext_ies_container; +using crit_diagnostics_ie_item_ext_ies_container = protocol_ext_container_empty_l; // CriticalityDiagnostics-IE-Item ::= SEQUENCE struct crit_diagnostics_ie_item_s { @@ -3455,7 +3455,7 @@ struct crit_diagnostics_ie_item_s { }; // CriticalityDiagnostics-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o crit_diagnostics_ext_ies_o; +using crit_diagnostics_ext_ies_o = s1ap_protocol_ext_empty_o; // CriticalityDiagnostics-IE-List ::= SEQUENCE (SIZE (1..256)) OF CriticalityDiagnostics-IE-Item using crit_diagnostics_ie_list_l = dyn_array; @@ -3468,7 +3468,7 @@ struct trigger_msg_opts { }; typedef enumerated trigger_msg_e; -typedef protocol_ext_container_empty_l crit_diagnostics_ext_ies_container; +using crit_diagnostics_ext_ies_container = protocol_ext_container_empty_l; // CriticalityDiagnostics ::= SEQUENCE struct crit_diagnostics_s { @@ -3567,15 +3567,15 @@ struct deactiv_trace_s { using forbidden_lacs_l = dyn_array >; // ForbiddenLAs-Item-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o forbidden_las_item_ext_ies_o; +using forbidden_las_item_ext_ies_o = s1ap_protocol_ext_empty_o; // ForbiddenTACs ::= SEQUENCE (SIZE (1..4096)) OF OCTET STRING (SIZE (2)) using forbidden_tacs_l = dyn_array >; // ForbiddenTAs-Item-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o forbidden_tas_item_ext_ies_o; +using forbidden_tas_item_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l forbidden_las_item_ext_ies_container; +using forbidden_las_item_ext_ies_container = protocol_ext_container_empty_l; // ForbiddenLAs-Item ::= SEQUENCE struct forbidden_las_item_s { @@ -3592,7 +3592,7 @@ struct forbidden_las_item_s { void to_json(json_writer& j) const; }; -typedef protocol_ext_container_empty_l forbidden_tas_item_ext_ies_container; +using forbidden_tas_item_ext_ies_container = protocol_ext_container_empty_l; // ForbiddenTAs-Item ::= SEQUENCE struct forbidden_tas_item_s { @@ -3710,7 +3710,7 @@ struct ho_restrict_list_ext_ies_o { }; // NRUESecurityCapabilities-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o nrue_security_cap_ext_ies_o; +using nrue_security_cap_ext_ies_o = s1ap_protocol_ext_empty_o; // DLNASPDUDeliveryAckRequest ::= ENUMERATED struct dlnaspdu_delivery_ack_request_opts { @@ -3765,7 +3765,7 @@ struct ho_restrict_list_s { void to_json(json_writer& j) const; }; -typedef protocol_ext_container_empty_l nrue_security_cap_ext_ies_container; +using nrue_security_cap_ext_ies_container = protocol_ext_container_empty_l; // NRUESecurityCapabilities ::= SEQUENCE struct nrue_security_cap_s { @@ -4025,9 +4025,9 @@ struct dl_non_ueassociated_lp_pa_transport_s { }; // E-RABDataForwardingItem-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o erab_data_forwarding_item_ext_ies_o; +using erab_data_forwarding_item_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l erab_data_forwarding_item_ext_ies_container; +using erab_data_forwarding_item_ext_ies_container = protocol_ext_container_empty_l; // E-RABDataForwardingItem ::= SEQUENCE struct erab_data_forwarding_item_s { @@ -4287,9 +4287,9 @@ using erab_ie_container_pair_list_l = dyn_seq_of, 0, 65535, true>, 1, 256>; // E-RABAdmittedItem-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o erab_admitted_item_ext_ies_o; +using erab_admitted_item_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l erab_admitted_item_ext_ies_container; +using erab_admitted_item_ext_ies_container = protocol_ext_container_empty_l; // E-RABAdmittedItem ::= SEQUENCE struct erab_admitted_item_s { @@ -4348,9 +4348,9 @@ struct erab_admitted_item_ies_o { }; // E-RABFailedToResumeItemResumeReq-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o erab_failed_to_resume_item_resume_req_ext_ies_o; +using erab_failed_to_resume_item_resume_req_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l erab_failed_to_resume_item_resume_req_ext_ies_container; +using erab_failed_to_resume_item_resume_req_ext_ies_container = protocol_ext_container_empty_l; // E-RABFailedToResumeItemResumeReq ::= SEQUENCE struct erab_failed_to_resume_item_resume_req_s { @@ -4400,9 +4400,9 @@ struct erab_failed_to_resume_item_resume_req_ies_o { }; // E-RABFailedToResumeItemResumeRes-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o erab_failed_to_resume_item_resume_res_ext_ies_o; +using erab_failed_to_resume_item_resume_res_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l erab_failed_to_resume_item_resume_res_ext_ies_container; +using erab_failed_to_resume_item_resume_res_ext_ies_container = protocol_ext_container_empty_l; // E-RABFailedToResumeItemResumeRes ::= SEQUENCE struct erab_failed_to_resume_item_resume_res_s { @@ -4452,9 +4452,9 @@ struct erab_failed_to_resume_item_resume_res_ies_o { }; // E-RABFailedToSetupItemHOReqAckExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o erab_failed_to_setup_item_ho_req_ack_ext_ies_o; +using erab_failed_to_setup_item_ho_req_ack_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l erab_failed_to_setup_item_ho_req_ack_ext_ies_container; +using erab_failed_to_setup_item_ho_req_ack_ext_ies_container = protocol_ext_container_empty_l; // E-RABFailedToSetupItemHOReqAck ::= SEQUENCE struct erab_failed_to_setup_item_ho_req_ack_s { @@ -4512,9 +4512,9 @@ struct dl_forwarding_opts { typedef enumerated dl_forwarding_e; // E-RABInformationListItem-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o erab_info_list_item_ext_ies_o; +using erab_info_list_item_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l erab_info_list_item_ext_ies_container; +using erab_info_list_item_ext_ies_container = protocol_ext_container_empty_l; // E-RABInformationListItem ::= SEQUENCE struct erab_info_list_item_s { @@ -4568,9 +4568,9 @@ struct erab_info_list_ies_o { using erab_info_list_l = dyn_array >; // E-RABItem-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o erab_item_ext_ies_o; +using erab_item_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l erab_item_ext_ies_container; +using erab_item_ext_ies_container = protocol_ext_container_empty_l; // E-RABItem ::= SEQUENCE struct erab_item_s { @@ -4623,9 +4623,9 @@ struct erab_item_ies_o { using erab_list_l = dyn_array >; // E-RABModifyItemBearerModConfExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o erab_modify_item_bearer_mod_conf_ext_ies_o; +using erab_modify_item_bearer_mod_conf_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l erab_modify_item_bearer_mod_conf_ext_ies_container; +using erab_modify_item_bearer_mod_conf_ext_ies_container = protocol_ext_container_empty_l; // E-RABModifyItemBearerModConf ::= SEQUENCE struct erab_modify_item_bearer_mod_conf_s { @@ -4780,9 +4780,9 @@ struct erab_mod_confirm_s { }; // E-RABUsageReportItem-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o erabusage_report_item_ext_ies_o; +using erabusage_report_item_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l erabusage_report_item_ext_ies_container; +using erabusage_report_item_ext_ies_container = protocol_ext_container_empty_l; // E-RABUsageReportItem ::= SEQUENCE struct erabusage_report_item_s { @@ -4834,18 +4834,18 @@ struct erabusage_report_item_ies_o { }; // NR-CGI-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o nr_cgi_ext_ies_o; +using nr_cgi_ext_ies_o = s1ap_protocol_ext_empty_o; // E-RABNotToBeModifiedItemBearerModInd-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o erab_not_to_be_modified_item_bearer_mod_ind_ext_ies_o; +using erab_not_to_be_modified_item_bearer_mod_ind_ext_ies_o = s1ap_protocol_ext_empty_o; // E-RABToBeModifiedItemBearerModInd-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o erab_to_be_modified_item_bearer_mod_ind_ext_ies_o; +using erab_to_be_modified_item_bearer_mod_ind_ext_ies_o = s1ap_protocol_ext_empty_o; // E-RABUsageReportList ::= SEQUENCE (SIZE (1..2)) OF ProtocolIE-SingleContainer{S1AP-PROTOCOL-IES : IEsSetParam} using erabusage_report_list_l = bounded_array, 2>; -typedef protocol_ext_container_empty_l nr_cgi_ext_ies_container; +using nr_cgi_ext_ies_container = protocol_ext_container_empty_l; // NR-CGI ::= SEQUENCE struct nr_cgi_s { @@ -4863,10 +4863,10 @@ struct nr_cgi_s { }; // PSCellInformation-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o ps_cell_info_ext_ies_o; +using ps_cell_info_ext_ies_o = s1ap_protocol_ext_empty_o; // SecondaryRATDataUsageReportItem-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o secondary_rat_data_usage_report_item_ext_ies_o; +using secondary_rat_data_usage_report_item_ext_ies_o = s1ap_protocol_ext_empty_o; // SecondaryRATType ::= ENUMERATED struct secondary_rat_type_opts { @@ -4876,7 +4876,7 @@ struct secondary_rat_type_opts { }; typedef enumerated secondary_rat_type_e; -typedef protocol_ext_container_empty_l erab_not_to_be_modified_item_bearer_mod_ind_ext_ies_container; +using erab_not_to_be_modified_item_bearer_mod_ind_ext_ies_container = protocol_ext_container_empty_l; // E-RABNotToBeModifiedItemBearerModInd ::= SEQUENCE struct erab_not_to_be_modified_item_bearer_mod_ind_s { @@ -4894,7 +4894,7 @@ struct erab_not_to_be_modified_item_bearer_mod_ind_s { void to_json(json_writer& j) const; }; -typedef protocol_ext_container_empty_l erab_to_be_modified_item_bearer_mod_ind_ext_ies_container; +using erab_to_be_modified_item_bearer_mod_ind_ext_ies_container = protocol_ext_container_empty_l; // E-RABToBeModifiedItemBearerModInd ::= SEQUENCE struct erab_to_be_modified_item_bearer_mod_ind_s { @@ -4912,7 +4912,7 @@ struct erab_to_be_modified_item_bearer_mod_ind_s { void to_json(json_writer& j) const; }; -typedef protocol_ext_container_empty_l ps_cell_info_ext_ies_container; +using ps_cell_info_ext_ies_container = protocol_ext_container_empty_l; // PSCellInformation ::= SEQUENCE struct ps_cell_info_s { @@ -4928,7 +4928,7 @@ struct ps_cell_info_s { void to_json(json_writer& j) const; }; -typedef protocol_ext_container_empty_l secondary_rat_data_usage_report_item_ext_ies_container; +using secondary_rat_data_usage_report_item_ext_ies_container = protocol_ext_container_empty_l; // SecondaryRATDataUsageReportItem ::= SEQUENCE struct secondary_rat_data_usage_report_item_s { @@ -5046,7 +5046,7 @@ struct secondary_rat_data_usage_report_item_ies_o { }; // Tunnel-Information-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o tunnel_info_ext_ies_o; +using tunnel_info_ext_ies_o = s1ap_protocol_ext_empty_o; // UserLocationInformation-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION struct user_location_info_ext_ies_o { @@ -5085,7 +5085,7 @@ struct user_location_info_ext_ies_o { using secondary_rat_data_usage_report_list_l = dyn_array >; -typedef protocol_ext_container_empty_l tunnel_info_ext_ies_container; +using tunnel_info_ext_ies_container = protocol_ext_container_empty_l; // TunnelInformation ::= SEQUENCE struct tunnel_info_s { @@ -5233,9 +5233,9 @@ struct erab_mod_ind_s { }; // E-RABModifyItemBearerModResExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o erab_modify_item_bearer_mod_res_ext_ies_o; +using erab_modify_item_bearer_mod_res_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l erab_modify_item_bearer_mod_res_ext_ies_container; +using erab_modify_item_bearer_mod_res_ext_ies_container = protocol_ext_container_empty_l; // E-RABModifyItemBearerModRes ::= SEQUENCE struct erab_modify_item_bearer_mod_res_s { @@ -5835,9 +5835,9 @@ struct erab_release_ind_s { }; // E-RABReleaseItemBearerRelCompExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o erab_release_item_bearer_rel_comp_ext_ies_o; +using erab_release_item_bearer_rel_comp_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l erab_release_item_bearer_rel_comp_ext_ies_container; +using erab_release_item_bearer_rel_comp_ext_ies_container = protocol_ext_container_empty_l; // E-RABReleaseItemBearerRelComp ::= SEQUENCE struct erab_release_item_bearer_rel_comp_s { @@ -5996,9 +5996,9 @@ struct erab_release_resp_s { }; // E-RABSetupItemBearerSUResExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o erab_setup_item_bearer_su_res_ext_ies_o; +using erab_setup_item_bearer_su_res_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l erab_setup_item_bearer_su_res_ext_ies_container; +using erab_setup_item_bearer_su_res_ext_ies_container = protocol_ext_container_empty_l; // E-RABSetupItemBearerSURes ::= SEQUENCE struct erab_setup_item_bearer_su_res_s { @@ -6049,9 +6049,9 @@ struct erab_setup_item_bearer_su_res_ies_o { }; // E-RABSetupItemCtxtSUResExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o erab_setup_item_ctxt_su_res_ext_ies_o; +using erab_setup_item_ctxt_su_res_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l erab_setup_item_ctxt_su_res_ext_ies_container; +using erab_setup_item_ctxt_su_res_ext_ies_container = protocol_ext_container_empty_l; // E-RABSetupItemCtxtSURes ::= SEQUENCE struct erab_setup_item_ctxt_su_res_s { @@ -6642,9 +6642,9 @@ using erab_to_be_setup_list_ctxt_su_req_l = dyn_array >; // E-RABToBeSwitchedDLItem-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o erab_to_be_switched_dl_item_ext_ies_o; +using erab_to_be_switched_dl_item_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l erab_to_be_switched_dl_item_ext_ies_container; +using erab_to_be_switched_dl_item_ext_ies_container = protocol_ext_container_empty_l; // E-RABToBeSwitchedDLItem ::= SEQUENCE struct erab_to_be_switched_dl_item_s { @@ -6695,9 +6695,9 @@ struct erab_to_be_switched_dl_item_ies_o { }; // E-RABToBeSwitchedULItem-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o erab_to_be_switched_ul_item_ext_ies_o; +using erab_to_be_switched_ul_item_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l erab_to_be_switched_ul_item_ext_ies_container; +using erab_to_be_switched_ul_item_ext_ies_container = protocol_ext_container_empty_l; // E-RABToBeSwitchedULItem ::= SEQUENCE struct erab_to_be_switched_ul_item_s { @@ -6767,12 +6767,12 @@ struct ehrpd_multi_sector_load_report_resp_item_s { }; // ENBX2ExtTLA-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o enbx2_ext_tla_ext_ies_o; +using enbx2_ext_tla_ext_ies_o = s1ap_protocol_ext_empty_o; // ENBX2GTPTLAs ::= SEQUENCE (SIZE (1..16)) OF BIT STRING (SIZE (1..160,...)) using enbx2_gtptlas_l = bounded_array, 16>; -typedef protocol_ext_container_empty_l enbx2_ext_tla_ext_ies_container; +using enbx2_ext_tla_ext_ies_container = protocol_ext_container_empty_l; // ENBX2ExtTLA ::= SEQUENCE struct enbx2_ext_tla_s { @@ -6800,7 +6800,7 @@ struct muting_availability_ind_opts { typedef enumerated muting_availability_ind_e; // RLFReportInformation-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o rlf_report_info_ext_ies_o; +using rlf_report_info_ext_ies_o = s1ap_protocol_ext_empty_o; // ENBIndirectX2TransportLayerAddresses ::= SEQUENCE (SIZE (1..2)) OF BIT STRING (SIZE (1..160,...)) using enb_indirect_x2_transport_layer_addresses_l = bounded_array, 2>; @@ -6809,12 +6809,12 @@ using enb_indirect_x2_transport_layer_addresses_l = bounded_array; // Global-en-gNB-ID-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o global_en_g_nb_id_ext_ies_o; +using global_en_g_nb_id_ext_ies_o = s1ap_protocol_ext_empty_o; // MutingPatternInformation-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o muting_pattern_info_ext_ies_o; +using muting_pattern_info_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l rlf_report_info_ext_ies_container; +using rlf_report_info_ext_ies_container = protocol_ext_container_empty_l; // RLFReportInformation ::= SEQUENCE struct rlf_report_info_s { @@ -6873,18 +6873,18 @@ struct time_synchronisation_info_ext_ies_o { }; // EN-DCSONeNBIdentification-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o en_dcso_nenb_identif_ext_ies_o; +using en_dcso_nenb_identif_ext_ies_o = s1ap_protocol_ext_empty_o; // EN-DCSONengNBIdentification-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o en_dcso_neng_nb_identif_ext_ies_o; +using en_dcso_neng_nb_identif_ext_ies_o = s1ap_protocol_ext_empty_o; // ENBX2TLAs ::= SEQUENCE (SIZE (1..2)) OF BIT STRING (SIZE (1..160,...)) using enbx2_tlas_l = bounded_array, 2>; // FiveGSTAI-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o five_gstai_ext_ies_o; +using five_gstai_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l global_en_g_nb_id_ext_ies_container; +using global_en_g_nb_id_ext_ies_container = protocol_ext_container_empty_l; // Global-en-gNB-ID ::= SEQUENCE struct global_en_g_nb_id_s { @@ -6901,7 +6901,7 @@ struct global_en_g_nb_id_s { void to_json(json_writer& j) const; }; -typedef protocol_ext_container_empty_l muting_pattern_info_ext_ies_container; +using muting_pattern_info_ext_ies_container = protocol_ext_container_empty_l; // MutingPatternInformation ::= SEQUENCE struct muting_pattern_info_s { @@ -7012,7 +7012,7 @@ struct x2_tnl_cfg_info_ext_ies_o { static presence_e get_presence(const uint32_t& id); }; -typedef protocol_ext_container_empty_l en_dcso_nenb_identif_ext_ies_container; +using en_dcso_nenb_identif_ext_ies_container = protocol_ext_container_empty_l; // EN-DCSONeNBIdentification ::= SEQUENCE struct en_dcso_nenb_identif_s { @@ -7029,7 +7029,7 @@ struct en_dcso_nenb_identif_s { void to_json(json_writer& j) const; }; -typedef protocol_ext_container_empty_l en_dcso_neng_nb_identif_ext_ies_container; +using en_dcso_neng_nb_identif_ext_ies_container = protocol_ext_container_empty_l; // EN-DCSONengNBIdentification ::= SEQUENCE struct en_dcso_neng_nb_identif_s { @@ -7047,12 +7047,12 @@ struct en_dcso_neng_nb_identif_s { }; // EN-DCTransferTypeReply-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o en_dc_transfer_type_reply_ext_ies_o; +using en_dc_transfer_type_reply_ext_ies_o = s1ap_protocol_ext_empty_o; // EN-DCTransferTypeRequest-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o en_dc_transfer_type_request_ext_ies_o; +using en_dc_transfer_type_request_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l five_gstai_ext_ies_container; +using five_gstai_ext_ies_container = protocol_ext_container_empty_l; // FiveGSTAI ::= SEQUENCE struct five_gstai_s { @@ -7164,7 +7164,7 @@ struct x2_tnl_cfg_info_s { void to_json(json_writer& j) const; }; -typedef protocol_ext_container_empty_l en_dc_transfer_type_reply_ext_ies_container; +using en_dc_transfer_type_reply_ext_ies_container = protocol_ext_container_empty_l; // EN-DCTransferTypeReply ::= SEQUENCE struct en_dc_transfer_type_reply_s { @@ -7181,7 +7181,7 @@ struct en_dc_transfer_type_reply_s { void to_json(json_writer& j) const; }; -typedef protocol_ext_container_empty_l en_dc_transfer_type_request_ext_ies_container; +using en_dc_transfer_type_request_ext_ies_container = protocol_ext_container_empty_l; // EN-DCTransferTypeRequest ::= SEQUENCE struct en_dc_transfer_type_request_s { @@ -7230,7 +7230,7 @@ struct son_info_request_opts { typedef enumerated son_info_request_e; // EN-DCSONConfigurationTransfer-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o en_dcson_cfg_transfer_ext_ies_o; +using en_dcson_cfg_transfer_ext_ies_o = s1ap_protocol_ext_empty_o; // EN-DCSONTransferType ::= CHOICE struct en_dcson_transfer_type_c { @@ -7363,7 +7363,7 @@ private: void destroy_(); }; -typedef protocol_ext_container_empty_l en_dcson_cfg_transfer_ext_ies_container; +using en_dcson_cfg_transfer_ext_ies_container = protocol_ext_container_empty_l; // EN-DCSONConfigurationTransfer ::= SEQUENCE struct en_dcson_cfg_transfer_s { @@ -7383,9 +7383,9 @@ struct en_dcson_cfg_transfer_s { }; // ENB-StatusTransfer-TransparentContainer-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o enb_status_transfer_transparent_container_ext_ies_o; +using enb_status_transfer_transparent_container_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l enb_status_transfer_transparent_container_ext_ies_container; +using enb_status_transfer_transparent_container_ext_ies_container = protocol_ext_container_empty_l; // ENB-StatusTransfer-TransparentContainer ::= SEQUENCE struct enb_status_transfer_transparent_container_s { @@ -7402,12 +7402,12 @@ struct enb_status_transfer_transparent_container_s { }; // S-TMSI-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o s_tmsi_ext_ies_o; +using s_tmsi_ext_ies_o = s1ap_protocol_ext_empty_o; // UL-CP-SecurityInformation-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o ul_cp_security_info_ext_ies_o; +using ul_cp_security_info_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l s_tmsi_ext_ies_container; +using s_tmsi_ext_ies_container = protocol_ext_container_empty_l; // S-TMSI ::= SEQUENCE struct s_tmsi_s { @@ -7424,7 +7424,7 @@ struct s_tmsi_s { void to_json(json_writer& j) const; }; -typedef protocol_ext_container_empty_l ul_cp_security_info_ext_ies_container; +using ul_cp_security_info_ext_ies_container = protocol_ext_container_empty_l; // UL-CP-SecurityInformation ::= SEQUENCE struct ul_cp_security_info_s { @@ -7522,9 +7522,9 @@ struct enbcp_relocation_ind_s { }; // ListeningSubframePattern-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o listening_sf_pattern_ext_ies_o; +using listening_sf_pattern_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l listening_sf_pattern_ext_ies_container; +using listening_sf_pattern_ext_ies_container = protocol_ext_container_empty_l; // ListeningSubframePattern ::= SEQUENCE struct listening_sf_pattern_s { @@ -7552,12 +7552,12 @@ struct listening_sf_pattern_s { }; // SynchronisationInformation-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o synchronisation_info_ext_ies_o; +using synchronisation_info_ext_ies_o = s1ap_protocol_ext_empty_o; // SourceeNB-ID-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o sourceenb_id_ext_ies_o; +using sourceenb_id_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l synchronisation_info_ext_ies_container; +using synchronisation_info_ext_ies_container = protocol_ext_container_empty_l; // SynchronisationInformation ::= SEQUENCE struct synchronisation_info_s { @@ -7579,7 +7579,7 @@ struct synchronisation_info_s { }; // TargeteNB-ID-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o targetenb_id_ext_ies_o; +using targetenb_id_ext_ies_o = s1ap_protocol_ext_empty_o; // SONConfigurationTransfer-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION struct son_cfg_transfer_ext_ies_o { @@ -7625,7 +7625,7 @@ struct son_cfg_transfer_ext_ies_o { static presence_e get_presence(const uint32_t& id); }; -typedef protocol_ext_container_empty_l sourceenb_id_ext_ies_container; +using sourceenb_id_ext_ies_container = protocol_ext_container_empty_l; // SourceeNB-ID ::= SEQUENCE struct sourceenb_id_s { @@ -7640,7 +7640,7 @@ struct sourceenb_id_s { void to_json(json_writer& j) const; }; -typedef protocol_ext_container_empty_l targetenb_id_ext_ies_container; +using targetenb_id_ext_ies_container = protocol_ext_container_empty_l; // TargeteNB-ID ::= SEQUENCE struct targetenb_id_s { @@ -8010,12 +8010,12 @@ struct enb_cfg_upd_fail_s { }; // LAI-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o lai_ext_ies_o; +using lai_ext_ies_o = s1ap_protocol_ext_empty_o; // GERAN-Cell-ID-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o geran_cell_id_ext_ies_o; +using geran_cell_id_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l lai_ext_ies_container; +using lai_ext_ies_container = protocol_ext_container_empty_l; // LAI ::= SEQUENCE struct lai_s { @@ -8033,9 +8033,9 @@ struct lai_s { }; // TargetRNC-ID-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o target_rnc_id_ext_ies_o; +using target_rnc_id_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l geran_cell_id_ext_ies_container; +using geran_cell_id_ext_ies_container = protocol_ext_container_empty_l; // GERAN-Cell-ID ::= SEQUENCE struct geran_cell_id_s { @@ -8053,7 +8053,7 @@ struct geran_cell_id_s { void to_json(json_writer& j) const; }; -typedef protocol_ext_container_empty_l target_rnc_id_ext_ies_container; +using target_rnc_id_ext_ies_container = protocol_ext_container_empty_l; // TargetRNC-ID ::= SEQUENCE struct target_rnc_id_s { @@ -8148,9 +8148,9 @@ private: }; // RIMTransfer-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o rim_transfer_ext_ies_o; +using rim_transfer_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l rim_transfer_ext_ies_container; +using rim_transfer_ext_ies_container = protocol_ext_container_empty_l; // RIMTransfer ::= SEQUENCE struct rim_transfer_s { @@ -8453,7 +8453,7 @@ struct event_triggered_cell_load_report_resp_s { }; // ExpectedUEActivityBehaviour-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o expected_ue_activity_behaviour_ext_ies_o; +using expected_ue_activity_behaviour_ext_ies_o = s1ap_protocol_ext_empty_o; // SourceOfUEActivityBehaviourInformation ::= ENUMERATED struct source_of_ue_activity_behaviour_info_opts { @@ -8463,7 +8463,7 @@ struct source_of_ue_activity_behaviour_info_opts { }; typedef enumerated source_of_ue_activity_behaviour_info_e; -typedef protocol_ext_container_empty_l expected_ue_activity_behaviour_ext_ies_container; +using expected_ue_activity_behaviour_ext_ies_container = protocol_ext_container_empty_l; // ExpectedUEActivityBehaviour ::= SEQUENCE struct expected_ue_activity_behaviour_s { @@ -8495,9 +8495,9 @@ struct expected_ho_interv_opts { typedef enumerated expected_ho_interv_e; // ExpectedUEBehaviour-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o expected_ue_behaviour_ext_ies_o; +using expected_ue_behaviour_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l expected_ue_behaviour_ext_ies_container; +using expected_ue_behaviour_ext_ies_container = protocol_ext_container_empty_l; // ExpectedUEBehaviour ::= SEQUENCE struct expected_ue_behaviour_s { @@ -9113,9 +9113,9 @@ struct ho_prep_fail_s { }; // MBSFN-ResultToLogInfo-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o mbsfn_result_to_log_info_ext_ies_o; +using mbsfn_result_to_log_info_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l mbsfn_result_to_log_info_ext_ies_container; +using mbsfn_result_to_log_info_ext_ies_container = protocol_ext_container_empty_l; // MBSFN-ResultToLogInfo ::= SEQUENCE struct mbsfn_result_to_log_info_s { @@ -9142,7 +9142,7 @@ struct links_to_log_opts { typedef enumerated links_to_log_e; // LoggedMBSFNMDT-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o logged_mbsfnmdt_ext_ies_o; +using logged_mbsfnmdt_ext_ies_o = s1ap_protocol_ext_empty_o; // LoggingDuration ::= ENUMERATED struct logging_dur_opts { @@ -9165,7 +9165,7 @@ struct logging_interv_opts { typedef enumerated logging_interv_e; // M3Configuration-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o m3_cfg_ext_ies_o; +using m3_cfg_ext_ies_o = s1ap_protocol_ext_empty_o; // M3period ::= ENUMERATED struct m3period_opts { @@ -9190,7 +9190,7 @@ struct m3period_opts { typedef enumerated m3period_e; // M4Configuration-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o m4_cfg_ext_ies_o; +using m4_cfg_ext_ies_o = s1ap_protocol_ext_empty_o; // M4period ::= ENUMERATED struct m4period_opts { @@ -9203,7 +9203,7 @@ struct m4period_opts { typedef enumerated m4period_e; // M5Configuration-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o m5_cfg_ext_ies_o; +using m5_cfg_ext_ies_o = s1ap_protocol_ext_empty_o; // M5period ::= ENUMERATED struct m5period_opts { @@ -9216,7 +9216,7 @@ struct m5period_opts { typedef enumerated m5period_e; // M6Configuration-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o m6_cfg_ext_ies_o; +using m6_cfg_ext_ies_o = s1ap_protocol_ext_empty_o; // M6delay-threshold ::= ENUMERATED struct m6delay_thres_opts { @@ -9239,7 +9239,7 @@ struct m6report_interv_opts { typedef enumerated m6report_interv_e; // M7Configuration-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o m7_cfg_ext_ies_o; +using m7_cfg_ext_ies_o = s1ap_protocol_ext_empty_o; // MBSFN-ResultToLog ::= SEQUENCE (SIZE (1..8)) OF MBSFN-ResultToLogInfo using mbsfn_result_to_log_l = dyn_array; @@ -9256,9 +9256,9 @@ typedef enumerated wlan_meas_cfg_e; using wlan_meas_cfg_name_list_l = bounded_array, 4>; // WLANMeasurementConfiguration-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o wlan_meas_cfg_ext_ies_o; +using wlan_meas_cfg_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l logged_mbsfnmdt_ext_ies_container; +using logged_mbsfnmdt_ext_ies_container = protocol_ext_container_empty_l; // LoggedMBSFNMDT ::= SEQUENCE struct logged_mbsfnmdt_s { @@ -9278,12 +9278,12 @@ struct logged_mbsfnmdt_s { }; // M1PeriodicReporting-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o m1_periodic_report_ext_ies_o; +using m1_periodic_report_ext_ies_o = s1ap_protocol_ext_empty_o; // M1ThresholdEventA2-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o m1_thres_event_a2_ext_ies_o; +using m1_thres_event_a2_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l m3_cfg_ext_ies_container; +using m3_cfg_ext_ies_container = protocol_ext_container_empty_l; // M3Configuration ::= SEQUENCE struct m3_cfg_s { @@ -9299,7 +9299,7 @@ struct m3_cfg_s { void to_json(json_writer& j) const; }; -typedef protocol_ext_container_empty_l m4_cfg_ext_ies_container; +using m4_cfg_ext_ies_container = protocol_ext_container_empty_l; // M4Configuration ::= SEQUENCE struct m4_cfg_s { @@ -9316,7 +9316,7 @@ struct m4_cfg_s { void to_json(json_writer& j) const; }; -typedef protocol_ext_container_empty_l m5_cfg_ext_ies_container; +using m5_cfg_ext_ies_container = protocol_ext_container_empty_l; // M5Configuration ::= SEQUENCE struct m5_cfg_s { @@ -9333,7 +9333,7 @@ struct m5_cfg_s { void to_json(json_writer& j) const; }; -typedef protocol_ext_container_empty_l m6_cfg_ext_ies_container; +using m6_cfg_ext_ies_container = protocol_ext_container_empty_l; // M6Configuration ::= SEQUENCE struct m6_cfg_s { @@ -9352,7 +9352,7 @@ struct m6_cfg_s { void to_json(json_writer& j) const; }; -typedef protocol_ext_container_empty_l m7_cfg_ext_ies_container; +using m7_cfg_ext_ies_container = protocol_ext_container_empty_l; // M7Configuration ::= SEQUENCE struct m7_cfg_s { @@ -9462,7 +9462,7 @@ struct report_interv_mdt_opts { }; typedef enumerated report_interv_mdt_e; -typedef protocol_ext_container_empty_l wlan_meas_cfg_ext_ies_container; +using wlan_meas_cfg_ext_ies_container = protocol_ext_container_empty_l; // WLANMeasurementConfiguration ::= SEQUENCE struct wlan_meas_cfg_s { @@ -9614,7 +9614,7 @@ struct logged_mdt_ext_ies_o { static presence_e get_presence(const uint32_t& id); }; -typedef protocol_ext_container_empty_l m1_periodic_report_ext_ies_container; +using m1_periodic_report_ext_ies_container = protocol_ext_container_empty_l; // M1PeriodicReporting ::= SEQUENCE struct m1_periodic_report_s { @@ -9639,7 +9639,7 @@ struct m1_report_trigger_opts { }; typedef enumerated m1_report_trigger_e; -typedef protocol_ext_container_empty_l m1_thres_event_a2_ext_ies_container; +using m1_thres_event_a2_ext_ies_container = protocol_ext_container_empty_l; // M1ThresholdEventA2 ::= SEQUENCE struct m1_thres_event_a2_s { @@ -10083,7 +10083,7 @@ struct request_type_ext_ies_o { }; // SecurityContext-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o security_context_ext_ies_o; +using security_context_ext_ies_o = s1ap_protocol_ext_empty_o; // TraceActivation-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION struct trace_activation_ext_ies_o { @@ -10145,13 +10145,13 @@ struct trace_depth_opts { typedef enumerated trace_depth_e; // UE-Sidelink-Aggregate-MaximumBitrates-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o ue_sidelink_aggregate_maximum_bitrates_ext_ies_o; +using ue_sidelink_aggregate_maximum_bitrates_ext_ies_o = s1ap_protocol_ext_empty_o; // UESecurityCapabilities-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o ue_security_cap_ext_ies_o; +using ue_security_cap_ext_ies_o = s1ap_protocol_ext_empty_o; // V2XServicesAuthorized-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o v2xservices_authorized_ext_ies_o; +using v2xservices_authorized_ext_ies_o = s1ap_protocol_ext_empty_o; // VehicleUE ::= ENUMERATED struct vehicle_ue_opts { @@ -10209,7 +10209,7 @@ struct request_type_s { void to_json(json_writer& j) const; }; -typedef protocol_ext_container_empty_l security_context_ext_ies_container; +using security_context_ext_ies_container = protocol_ext_container_empty_l; // SecurityContext ::= SEQUENCE struct security_context_s { @@ -10260,7 +10260,7 @@ struct trace_activation_s { void to_json(json_writer& j) const; }; -typedef protocol_ext_container_empty_l ue_security_cap_ext_ies_container; +using ue_security_cap_ext_ies_container = protocol_ext_container_empty_l; // UESecurityCapabilities ::= SEQUENCE struct ue_security_cap_s { @@ -10277,7 +10277,7 @@ struct ue_security_cap_s { void to_json(json_writer& j) const; }; -typedef protocol_ext_container_empty_l ue_sidelink_aggregate_maximum_bitrates_ext_ies_container; +using ue_sidelink_aggregate_maximum_bitrates_ext_ies_container = protocol_ext_container_empty_l; // UESidelinkAggregateMaximumBitrate ::= SEQUENCE struct ue_sidelink_aggregate_maximum_bitrate_s { @@ -10301,7 +10301,7 @@ struct ueuser_plane_cio_tsupport_ind_opts { }; typedef enumerated ueuser_plane_cio_tsupport_ind_e; -typedef protocol_ext_container_empty_l v2xservices_authorized_ext_ies_container; +using v2xservices_authorized_ext_ies_container = protocol_ext_container_empty_l; // V2XServicesAuthorized ::= SEQUENCE struct v2xservices_authorized_s { @@ -10676,9 +10676,9 @@ struct ho_request_ack_s { }; // TargetNgRanNode-ID-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o target_ng_ran_node_id_ext_ies_o; +using target_ng_ran_node_id_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l target_ng_ran_node_id_ext_ies_container; +using target_ng_ran_node_id_ext_ies_container = protocol_ext_container_empty_l; // TargetNgRanNode-ID ::= SEQUENCE struct target_ng_ran_node_id_s { @@ -10995,9 +10995,9 @@ private: }; // RecommendedENBItem-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o recommended_enb_item_ext_ies_o; +using recommended_enb_item_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l recommended_enb_item_ext_ies_container; +using recommended_enb_item_ext_ies_container = protocol_ext_container_empty_l; // RecommendedENBItem ::= SEQUENCE struct recommended_enb_item_s { @@ -11049,12 +11049,12 @@ struct recommended_enb_item_ies_o { using recommended_enb_list_l = bounded_array, 16>; // RecommendedENBsForPaging-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o recommended_enbs_for_paging_ext_ies_o; +using recommended_enbs_for_paging_ext_ies_o = s1ap_protocol_ext_empty_o; // InformationOnRecommendedCellsAndENBsForPaging-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o info_on_recommended_cells_and_enbs_for_paging_ext_ies_o; +using info_on_recommended_cells_and_enbs_for_paging_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l recommended_enbs_for_paging_ext_ies_container; +using recommended_enbs_for_paging_ext_ies_container = protocol_ext_container_empty_l; // RecommendedENBsForPaging ::= SEQUENCE struct recommended_enbs_for_paging_s { @@ -11070,7 +11070,7 @@ struct recommended_enbs_for_paging_s { void to_json(json_writer& j) const; }; -typedef protocol_ext_container_empty_l info_on_recommended_cells_and_enbs_for_paging_ext_ies_container; +using info_on_recommended_cells_and_enbs_for_paging_ext_ies_container = protocol_ext_container_empty_l; // InformationOnRecommendedCellsAndENBsForPaging ::= SEQUENCE struct info_on_recommended_cells_and_enbs_for_paging_s { @@ -11738,12 +11738,12 @@ struct init_ue_msg_s { }; // UE-associatedLogicalS1-ConnectionItemExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o ue_associated_lc_s1_conn_item_ext_ies_o; +using ue_associated_lc_s1_conn_item_ext_ies_o = s1ap_protocol_ext_empty_o; // TAIItemExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o tai_item_ext_ies_o; +using tai_item_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l ue_associated_lc_s1_conn_item_ext_ies_container; +using ue_associated_lc_s1_conn_item_ext_ies_container = protocol_ext_container_empty_l; // UE-associatedLogicalS1-ConnectionItem ::= SEQUENCE struct ue_associated_lc_s1_conn_item_s { @@ -11763,7 +11763,7 @@ struct ue_associated_lc_s1_conn_item_s { }; // ServedDCNsItem-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o served_dcns_item_ext_ies_o; +using served_dcns_item_ext_ies_o = s1ap_protocol_ext_empty_o; // ServedGUMMEIsItem-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION struct served_gummeis_item_ext_ies_o { @@ -11806,7 +11806,7 @@ using served_mmecs_l = dyn_array >; // ServedPLMNs ::= SEQUENCE (SIZE (1..32)) OF OCTET STRING (SIZE (3)) using served_plmns_l = bounded_array, 32>; -typedef protocol_ext_container_empty_l tai_item_ext_ies_container; +using tai_item_ext_ies_container = protocol_ext_container_empty_l; // TAIItem ::= SEQUENCE struct tai_item_s { @@ -11823,7 +11823,7 @@ struct tai_item_s { }; // UE-S1AP-ID-pair-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o ue_s1ap_id_pair_ext_ies_o; +using ue_s1ap_id_pair_ext_ies_o = s1ap_protocol_ext_empty_o; // UE-associatedLogicalS1-ConnectionItemRes ::= OBJECT SET OF S1AP-PROTOCOL-IES struct ue_associated_lc_s1_conn_item_res_o { @@ -11886,7 +11886,7 @@ struct nb_io_t_paging_e_drx_cycle_opts { typedef enumerated nb_io_t_paging_e_drx_cycle_e; // NB-IoT-Paging-eDRXInformation-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o nb_io_t_paging_e_drx_info_ext_ies_o; +using nb_io_t_paging_e_drx_info_ext_ies_o = s1ap_protocol_ext_empty_o; // NB-IoT-PagingTimeWindow ::= ENUMERATED struct nb_io_t_paging_time_win_opts { @@ -11944,7 +11944,7 @@ struct paging_e_drx_cycle_opts { typedef enumerated paging_e_drx_cycle_e; // Paging-eDRXInformation-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o paging_e_drx_info_ext_ies_o; +using paging_e_drx_info_ext_ies_o = s1ap_protocol_ext_empty_o; // PagingTimeWindow ::= ENUMERATED struct paging_time_win_opts { @@ -11964,7 +11964,7 @@ struct reset_all_opts { }; typedef enumerated reset_all_e; -typedef protocol_ext_container_empty_l served_dcns_item_ext_ies_container; +using served_dcns_item_ext_ies_container = protocol_ext_container_empty_l; // ServedDCNsItem ::= SEQUENCE struct served_dcns_item_s { @@ -12032,7 +12032,7 @@ struct tai_item_ies_o { // TAIListforWarning ::= SEQUENCE (SIZE (1..65535)) OF TAI using tai_listfor_warning_l = dyn_array; -typedef protocol_ext_container_empty_l ue_s1ap_id_pair_ext_ies_container; +using ue_s1ap_id_pair_ext_ies_container = protocol_ext_container_empty_l; // UE-S1AP-ID-pair ::= SEQUENCE struct ue_s1ap_id_pair_s { @@ -12152,7 +12152,7 @@ struct mme_relay_support_ind_opts { }; typedef enumerated mme_relay_support_ind_e; -typedef protocol_ext_container_empty_l nb_io_t_paging_e_drx_info_ext_ies_container; +using nb_io_t_paging_e_drx_info_ext_ies_container = protocol_ext_container_empty_l; // NB-IoT-Paging-eDRXInformation ::= SEQUENCE struct nb_io_t_paging_e_drx_info_s { @@ -12195,7 +12195,7 @@ private: // PWSfailedECGIList ::= SEQUENCE (SIZE (1..256)) OF EUTRAN-CGI using pw_sfailed_ecgi_list_l = dyn_array; -typedef protocol_ext_container_empty_l paging_e_drx_info_ext_ies_container; +using paging_e_drx_info_ext_ies_container = protocol_ext_container_empty_l; // Paging-eDRXInformation ::= SEQUENCE struct paging_e_drx_info_s { @@ -13667,7 +13667,7 @@ struct s1ap_private_ies_empty_o { }; }; // PrivateMessageIEs ::= OBJECT SET OF S1AP-PRIVATE-IES -typedef s1ap_private_ies_empty_o private_msg_ies_o; +using private_msg_ies_o = s1ap_private_ies_empty_o; // RerouteNASRequest-IEs ::= OBJECT SET OF S1AP-PROTOCOL-IES struct reroute_nas_request_ies_o { @@ -16142,7 +16142,7 @@ struct private_ie_container_empty_l { SRSASN_CODE unpack(cbit_ref& bref); void to_json(json_writer& j) const; }; -typedef private_ie_container_empty_l private_msg_ies_container; +using private_msg_ies_container = private_ie_container_empty_l; // PrivateMessage ::= SEQUENCE struct private_msg_s { @@ -18563,9 +18563,9 @@ struct sourceenb_to_targetenb_transparent_container_s { }; // TargeteNB-ToSourceeNB-TransparentContainer-ExtIEs ::= OBJECT SET OF S1AP-PROTOCOL-EXTENSION -typedef s1ap_protocol_ext_empty_o targetenb_to_sourceenb_transparent_container_ext_ies_o; +using targetenb_to_sourceenb_transparent_container_ext_ies_o = s1ap_protocol_ext_empty_o; -typedef protocol_ext_container_empty_l targetenb_to_sourceenb_transparent_container_ext_ies_container; +using targetenb_to_sourceenb_transparent_container_ext_ies_container = protocol_ext_container_empty_l; // TargeteNB-ToSourceeNB-TransparentContainer ::= SEQUENCE struct targetenb_to_sourceenb_transparent_container_s {