Merge remote-tracking branch 'origin/NR_FR2_200MHz' into integration_2024_w17

openair1/PHY/NR_TRANSPORT/nr_prach.c

@@ -350,6 +350,12 @@ void rx_nr_prach_ru(RU_t *ru,
     dftlen = dftlen*6;
     break;
 
+  case 245760:
+    // 200 MHz @ 245.76 Ms/s
+    Ncp <<= 3;
+    dftlen <<= 3;
+    break;
+
   default:
     AssertFatal(1==0,"sample rate %f MHz not supported for numerology %d\n", fp->samples_per_subframe / 1000.0, mu);
   }

openair1/PHY/NR_UE_TRANSPORT/nr_prach.c

@@ -366,6 +366,12 @@ int32_t generate_nr_prach(PHY_VARS_NR_UE *ue, uint8_t gNB_id, int frame, uint8_t
     dftlen = dftlen*6;
     break;
 
+  case 245760:
+    // 200 MHz @ 245.76 Ms/s
+    Ncp <<= 3;
+    dftlen <<= 3;
+    break;
+
   default:
     AssertFatal(1==0,"sample rate %f MHz not supported for numerology %d\n", fp->samples_per_subframe / 1000.0, mu);
   }

radio/USRP/usrp_lib.cpp

@@ -1220,12 +1220,20 @@ extern "C" {
     LOG_I(HW,"%s() sample_rate:%u\n", __FUNCTION__, (int)openair0_cfg[0].sample_rate);
 
     switch ((int)openair0_cfg[0].sample_rate) {
+      case 245760000:
+        // 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 = 200e6;
+        openair0_cfg[0].rx_bw = 200e6;
+        break;
+
       case 184320000:
         // 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                 = 100e6;
-        openair0_cfg[0].rx_bw                 = 100e6;
+        // openair0_cfg[0].samples_per_packet    = 2048;
+        openair0_cfg[0].tx_sample_advance = 15; // to be checked
+        openair0_cfg[0].tx_bw = 100e6;
+        openair0_cfg[0].rx_bw = 100e6;
         break;
 
       case 122880000: