From 71e7c137b3ecbea8a9aba96a6e42a1bd12269bd1 Mon Sep 17 00:00:00 2001
From: Klaus Kuehnhammer <klaus@bitstem.com>
Date: Mon, 23 Oct 2023 14:34:07 +0200
Subject: [PATCH] fixes for 6 PRB cells

---
 lib/src/phy/phch/pmch.c  | 3 +++
 lib/src/phy/phch/ra_dl.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/src/phy/phch/pmch.c b/lib/src/phy/phch/pmch.c
index 638d999818..c8961003d7 100644
--- a/lib/src/phy/phch/pmch.c
+++ b/lib/src/phy/phch/pmch.c
@@ -301,6 +301,9 @@ int srsran_pmch_decode(srsran_pmch_t*         q,
          sf->cfi);
 
     uint32_t lstart = SRSRAN_NOF_CTRL_SYMBOLS(q->cell, sf->cfi);
+    if (q->cell.mbms_dedicated) {
+      lstart = 0;
+    }
     for (int j = 0; j < q->nof_rx_antennas; j++) {
       /* extract symbols */
       n = pmch_get(q, sf_symbols[j], q->symbols[j], lstart, sf->subcarrier_spacing, sf->tti % 10);
diff --git a/lib/src/phy/phch/ra_dl.c b/lib/src/phy/phch/ra_dl.c
index 27f2f0e04b..b49a2ac0e4 100644
--- a/lib/src/phy/phch/ra_dl.c
+++ b/lib/src/phy/phch/ra_dl.c
@@ -142,7 +142,7 @@ uint32_t ra_re_x_prb(const srsran_cell_t* cell, srsran_dl_sf_cfg_t* sf, uint32_t
   }
 
   // remove references
-  if (skip_refs) {
+  if (skip_refs && re > 0) {
     if (sf->sf_type == SRSRAN_SF_NORM) {
       switch (cell->nof_ports) {
         case 1: