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

update all asn1 files

Browse Source
master
Francisco Paisana 5 years ago
parent 5468189cd9
commit 58e555e86c
5 changed files with 13624 additions and 15152 deletions
Show Stats Download Patch File Download Diff File

17191
lib/include/srslte/asn1/ngap_nr_asn1.h
View File

File diff suppressed because it is too large Load Diff

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

@ -5026,7 +5026,7 @@ struct cg_uci_on_pusch_c {
// getters // getters
dynamic_l_& dynamic_type() dynamic_l_& dynamic_type()
{ {
assert_choice_type("dynamic_type", type_.to_string(), "CG-UCI-OnPUSCH"); assert_choice_type("dynamic", type_.to_string(), "CG-UCI-OnPUSCH");
return c.get<dynamic_l_>(); return c.get<dynamic_l_>();
} }
beta_offsets_s& semi_static() beta_offsets_s& semi_static()
@ -5036,7 +5036,7 @@ struct cg_uci_on_pusch_c {
} }
const dynamic_l_& dynamic_type() const const dynamic_l_& dynamic_type() const
{ {
assert_choice_type("dynamic_type", type_.to_string(), "CG-UCI-OnPUSCH"); assert_choice_type("dynamic", type_.to_string(), "CG-UCI-OnPUSCH");
return c.get<dynamic_l_>(); return c.get<dynamic_l_>();
} }
const beta_offsets_s& semi_static() const const beta_offsets_s& semi_static() const
@ -6750,7 +6750,7 @@ struct uci_on_pusch_s {
// getters // getters
dynamic_l_& dynamic_type() dynamic_l_& dynamic_type()
{ {
assert_choice_type("dynamic_type", type_.to_string(), "betaOffsets"); assert_choice_type("dynamic", type_.to_string(), "betaOffsets");
return c.get<dynamic_l_>(); return c.get<dynamic_l_>();
} }
beta_offsets_s& semi_static() beta_offsets_s& semi_static()
@ -6760,7 +6760,7 @@ struct uci_on_pusch_s {
} }
const dynamic_l_& dynamic_type() const const dynamic_l_& dynamic_type() const
{ {
assert_choice_type("dynamic_type", type_.to_string(), "betaOffsets"); assert_choice_type("dynamic", type_.to_string(), "betaOffsets");
return c.get<dynamic_l_>(); return c.get<dynamic_l_>();
} }
const beta_offsets_s& semi_static() const const beta_offsets_s& semi_static() const
@ -11460,12 +11460,12 @@ struct tdd_ul_dl_slot_cfg_s {
// getters // getters
explicit_s_& explicit_type() explicit_s_& explicit_type()
{ {
assert_choice_type("explicit_type", type_.to_string(), "symbols"); assert_choice_type("explicit", type_.to_string(), "symbols");
return c; return c;
} }
const explicit_s_& explicit_type() const const explicit_s_& explicit_type() const
{ {
assert_choice_type("explicit_type", type_.to_string(), "symbols"); assert_choice_type("explicit", type_.to_string(), "symbols");
return c; return c;
} }
explicit_s_& set_explicit_type() explicit_s_& set_explicit_type()

11550
lib/src/asn1/ngap_nr_asn1.cc
View File

File diff suppressed because it is too large Load Diff

17
lib/src/asn1/rrc_nr_asn1.cc
Unescape Escape View File

@ -69,7 +69,8 @@ void asn1::rrc_nr::assert_choice_type(const std::string& access_type,
} }
} }
const char* convert_enum_idx(const char* array[], uint32_t nof_types, uint32_t enum_val, const char* enum_type) const char*
asn1::rrc_nr::convert_enum_idx(const char* array[], uint32_t nof_types, uint32_t enum_val, const char* enum_type)
{ {
if (enum_val >= nof_types) { if (enum_val >= nof_types) {
if (enum_val == nof_types) { if (enum_val == nof_types) {
@ -4389,7 +4390,7 @@ void setup_release_c<elem_type_paramT_>::to_json(json_writer& j) const
switch (type_) { switch (type_) {
case types::release: case types::release:
break; break;
case types::setup:; case types::setup:
break; break;
default: default:
log_invalid_choice_id(type_, "setup_release_c"); log_invalid_choice_id(type_, "setup_release_c");
@ -9750,7 +9751,7 @@ void cg_uci_on_pusch_c::to_json(json_writer& j) const
j.start_obj(); j.start_obj();
switch (type_) { switch (type_) {
case types::dynamic_type: case types::dynamic_type:
j.start_array("dynamic_type"); j.start_array("dynamic");
for (uint32_t i1 = 0; i1 < c.get<dynamic_l_>().size(); ++i1) { for (uint32_t i1 = 0; i1 < c.get<dynamic_l_>().size(); ++i1) {
c.get<dynamic_l_>()[i1].to_json(j); c.get<dynamic_l_>()[i1].to_json(j);
} }
@ -9802,7 +9803,7 @@ SRSASN_CODE cg_uci_on_pusch_c::unpack(bit_ref& bref)
std::string cg_uci_on_pusch_c::types_opts::to_string() const std::string cg_uci_on_pusch_c::types_opts::to_string() const
{ {
static constexpr const char* options[] = {"dynamic_type", "semiStatic"}; static constexpr const char* options[] = {"dynamic", "semiStatic"};
return convert_enum_idx(options, 2, value, "cg_uci_on_pusch_c::types"); return convert_enum_idx(options, 2, value, "cg_uci_on_pusch_c::types");
} }
@ -13158,7 +13159,7 @@ void uci_on_pusch_s::beta_offsets_c_::to_json(json_writer& j) const
j.start_obj(); j.start_obj();
switch (type_) { switch (type_) {
case types::dynamic_type: case types::dynamic_type:
j.start_array("dynamic_type"); j.start_array("dynamic");
for (uint32_t i1 = 0; i1 < c.get<dynamic_l_>().size(); ++i1) { for (uint32_t i1 = 0; i1 < c.get<dynamic_l_>().size(); ++i1) {
c.get<dynamic_l_>()[i1].to_json(j); c.get<dynamic_l_>()[i1].to_json(j);
} }
@ -13210,7 +13211,7 @@ SRSASN_CODE uci_on_pusch_s::beta_offsets_c_::unpack(bit_ref& bref)
std::string uci_on_pusch_s::beta_offsets_c_::types_opts::to_string() const std::string uci_on_pusch_s::beta_offsets_c_::types_opts::to_string() const
{ {
static constexpr const char* options[] = {"dynamic_type", "semiStatic"}; static constexpr const char* options[] = {"dynamic", "semiStatic"};
return convert_enum_idx(options, 2, value, "uci_on_pusch_s::beta_offsets_c_::types"); return convert_enum_idx(options, 2, value, "uci_on_pusch_s::beta_offsets_c_::types");
} }
@ -22624,7 +22625,7 @@ void tdd_ul_dl_slot_cfg_s::symbols_c_::to_json(json_writer& j) const
case types::all_ul: case types::all_ul:
break; break;
case types::explicit_type: case types::explicit_type:
j.write_fieldname("explicit_type"); j.write_fieldname("explicit");
j.start_obj(); j.start_obj();
if (c.nrof_dl_symbols_present) { if (c.nrof_dl_symbols_present) {
j.write_int("nrofDownlinkSymbols", c.nrof_dl_symbols); j.write_int("nrofDownlinkSymbols", c.nrof_dl_symbols);
@ -22692,7 +22693,7 @@ SRSASN_CODE tdd_ul_dl_slot_cfg_s::symbols_c_::unpack(bit_ref& bref)
std::string tdd_ul_dl_slot_cfg_s::symbols_c_::types_opts::to_string() const std::string tdd_ul_dl_slot_cfg_s::symbols_c_::types_opts::to_string() const
{ {
static constexpr const char* options[] = {"allDownlink", "allUplink", "explicit_type"}; static constexpr const char* options[] = {"allDownlink", "allUplink", "explicit"};
return convert_enum_idx(options, 3, value, "tdd_ul_dl_slot_cfg_s::symbols_c_::types"); return convert_enum_idx(options, 3, value, "tdd_ul_dl_slot_cfg_s::symbols_c_::types");
} }

6
lib/test/asn1/ngap_asn1_test.cc
Unescape Escape View File

@ -81,8 +81,8 @@ int test_ngsetup_request()
ng_setup_request_s& ngsetup = pdu.init_msg().value.ng_setup_request(); ng_setup_request_s& ngsetup = pdu.init_msg().value.ng_setup_request();
TESTASSERT(not ngsetup.ext); TESTASSERT(not ngsetup.ext);
// Field 0 // Field 0
TESTASSERT(ngsetup.protocol_ies.global_ran_node_id.id == 27); // TODO: Is this really needed? TESTASSERT(ngsetup.protocol_ies.global_ran_node_id.id == 27); // FIXME: Is this really needed?
TESTASSERT(ngsetup.protocol_ies.global_ran_node_id.crit.value == crit_opts::reject); // TODO: Is this really needed? TESTASSERT(ngsetup.protocol_ies.global_ran_node_id.crit.value == crit_opts::reject); // FIXME: Is this really needed?
TESTASSERT(ngsetup.protocol_ies.global_ran_node_id.value.type().value == TESTASSERT(ngsetup.protocol_ies.global_ran_node_id.value.type().value ==
global_ran_node_id_c::types_opts::global_gnb_id); global_ran_node_id_c::types_opts::global_gnb_id);
global_gnb_id_s& global_gnb = ngsetup.protocol_ies.global_ran_node_id.value.global_gnb_id(); global_gnb_id_s& global_gnb = ngsetup.protocol_ies.global_ran_node_id.value.global_gnb_id();
@ -136,7 +136,7 @@ int test_ngsetup_response()
TESTASSERT(pdu.successful_outcome().proc_code == 21); TESTASSERT(pdu.successful_outcome().proc_code == 21);
TESTASSERT(pdu.successful_outcome().crit.value == crit_opts::reject); TESTASSERT(pdu.successful_outcome().crit.value == crit_opts::reject);
TESTASSERT(pdu.successful_outcome().value.type().value == TESTASSERT(pdu.successful_outcome().value.type().value ==
ngap_elem_procs_o::successful_outcome_c::types_opts::ng_setup_request); // TODO: Change name ngap_elem_procs_o::successful_outcome_c::types_opts::ng_setup_request); // FIXME: Change name
ng_setup_resp_s& resp = pdu.successful_outcome().value.ng_setup_request(); ng_setup_resp_s& resp = pdu.successful_outcome().value.ng_setup_request();
// field 0 // field 0
TESTASSERT(resp.protocol_ies.amf_name.id == 1); TESTASSERT(resp.protocol_ies.amf_name.id == 1);

Write Preview
Loading…
Cancel
Save