From 4b7b621f00bc9c31e7fe35914df06f542d848659 Mon Sep 17 00:00:00 2001
From: luis_pereira87 <lpereira@allbesmart.pt>
Date: Mon, 2 May 2022 11:43:03 +0100
Subject: [PATCH] Minor improvements and cleanup in 5G NR SA configuration
 files

---
 .../CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf     | 13 ++++---------
 .../CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf |  7 +------
 .../CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf     | 13 ++++---------
 .../CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf | 13 ++++---------
 4 files changed, 13 insertions(+), 33 deletions(-)

diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
index d124c5692f6..e645094e8be 100644
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
@@ -19,10 +19,6 @@ gNBs =
                     {
                       sst = 1;
                       sd  = 0x1; // 0 false, else true
-                    },
-                    {
-                      sst = 1;
-                      sd  = 0x112233; // 0 false, else true
                     }
                   );
 
@@ -33,7 +29,7 @@ gNBs =
     ////////// Physical parameters:
 
     ssb_SubcarrierOffset                                      = 0;
-    min_rxtxtime                                              = 6;
+    min_rxtxtime                                              = 2;
     do_SRS                                                    = 1;
 
      pdcch_ConfigSIB1 = (
@@ -218,7 +214,7 @@ L1s = (
   num_cc = 1;
   tr_n_preference       = "local_mac";
   prach_dtx_threshold   = 120;
-  pucch0_dtx_threshold  = 150;
+  pucch0_dtx_threshold  = 100;
   ofdm_offset_divisor   = 8; #set this to UINT_MAX for offset 0
 }
 );
@@ -228,12 +224,11 @@ RUs = (
   local_rf       = "yes"
   nb_tx          = 1
   nb_rx          = 1
-  att_tx         = 0
-  att_rx         = 0;
+  att_tx         = 6;
+  att_rx         = 6;
   bands          = [41];
   max_pdschReferenceSignalPower = -27;
   max_rxgain                    = 114;
-  sf_extension                  = 0;
   eNB_instances  = [0];
   #beamforming 1x4 matrix:
   bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000];
diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf
index 1bc6de3bfe9..2881a77d48f 100644
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf
@@ -19,10 +19,6 @@ gNBs =
                     {
                       sst = 1;
                       sd  = 0x1; // 0 false, else true
-                    },
-                    {
-                      sst = 1;
-                      sd  = 0x112233; // 0 false, else true
                     }
                   );
 
@@ -40,7 +36,7 @@ gNBs =
 
     pdcch_ConfigSIB1 = (
       {
-        controlResourceSetZero = 11;
+        controlResourceSetZero = 12;
         searchSpaceZero = 0;
       }
     );
@@ -234,7 +230,6 @@ RUs = (
   bands          = [78];
   max_pdschReferenceSignalPower = -27;
   max_rxgain                    = 75;
-  sf_extension                  = 0;
   eNB_instances  = [0];
   ##beamforming 1x2 matrix: 1 layer x 2 antennas
   bf_weights = [0x00007fff, 0x0000];
diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
index a0cee6f9caa..e3024737eea 100644
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
@@ -19,10 +19,6 @@ gNBs =
                     {
                       sst = 1;
                       sd  = 0x1; // 0 false, else true
-                    },
-                    {
-                      sst = 1;
-                      sd  = 0x112233; // 0 false, else true
                     }
                   );
 
@@ -33,7 +29,7 @@ gNBs =
     ////////// Physical parameters:
 
     ssb_SubcarrierOffset                                      = 0;
-    min_rxtxtime                                              = 6;
+    min_rxtxtime                                              = 2;
 
      pdcch_ConfigSIB1 = (
       {
@@ -217,7 +213,7 @@ L1s = (
   num_cc = 1;
   tr_n_preference       = "local_mac";
   prach_dtx_threshold   = 120;
-  pucch0_dtx_threshold  = 150;
+  pucch0_dtx_threshold  = 100;
   ofdm_offset_divisor   = 8; #set this to UINT_MAX for offset 0
 }
 );
@@ -227,12 +223,11 @@ RUs = (
   local_rf       = "yes"
   nb_tx          = 1
   nb_rx          = 1
-  att_tx         = 0
-  att_rx         = 0;
+  att_tx         = 6;
+  att_rx         = 6;
   bands          = [78];
   max_pdschReferenceSignalPower = -27;
   max_rxgain                    = 114;
-  sf_extension                  = 0;
   eNB_instances  = [0];
   #beamforming 1x4 matrix:
   bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000];
diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf
index 74f8f2cb3b5..b8d71015c17 100644
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf
@@ -19,10 +19,6 @@ gNBs =
                     {
                       sst = 1;
                       sd  = 0x1; // 0 false, else true
-                    },
-                    {
-                      sst = 1;
-                      sd  = 0x112233; // 0 false, else true
                     }
                   );
 
@@ -33,12 +29,12 @@ gNBs =
     ////////// Physical parameters:
 
     ssb_SubcarrierOffset                                      = 0;
-    pdsch_AntennaPorts_N1                                     = 2;
+    pdsch_AntennaPorts_N1                                     = 1;
     pusch_AntennaPorts                                        = 2;
     ul_prbblacklist                                           = "79,80,81,82"
     pdcch_ConfigSIB1 = (
       {
-        controlResourceSetZero = 11;
+        controlResourceSetZero = 12;
         searchSpaceZero = 10;
       }
     );
@@ -236,7 +232,7 @@ MACRLCs = (
   num_cc                      = 1;
   tr_s_preference             = "local_L1";
   tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 200;
+  pusch_TargetSNRx10          = 150;
   pucch_TargetSNRx10          = 200;
   ulsch_max_frame_inactivity  = 0;
 }
@@ -247,7 +243,7 @@ L1s = (
   num_cc = 1;
   tr_n_preference = "local_mac";
   prach_dtx_threshold = 120;
-  pucch0_dtx_threshold = 120;
+  pucch0_dtx_threshold = 100;
 }
 );
 
@@ -261,7 +257,6 @@ RUs = (
   bands          = [78];
   max_pdschReferenceSignalPower = -27;
   max_rxgain                    = 75;
-  sf_extension                  = 0;
   eNB_instances  = [0];
   ##beamforming 1x2 matrix: 1 layer x 2 antennas
   bf_weights = [0x00007fff, 0x0000];
-- 
GitLab