Started on Rel-16 SCSs. CE + RS still to do

kuehnhammer · Oct 5, 2023 · 4a2a818 · 4a2a818
1 parent 4e359bf
commit 4a2a818
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/lib/srsran b/lib/srsran
diff --git a/src/Phy.h b/src/Phy.h
@@ -179,13 +179,17 @@ class Phy {
     enum class SubcarrierSpacing {
       df_15kHz,
       df_7kHz5,
-      df_1kHz25
+      df_2kHz5,
+      df_1kHz25,
+      df_0kHz37
     };
 
     SubcarrierSpacing mbsfn_subcarrier_spacing() {
       if (_cell.mbms_dedicated) {
         switch (_sib13.mbsfn_area_info_list[0].subcarrier_spacing) {
+          case srsran::mbsfn_area_info_t::subcarrier_spacing_t::khz_0dot37: return SubcarrierSpacing::df_0kHz37;
           case srsran::mbsfn_area_info_t::subcarrier_spacing_t::khz_1dot25: return SubcarrierSpacing::df_1kHz25;
+          case srsran::mbsfn_area_info_t::subcarrier_spacing_t::khz_2dot5: return SubcarrierSpacing::df_2kHz5;
           case srsran::mbsfn_area_info_t::subcarrier_spacing_t::khz_7dot5: return SubcarrierSpacing::df_7kHz5;
           default: return SubcarrierSpacing::df_15kHz;
         }
@@ -197,7 +201,9 @@ class Phy {
     float mbsfn_subcarrier_spacing_khz() {
       if (_cell.mbms_dedicated) {
         switch (_sib13.mbsfn_area_info_list[0].subcarrier_spacing) {
+          case srsran::mbsfn_area_info_t::subcarrier_spacing_t::khz_0dot37: return 0.37;
           case srsran::mbsfn_area_info_t::subcarrier_spacing_t::khz_1dot25: return 1.25;
+          case srsran::mbsfn_area_info_t::subcarrier_spacing_t::khz_2dot5: return 2.5;
           case srsran::mbsfn_area_info_t::subcarrier_spacing_t::khz_7dot5: return 7.5;
           default: return 15;
         }

diff --git a/src/main.cpp b/src/main.cpp
@@ -554,7 +554,9 @@ auto main(int argc, char **argv) -> int {
                 switch (phy.mbsfn_subcarrier_spacing()) {
                   case Phy::SubcarrierSpacing::df_15kHz:  scs = SRSRAN_SCS_15KHZ; break;
                   case Phy::SubcarrierSpacing::df_7kHz5:  scs = SRSRAN_SCS_7KHZ5; break;
+                  case Phy::SubcarrierSpacing::df_2kHz5:  scs = SRSRAN_SCS_2KHZ5; break;
                   case Phy::SubcarrierSpacing::df_1kHz25: scs = SRSRAN_SCS_1KHZ25; break;
+                  case Phy::SubcarrierSpacing::df_0kHz37: scs = SRSRAN_SCS_0KHZ37; break;
                 }
                 auto cell = phy.cell();
                 cell.nof_prb = cell.mbsfn_prb;