From 0f63e948613133512e2405942b3a5b27118f0e2c Mon Sep 17 00:00:00 2001
From: luis_pereira87 <lpereira@allbesmart.pt>
Date: Wed, 1 Dec 2021 23:17:20 +0000
Subject: [PATCH] Update Dedicated Serving Cell Configuration section in
 configuration file

---
 .../gnb.band78.tm1.106PRB.usrpn300.SCD.conf   | 100 +++++++++++-------
 1 file changed, 64 insertions(+), 36 deletions(-)

diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.SCD.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.SCD.conf
index c21f586d0a..05ba28b3f7 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.SCD.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.SCD.conf
@@ -175,51 +175,79 @@ gNBs =
 
   );
 
-#  Dedicated Serving Cell Configuration
-  servingCellConfigDedicated = (
-  {
-    # BWP-Downlink
-      # BWP 1 Configuration
-           bwp-Id_1 = 1;
-           bwp1_locationAndBandwidth = 28908; // RBstart=33,L=106
-          #  subcarrierSpacing
-           # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120 
-           bwp1_subcarrierSpacing = 1 ;
-      # BWP 2 Configuration
-           bwp-Id_2 = 2;
-           bwp2_locationAndBandwidth = 6325; // RBstart=0,L=24 ( 10 MHz BW)
-          #  subcarrierSpacing
-           # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120 
-           bwp2_subcarrierSpacing = 1 ;
-      # BWP 3 Configuration
-           bwp-Id_3 = 3;
-           bwp3_locationAndBandwidth = 13750; // RBstart=0,L=51 ( 20 MHz BW)
-          #  subcarrierSpacing
-           # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120 
-           bwp3_subcarrierSpacing = 1 ;
-      # BWP 4 Configuration
-           bwp-Id_4 = 4;
-           bwp4_locationAndBandwidth = 28908; // RBstart=33,L=106
-          #  subcarrierSpacing
-           # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120 
-           bwp4_subcarrierSpacing = 1 ;
 
-    firstActiveDownlinkBWP-Id                                         = 1;  #BWP-Id
+# Dedicated Serving Cell Configuration
+servingCellConfigDedicated = ({
+  # BWP-Downlink
+    # BWP 1 Configuration
+      dl_bwp-Id_1 = 1;
+      dl_bwp1_locationAndBandwidth = 28875; // RBstart=0, L=106 (40 MHz BW)
+      # subcarrierSpacing
+      # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      dl_bwp1_subcarrierSpacing = 1;
+
+    # BWP 2 Configuration
+      dl_bwp-Id_2 = 2;
+      dl_bwp2_locationAndBandwidth = 6325; // RBstart=0, L=24 (10 MHz BW)
+      # subcarrierSpacing
+      # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      dl_bwp2_subcarrierSpacing = 1;
+
+    # BWP 3 Configuration
+      dl_bwp-Id_3 = 3;
+      dl_bwp3_locationAndBandwidth = 13750; // RBstart=0, L=51 (20 MHz BW)
+      # subcarrierSpacing
+      # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      dl_bwp3_subcarrierSpacing = 1;
+
+    # BWP 4 Configuration
+      dl_bwp-Id_4 = 4;
+      dl_bwp4_locationAndBandwidth = 28899; // RBstart=24, L=106
+      # subcarrierSpacing
+      # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      dl_bwp4_subcarrierSpacing = 1;
+
+    firstActiveDownlinkBWP-Id = 1;  #BWP-Id
+    defaultDownlinkBWP-Id     = 1;  #BWP-Id
 
     # bwp-InactivityTimer                 ENUMERATED {ms2, ms3, ms4, ms5, ms6, ms8, ms10, ms20, ms30,
     #                                                ms40,ms50, ms60, ms80,ms100, ms200,ms300, ms500,
     #                                                ms750, ms1280, ms1920, ms2560, spare10, spare9, spare8,
     #                                                spare7, spare6, spare5, spare4, spare3, spare2, spare1 }
 
-    defaultDownlinkBWP-Id                                             = 1;     #BWP-Id
+  # UplinkConfig
+    # BWP-Uplink
+      # BWP 1 Configuration
+        ul_bwp-Id_1 = 1;
+        ul_bwp1_locationAndBandwidth = 28875; // RBstart=0, L=106 (40 MHz BW)
+        # subcarrierSpacing
+        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        ul_bwp1_subcarrierSpacing = 1;
 
-    # UplinkConfig 
-    firstActiveUplinkBWP-Id                                           = 1;     #BWP-Id  
+      # BWP 2 Configuration
+        ul_bwp-Id_2 = 2;
+        ul_bwp2_locationAndBandwidth = 6325; // RBstart=0, L=24 (10 MHz BW)
+        # subcarrierSpacing
+        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        ul_bwp2_subcarrierSpacing = 1;
 
-    #BWP-Uplink
-    
-    }
-  );
+      # BWP 3 Configuration
+        ul_bwp-Id_3 = 3;
+        ul_bwp3_locationAndBandwidth = 13750; // RBstart=0, L=51 (20 MHz BW)
+        # subcarrierSpacing
+        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        ul_bwp3_subcarrierSpacing = 1;
+
+      # BWP 4 Configuration
+        ul_bwp-Id_4 = 4;
+        ul_bwp4_locationAndBandwidth = 28899; // RBstart=24, L=106
+        # subcarrierSpacing
+        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        ul_bwp4_subcarrierSpacing = 1;
+
+      firstActiveUplinkBWP-Id = 1;  #BWP-Id
+  }
+);
 
     # ------- SCTP definitions
     SCTP :