add amp

openair1/PHY/NR_UE_TRANSPORT/pss_nr.c

@@ -703,7 +703,6 @@ int pss_search_time_nr(c16_t **rxdata, PHY_VARS_NR_UE *ue, int fo_flag, int is)
 
         /* perform correlation of rx data and pss sequence ie it is a dot product */
         const c32_t result = dot_product((c16_t *)primary_synchro_time_nr[pss_index], &(rxdata[ar][n + is * frame_parms->samples_per_frame]), frame_parms->ofdm_symbol_size, shift);
-        LOG_I(HW,"ofdm_symbol_size = %d short = %d\n",frame_parms->ofdm_symbol_size,shift);
         const c64_t r64 = {.r = result.r, .i = result.i};
         pss_corr_ue += squaredMod(r64);
         //((short*)pss_corr_ue[pss_index])[2*n] += ((short*) &result)[0];   /* real part */
@@ -719,12 +718,15 @@ int pss_search_time_nr(c16_t **rxdata, PHY_VARS_NR_UE *ue, int fo_flag, int is)
         peak_value = pss_corr_ue;
         peak_position = n;
         pss_source = pss_index;
+
+      
         
 #ifdef DEBUG_PSS_NR
         printf("pss_index %d: n %6u peak_value %15llu\n", pss_index, n, (unsigned long long)pss_corr_ue[n]);
 #endif
       }
     }
+    LOG_I(HW,"length = %d avg = %ld peak_value = %ld peak_position = %d pss_source = %d is = %d frame_parms->samples_per_frame %d\n",length,avg[pss_index],peak_value,peak_position,pss_source,is,frame_parms->samples_per_frame);
   }
   
   if (fo_flag){

openair1/PHY/impl_defs_top.h

@@ -248,7 +248,8 @@
 #ifdef BIT8_TX
 #define AMP_SHIFT 7
 #else
-#define AMP_SHIFT 9
+//#define AMP_SHIFT 9
+#define AMP_SHIFT 13
 #endif
 
 #define AMP ((1)<<AMP_SHIFT)

radio/DPDKRF/dpdkrf_oai.c

@@ -191,7 +191,7 @@ int trx_dpdkrf_start(openair0_device *device) {
 	txpCtrlgain[0] = (uint8_t *)gTxCtrlBuf;
 	trx_dpdkrf_write_ctrl(txpCtrlgain);
 
-	trx_setMsgGainRx(gRxCtrlBuf, 0, 0, 0, 0);
+	trx_setMsgGainRx(gRxCtrlBuf, 30, 30, 30, 30);
 	rxpCtrlgain[0] = (uint8_t *)gRxCtrlBuf;
 	trx_dpdkrf_write_ctrl(rxpCtrlgain);
 	return 0;
@@ -248,12 +248,13 @@ int device_init(openair0_device *device, openair0_config_t *openair0_cfg) {
     switch ((int)openair0_cfg->sample_rate) {
     case 122880000:
         openair0_cfg->samples_per_packet    = 122880;
-        openair0_cfg->tx_sample_advance     = 1228;
+        openair0_cfg->tx_sample_advance     = 1226;
         openair0_cfg[0].tx_bw               = 100e6;
         openair0_cfg[0].rx_bw               = 100e6;
         break;
     case 61440000:
         openair0_cfg->samples_per_packet    = 61440;
+		
         openair0_cfg->tx_sample_advance     = 70;
         openair0_cfg[0].tx_bw               = 40e6;
         openair0_cfg[0].rx_bw               = 40e6;

targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.273PRB.dpdkrf.conf

@@ -168,7 +168,7 @@ gNBs =
 
 
     ////////// AMF parameters:
-    amf_ip_address      = ( { ipv4       = "192.168.199.193";
+    amf_ip_address      = ( { ipv4       = "172.11.200.14";
                               ipv6       = "192:168:30::17";
                               active     = "yes";
                               preference = "ipv4";
@@ -178,10 +178,10 @@ gNBs =
 
     NETWORK_INTERFACES :
     {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "enp90s0";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.199.218";
-        GNB_INTERFACE_NAME_FOR_NGU               = "enp90s0";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.199.218";
+        GNB_INTERFACE_NAME_FOR_NG_AMF            = "docker-openxg";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.11.200.1";
+        GNB_INTERFACE_NAME_FOR_NGU               = "docker-openxg";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.11.200.1";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };