From b2b2c3f80d31f6a50c6e7853bd451c8252e7b309 Mon Sep 17 00:00:00 2001
From: Francesco Mani <francesco.mani@orange.com>
Date: Mon, 25 Feb 2019 16:51:41 +0100
Subject: [PATCH] config files changed and pdcch/pdsch enabled

---
 openair1/SCHED_NR/phy_procedures_nr_gNB.c                   | 4 ++--
 .../CONF/gnb.band22.tm1.106PRB.adrv9371zc706.conf           | 6 +++---
 .../CONF/gnb.band78.tm1.106PRB.usrpn300.conf                | 6 +++---
 .../CONF/gnb.band78.tm1.217PRB.usrpn300.conf                | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/openair1/SCHED_NR/phy_procedures_nr_gNB.c b/openair1/SCHED_NR/phy_procedures_nr_gNB.c
index f1db75d534..d922a3143d 100644
--- a/openair1/SCHED_NR/phy_procedures_nr_gNB.c
+++ b/openair1/SCHED_NR/phy_procedures_nr_gNB.c
@@ -213,7 +213,7 @@ void phy_procedures_gNB_TX(PHY_VARS_gNB *gNB,
   num_dci = gNB->pdcch_vars.num_dci;
   num_pdsch_rnti = gNB->pdcch_vars.num_pdsch_rnti;
 
-  /*if (num_dci) {
+  if (num_dci) {
     LOG_I(PHY, "[gNB %d] Frame %d slot %d \
     Calling nr_generate_dci_top (number of DCI %d)\n", gNB->Mod_id, frame, slot, num_dci);
 
@@ -232,7 +232,7 @@ void phy_procedures_gNB_TX(PHY_VARS_gNB *gNB,
                           AMP, slot, *fp, *cfg);
       }
     }
-  }*/
+  }
 
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_TX+offset,0);
 }
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band22.tm1.106PRB.adrv9371zc706.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band22.tm1.106PRB.adrv9371zc706.conf
index 258d6c5f03..5fd4b465b3 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band22.tm1.106PRB.adrv9371zc706.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band22.tm1.106PRB.adrv9371zc706.conf
@@ -26,10 +26,10 @@ gNBs =
       node_function                                                 = "3GPP_gNODEB";
       node_timing                                                   = "synch_to_ext_device";
       node_synch_ref                                                = 0;
-      frame_type                                                    = "FDD";
+      frame_type                                                    = "TDD";
       DL_prefix_type                                                = "NORMAL";
       UL_prefix_type                                                = "NORMAL";
-      eutra_band                                                    = 22;
+      eutra_band                                                    = 78;
       downlink_frequency                                            = 3510000000L;
       uplink_frequency_offset                                       = -120000000;
       Nid_cell                                                      = 0;
@@ -70,7 +70,7 @@ gNBs =
       UL_BWP_prefix_type                                            = "NORMAL";
       UL_timeAlignmentTimerCommon                                   = "infinity";
       ServingCellConfigCommon_n_TimingAdvanceOffset                 = "n0"
-      ServingCellConfigCommon_ssb_PositionsInBurst_PR               = "shortBitmap";
+      ServingCellConfigCommon_ssb_PositionsInBurst_PR               = 0x01;
       ServingCellConfigCommon_ssb_periodicityServingCell            = 10;
       ServingCellConfigCommon_dmrs_TypeA_Position                   = 2;
       NIA_SubcarrierSpacing                                         = "kHz15"; 
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf
index 3aaf0c5506..077d1e5bd3 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf
@@ -26,10 +26,10 @@ gNBs =
       node_function                                                 = "3GPP_gNODEB";
       node_timing                                                   = "synch_to_ext_device";
       node_synch_ref                                                = 0;
-      frame_type                                                    = "FDD";
+      frame_type                                                    = "TDD";
       DL_prefix_type                                                = "NORMAL";
       UL_prefix_type                                                = "NORMAL";
-      eutra_band                                                    = 22;
+      eutra_band                                                    = 78;
       downlink_frequency                                            = 3510000000L;
       uplink_frequency_offset                                       = -120000000;
       Nid_cell                                                      = 0;
@@ -70,7 +70,7 @@ gNBs =
       UL_BWP_prefix_type                                            = "NORMAL";
       UL_timeAlignmentTimerCommon                                   = "infinity";
       ServingCellConfigCommon_n_TimingAdvanceOffset                 = "n0"
-      ServingCellConfigCommon_ssb_PositionsInBurst_PR               = "shortBitmap";
+      ServingCellConfigCommon_ssb_PositionsInBurst_PR               = 0x01;
       ServingCellConfigCommon_ssb_periodicityServingCell            = 10;
       ServingCellConfigCommon_dmrs_TypeA_Position                   = 2;
       NIA_SubcarrierSpacing                                         = "kHz15"; 
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf
index a604feabec..dbd937d61a 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf
@@ -26,10 +26,10 @@ gNBs =
       node_function                                                 = "3GPP_gNODEB";
       node_timing                                                   = "synch_to_ext_device";
       node_synch_ref                                                = 0;
-      frame_type                                                    = "FDD";
+      frame_type                                                    = "TDD";
       DL_prefix_type                                                = "NORMAL";
       UL_prefix_type                                                = "NORMAL";
-      eutra_band                                                    = 22;
+      eutra_band                                                    = 78;
       downlink_frequency                                            = 3510000000L;
       uplink_frequency_offset                                       = -120000000;
       Nid_cell                                                      = 0;
@@ -70,7 +70,7 @@ gNBs =
       UL_BWP_prefix_type                                            = "NORMAL";
       UL_timeAlignmentTimerCommon                                   = "infinity";
       ServingCellConfigCommon_n_TimingAdvanceOffset                 = "n0"
-      ServingCellConfigCommon_ssb_PositionsInBurst_PR               = "shortBitmap";
+      ServingCellConfigCommon_ssb_PositionsInBurst_PR               = 0x01;
       ServingCellConfigCommon_ssb_periodicityServingCell            = 10;
       ServingCellConfigCommon_dmrs_TypeA_Position                   = 2;
       NIA_SubcarrierSpacing                                         = "kHz15"; 
-- 
2.26.2