develop-nr up-to-date as of 8.8.19

cmake_targets/CMakeLists.txt

@@ -309,8 +309,8 @@ elseif (${RRC_ASN1_VERSION} STREQUAL "Rel14")
   make_version(LTE_RRC_VERSION 14 7 0)
   set (RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/LTE/MESSAGES/asn1c/ASN1_files/lte-rrc-14.7.0.asn1)
 elseif (${RRC_ASN1_VERSION} STREQUAL "Rel15")
-  make_version(LTE_RRC_VERSION 15 3 0)
-  set (RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/LTE/MESSAGES/asn1c/ASN1_files/lte-rrc-15.3.0.asn1)
+  make_version(LTE_RRC_VERSION 15 6 0)
+  set (RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/LTE/MESSAGES/asn1c/ASN1_files/lte-rrc-15.6.0.asn1)
 endif  (${RRC_ASN1_VERSION} STREQUAL "Rel8")
 add_definitions(-DLTE_RRC_VERSION=${LTE_RRC_VERSION})
 set (RRC_FULL_DIR ${asn1_generated_dir}/RRC_${RRC_ASN1_VERSION})
@@ -341,8 +341,8 @@ include_directories ("${RRC_FULL_DIR}")
 add_list2_option(NR_RRC_ASN1_VERSION "NR_Rel15" "ASN.1 version of NR_RRC interface")
 
 if (${NR_RRC_ASN1_VERSION} STREQUAL "NR_Rel15")
-  make_version(NR_RRC_VERSION 15 3 0)
-  set (NR_RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/NR/MESSAGES/asn1c/ASN1_files/nr-rrc-15.3.0.asn1)
+  make_version(NR_RRC_VERSION 15 6 0)
+  set (NR_RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/NR/MESSAGES/asn1c/ASN1_files/nr-rrc-15.6.0.asn1)
 endif  (${NR_RRC_ASN1_VERSION} STREQUAL "NR_Rel15")
 add_definitions(-DNR_RRC_VERSION=${NR_RRC_VERSION})
 set (NR_RRC_FULL_DIR ${asn1_generated_dir}/${NR_RRC_ASN1_VERSION})
@@ -394,11 +394,11 @@ elseif (${S1AP_RELEASE} STREQUAL "R13")
   make_version(S1AP_VERSION 13 6 0)
   set(S1AP_ASN_FILES "s1ap-13.6.0.asn1")
 elseif (${S1AP_RELEASE} STREQUAL "R14")
-  make_version(S1AP_VERSION 14 7 0)
-  set(S1AP_ASN_FILES "s1ap-14.7.0.asn1")
+  make_version(S1AP_VERSION 14 9 0)
+  set(S1AP_ASN_FILES "s1ap-14.9.0.asn1")
 else (${S1AP_RELEASE} STREQUAL "R15")
-  make_version(S1AP_VERSION 15 3 0)
-  set(S1AP_ASN_FILES "s1ap-15.3.0.asn1")
+  make_version(S1AP_VERSION 15 6 0)
+  set(S1AP_ASN_FILES "s1ap-15.6.0.asn1")
 endif(${S1AP_RELEASE} STREQUAL "R8")
 add_definitions(-DS1AP_VERSION=${S1AP_VERSION})
 set(S1AP_ASN_DIR ${S1AP_DIR}/MESSAGES/ASN1/${S1AP_RELEASE})
@@ -460,11 +460,11 @@ elseif (${X2AP_RELEASE} STREQUAL "R12")
   make_version(X2AP_VERSION 12 9 0)
   set(X2AP_ASN_FILES x2ap-12.9.0.asn1)
 elseif (${X2AP_RELEASE} STREQUAL "R14")
-  make_version(X2AP_VERSION 14 6 0)
-  set(X2AP_ASN_FILES x2ap-14.6.0.asn1)
+  make_version(X2AP_VERSION 14 7 0)
+  set(X2AP_ASN_FILES x2ap-14.7.0.asn1)
 elseif (${X2AP_RELEASE} STREQUAL "R15")
-  make_version(X2AP_VERSION 15 3 0)
-  set(X2AP_ASN_FILES x2ap-15.3.0.asn1)
+  make_version(X2AP_VERSION 15 6 0)
+  set(X2AP_ASN_FILES x2ap-15.6.0.asn1)
 endif(${X2AP_RELEASE} STREQUAL "R8")
 add_definitions(-DX2AP_VERSION=${X2AP_VERSION})
 set(X2AP_ASN_DIR ${X2AP_DIR}/MESSAGES/ASN1/${X2AP_RELEASE})
@@ -1440,7 +1440,8 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_gold_ue.c
   ${OPENAIR1_DIR}/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
   ${OPENAIR1_DIR}/PHY/NR_UE_ESTIMATION/nr_adjust_synch_ue.c
-  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_ue_measurements.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_ESTIMATION/nr_adjust_gain.c
   ${OPENAIR1_DIR}/PHY/TOOLS/file_output.c
   ${OPENAIR1_DIR}/PHY/TOOLS/cadd_vv.c
  # ${OPENAIR1_DIR}/PHY/TOOLS/lte_dfts.c

executables/nr-ue.c

@@ -640,7 +640,16 @@ void *UE_thread(void *arg) {
     curMsg->proc.frame_rx = ( absolute_slot/nb_slot_frame ) % MAX_FRAME_NUMBER;
     curMsg->proc.frame_tx = ( (absolute_slot + DURATION_RX_TO_TX) /nb_slot_frame ) % MAX_FRAME_NUMBER;
     curMsg->proc.decoded_frame_rx=-1;
-    LOG_D(PHY,"Process slot %d thread Idx %d \n", slot_nr, thread_idx);
+    //LOG_I(PHY,"Process slot %d thread Idx %d total gain %d\n", slot_nr, thread_idx, UE->rx_total_gain_dB);
+
+#ifdef OAI_ADRV9371_ZC706
+    uint32_t total_gain_dB_prev = 0;
+    if (total_gain_dB_prev != UE->rx_total_gain_dB) {
+		total_gain_dB_prev = UE->rx_total_gain_dB;
+        openair0_cfg[0].rx_gain[0] = UE->rx_total_gain_dB-20;
+        UE->rfdevice.trx_set_gains_func(&UE->rfdevice,&openair0_cfg[0]);
+    }
+#endif
 
     for (int i=0; i<UE->frame_parms.nb_antennas_rx; i++)
       rxp[i] = (void *)&UE->common_vars.rxdata[i][UE->frame_parms.ofdm_symbol_size+
@@ -768,6 +777,12 @@ void init_NR_UE(int nb_inst) {
     mac_inst->initial_bwp_ul.cyclic_prefix = UE->frame_parms.Ncp;
     LOG_I(PHY,"Intializing UE Threads for instance %d (%p,%p)...\n",inst,PHY_vars_UE_g[inst],PHY_vars_UE_g[inst][0]);
     threadCreate(&threads[inst], UE_thread, (void *)UE, "UEthread", -1, OAI_PRIORITY_RT_MAX);
+
+#ifdef UE_DLSCH_PARALLELISATION
+    pthread_t dlsch0_threads;
+    threadCreate(&dlsch0_threads, dlsch_thread, (void *)UE, "DLthread", -1, OAI_PRIORITY_RT_MAX-1);
+#endif
+
   }
 
   printf("UE threads created by %ld\n", gettid());

oaienv

@@ -18,6 +18,6 @@ alias oailte='cd $OPENAIR_TARGETS/RT/USER'
 alias oais='cd $OPENAIR_TARGETS/SIMU/USER'
 alias oaiex='cd $OPENAIR_TARGETS/SIMU/EXAMPLES'
 
-export IIOD_REMOTE=192.168.121.32
+export IIOD_REMOTE=192.168.1.2
 #export IIOD_REMOTE=192.168.1.11
 

openair1/PHY/LTE_ESTIMATION/lte_estimation.h

@@ -71,7 +71,9 @@ The algorithm uses a frequency-domain correlation.  It scans over 20 MHz/10ms si
 \param band index of band in scan_info structure, used to store statistics
 \param DL_freq center frequency of band being scanned, used when storing statistics
 */
-void lte_sync_timefreq(PHY_VARS_UE *ue,int band,unsigned int DL_freq);
+void lte_sync_timefreq(PHY_VARS_UE *ue,
+                       int band,
+                       unsigned int DL_freq);
 
 
 /*!
@@ -195,7 +197,9 @@ void ue_rrc_measurements(PHY_VARS_UE *phy_vars_ue,
                          uint8_t slot,
                          uint8_t abstraction_flag);
 
-void lte_ue_measurements_emul(PHY_VARS_UE *phy_vars_ue,uint8_t last_slot,uint8_t eNB_id);
+void lte_ue_measurements_emul(PHY_VARS_UE *phy_vars_ue,
+                              uint8_t last_slot,
+                              uint8_t eNB_id);
 
 /*! \brief Function to return the path-loss based on the UE cell-specific reference signal strength and transmission power of eNB
 @param Mod_id Module ID for UE

openair1/PHY/NR_UE_ESTIMATION/nr_adjust_gain.c

+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+#include "PHY/types.h"
+#include "PHY/defs_nr_UE.h"
+#include "PHY/phy_extern_nr_ue.h"
+
+void
+phy_adjust_gain_nr (PHY_VARS_NR_UE *ue, uint32_t rx_power_fil_dB, uint8_t eNB_id)
+{
+
+  LOG_I(PHY,"Gain control: rssi %d (%d,%d)\n",
+	rx_power_fil_dB,
+	ue->measurements.rssi,
+	ue->measurements.rx_power_avg_dB[eNB_id]
+        );
+
+  // Gain control with hysterisis
+  // Adjust gain in ue->rx_vars[0].rx_total_gain_dB
+
+  if (rx_power_fil_dB < TARGET_RX_POWER - 5) //&& (ue->rx_total_gain_dB < MAX_RF_GAIN) )
+    ue->rx_total_gain_dB+=5;
+  else if (rx_power_fil_dB > TARGET_RX_POWER + 5) //&& (ue->rx_total_gain_dB > MIN_RF_GAIN) )
+    ue->rx_total_gain_dB-=5;
+
+  if (ue->rx_total_gain_dB>MAX_RF_GAIN) {
+    /*
+    if ((openair_daq_vars.rx_rf_mode==0) && (openair_daq_vars.mode == openair_NOT_SYNCHED)) {
+      openair_daq_vars.rx_rf_mode=1;
+      ue->rx_total_gain_dB = max(MIN_RF_GAIN,MAX_RF_GAIN-25);
+    }
+    else {
+    */
+    ue->rx_total_gain_dB = MAX_RF_GAIN;
+  } else if (ue->rx_total_gain_dB<MIN_RF_GAIN) {
+    /*
+    if ((openair_daq_vars.rx_rf_mode==1) && (openair_daq_vars.mode == openair_NOT_SYNCHED)) {
+      openair_daq_vars.rx_rf_mode=0;
+      ue->rx_total_gain_dB = min(MAX_RF_GAIN,MIN_RF_GAIN+25);
+    }
+    else {
+    */
+    ue->rx_total_gain_dB = MIN_RF_GAIN;
+  }
+
+  LOG_I(PHY,"Gain control: rx_total_gain_dB = %d TARGET_RX_POWER %d (max %d,rxpf %d)\n",ue->rx_total_gain_dB,TARGET_RX_POWER,MAX_RF_GAIN,rx_power_fil_dB);
+
+#ifdef DEBUG_PHY
+  /*  if ((ue->frame%100==0) || (ue->frame < 10))
+  msg("[PHY][ADJUST_GAIN] frame %d,  rx_power = %d, rx_power_fil = %d, rx_power_fil_dB = %d, coef=%d, ncoef=%d, rx_total_gain_dB = %d (%d,%d,%d)\n",
+    ue->frame,rx_power,rx_power_fil,rx_power_fil_dB,coef,ncoef,ue->rx_total_gain_dB,
+  TARGET_RX_POWER,MAX_RF_GAIN,MIN_RF_GAIN);
+  */
+#endif //DEBUG_PHY
+
+}
+
+

openair1/PHY/NR_UE_ESTIMATION/nr_estimation.h

@@ -72,7 +72,6 @@ int nr_pdsch_channel_estimation(PHY_VARS_NR_UE *ue,
                                 unsigned short bwp_start_subcarrier,
                                 unsigned short nb_rb_pdsch);
 
-							  
 void nr_adjust_synch_ue(NR_DL_FRAME_PARMS *frame_parms,
                         PHY_VARS_NR_UE *ue,
                         module_id_t eNB_id,
@@ -80,4 +79,15 @@ void nr_adjust_synch_ue(NR_DL_FRAME_PARMS *frame_parms,
                         unsigned char clear,
                         short coef);
                       
+void nr_ue_measurements(PHY_VARS_NR_UE *ue,
+                        unsigned int subframe_offset,
+                        unsigned char N0_symbol,
+                        unsigned char abstraction_flag,
+                        unsigned char rank_adaptation,
+                        uint8_t subframe);
+
+void phy_adjust_gain_nr(PHY_VARS_NR_UE *ue,
+                        uint32_t rx_power_fil_dB,
+                        uint8_t eNB_id);
+
 #endif

openair1/PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h

@@ -1818,6 +1818,6 @@ int nr_extract_dci_info(PHY_VARS_NR_UE *ue,
 			uint16_t n_RB_DLBWP,
 			uint16_t crc_scrambled_values[TOTAL_NBR_SCRAMBLED_VALUES]);
 
-
+void *dlsch_thread(void *arg);
 /**@}*/
 #endif

openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c

@@ -56,6 +56,8 @@ int generate_ue_ulsch_params(PHY_VARS_NR_UE *UE,
   NR_UE_ULSCH_t *ulsch_ue;
   NR_UL_UE_HARQ_t *harq_process_ul_ue;
 
+  LOG_W(PHY,"This function should not be used. Use FAPI interfaces instead\n");
+  
   //--------------------------Temporary configuration-----------------------------//
   length_dmrs = 1;
   n_rnti = 0x1234;

openair1/PHY/defs_common.h

@@ -78,6 +78,7 @@
 
 #define RX_NB_TH_MAX 2
 #define RX_NB_TH 2
+#define RX_NB_TH_DL 2
 
 #define LTE_SLOTS_PER_SUBFRAME 2
 

openair1/PHY/defs_nr_UE.h

@@ -1227,10 +1227,10 @@ typedef struct {
 /* this structure is used to pass both UE phy vars and
  * proc to the function UE_thread_rxn_txnp4
  */
-struct nr_rxtx_thread_data {
+typedef struct nr_rxtx_thread_data_s {
+  UE_nr_rxtx_proc_t proc;
   PHY_VARS_NR_UE    *UE;
-  UE_nr_rxtx_proc_t *proc;
-};
+}  nr_rxtx_thread_data_t;
 
 /*static inline int wait_on_condition(pthread_mutex_t *mutex,pthread_cond_t *cond,int *instance_cnt,char *name) {
 

openair1/PHY/thread_NR_UE.h

@@ -60,7 +60,7 @@ typedef struct {
   uint8_t decoder_thread_available;
   uint8_t decoder_main_available;
   uint8_t decoder_switch;
-  int counter_decoder;
+  int num_seg;
   uint8_t channel_level;
   int eNB_id;
   int harq_pid;

openair1/SCHED_NR_UE/phy_procedures_nr_ue.c

@@ -38,8 +38,8 @@
 #include "PHY/defs_nr_UE.h"
 //#include "PHY/phy_vars_nr_ue.h"
 #include "PHY/phy_extern_nr_ue.h"
-#include "PHY/NR_REFSIG/refsig_defs_ue.h"
 #include "PHY/MODULATION/modulation_UE.h"
+#include "PHY/NR_REFSIG/refsig_defs_ue.h"
 #include "PHY/NR_UE_TRANSPORT/nr_transport_ue.h"
 #include "PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h"
 //#include "PHY/extern.h"
@@ -2487,10 +2487,12 @@ void phy_procedures_nrUE_TX(PHY_VARS_NR_UE *ue,
 
   harq_pid = 0; //temporary implementation
 
+  /*
   generate_ue_ulsch_params(ue,
                            0,
                            gNB_id,
                            harq_pid);
+  */
   
   ulsch_ue = ue->ulsch[thread_id][gNB_id][0]; // cwd_index = 0
   harq_process_ul_ue = ulsch_ue->harq_processes[harq_pid];
@@ -2589,30 +2591,23 @@ void nr_ue_measurement_procedures(uint16_t l,    // symbol index of each slot [0
 {
   LOG_D(PHY,"ue_measurement_procedures l %u Ncp %d\n",l,ue->frame_parms.Ncp);
 
-#if 0
   NR_DL_FRAME_PARMS *frame_parms=&ue->frame_parms;
   int nr_tti_rx = proc->nr_tti_rx;
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_MEASUREMENT_PROCEDURES, VCD_FUNCTION_IN);
 
-  if (l==0) {
+  if (l==2) {
     // UE measurements on symbol 0
-    if (abstraction_flag==0) {
       LOG_D(PHY,"Calling measurements nr_tti_rx %d, rxdata %p\n",nr_tti_rx,ue->common_vars.rxdata);
 
-      lte_ue_measurements(ue,
-			  (nr_tti_rx*frame_parms->samples_per_tti+ue->rx_offset)%(frame_parms->samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME),
-			  (nr_tti_rx == 1) ? 1 : 0,
+      nr_ue_measurements(ue,
 			  0,
-			  0,
-			  nr_tti_rx);
-    } else {
-      lte_ue_measurements(ue,
 			  0,
 			  0,
-			  1,
 			  0,
 			  nr_tti_rx);
-    }
+			  
+			  //(nr_tti_rx*frame_parms->samples_per_tti+ue->rx_offset)%(frame_parms->samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME)
+
 #if T_TRACER
     if(slot == 0)
       T(T_UE_PHY_MEAS, T_INT(eNB_id),  T_INT(ue->Mod_id), T_INT(proc->frame_rx%1024), T_INT(proc->nr_tti_rx),
@@ -2625,7 +2620,7 @@ void nr_ue_measurement_procedures(uint16_t l,    // symbol index of each slot [0
 	T_INT((int)ue->common_vars.freq_offset));
 #endif
   }
-
+#if 0
   if (l==(6-ue->frame_parms.Ncp)) {
 
     // make sure we have signal from PSS/SSS for N0 measurement
@@ -2641,6 +2636,19 @@ void nr_ue_measurement_procedures(uint16_t l,    // symbol index of each slot [0
   }
 #endif
 
+  // accumulate and filter timing offset estimation every subframe (instead of every frame)
+  if (( slot == 2) && (l==(2-frame_parms->Ncp))) {
+
+    // AGC
+
+    VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_GAIN_CONTROL, VCD_FUNCTION_IN);
+
+
+    //printf("start adjust gain power avg db %d\n", ue->measurements.rx_power_avg_dB[eNB_id]);
+    phy_adjust_gain_nr (ue,ue->measurements.rx_power_avg_dB[eNB_id],eNB_id);
+
+}
+
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_MEASUREMENT_PROCEDURES, VCD_FUNCTION_OUT);
 }
 
@@ -4188,7 +4196,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,
     LOG_I(PHY,"[UE  %d] Frame %d, nr_tti_rx %d: found %d DCIs\n",ue->Mod_id,frame_rx,nr_tti_rx,dci_cnt);
     
     if (ue->no_timing_correction==0) {
-      LOG_I(PHY,"start adjust sync slot = %d no timing %d\n", nr_tti_rx, ue->no_timing_correction);
+      LOG_D(PHY,"start adjust sync slot = %d no timing %d\n", nr_tti_rx, ue->no_timing_correction);
       nr_adjust_synch_ue(&ue->frame_parms,
     		             ue,
 						 eNB_id,
@@ -4214,8 +4222,6 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,
 		  0,
 		  0);
  
-      //printf("phy procedure pdsch start measurement\n"); 
-      nr_ue_measurement_procedures(m,ue,proc,eNB_id,(nr_tti_rx<<1),mode);
       
     }
     //set active for testing, to be removed
@@ -4237,6 +4243,9 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,
 			   ue->dlsch[ue->current_thread_id[nr_tti_rx]][eNB_id][0],
 			   NULL);
 			   
+    //printf("phy procedure pdsch start measurement\n"); 
+    nr_ue_measurement_procedures(2,ue,proc,eNB_id,nr_tti_rx,mode);
+
     /*
     write_output("rxF.m","rxF",&ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[nr_tti_rx]].rxdataF[0][0],ue->frame_parms.ofdm_symbol_size*14,1,1);
     write_output("rxF_ch.m","rxFch",&ue->pdsch_vars[ue->current_thread_id[nr_tti_rx]][eNB_id]->dl_ch_estimates[0][0],ue->frame_parms.ofdm_symbol_size*14,1,1);

openair1/SIMULATION/NR_PHY/dlsim.c

@@ -36,7 +36,7 @@
 #include "PHY/defs_gNB.h"
 #include "PHY/defs_nr_common.h"
 #include "PHY/defs_nr_UE.h"
-#include "PHY/phy_vars.h"
+#include "PHY/phy_vars_nr_ue.h"
 #include "PHY/types.h"
 #include "PHY/INIT/phy_init.h"
 #include "PHY/MODULATION/modulation_eNB.h"

openair1/SIMULATION/NR_PHY/ulsim.c

@@ -31,7 +31,7 @@
 #include "PHY/defs_gNB.h"
 #include "PHY/defs_nr_common.h"
 #include "PHY/defs_nr_UE.h"
-#include "PHY/phy_vars.h"
+#include "PHY/phy_vars_nr_ue.h"
 #include "PHY/types.h"
 #include "PHY/INIT/phy_init.h"
 #include "PHY/MODULATION/modulation_UE.h"
@@ -353,6 +353,10 @@ int main(int argc, char **argv)
 
   //configure UE
   UE = malloc(sizeof(PHY_VARS_NR_UE));
+  memset((void*)UE,0,sizeof(PHY_VARS_NR_UE));
+  PHY_vars_UE_g = malloc(sizeof(PHY_VARS_NR_UE**));
+  PHY_vars_UE_g[0] = malloc(sizeof(PHY_VARS_NR_UE*));
+  PHY_vars_UE_g[0][0] = UE;
   memcpy(&UE->frame_parms, frame_parms, sizeof(NR_DL_FRAME_PARMS));
 
   //phy_init_nr_top(frame_parms);
@@ -408,10 +412,10 @@ int main(int argc, char **argv)
   rel15_ul->ulsch_pdu_rel15.n_layers       = precod_nbr_layers;
   ///////////////////////////////////////////////////
 
-  /*fapi_nr_ul_config_request_t ul_config;
+  nr_scheduled_response_t scheduled_response;
+  fapi_nr_ul_config_request_t ul_config;
   //fapi_nr_tx_request_t tx_request;
 
-  nr_scheduled_response_t scheduled_response;
   scheduled_response.module_id = 0;
   scheduled_response.CC_id = 0;
   scheduled_response.frame = frame;
@@ -432,12 +436,13 @@ int main(int argc, char **argv)
   ul_config.ul_config_list[0].ulsch_config_pdu.ulsch_pdu_rel15.mcs = Imcs;
   ul_config.ul_config_list[0].ulsch_config_pdu.ulsch_pdu_rel15.ndi = 0;
   ul_config.ul_config_list[0].ulsch_config_pdu.ulsch_pdu_rel15.rv = 0;
-  ul_config.ul_config_list[0].ulsch_config_pdu.ulsch_pdu_rel15.n_layers = precod_nbr_layers;*/
+  ul_config.ul_config_list[0].ulsch_config_pdu.ulsch_pdu_rel15.n_layers = precod_nbr_layers;
+  ul_config.ul_config_list[0].ulsch_config_pdu.ulsch_pdu_rel15.harq_process_nbr = harq_pid;
   //there are plenty of other parameters that we don't seem to be using for now. e.g.
   //ul_config.ul_config_list[0].ulsch_config_pdu.ulsch_pdu_rel15.absolute_delta_PUSCH = 0; 
 
   // set FAPI parameters for UE, put them in the scheduled response and call 
-  //nr_ue_scheduled_response(&scheduled_response);
+  nr_ue_scheduled_response(&scheduled_response);
 
   unsigned char *estimated_output_bit;
   unsigned char *test_input_bit;

openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c

@@ -146,7 +146,7 @@ int nr_ue_dl_indication(nr_downlink_indication_t *dl_info){
   if(dl_info->dci_ind != NULL){
     LOG_D(MAC,"[L2][IF MODULE][DL INDICATION][DCI_IND]\n");
     for(i=0; i<dl_info->dci_ind->number_of_dcis; ++i){
-      LOG_I(MAC,">>>NR_IF_Module i=%d, dl_info->dci_ind->number_of_dcis=%d\n",i,dl_info->dci_ind->number_of_dcis);
+      LOG_D(MAC,">>>NR_IF_Module i=%d, dl_info->dci_ind->number_of_dcis=%d\n",i,dl_info->dci_ind->number_of_dcis);
       fapi_nr_dci_pdu_rel15_t *dci = &dl_info->dci_ind->dci_list[i].dci;
 
       ret_mask |= (handle_dci(

openair2/RRC/NR/MESSAGES/asn1_msg.c

@@ -341,7 +341,11 @@ void do_SERVINGCELLCONFIGCOMMON(uint8_t Mod_id,
     //(*servingcellconfigcommon)->lte_CRS_ToMatchAround           = CALLOC(1,sizeof(struct NR_SetupRelease_RateMatchPatternLTE_CRS));
     (*servingcellconfigcommon)->rateMatchPatternToAddModList              = CALLOC(1,sizeof(struct NR_ServingCellConfigCommon__rateMatchPatternToAddModList));
     (*servingcellconfigcommon)->rateMatchPatternToReleaseList             = CALLOC(1,sizeof(struct NR_ServingCellConfigCommon__rateMatchPatternToReleaseList));
+#if (NR_RRC_VERSION >= MAKE_VERSION(15, 5, 0))
+    (*servingcellconfigcommon)->ssbSubcarrierSpacing                      = CALLOC(1,sizeof(NR_SubcarrierSpacing_t));
+#else 
     (*servingcellconfigcommon)->subcarrierSpacing                         = CALLOC(1,sizeof(NR_SubcarrierSpacing_t));
+#endif
     (*servingcellconfigcommon)->tdd_UL_DL_ConfigurationCommon             = CALLOC(1,sizeof(struct NR_TDD_UL_DL_ConfigCommon));
 
 
@@ -869,7 +873,11 @@ void do_SERVINGCELLCONFIGCOMMON(uint8_t Mod_id,
   ASN_SEQUENCE_ADD(&(*servingcellconfigcommon)->rateMatchPatternToReleaseList->list,&ratematchpatternid);
 
   //subcarrierSpacing
+#if (NR_RRC_VERSION >= MAKE_VERSION(15, 5, 0))
+  *(*servingcellconfigcommon)->ssbSubcarrierSpacing         = configuration->NIA_SubcarrierSpacing[CC_id];
+#else
   *(*servingcellconfigcommon)->subcarrierSpacing            = configuration->NIA_SubcarrierSpacing[CC_id];
+#endif
 
   //tdd_UL_DL_ConfigurationCommon
   (*servingcellconfigcommon)->tdd_UL_DL_ConfigurationCommon->referenceSubcarrierSpacing             = configuration->referenceSubcarrierSpacing[CC_id];

openair2/X2AP/x2ap_eNB_generate_messages.c

@@ -1107,9 +1107,9 @@ int x2ap_eNB_generate_senb_addition_request_ack (x2ap_eNB_instance_t *instance_p
   X2AP_SeNBAdditionRequestAcknowledge_IEs_t        *ie;
   X2AP_E_RABs_Admitted_ToBeAdded_ItemIEs_t         *e_RABS_Admitted_ToBeAdded_ItemIEs;
   X2AP_E_RABs_Admitted_ToBeAdded_Item_t            *e_RABs_Admitted_ToBeAdded_Item;
-  int                                    ue_id;
-  int                                    ue_id_MeNB;
-  int                                    ue_id_SeNB;
+  //int                                    ue_id;
+  //int                                    ue_id_MeNB;
+  //int                                    ue_id_SeNB;
 
   uint8_t  *buffer;
   uint32_t  len;

openair2/X2AP/x2ap_eNB_handler.c

@@ -1134,9 +1134,9 @@ int x2ap_eNB_handle_senb_addition_request (instance_t instance,
   X2AP_E_RABs_ToBeAdded_Item_t       *e_RABs_ToBeAdded_Item;
 
   x2ap_eNB_instance_t                *instance_p;
-  x2ap_eNB_data_t                    *x2ap_eNB_data;
+  //x2ap_eNB_data_t                    *x2ap_eNB_data;
   MessageDef                         *msg;
-  int                                ue_id;
+  //int                                ue_id;
 
   DevAssert (pdu != NULL);
   x2SeNBAdditionRequest = &pdu->choice.initiatingMessage.value.choice.SeNBAdditionRequest;