From 909e5de34fab9693662095d6c9fa5e46b3faae7f Mon Sep 17 00:00:00 2001
From: Xavier Arteaga <xavier@softwareradiosystems.com>
Date: Tue, 22 Dec 2020 19:07:54 +0100
Subject: [PATCH] Fix NR workers

---
 srsenb/src/phy/nr/cc_worker.cc |  6 ++++++
 srsue/hdr/phy/nr/cc_worker.h   |  2 +-
 srsue/src/phy/nr/cc_worker.cc  | 15 +++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/srsenb/src/phy/nr/cc_worker.cc b/srsenb/src/phy/nr/cc_worker.cc
index 570008545..b951c1055 100644
--- a/srsenb/src/phy/nr/cc_worker.cc
+++ b/srsenb/src/phy/nr/cc_worker.cc
@@ -118,6 +118,12 @@ bool cc_worker::work_dl()
     ERROR("Error loading default grant\n");
     return false;
   }
+
+  if (srslte_ue_dl_nr_nof_dmrs_cdm_groups_without_data_format_1_0(&pdsch_cfg, &pdsch_grant) < SRSLTE_SUCCESS) {
+    ERROR("Error loading number of DMRS CDM groups\n");
+    return false;
+  }
+
   pdsch_grant.nof_layers = enb_dl.carrier.max_mimo_layers;
   pdsch_grant.dci_format = srslte_dci_format_nr_1_0;
   pdsch_grant.rnti       = 0x1234;
diff --git a/srsue/hdr/phy/nr/cc_worker.h b/srsue/hdr/phy/nr/cc_worker.h
index a51dbdab3..d3566b790 100644
--- a/srsue/hdr/phy/nr/cc_worker.h
+++ b/srsue/hdr/phy/nr/cc_worker.h
@@ -53,7 +53,7 @@ public:
     args.dl.nof_max_prb            = 100;
     args.dl.pdsch.measure_evm      = true;
     args.dl.pdsch.measure_time     = true;
-    args.dl.pdsch.sch.disable_simd = true;
+    args.dl.pdsch.sch.disable_simd = false;
   }
 };
 
diff --git a/srsue/src/phy/nr/cc_worker.cc b/srsue/src/phy/nr/cc_worker.cc
index 3e73d6b8e..a380a8bbe 100644
--- a/srsue/src/phy/nr/cc_worker.cc
+++ b/srsue/src/phy/nr/cc_worker.cc
@@ -74,6 +74,15 @@ bool cc_worker::set_carrier(const srslte_carrier_nr_t* carrier)
     return false;
   }
 
+  srslte_coreset_t coreset  = {};
+  coreset.freq_resources[0] = true; // Enable the bottom 6 PRB for PDCCH
+  coreset.duration          = 2;
+
+  if (srslte_ue_dl_nr_set_coreset(&ue_dl, &coreset) < SRSLTE_SUCCESS) {
+    ERROR("Error setting carrier\n");
+    return false;
+  }
+
   return true;
 }
 
@@ -108,6 +117,12 @@ bool cc_worker::work_dl()
     ERROR("Error loading default grant\n");
     return false;
   }
+
+  if (srslte_ue_dl_nr_nof_dmrs_cdm_groups_without_data_format_1_0(&pdsch_cfg, &pdsch_grant) < SRSLTE_SUCCESS) {
+    ERROR("Error loading number of DMRS CDM groups\n");
+    return false;
+  }
+
   pdsch_grant.nof_layers = ue_dl.carrier.max_mimo_layers;
   pdsch_grant.dci_format = srslte_dci_format_nr_1_0;
   pdsch_grant.rnti       = 0x1234;