Merge remote-tracking branch 'origin/Develop-nr-threequarter_fs-80mhz-x310'...

Merge remote-tracking branch 'origin/Develop-nr-threequarter_fs-80mhz-x310' into integration_2019_w18

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,

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;

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)
 {

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)
 {

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;

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;
 

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;

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