mirror of https://github.com/PentHertz/srsLTE.git
srsue,rrc: remove phy_cfg_default header
* address Xicos comment in https://github.com/softwareradiosystems/srsLTE/pull/3836
This commit is contained in:
parent
7c63da9e4d
commit
8cf6c851e1
|
@ -12,7 +12,6 @@
|
||||||
|
|
||||||
#include "srsue/hdr/stack/rrc_nr/rrc_nr.h"
|
#include "srsue/hdr/stack/rrc_nr/rrc_nr.h"
|
||||||
#include "srsran/common/band_helper.h"
|
#include "srsran/common/band_helper.h"
|
||||||
#include "srsran/common/phy_cfg_nr_default.h"
|
|
||||||
#include "srsran/common/security.h"
|
#include "srsran/common/security.h"
|
||||||
#include "srsran/common/standard_streams.h"
|
#include "srsran/common/standard_streams.h"
|
||||||
#include "srsran/interfaces/ue_pdcp_interfaces.h"
|
#include "srsran/interfaces/ue_pdcp_interfaces.h"
|
||||||
|
@ -23,6 +22,7 @@
|
||||||
using namespace asn1::rrc_nr;
|
using namespace asn1::rrc_nr;
|
||||||
using namespace asn1;
|
using namespace asn1;
|
||||||
using namespace srsran;
|
using namespace srsran;
|
||||||
|
|
||||||
namespace srsue {
|
namespace srsue {
|
||||||
|
|
||||||
const static char* rrc_nr_state_text[] = {"IDLE", "CONNECTED", "CONNECTED-INACTIVE"};
|
const static char* rrc_nr_state_text[] = {"IDLE", "CONNECTED", "CONNECTED-INACTIVE"};
|
||||||
|
|
|
@ -277,7 +277,7 @@ int ue::parse_args(const all_args_t& args_)
|
||||||
}
|
}
|
||||||
|
|
||||||
// SA params
|
// SA params
|
||||||
if (args.phy.nof_lte_carriers == 0 && args.phy.nof_nr_carriers == 1) {
|
if (args.phy.nof_lte_carriers == 0 && args.phy.nof_nr_carriers > 0) {
|
||||||
// Update NAS-5G args
|
// Update NAS-5G args
|
||||||
args.stack.nas_5g.ia5g = args.stack.nas.eia;
|
args.stack.nas_5g.ia5g = args.stack.nas.eia;
|
||||||
args.stack.nas_5g.ea5g = args.stack.nas.eea;
|
args.stack.nas_5g.ea5g = args.stack.nas.eea;
|
||||||
|
|
Loading…
Reference in New Issue