diff --git a/openair1/PHY/INIT/nr_init.c b/openair1/PHY/INIT/nr_init.c
index ef555c0f20705dce4607d05d49074ace1cf55dee..397f20633698fb8f4865381ee041790e86eafa52 100644
--- a/openair1/PHY/INIT/nr_init.c
+++ b/openair1/PHY/INIT/nr_init.c
@@ -40,6 +40,7 @@
extern uint32_t from_nrarfcn(int nr_bandP,uint32_t dl_nrarfcn);
extern int32_t get_uldl_offset(int nr_bandP);
+extern openair0_config_t openair0_cfg[MAX_CARDS];
int l1_north_init_gNB() {
int i,j;
@@ -417,7 +418,7 @@ void nr_phy_config_request(NR_PHY_Config_t *phy_config) {
RC.gNB[Mod_id][CC_id]->mac_enabled = 1;
fp->dl_CarrierFreq = from_nrarfcn(gNB_config->nfapi_config.rf_bands.rf_band[0],gNB_config->nfapi_config.nrarfcn.value);
fp->ul_CarrierFreq = fp->dl_CarrierFreq - (get_uldl_offset(gNB_config->nfapi_config.rf_bands.rf_band[0])*100000);
- fp->threequarter_fs = 0;
+ fp->threequarter_fs = openair0_cfg[0].threequarter_fs;
LOG_I(PHY,"Configuring MIB for instance %d, CCid %d : (band %d,N_RB_DL %d, N_RB_UL %d, Nid_cell %d,DL freq %u)\n",
Mod_id,
CC_id,
diff --git a/openair1/SIMULATION/NR_PHY/dlschsim.c b/openair1/SIMULATION/NR_PHY/dlschsim.c
index 1a7a91f625b69de86e3055c49780930be75f6b50..0eed21c446e0262181872f098d966bae55d91618 100644
--- a/openair1/SIMULATION/NR_PHY/dlschsim.c
+++ b/openair1/SIMULATION/NR_PHY/dlschsim.c
@@ -103,6 +103,7 @@ void exit_function(const char *file, const char *function, const int line,
// needed for some functions
PHY_VARS_NR_UE *PHY_vars_UE_g[1][1] = { { NULL } };
uint16_t n_rnti = 0x1234;
+openair0_config_t openair0_cfg[MAX_CARDS];
char quantize(double D, double x, unsigned char B) {
double qxd;
diff --git a/openair1/SIMULATION/NR_PHY/dlsim.c b/openair1/SIMULATION/NR_PHY/dlsim.c
index 899868d2f6675adf70e5ebc0dc29ec807c26b45a..771b6ba7c631677d1183ca9c4cba8d2d1e28702d 100644
--- a/openair1/SIMULATION/NR_PHY/dlsim.c
+++ b/openair1/SIMULATION/NR_PHY/dlsim.c
@@ -122,6 +122,7 @@ void config_common(int Mod_idP,
// needed for some functions
PHY_VARS_NR_UE ***PHY_vars_UE_g;
short conjugate[8]__attribute__((aligned(32))) = {-1,1,-1,1,-1,1,-1,1};
+openair0_config_t openair0_cfg[MAX_CARDS];
int main(int argc, char **argv)
{
diff --git a/openair1/SIMULATION/NR_PHY/pbchsim.c b/openair1/SIMULATION/NR_PHY/pbchsim.c
index 4664af3b67cc1b9830761f046104d5ebe0e4f1c0..847fac3213f2ea29232f2279ba99245de9a245d0 100644
--- a/openair1/SIMULATION/NR_PHY/pbchsim.c
+++ b/openair1/SIMULATION/NR_PHY/pbchsim.c
@@ -80,6 +80,7 @@ void exit_function(const char* file, const char* function, const int line,const
// needed for some functions
PHY_VARS_NR_UE * PHY_vars_UE_g[1][1]={{NULL}};
+openair0_config_t openair0_cfg[MAX_CARDS];
int main(int argc, char **argv)
{
diff --git a/openair1/SIMULATION/NR_PHY/ulschsim.c b/openair1/SIMULATION/NR_PHY/ulschsim.c
index b76393f1b5585a505bc8ba9ac59c582eb4d8d11d..e021683a433e41077de03a5e7b57fb7752d3e442 100644
--- a/openair1/SIMULATION/NR_PHY/ulschsim.c
+++ b/openair1/SIMULATION/NR_PHY/ulschsim.c
@@ -104,6 +104,7 @@ void exit_function(const char *file, const char *function, const int line, const
// needed for some functions
PHY_VARS_NR_UE *PHY_vars_UE_g[1][1] = { { NULL } };
uint16_t n_rnti = 0x1234;
+openair0_config_t openair0_cfg[MAX_CARDS];
char quantize(double D, double x, unsigned char B) {
double qxd;
diff --git a/targets/ARCH/COMMON/common_lib.h b/targets/ARCH/COMMON/common_lib.h
index d14b2457c942f61abf65e1e2b9b2d24d5535ebcb..99b5bce50e916887617ea2fddb6cf0931fbe22e7 100644
--- a/targets/ARCH/COMMON/common_lib.h
+++ b/targets/ARCH/COMMON/common_lib.h
@@ -238,6 +238,8 @@ typedef struct {
double rx_sample_rate;
//! the sample rate for transmit.
double tx_sample_rate;
+ //! check for threequarter sampling rate
+ int8_t threequarter_fs;
} openair0_config_t;
diff --git a/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp b/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
index 58a8697f79552e1f82e7eed02002ebcf96f0e7b4..f7fb036ebd61041bab7337b46371227764868d9a 100644
--- a/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
+++ b/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
@@ -1128,7 +1128,15 @@ extern "C" {
openair0_cfg[0].rx_bw = 80e6;
break;
- case 61440000:
+ case 92160000:
+ // from usrp_time_offset
+ //openair0_cfg[0].samples_per_packet = 2048;
+ openair0_cfg[0].tx_sample_advance = 15; //to be checked
+ openair0_cfg[0].tx_bw = 80e6;
+ openair0_cfg[0].rx_bw = 80e6;
+ break;
+
+ case 61440000:
// from usrp_time_offset
//openair0_cfg[0].samples_per_packet = 2048;
openair0_cfg[0].tx_sample_advance = 15;
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpx300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpx300.conf
new file mode 100644
index 0000000000000000000000000000000000000000..51910091f7348811048e48bc7e714252562e2cd4
--- /dev/null
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpx300.conf
@@ -0,0 +1,298 @@
+Active_gNBs = ( "gNB-Eurecom-5GNRBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+gNBs =
+(
+ {
+ ////////// Identification parameters:
+ gNB_ID = 0xe00;
+
+ cell_type = "CELL_MACRO_GNB";
+
+ gNB_name = "gNB-Eurecom-5GNRBox";
+
+ // Tracking area code, 0x0000 and 0xfffe are reserved values
+ tracking_area_code = 1;
+
+ plmn_list = ({mcc = 208; mnc = 93; mnc_length = 2;});
+
+ tr_s_preference = "local_mac"
+
+ ////////// Physical parameters:
+
+ component_carriers = (
+ {
+ node_function = "3GPP_gNODEB";
+ node_timing = "synch_to_ext_device";
+ node_synch_ref = 0;
+ frame_type = "TDD";
+ DL_prefix_type = "NORMAL";
+ UL_prefix_type = "NORMAL";
+ eutra_band = 78;
+ downlink_frequency = 3510000000L;
+ uplink_frequency_offset = -120000000;
+ Nid_cell = 0;
+ N_RB_DL = 217;
+ nb_antenna_ports = 1;
+ nb_antennas_tx = 1;
+ nb_antennas_rx = 1;
+ tx_gain = 90;
+ rx_gain = 125;
+ MIB_subCarrierSpacingCommon = 30;
+ MIB_ssb_SubcarrierOffset = 0;
+ MIB_dmrs_TypeA_Position = 2;
+ pdcch_ConfigSIB1 = 0;
+ SIB1_frequencyOffsetSSB = "khz5";
+ SIB1_ssb_PeriodicityServingCell = 5;
+ SIB1_ss_PBCH_BlockPower = -60;
+ absoluteFrequencySSB = 0;
+ DL_FreqBandIndicatorNR = 15;
+ DL_absoluteFrequencyPointA = 15;
+ DL_offsetToCarrier = 15;
+ DL_SCS_SubcarrierSpacing = "kHz30";
+ DL_SCS_SpecificCarrier_k0 = 0;
+ DL_carrierBandwidth = 15;
+ DL_locationAndBandwidth = 15;
+ DL_BWP_SubcarrierSpacing = "kHz30";
+ DL_BWP_prefix_type = "NORMAL";
+ UL_FreqBandIndicatorNR = 15;
+ UL_absoluteFrequencyPointA = 13;
+ UL_additionalSpectrumEmission = 3;
+ UL_p_Max = -1;
+ UL_frequencyShift7p5khz = "TRUE";
+ UL_offsetToCarrier = 10;
+ UL_SCS_SubcarrierSpacing = "kHz30";
+ UL_SCS_SpecificCarrier_k0 = 0;
+ UL_carrierBandwidth = 15;
+ UL_locationAndBandwidth = 15;
+ UL_BWP_SubcarrierSpacing = "kHz30";
+ UL_BWP_prefix_type = "NORMAL";
+ UL_timeAlignmentTimerCommon = "infinity";
+ ServingCellConfigCommon_n_TimingAdvanceOffset = "n0"
+ ServingCellConfigCommon_ssb_PositionsInBurst_PR = 0x01;
+ ServingCellConfigCommon_ssb_periodicityServingCell = 10;
+ ServingCellConfigCommon_dmrs_TypeA_Position = 2;
+ NIA_SubcarrierSpacing = "kHz15";
+ ServingCellConfigCommon_ss_PBCH_BlockPower = -60;
+ referenceSubcarrierSpacing = "kHz15";
+ dl_UL_TransmissionPeriodicity = "ms0p5";
+ nrofDownlinkSlots = 10;
+ nrofDownlinkSymbols = 10;
+ nrofUplinkSlots = 10;
+ nrofUplinkSymbols = 10;
+ rach_totalNumberOfRA_Preambles = 63;
+ rach_ssb_perRACH_OccasionAndCB_PreamblesPerSSB_choice = "oneEighth";
+ rach_ssb_perRACH_OccasionAndCB_PreamblesPerSSB_oneEighth = 4;
+ rach_ssb_perRACH_OccasionAndCB_PreamblesPerSSB_oneFourth = 8;
+ rach_ssb_perRACH_OccasionAndCB_PreamblesPerSSB_oneHalf = 16;
+ rach_ssb_perRACH_OccasionAndCB_PreamblesPerSSB_one = 24;
+ rach_ssb_perRACH_OccasionAndCB_PreamblesPerSSB_two = 32;
+ rach_ssb_perRACH_OccasionAndCB_PreamblesPerSSB_four = 8;
+ rach_ssb_perRACH_OccasionAndCB_PreamblesPerSSB_eight = 4;
+ rach_ssb_perRACH_OccasionAndCB_PreamblesPerSSB_sixteen = 2;
+ rach_groupBconfigured = "ENABLE";
+ rach_ra_Msg3SizeGroupA = 56;
+ rach_messagePowerOffsetGroupB = "dB0";
+ rach_numberOfRA_PreamblesGroupA = 32;
+ rach_ra_ContentionResolutionTimer = 8;
+ rsrp_ThresholdSSB = 64;
+ rsrp_ThresholdSSB_SUL = 64;
+ prach_RootSequenceIndex_choice = "l839";
+ prach_RootSequenceIndex_l839 = 0;
+ prach_RootSequenceIndex_l139 = 0;
+ prach_msg1_SubcarrierSpacing = "kHz30";
+ restrictedSetConfig = "unrestrictedSet";
+ msg3_transformPrecoding = "ENABLE";
+ prach_ConfigurationIndex = 10;
+ prach_msg1_FDM = "one";
+ prach_msg1_FrequencyStart = 10;
+ zeroCorrelationZoneConfig = 10;
+ preambleReceivedTargetPower = -150;
+ preambleTransMax = 6;
+ powerRampingStep = "dB0";
+ ra_ResponseWindow = 8;
+ groupHoppingEnabledTransformPrecoding = "ENABLE";
+ msg3_DeltaPreamble = 0;
+ p0_NominalWithGrant = 0;
+ PUSCH_TimeDomainResourceAllocation_k2 = 0;
+ PUSCH_TimeDomainResourceAllocation_mappingType = "typeA";
+ PUSCH_TimeDomainResourceAllocation_startSymbolAndLength = 0;
+ pucch_ResourceCommon = 0;
+ pucch_GroupHopping = "neither";
+ hoppingId = 0;
+ p0_nominal = -30;
+ PDSCH_TimeDomainResourceAllocation_k0 = 2;
+ PDSCH_TimeDomainResourceAllocation_mappingType = "typeA";
+ PDSCH_TimeDomainResourceAllocation_startSymbolAndLength = 0;
+ rateMatchPatternId = 0;
+ RateMatchPattern_patternType = "bitmaps";
+ symbolsInResourceBlock = "oneSlot";
+ periodicityAndPattern = 2;
+ RateMatchPattern_controlResourceSet = 5;
+ RateMatchPattern_subcarrierSpacing = "kHz30";
+ RateMatchPattern_mode = "dynamic";
+ controlResourceSetZero = 0;
+ searchSpaceZero = 0;
+ searchSpaceSIB1 = 10;
+ searchSpaceOtherSystemInformation = 10;
+ pagingSearchSpace = 10;
+ ra_SearchSpace = 10;
+ PDCCH_common_controlResourceSetId = 5;
+ PDCCH_common_ControlResourceSet_duration = 2;
+ PDCCH_cce_REG_MappingType = "nonInterleaved";
+ PDCCH_reg_BundleSize = 3;
+ PDCCH_interleaverSize = 3;
+ PDCCH_shiftIndex = 10;
+ PDCCH_precoderGranularity = "sameAsREG-bundle";
+ PDCCH_TCI_StateId = 32;
+ tci_PresentInDCI = "ENABLE";
+ PDCCH_DMRS_ScramblingID = 0;
+ SearchSpaceId = 10;
+ commonSearchSpaces_controlResourceSetId = 5;
+ SearchSpace_monitoringSlotPeriodicityAndOffset_choice = "sl1";
+ SearchSpace_monitoringSlotPeriodicityAndOffset_value = 0;
+ SearchSpace_duration = 2;
+ SearchSpace_nrofCandidates_aggregationLevel1 = 0;
+ SearchSpace_nrofCandidates_aggregationLevel2 = 0;
+ SearchSpace_nrofCandidates_aggregationLevel4 = 0;
+ SearchSpace_nrofCandidates_aggregationLevel8 = 0;
+ SearchSpace_nrofCandidates_aggregationLevel16 = 0;
+ SearchSpace_searchSpaceType = "common";
+ Common_dci_Format2_0_nrofCandidates_SFI_aggregationLevel1 = 1;
+ Common_dci_Format2_0_nrofCandidates_SFI_aggregationLevel2 = 1;
+ Common_dci_Format2_0_nrofCandidates_SFI_aggregationLevel4 = 1;
+ Common_dci_Format2_0_nrofCandidates_SFI_aggregationLevel8 = 1;
+ Common_dci_Format2_0_nrofCandidates_SFI_aggregationLevel16 = 1;
+ Common_dci_Format2_3_monitoringPeriodicity = 1;
+ Common_dci_Format2_3_nrofPDCCH_Candidates = 1;
+ ue_Specific__dci_Formats = "formats0-0-And-1-0";
+ RateMatchPatternLTE_CRS_carrierFreqDL = 6;
+ RateMatchPatternLTE_CRS_carrierBandwidthDL = 6;
+ RateMatchPatternLTE_CRS_nrofCRS_Ports = 1;
+ RateMatchPatternLTE_CRS_v_Shift = 0;
+ RateMatchPatternLTE_CRS_radioframeAllocationPeriod = 1;
+ RateMatchPatternLTE_CRS_radioframeAllocationOffset = 0;
+ RateMatchPatternLTE_CRS_subframeAllocation_choice = "oneFrame";
+ }
+ );
+
+
+ srb1_parameters :
+ {
+ # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
+ timer_poll_retransmit = 80;
+
+ # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
+ timer_reordering = 35;
+
+ # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
+ timer_status_prohibit = 0;
+
+ # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
+ poll_pdu = 4;
+
+ # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
+ poll_byte = 99999;
+
+ # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
+ max_retx_threshold = 4;
+ }
+
+ # ------- SCTP definitions
+ SCTP :
+ {
+ # Number of streams to use in input/output
+ SCTP_INSTREAMS = 2;
+ SCTP_OUTSTREAMS = 2;
+ };
+
+
+ ////////// MME parameters:
+ mme_ip_address = ( { ipv4 = "192.168.12.26";
+ ipv6 = "192:168:30::17";
+ active = "yes";
+ preference = "ipv4";
+ }
+ );
+
+ NETWORK_INTERFACES :
+ {
+
+ GNB_INTERFACE_NAME_FOR_S1_MME = "eth0";
+ GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24";
+ GNB_INTERFACE_NAME_FOR_S1U = "eth0";
+ GNB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24";
+ GNB_PORT_FOR_S1U = 2152; # Spec 2152
+ };
+ }
+);
+
+MACRLCs = (
+ {
+ num_cc = 1;
+ tr_s_preference = "local_L1";
+ tr_n_preference = "local_RRC";
+ }
+);
+
+L1s = (
+ {
+ num_cc = 1;
+ tr_n_preference = "local_mac";
+ }
+);
+
+RUs = (
+ {
+ local_rf = "yes"
+ nb_tx = 1
+ nb_rx = 1
+ att_tx = 0
+ att_rx = 0;
+ bands = [7];
+ max_pdschReferenceSignalPower = -27;
+ max_rxgain = 114;
+ eNB_instances = [0];
+ sdr_addrs = "addr=192.168.30.2";
+
+ }
+);
+
+THREAD_STRUCT = (
+ {
+ #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+ parallel_config = "PARALLEL_SINGLE_THREAD";
+ #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+ worker_config = "WORKER_DISABLE";
+ }
+);
+
+NETWORK_CONTROLLER :
+{
+ FLEXRAN_ENABLED = "no";
+ FLEXRAN_INTERFACE_NAME = "lo";
+ FLEXRAN_IPV4_ADDRESS = "127.0.0.1";
+ FLEXRAN_PORT = 2210;
+ FLEXRAN_CACHE = "/mnt/oai_agent_cache";
+ FLEXRAN_AWAIT_RECONF = "no";
+};
+
+ log_config :
+ {
+ global_log_level ="info";
+ global_log_verbosity ="medium";
+ hw_log_level ="info";
+ hw_log_verbosity ="medium";
+ phy_log_level ="info";
+ phy_log_verbosity ="medium";
+ mac_log_level ="info";
+ mac_log_verbosity ="high";
+ rlc_log_level ="info";
+ rlc_log_verbosity ="medium";
+ pdcp_log_level ="info";
+ pdcp_log_verbosity ="medium";
+ rrc_log_level ="info";
+ rrc_log_verbosity ="medium";
+ };
+
diff --git a/targets/RT/USER/nr-softmodem.c b/targets/RT/USER/nr-softmodem.c
index 55612586943252ed71f7465f272710a2cbbb5c7b..411281d72a28086f389a96228cb00bcd51e3eaae 100644
--- a/targets/RT/USER/nr-softmodem.c
+++ b/targets/RT/USER/nr-softmodem.c
@@ -961,6 +961,7 @@ int main( int argc, char **argv )
fprintf(stderr,"Getting configuration failed\n");
exit(-1);
}
+ openair0_cfg[0].threequarter_fs = threequarter_fs;
#if T_TRACER