From f962c2e371f142f1bbafc4bc5924d6fac98c696f Mon Sep 17 00:00:00 2001
From: Raymond Knopp <raymond.knopp@eurecom.fr>
Date: Thu, 17 Aug 2017 17:17:32 -0700
Subject: [PATCH] added configuration file for nFAPI PNF (oaiL1) and
modifications in startup procedure to initialize L1 only. When executed, it
just waits for configuration, which will never come ... Provides and initial
framework to integrate NFAPI PNF modules.
---
openair2/ENB_APP/enb_config.c | 2 +-
.../CONF/oaiL1.nfapi.usrpb210.conf | 27 +++++++++++++++++++
targets/RT/USER/lte-softmodem.c | 22 ++-------------
3 files changed, 30 insertions(+), 21 deletions(-)
create mode 100644 targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpb210.conf
diff --git a/openair2/ENB_APP/enb_config.c b/openair2/ENB_APP/enb_config.c
index dfabfc24be..be55afa231 100644
--- a/openair2/ENB_APP/enb_config.c
+++ b/openair2/ENB_APP/enb_config.c
@@ -732,7 +732,7 @@ void RCconfig_L1() {
- printf("l1 %d/%d (nb CC %d)\n",j,RC.nb_inst,RC.nb_CC[j]);
+ printf("l1 %d/%d (nb CC %d)\n",j,RC.nb_inst,RC.nb_L1_CC[j]);
printf("RU %d: Transport %s\n",j,tr_n_preference);
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpb210.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpb210.conf
new file mode 100644
index 0000000000..f97cd0ad8b
--- /dev/null
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpb210.conf
@@ -0,0 +1,27 @@
+L1s = (
+ {
+ num_cc = 1;
+ tr_n_preference = "nfapi";
+ local_n_if_name = "lo";
+ remote_n_address = "127.0.0.2";
+ local_n_address = "127.0.0.1";
+ local_n_portc = 50000;
+ remote_n_portc = 50000;
+ local_n_portd = 50001;
+ remote_n_portd = 50001;
+ }
+);
+
+RUs = (
+ {
+ local_rf = "yes"
+ nb_tx = 1
+ nb_rx = 1
+ att_tx = 0
+ att_rx = 0;
+ bands = [7,38,42,43];
+ max_pdschReferenceSignalPower = -27;
+ max_rxgain = 125;
+ eNB_instances = [0];
+ }
+);
diff --git a/targets/RT/USER/lte-softmodem.c b/targets/RT/USER/lte-softmodem.c
index a9bc2f032c..aaaaf82647 100644
--- a/targets/RT/USER/lte-softmodem.c
+++ b/targets/RT/USER/lte-softmodem.c
@@ -1073,25 +1073,6 @@ static void get_options (int argc, char **argv) {
printf("Read in %s : nb_inst %d, nb_ru %d\n",conf_config_file_name,NB_eNB_INST,NB_RU);
- /*
- init_all_otg(0);
- g_otg->seed = 0;
- init_seeds(g_otg->seed);
-
- for (k=0; k<enb_properties->properties[i]->num_otg_elements; k++) {
- j=enb_properties->properties[i]->otg_ue_id[k]; // ue_id
- g_otg->application_idx[i][j] = 1;
- //g_otg->packet_gen_type=SUBSTRACT_STRING;
- g_otg->background[i][j][0] =enb_properties->properties[i]->otg_bg_traffic[k];
- g_otg->application_type[i][j][0] =enb_properties->properties[i]->otg_app_type[k];// BCBR; //MCBR, BCBR
-
- printf("[OTG] configuring traffic type %d for eNB %d UE %d (Background traffic is %s)\n",
- g_otg->application_type[i][j][0], i, j,(g_otg->background[i][j][0]==1)?"Enabled":"Disabled");
- }
-
- init_predef_traffic(enb_properties->properties[i]->num_otg_elements, 1);
-
- */
} else if (UE_flag == 1) {
if (conf_config_file_name != NULL) {
@@ -1589,7 +1570,8 @@ int main( int argc, char **argv )
printf("ITTI tasks created\n");
}
else {
- printf("No ITTI\n");
+ printf("No ITTI, Initializing L1\n");
+ RCconfig_L1();
}
#endif
--
GitLab