Merge branch 'nr_pdsch' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_pdsch

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.11
+export IIOD_REMOTE=192.168.121.32
+#export IIOD_REMOTE=192.168.1.11
 

openair1/PHY/NR_TRANSPORT/nr_tbs_tools.c

@@ -144,20 +144,20 @@ void nr_get_tbs(nfapi_nr_dl_config_dlsch_pdu *dlsch_pdu,
       }
   }
   else {
-    n = log2(Ninfo)-29;
+    n = log2(Ninfo-24)-5;
     Ninfo_prime = max(3840, (ROUNDIDIV((Ninfo-24),(1<<n)))<<n);
 
     if (R<256) {
       C = CEILIDIV((Ninfo_prime+24),3816);
-      TBS = (C*CEILIDIV((Ninfo_prime+24),(C<<3)))<<3;
+      TBS = (C<<3)*CEILIDIV((Ninfo_prime+24),(C<<3)) - 24;
     }
     else {
       if (Ninfo_prime>8424) {
         C = CEILIDIV((Ninfo_prime+24),8424);
-        TBS = (C*CEILIDIV((Ninfo_prime+24),(C<<3)))<<3;
+        TBS = (C<<3)*CEILIDIV((Ninfo_prime+24),(C<<3)) - 24;
       }
       else
-        TBS = (CEILIDIV((Ninfo_prime+24),8) - 24)<<3;
+        TBS = ((CEILIDIV((Ninfo_prime+24),8))<<3) - 24;
     }    
   }
 

targets/ARCH/COMMON/common_lib.h

@@ -205,9 +205,7 @@ typedef struct {
   clock_source_t clock_source;
   //! Manual SDR IP address
 //#if defined(EXMIMO) || defined(OAI_USRP) || defined(OAI_BLADERF) || defined(OAI_LMSSDR) 
-#ifndef OAI_ADRV9371_ZC706
   char *sdr_addrs;
-#endif
   //! Auto calibration flag
   int autocal[4];
   //! rf devices work with x bits iqs when oai have its own iq format

targets/RT/USER/nr-ru.c

@@ -2443,11 +2443,9 @@ void RCconfig_RU(void) {
 	    RC.ru[j]->num_gNB                           = 0;
       for (i=0;i<RC.ru[j]->num_gNB;i++) RC.ru[j]->gNB_list[i] = RC.gNB[RUParamList.paramarray[j][RU_ENB_LIST_IDX].iptr[i]][0];     
 
-#ifndef OAI_ADRV9371_ZC706
       if (config_isparamset(RUParamList.paramarray[j], RU_SDR_ADDRS)) {
         RC.ru[j]->openair0_cfg.sdr_addrs = strdup(*(RUParamList.paramarray[j][RU_SDR_ADDRS].strptr));
       }
-#endif
 
       if (config_isparamset(RUParamList.paramarray[j], RU_SDR_CLK_SRC)) {
         if (strcmp(*(RUParamList.paramarray[j][RU_SDR_CLK_SRC].strptr), "internal") == 0) {

targets/RT/USER/nr-ue.c

@@ -825,7 +825,6 @@ void *UE_thread(void *arg) {
     int i;
     char threadname[128];
     int th_id;
-    unsigned char nb_sf_init=10;
     UE->proc.proc_rxtx[0].counter_decoder = 0;
     UE->proc.proc_rxtx[1].counter_decoder = 0;
     UE->proc.proc_rxtx[2].counter_decoder = 0;
@@ -869,22 +868,17 @@ void *UE_thread(void *arg) {
 	  }
 #endif
 
-#ifndef OAI_ADRV9371_ZC706
-nb_sf_init = 10;
-#else
-nb_sf_init=5;
-#endif
             if (instance_cnt_synch < 0) {  // we can invoke the synch
                 // grab 10 ms of signal and wakeup synch thread
                 for (int i=0; i<UE->frame_parms.nb_antennas_rx; i++)
                     rxp[i] = (void*)&UE->common_vars.rxdata[i][0];
 
                 if (UE->mode != loop_through_memory)
-                    AssertFatal( UE->frame_parms.samples_per_subframe*nb_sf_init ==
+                    AssertFatal( UE->frame_parms.samples_per_subframe*10==
                                  UE->rfdevice.trx_read_func(&UE->rfdevice,
                                                             &timestamp,
                                                             rxp,
-                                                            UE->frame_parms.samples_per_subframe*nb_sf_init,
+                                                            UE->frame_parms.samples_per_subframe*10,
                                                             UE->frame_parms.nb_antennas_rx), "error reading samples");
 
 		AssertFatal ( 0== pthread_mutex_lock(&UE->proc.mutex_synch), "");

targets/RT/USER/nr-uesoftmodem.c

@@ -804,9 +804,7 @@ void init_openair0() {
 		 openair0_cfg[card].rx_freq[i]);
 	}
 	
-#ifndef OAI_ADRV9371_ZC706 
 	if (usrp_args) openair0_cfg[card].sdr_addrs = usrp_args;
-#endif
 	if (usrp_clksrc) {
 	  if (strcmp(usrp_clksrc, "internal") == 0) {
 	    openair0_cfg[card].clock_source = internal;