5g-team
/
srsRAN_4G
mirror of https://github.com/pvnis/srsRAN_4G.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use using keyword in asn1 rather than typedef

Browse Source
master
Francisco 4 years ago committed by Andre Puschmann
parent 049ad77fca
commit b45fdd4f10
17 changed files with 533 additions and 533 deletions
Show Stats Download Patch File Download Diff File

18
lib/include/srslte/asn1/rrc.h
Unescape Escape View File

@ -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<meas_result_serv_cell
using meas_result_serv_cell_list_scg_r12_l = dyn_array<meas_result_serv_cell_scg_r12_s>;
// 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<var_meas_report_s>;
using var_meas_report_list_r12_l = dyn_array<var_meas_report_s>;
// 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 {

12
lib/include/srslte/asn1/rrc/bcch_msg.h
Unescape Escape View File

@ -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<sib_type_and_info_item_c_>;
using sib_type_and_info_item_c_ = sib_info_item_c;
using sib_type_and_info_l_ = dyn_array<sib_type_and_info_item_c_>;
// 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

8
lib/include/srslte/asn1/rrc/common_ext.h
Unescape Escape View File

@ -958,7 +958,7 @@ struct sl_disc_res_pool_r12_s {
uint8_t to_number() const;
};
typedef enumerated<setup_opts> 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;

6
lib/include/srslte/asn1/rrc/dl_ccch_msg.h
Unescape Escape View File

@ -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;

74
lib/include/srslte/asn1/rrc/dl_dcch_msg.h
Unescape Escape View File

@ -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;

8
lib/include/srslte/asn1/rrc/ho_cmd.h
Unescape Escape View File

@ -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;

44
lib/include/srslte/asn1/rrc/meascfg.h
Unescape Escape View File

@ -699,7 +699,7 @@ using alt_ttt_cells_to_add_mod_list_r12_l = dyn_array<alt_ttt_cells_to_add_mod_r
// BT-NameListConfig-r15 ::= CHOICE
struct bt_name_list_cfg_r15_c {
typedef setup_e types;
using types = setup_e;
// choice methods
bt_name_list_cfg_r15_c() = default;
@ -934,7 +934,7 @@ struct meas_ds_cfg_r12_c {
meas_csi_rs_to_add_mod_list_r12_l meas_csi_rs_to_add_mod_list_r12;
// ...
};
typedef setup_e types;
using types = setup_e;
// choice methods
meas_ds_cfg_r12_c() = default;
@ -1324,7 +1324,7 @@ struct meas_gap_cfg_c {
// member variables
gap_offset_c_ gap_offset;
};
typedef setup_e types;
using types = setup_e;
// choice methods
meas_gap_cfg_c() = default;
@ -1401,7 +1401,7 @@ struct meas_sf_pattern_cfg_neigh_r10_c {
meas_sf_pattern_r10_c meas_sf_pattern_neigh_r10;
meas_sf_cell_list_r10_l meas_sf_cell_list_r10;
};
typedef setup_e types;
using types = setup_e;
// choice methods
meas_sf_pattern_cfg_neigh_r10_c() = default;
@ -1493,7 +1493,7 @@ struct rmtc_cfg_r13_c {
meas_dur_r13_e_ meas_dur_r13;
// ...
};
typedef setup_e types;
using types = setup_e;
// choice methods
rmtc_cfg_r13_c() = default;
@ -1538,7 +1538,7 @@ struct rs_cfg_ssb_nr_r15_s {
};
typedef enumerated<subcarrier_spacing_ssb_r15_opts> 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_ids_r12_s>;
// 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_opts> 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<uint16_t, 3>;
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_opts> 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_opts> 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;

4
lib/include/srslte/asn1/rrc/paging.h
Unescape Escape View File

@ -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;

192
lib/include/srslte/asn1/rrc/phy_ded.h
Unescape Escape View File

@ -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<uint8_t, 2>;
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<uint8_t, 24>;
// CSI-RS-ConfigZP-ApList-r14 ::= CHOICE
struct csi_rs_cfg_zp_ap_list_r14_c {
using setup_l_ = dyn_array<csi_rs_cfg_zp_r11_s>;
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_opts> 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_opts> 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_opts> 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<srs_tpc_pdcch_cfg_r14_c>;
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;

4
lib/include/srslte/asn1/rrc/rr_common.h
Unescape Escape View File

@ -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;

110
lib/include/srslte/asn1/rrc/rr_ded.h
Unescape Escape View File

@ -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_opts> 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_opts> 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;

2
lib/include/srslte/asn1/rrc/security.h
Unescape Escape View File

@ -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;

10
lib/include/srslte/asn1/rrc/uecap.h
Unescape Escape View File

@ -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;

34
lib/include/srslte/asn1/rrc/ul_dcch_msg.h
Unescape Escape View File

@ -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;

44
lib/include/srslte/asn1/rrc_nbiot.h
Unescape Escape View File

@ -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;

2
lib/include/srslte/asn1/rrc_nr.h
Unescape Escape View File

@ -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 {

494
lib/include/srslte/asn1/s1ap.h
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save