disabled prach vs pucch collision detection temporarily until enb cfg files are updated in the rfci

lib/include/srslte/interfaces/sched_interface.h

@@ -81,7 +81,6 @@ public:
     uint32_t maxharq_msg3tx;
     uint32_t n1pucch_an;
     uint32_t delta_pucch_shift;
-    bool     pucch_mux_enabled = false;
 
     // If non-negative, statically allocate N prbs at the edges of the uplink for PUCCH
     int nrb_pucch;

srsenb/src/stack/mac/sched_grid.cc

@@ -112,10 +112,6 @@ cc_sched_result* sched_result_list::get_cc(srslte::tti_point tti_rx, uint32_t en
   return res != nullptr ? res->get_cc(enb_cc_idx) : nullptr;
 }
 
-/*******************************************************
- *             PDCCH Allocation Methods
- *******************************************************/
-
 /*******************************************************
  *          TTI resource Scheduling Methods
  *******************************************************/
@@ -159,7 +155,7 @@ void sf_grid_t::new_tti(tti_point tti_rx_)
   if (srslte_prach_tti_opportunity_config_fdd(cc_cfg->cfg.prach_config, to_tx_ul(tti_rx).to_uint(), -1)) {
     prbmask_t prach_mask{cc_cfg->nof_prb()};
     prach_mask.fill(cc_cfg->cfg.prach_freq_offset, cc_cfg->cfg.prach_freq_offset + 6);
-    reserve_ul_prbs(prach_mask, cc_cfg->nof_prb() != 6);
+    reserve_ul_prbs(prach_mask, false); // TODO: set to true once test sib.conf files are updated
     logger.debug("SCHED: Allocated PRACH RBs for tti_tx_ul=%d. Mask: 0x%s",
                  to_tx_ul(tti_rx).to_uint(),
                  prach_mask.to_hex().c_str());

srsenb/src/stack/mac/sched_phy_ch/sf_cch_allocator.cc

@@ -217,7 +217,7 @@ bool sf_cch_allocator::alloc_tree_t::add_tree_node_leaves(int
       }
 
       pucch_prbidx = srslte_pucch_n_prb(&cc_cfg->cfg.cell, pucch_cfg, 0);
-      if (not cc_cfg->cfg.pucch_mux_enabled and parent_pucch_mask.test(pucch_prbidx)) {
+      if (not cc_cfg->sched_cfg->pucch_mux_enabled and parent_pucch_mask.test(pucch_prbidx)) {
         // PUCCH allocation would collide with other PUCCH/PUSCH grants. Try another CCE position
         continue;
       }