From a6098dbf09d5bc7caa3bd544c2594dec054a5608 Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@eurecom.fr>
Date: Mon, 15 Jan 2018 18:31:37 +0100
Subject: [PATCH] delete unnecessary FlexRAN source files

all the FlexRAN scheduling code is now also handled by the general OAI
scheduling code
---
 cmake_targets/CMakeLists.txt                  |   22 -
 .../CONTROL_MODULES/MAC/flexran_agent_mac.c   |    2 -
 openair2/LAYER2/MAC/eNB_scheduler.c           |    1 -
 openair2/LAYER2/MAC/eNB_scheduler_dlsch.c     |    2 +-
 openair2/LAYER2/MAC/flexran_agent_mac_proto.h |  323 ---
 .../MAC/flexran_agent_scheduler_dataplane.c   |  583 ------
 .../MAC/flexran_agent_scheduler_dlsch_ue.c    | 1814 -----------------
 .../flexran_agent_scheduler_dlsch_ue_remote.c |  202 --
 .../flexran_agent_scheduler_dlsch_ue_remote.h |   70 -
 .../MAC/flexran_agent_scheduler_ulsch_ue.c    | 1112 ----------
 openair2/LAYER2/MAC/flexran_dci_conversions.h |   51 -
 11 files changed, 1 insertion(+), 4181 deletions(-)
 delete mode 100644 openair2/LAYER2/MAC/flexran_agent_mac_proto.h
 delete mode 100644 openair2/LAYER2/MAC/flexran_agent_scheduler_dataplane.c
 delete mode 100644 openair2/LAYER2/MAC/flexran_agent_scheduler_dlsch_ue.c
 delete mode 100644 openair2/LAYER2/MAC/flexran_agent_scheduler_dlsch_ue_remote.c
 delete mode 100644 openair2/LAYER2/MAC/flexran_agent_scheduler_dlsch_ue_remote.h
 delete mode 100644 openair2/LAYER2/MAC/flexran_agent_scheduler_ulsch_ue.c
 delete mode 100644 openair2/LAYER2/MAC/flexran_dci_conversions.h

diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt
index da0c3fbc1f..b659819e25 100644
--- a/cmake_targets/CMakeLists.txt
+++ b/cmake_targets/CMakeLists.txt
@@ -1191,17 +1191,6 @@ set (MAC_SRC
   ${MAC_DIR}/config.c
  )
 
-if (FLEXRAN_AGENT_SB_IF)
-
-set (MAC_SRC ${MAC_SRC}
-  ${MAC_DIR}/flexran_agent_scheduler_dlsch_ue.c
-  ${MAC_DIR}/flexran_agent_scheduler_ulsch_ue.c
-  ${MAC_DIR}/flexran_agent_scheduler_dataplane.c
-  ${MAC_DIR}/flexran_agent_scheduler_dlsch_ue_remote.c
-)
-
-endif()
-
 set (ENB_APP_SRC
   ${OPENAIR2_DIR}/ENB_APP/enb_app.c
   ${OPENAIR2_DIR}/ENB_APP/enb_config.c
@@ -1213,17 +1202,6 @@ add_library(L2
   ${ENB_APP_SRC})
 #  ${OPENAIR2_DIR}/RRC/L2_INTERFACE/openair_rrc_L2_interface.c)
 
-if (FLEXRAN_AGENT_SB_IF)
-
-#Test for adding a shared library
-add_library(default_sched SHARED ${MAC_DIR}/flexran_agent_scheduler_dlsch_ue.c)
-add_library(remote_sched SHARED ${MAC_DIR}/flexran_agent_scheduler_dlsch_ue_remote.c)
-
-add_library(default_ul_sched SHARED ${MAC_DIR}/flexran_agent_scheduler_ulsch_ue.c)
-
-
-endif()
-
 # L3 Libs
 ##########################
 
diff --git a/openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c b/openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c
index 02350eb0c1..d60a9eb3b7 100644
--- a/openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c
+++ b/openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c
@@ -35,8 +35,6 @@
 #include "flexran_agent_ran_api.h"
 
 #include "LAYER2/MAC/proto.h"
-#include "LAYER2/MAC/flexran_agent_mac_proto.h"
-#include "LAYER2/MAC/flexran_agent_scheduler_dlsch_ue_remote.h"
 
 #include "liblfds700.h"
 
diff --git a/openair2/LAYER2/MAC/eNB_scheduler.c b/openair2/LAYER2/MAC/eNB_scheduler.c
index 432915eb8c..1195e05379 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler.c
@@ -56,7 +56,6 @@
 //Agent-related headers
 #include "flexran_agent_extern.h"
 #include "flexran_agent_mac.h"
-#include "flexran_agent_mac_proto.h"
 #endif
 
 #if defined(ENABLE_ITTI)
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c b/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
index 0d9f129fa6..a0da4f4961 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
@@ -62,7 +62,7 @@
 #include "flexran_agent_ran_api.h"
 #include "header.pb-c.h"
 #include "flexran.pb-c.h"
-#include "flexran_agent_mac.h"
+#endif
 #include <dlfcn.h>
 #endif
 
diff --git a/openair2/LAYER2/MAC/flexran_agent_mac_proto.h b/openair2/LAYER2/MAC/flexran_agent_mac_proto.h
deleted file mode 100644
index be61fa1590..0000000000
--- a/openair2/LAYER2/MAC/flexran_agent_mac_proto.h
+++ /dev/null
@@ -1,323 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-/*! \file flexran_agent_mac_proto.h
- * \brief MAC functions for FlexRAN agent
- * \author Xenofon Foukas and Navid Nikaein
- * \date 2016
- * \email: x.foukas@sms.ed.ac.uk
- * \version 0.1
- * @ingroup _mac
-
- */
-
-#ifndef __LAYER2_MAC_FLEXRAN_AGENT_MAC_PROTO_H__
-#define __LAYER2_MAC_FLEXRAN_AGENT_MAC_PROTO_H__
-
-#include "flexran_agent_defs.h"
-#include "header.pb-c.h"
-#include "flexran.pb-c.h"
-
-/*
- * slice specific scheduler 
- */
-typedef void (*slice_scheduler_dl)(module_id_t mod_id,
-				int slice_id,
-				uint32_t frame,
-				uint32_t subframe,
-				int *mbsfn_flag,
-				Protocol__FlexranMessage **dl_info);
-
-typedef void (*slice_scheduler_ul)(module_id_t mod_id, 
-				frame_t frame,
-				unsigned char cooperation_flag,
-				uint32_t      subframe,
-				unsigned char sched_subframe,
-				Protocol__FlexranMessage **ul_info);
-
-
-/*
- * top level flexran scheduler used by the eNB scheduler
- */
-void flexran_schedule_ue_dl_spec_default(mid_t mod_id,
-				      uint32_t frame,
-				      uint32_t subframe,
-				      int *mbsfn_flag,
-				      Protocol__FlexranMessage ** dl_info);
-/*
- * slice specific scheduler for embb
- */
-void
-flexran_schedule_ue_spec_embb(mid_t mod_id,
-			      int slice_id,
-			      uint32_t frame,
-			      uint32_t subframe,
-			      int *mbsfn_flag,
-			      Protocol__FlexranMessage ** dl_info);
-/*
- * slice specific scheduler for urllc
- */
-void
-flexran_schedule_ue_spec_urllc(mid_t mod_id,
-			       int slice_id,
-			       uint32_t frame,
-			       uint32_t subframe,
-			       int *mbsfn_flag,
-			       Protocol__FlexranMessage ** dl_info);
-
-/*
- * slice specific scheduler for mmtc
- */
-void
-flexran_schedule_ue_spec_mmtc(mid_t mod_id,
-			      int slice_id,
-			      uint32_t frame,
-			      uint32_t subframe,
-			      int *mbsfn_flag,
-			      Protocol__FlexranMessage ** dl_info);
-/*
- * slice specific scheduler for best effort traffic 
- */
-void
-flexran_schedule_ue_spec_be(mid_t mod_id,
-			    int slice_id,
-			    uint32_t frame,
-			    uint32_t subframe,
-			    int *mbsfn_flag,
-			    Protocol__FlexranMessage ** dl_info);
-
-/*
- * common flexran scheduler function
- */
-void
-<<<<<<< HEAD
-flexran_schedule_ue_spec_common(mid_t mod_id,
-				int slice_id,
-				uint32_t frame,
-				uint32_t subframe,
-				int *mbsfn_flag,
-				Protocol__FlexranMessage ** dl_info);
-
-uint16_t flexran_nb_rbs_allowed_slice(float rb_percentage, int total_rbs);
-
-int flexran_slice_member(int UE_id, int slice_id);
-
-int flexran_slice_maxmcs(int slice_id);
-
-void _store_dlsch_buffer(module_id_t Mod_id,
-			 int slice_id,
-			 frame_t frameP, sub_frame_t subframeP);
-
-
-void _assign_rbs_required(module_id_t Mod_id,
-			  int slice_id,
-			  frame_t frameP,
-			  sub_frame_t subframe,
-			  uint16_t
-			  nb_rbs_required[MAX_NUM_CCs][NUMBER_OF_UE_MAX],
-			  uint16_t
-			  nb_rbs_allowed_slice[MAX_NUM_CCs]
-			  [MAX_NUM_SLICES], int min_rb_unit[MAX_NUM_CCs]);
-
-void _dlsch_scheduler_pre_processor(module_id_t Mod_id,
-				    int slice_id,
-				    frame_t frameP,
-				    sub_frame_t subframeP,
-				    int N_RBG[MAX_NUM_CCs],
-				    int *mbsfn_flag);
-
-void _dlsch_scheduler_pre_processor_reset(int module_idP,
-					  int UE_id,
-					  uint8_t CC_id,
-					  int frameP,
-					  int subframeP,
-					  int N_RBG,
-					  uint16_t
-					  nb_rbs_required[MAX_NUM_CCs]
-					  [NUMBER_OF_UE_MAX],
-					  uint16_t
-					  nb_rbs_required_remaining
-					  [MAX_NUM_CCs][NUMBER_OF_UE_MAX],
-					  uint16_t
-					  nb_rbs_allowed_slice[MAX_NUM_CCs]
-					  [MAX_NUM_SLICES],
-					  unsigned char
-					  rballoc_sub[MAX_NUM_CCs]
-					  [N_RBG_MAX],
-					  unsigned char
-					  MIMO_mode_indicator[MAX_NUM_CCs]
-					  [N_RBG_MAX]);
-
-void _dlsch_scheduler_pre_processor_allocate(module_id_t Mod_id,
-					     int UE_id,
-					     uint8_t CC_id,
-					     int N_RBG,
-					     int transmission_mode,
-					     int min_rb_unit,
-					     uint8_t N_RB_DL,
-					     uint16_t
-					     nb_rbs_required[MAX_NUM_CCs]
-					     [NUMBER_OF_UE_MAX],
-					     uint16_t
-					     nb_rbs_required_remaining
-					     [MAX_NUM_CCs]
-					     [NUMBER_OF_UE_MAX],
-					     unsigned char
-					     rballoc_sub[MAX_NUM_CCs]
-					     [N_RBG_MAX],
-					     unsigned char
-					     MIMO_mode_indicator
-					     [MAX_NUM_CCs][N_RBG_MAX]);
-=======
-flexran_schedule_ue_dl_spec_common(mid_t   mod_id,
-				int       slice_id, 
-				uint32_t      frame,
-				uint32_t      subframe,
-				int           *mbsfn_flag,
-				Protocol__FlexranMessage **dl_info);
-
-void
-flexran_schedule_ue_ul_spec_default(mid_t   mod_id,
-				 uint32_t      frame,
-				 uint32_t      cooperation_flag,
-				 int           subframe,
-				 unsigned char sched_subframe,
-				 Protocol__FlexranMessage **ul_info);
-
-
-uint16_t flexran_nb_rbs_allowed_slice(float rb_percentage, 
-				      int total_rbs);
-
-int flexran_slice_member(int UE_id, 
-			 int slice_id);
-
-int flexran_slice_maxmcs(int slice_id) ;
-
-/* Downlink Primitivies */
-
-void _store_dlsch_buffer (module_id_t Mod_id,
-			  int         slice_id,
-			  frame_t     frameP,
-			  sub_frame_t subframeP);
-
-
-void _assign_rbs_required (module_id_t Mod_id,
-			   int         slice_id,
-			   frame_t     frameP,
-			   sub_frame_t subframe,
-			   uint16_t    nb_rbs_required[MAX_NUM_CCs][NUMBER_OF_UE_MAX],
-			   uint16_t    nb_rbs_allowed_slice[MAX_NUM_CCs][MAX_NUM_SLICES], 
-			   int         min_rb_unit[MAX_NUM_CCs]);
-
-
-/* Uplink Primitivies */
-
-// void _sort_ue_ul (module_id_t module_idP,int frameP, sub_frame_t subframeP);
-
-void _assign_max_mcs_min_rb(module_id_t module_idP, int slice_id, int frameP, sub_frame_t subframeP, uint16_t *first_rb);
-
-
-void _ulsch_scheduler_pre_processor(module_id_t module_idP,
-                                   int slice_id,                                   
-                                   int frameP,
-                                   sub_frame_t subframeP,
-                                   uint16_t *first_rb);
-
-
-void flexran_agent_schedule_ulsch_rnti(module_id_t   module_idP,
-                         unsigned char cooperation_flag,
-                         frame_t       frameP,
-                         sub_frame_t   subframeP,
-                         unsigned char sched_subframe,
-                         uint16_t     *first_rb);
-
-/* Downlink Primitives */
-
-void _dlsch_scheduler_pre_processor (module_id_t   Mod_id,
-				     int           slice_id,
-				     frame_t       frameP,
-				     sub_frame_t   subframeP,
-				     int           N_RBG[MAX_NUM_CCs],
-				     int           *mbsfn_flag);
-
-void _dlsch_scheduler_pre_processor_reset (int module_idP,
-					   int UE_id,
-					   uint8_t  CC_id,
-					   int frameP,
-					   int subframeP,					  
-					   int N_RBG,
-					   uint16_t nb_rbs_required[MAX_NUM_CCs][NUMBER_OF_UE_MAX],
-					   uint16_t nb_rbs_required_remaining[MAX_NUM_CCs][NUMBER_OF_UE_MAX],
-					   uint16_t nb_rbs_allowed_slice[MAX_NUM_CCs][MAX_NUM_SLICES],
-					   unsigned char rballoc_sub[MAX_NUM_CCs][N_RBG_MAX],
-					   unsigned char MIMO_mode_indicator[MAX_NUM_CCs][N_RBG_MAX]);
-
-void _dlsch_scheduler_pre_processor_allocate (module_id_t   Mod_id,
-					      int           UE_id,
-					      uint8_t       CC_id,
-					      int           N_RBG,
-					      int           transmission_mode,
-					      int           min_rb_unit,
-					      uint8_t       N_RB_DL,
-					      uint16_t      nb_rbs_required[MAX_NUM_CCs][NUMBER_OF_UE_MAX],
-					      uint16_t      nb_rbs_required_remaining[MAX_NUM_CCs][NUMBER_OF_UE_MAX],
-					      unsigned char rballoc_sub[MAX_NUM_CCs][N_RBG_MAX],
-					      unsigned char MIMO_mode_indicator[MAX_NUM_CCs][N_RBG_MAX]);
->>>>>>> feature-68-enb-agent
-
-/*
- * Default scheduler used by the eNB agent
- */
-void flexran_schedule_ue_dl_spec_default(mid_t mod_id, uint32_t frame, uint32_t subframe,
-				      int *mbsfn_flag, Protocol__FlexranMessage **dl_info);
-
-/*
-  Uplink scheduler used by MAC agent
-*/
-
-void flexran_agent_schedule_ulsch_ue_spec(module_id_t module_idP,  frame_t frameP,  unsigned char cooperation_flag,
-		    sub_frame_t subframeP, 
-		    unsigned char sched_subframe, Protocol__FlexranMessage **ul_info);
-
-/*
- * Data plane function for applying the DL decisions of the scheduler
- */
-void flexran_apply_scheduling_decisions(mid_t mod_id, uint32_t frame, uint32_t subframe, int *mbsfn_flag,
-					   Protocol__FlexranMessage *dl_scheduling_info);
-
-/*
- * Data plane function for applying the UE specific DL decisions of the scheduler
- */
-void flexran_apply_ue_spec_scheduling_decisions(mid_t mod_id,
-						uint32_t frame,
-						uint32_t subframe,
-						int *mbsfn_flag,
-						uint32_t n_dl_ue_data,
-						Protocol__FlexDlData **
-						dl_ue_data);
-
-/*
- * Data plane function for filling the DCI structure
- */
-void flexran_fill_oai_dci(mid_t mod_id, uint32_t CC_id, uint32_t rnti,
-			  Protocol__FlexDlDci * dl_dci);
-
-#endif
diff --git a/openair2/LAYER2/MAC/flexran_agent_scheduler_dataplane.c b/openair2/LAYER2/MAC/flexran_agent_scheduler_dataplane.c
deleted file mode 100644
index 6b1c2579b2..0000000000
--- a/openair2/LAYER2/MAC/flexran_agent_scheduler_dataplane.c
+++ /dev/null
@@ -1,583 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-/*! \file flexran_agent_scheduler_dataplane.c
- * \brief data plane procedures related to eNB scheduling
- * \author Xenofon Foukas
- * \date 2016
- * \email: x.foukas@sms.ed.ac.uk
- * \version 0.1
- * @ingroup _mac
-
- */
-
-#include "assertions.h"
-#include "PHY/defs.h"
-#include "PHY/extern.h"
-
-#include "SCHED/defs.h"
-#include "SCHED/extern.h"
-
-#include "LAYER2/MAC/flexran_agent_mac_proto.h"
-#include "LAYER2/MAC/defs.h"
-#include "LAYER2/MAC/proto.h"
-#include "LAYER2/MAC/extern.h"
-#include "LAYER2/MAC/flexran_dci_conversions.h"
-
-#include "UTIL/LOG/log.h"
-#include "UTIL/LOG/vcd_signal_dumper.h"
-#include "UTIL/OPT/opt.h"
-#include "OCG.h"
-#include "OCG_extern.h"
-
-#include "RRC/LITE/extern.h"
-#include "RRC/L2_INTERFACE/openair_rrc_L2_interface.h"
-
-#include "header.pb-c.h"
-#include "flexran.pb-c.h"
-#include "flexran_agent_extern.h"
-
-#include "flexran_agent_common.h"
-
-#include "SIMULATION/TOOLS/defs.h"	// for taus
-
-void
-flexran_apply_dl_scheduling_decisions(mid_t mod_id,
-				      uint32_t frame,
-				      uint32_t subframe,
-				      int *mbsfn_flag,
-				      Protocol__FlexranMessage *
-				      dl_scheduling_info)
-{
-
-    Protocol__FlexDlMacConfig *mac_config =
-	dl_scheduling_info->dl_mac_config_msg;
-
-    // Check if there is anything to schedule for random access
-    if (mac_config->n_dl_rar > 0) {
-	/*TODO: call the random access data plane function */
-    }
-    // Check if there is anything to schedule for paging/broadcast
-    if (mac_config->n_dl_broadcast > 0) {
-	/*TODO: call the broadcast/paging data plane function */
-    }
-    // Check if there is anything to schedule for the UEs
-    if (mac_config->n_dl_ue_data > 0) {
-	flexran_apply_ue_spec_scheduling_decisions(mod_id, frame, subframe,
-						   mbsfn_flag,
-						   mac_config->
-						   n_dl_ue_data,
-						   mac_config->dl_ue_data);
-    }
-
-}
-
-void
-flexran_apply_ue_spec_scheduling_decisions(mid_t mod_id,
-					   uint32_t frame,
-					   uint32_t subframe,
-					   int *mbsfn_flag,
-					   uint32_t n_dl_ue_data,
-					   Protocol__FlexDlData **
-					   dl_ue_data)
-{
-
-    uint8_t CC_id;
-    int UE_id;
-    mac_rlc_status_resp_t rlc_status;
-    unsigned char ta_len = 0;
-    unsigned char header_len = 0, header_len_tmp = 0;
-    unsigned char sdu_lcids[11], offset, num_sdus = 0;
-    uint16_t nb_rb;
-    uint16_t TBS, sdu_lengths[11], rnti, padding = 0, post_padding = 0;
-    unsigned char dlsch_buffer[MAX_DLSCH_PAYLOAD_BYTES];
-    uint8_t round = 0;
-    uint8_t harq_pid = 0;
-    //  LTE_DL_FRAME_PARMS   *frame_parms[MAX_NUM_CCs];
-    LTE_eNB_UE_stats *eNB_UE_stats = NULL;
-    uint16_t sdu_length_total = 0;
-    short ta_update = 0;
-    eNB_MAC_INST *eNB = &eNB_mac_inst[mod_id];
-    UE_list_t *UE_list = &eNB->UE_list;
-    //  static int32_t          tpc_accumulated=0;
-    UE_sched_ctrl *ue_sched_ctl;
-
-    int last_sdu_header_len = 0;
-
-    int i, j;
-
-    Protocol__FlexDlData *dl_data;
-    Protocol__FlexDlDci *dl_dci;
-
-    uint32_t rlc_size, n_lc, lcid;
-
-    // For each UE-related command
-    for (i = 0; i < n_dl_ue_data; i++) {
-
-	dl_data = dl_ue_data[i];
-	dl_dci = dl_data->dl_dci;
-
-	CC_id = dl_data->serv_cell_index;
-	//    frame_parms[CC_id] = mac_xface->get_lte_frame_parms(mod_id, CC_id);
-
-	rnti = dl_data->rnti;
-	UE_id = find_ue(rnti, PHY_vars_eNB_g[mod_id][CC_id]);
-
-	ue_sched_ctl = &UE_list->UE_sched_ctrl[UE_id];
-	eNB_UE_stats = mac_xface->get_eNB_UE_stats(mod_id, CC_id, rnti);
-
-	round = dl_dci->rv[0];
-	harq_pid = dl_dci->harq_process;
-
-	//LOG_I(FLEXRAN_AGENT, "[Frame %d][Subframe %d] Scheduling harq %d\n", frame, subframe, harq_pid);
-	//    LOG_I(FLEXRAN_AGENT, "[Frame %d][Subframe %d]Now scheduling harq_pid %d (round %d)\n", frame, subframe, harq_pid, round);
-
-	// If this is a new transmission
-	if (round == 0) {
-	    // First we have to deal with the creation of the PDU based on the message instructions
-	    rlc_status.bytes_in_buffer = 0;
-
-	    TBS = dl_dci->tbs_size[0];
-
-	    if (dl_data->n_ce_bitmap > 0) {
-		//Check if there is TA command and set the length appropriately
-		ta_len =
-		    (dl_data->
-		     ce_bitmap[0] & PROTOCOL__FLEX_CE_TYPE__FLPCET_TA) ? 2
-		    : 0;
-	    }
-
-	    num_sdus = 0;
-	    sdu_length_total = 0;
-
-	    n_lc = dl_data->n_rlc_pdu;
-	    // Go through each one of the channel commands and create SDUs
-	    header_len = 0;
-	    last_sdu_header_len = 0;
-	    for (j = 0; j < n_lc; j++) {
-		sdu_lengths[j] = 0;
-		lcid =
-		    dl_data->rlc_pdu[j]->rlc_pdu_tb[0]->logical_channel_id;
-		rlc_size = dl_data->rlc_pdu[j]->rlc_pdu_tb[0]->size;
-		LOG_D(MAC,
-		      "[TEST] [eNB %d] [Frame %d] [Subframe %d], LCID %d, CC_id %d, Requesting %d bytes from RLC (RRC message)\n",
-		      mod_id, frame, subframe, lcid, CC_id, rlc_size);
-		if (rlc_size > 0) {
-
-		    rlc_status = mac_rlc_status_ind(mod_id,
-						    rnti,
-						    mod_id,
-						    frame,
-						    subframe,
-						    ENB_FLAG_YES,
-						    MBMS_FLAG_NO, lcid, 0);
-
-		    if (rlc_status.bytes_in_buffer > 0) {
-
-			if (rlc_status.bytes_in_buffer < rlc_size) {
-			    rlc_size = rlc_status.bytes_in_buffer;
-			}
-
-			if (rlc_size <= 2) {
-			    rlc_size = 3;
-			}
-
-			rlc_status = mac_rlc_status_ind(mod_id, rnti, mod_id, frame, subframe, ENB_FLAG_YES, MBMS_FLAG_NO, lcid, rlc_size);	// transport block set size
-
-			LOG_D(MAC,
-			      "[TEST] RLC can give %d bytes for LCID %d during second call\n",
-			      rlc_status.bytes_in_buffer, lcid);
-
-			if (rlc_status.bytes_in_buffer > 0) {
-
-			    sdu_lengths[j] = mac_rlc_data_req(mod_id, rnti, mod_id, frame, ENB_FLAG_YES, MBMS_FLAG_NO, lcid, rlc_size,	//not used
-							      (char *)
-							      &dlsch_buffer
-							      [sdu_length_total]);
-
-			    LOG_D(MAC,
-				  "[eNB %d][LCID %d] CC_id %d Got %d bytes from RLC\n",
-				  mod_id, lcid, CC_id, sdu_lengths[j]);
-			    sdu_length_total += sdu_lengths[j];
-			    sdu_lcids[j] = lcid;
-
-			    UE_list->
-				eNB_UE_stats[CC_id][UE_id].num_pdu_tx[lcid]
-				+= 1;
-			    UE_list->
-				eNB_UE_stats[CC_id][UE_id].num_bytes_tx
-				[lcid] += sdu_lengths[j];
-
-			    if (sdu_lengths[j] < 128) {
-				header_len += 2;
-				last_sdu_header_len = 2;
-			    } else {
-				header_len += 3;
-				last_sdu_header_len = 3;
-			    }
-			    num_sdus++;
-			}
-		    }
-		}
-	    }			// SDU creation end
-
-
-	    if (((sdu_length_total + header_len + ta_len) > 0)) {
-
-		header_len_tmp = header_len;
-
-		// If we have only a single SDU, header length becomes 1
-		if ((num_sdus) == 1) {
-		    //if (header_len == 2 || header_len == 3) {
-		    header_len = 1;
-		} else {
-		    header_len = (header_len - last_sdu_header_len) + 1;
-		}
-
-		// If we need a 1 or 2 bit padding or no padding at all
-		if ((TBS - header_len - sdu_length_total - ta_len) <= 2 || (TBS - header_len - sdu_length_total - ta_len) > TBS) {	//protect from overflow
-		    padding =
-			(TBS - header_len - sdu_length_total - ta_len);
-		    post_padding = 0;
-		} else {	// The last sdu needs to have a length field, since we add padding
-		    padding = 0;
-		    header_len = header_len_tmp;
-		    post_padding = TBS - sdu_length_total - header_len - ta_len;	// 1 is for the postpadding header
-		}
-
-		if (ta_len > 0) {
-		    // Reset the measurement
-		    ta_update = flexran_get_TA(mod_id, UE_id, CC_id);
-		    ue_sched_ctl->ta_timer = 20;
-		    eNB_UE_stats->timing_advance_update = 0;
-		} else {
-		    ta_update = 0;
-		}
-
-		// If there is nothing to schedule, just leave
-		if ((sdu_length_total) <= 0) {
-		    harq_pid_updated[UE_id][harq_pid] = 1;
-		    harq_pid_round[UE_id][harq_pid] = 0;
-		    continue;
-		}
-		//      LOG_I(FLEXRAN_AGENT, "[Frame %d][Subframe %d] TBS is %d and bytes are %d\n", frame, subframe, TBS, sdu_length_total);
-
-		offset = generate_dlsch_header((unsigned char *) UE_list->DLSCH_pdu[CC_id][0][UE_id].payload[0], num_sdus,	//num_sdus
-					       sdu_lengths,	//
-					       sdu_lcids, 255,	// no drx
-					       ta_update,	// timing advance
-					       NULL,	// contention res id
-					       padding, post_padding);
-
-#ifdef DEBUG_eNB_SCHEDULER
-		LOG_T(MAC, "[eNB %d] First 16 bytes of DLSCH : \n");
-
-		for (i = 0; i < 16; i++) {
-		    LOG_T(MAC, "%x.", dlsch_buffer[i]);
-		}
-
-		LOG_T(MAC, "\n");
-#endif
-		// cycle through SDUs and place in dlsch_buffer
-		memcpy(&UE_list->DLSCH_pdu[CC_id][0][UE_id].
-		       payload[0][offset], dlsch_buffer, sdu_length_total);
-		// memcpy(&eNB_mac_inst[0].DLSCH_pdu[0][0].payload[0][offset],dcch_buffer,sdu_lengths[0]);
-
-		// fill remainder of DLSCH with random data
-		for (j = 0; j < (TBS - sdu_length_total - offset); j++) {
-		    UE_list->DLSCH_pdu[CC_id][0][UE_id].payload[0][offset +
-								   sdu_length_total
-								   + j] =
-			(char) (taus() & 0xff);
-		}
-
-		//eNB_mac_inst[0].DLSCH_pdu[0][0].payload[0][offset+sdu_lengths[0]+j] = (char)(taus()&0xff);
-		if (opt_enabled == 1) {
-		    trace_pdu(1,
-			      (uint8_t *)
-			      UE_list->DLSCH_pdu[CC_id][0][UE_id].
-			      payload[0], TBS, mod_id, 3, UE_RNTI(mod_id,
-								  UE_id),
-			      eNB->frame, eNB->subframe, 0, 0);
-		    LOG_D(OPT,
-			  "[eNB %d][DLSCH] CC_id %d Frame %d  rnti %x  with size %d\n",
-			  mod_id, CC_id, frame, UE_RNTI(mod_id, UE_id),
-			  TBS);
-		}
-		// store stats
-		eNB->eNB_stats[CC_id].dlsch_bytes_tx += sdu_length_total;
-		eNB->eNB_stats[CC_id].dlsch_pdus_tx += 1;
-		UE_list->eNB_UE_stats[CC_id][UE_id].dl_cqi =
-		    eNB_UE_stats->DL_cqi[0];
-
-		UE_list->eNB_UE_stats[CC_id][UE_id].crnti = rnti;
-		UE_list->eNB_UE_stats[CC_id][UE_id].rrc_status =
-		    mac_eNB_get_rrc_status(mod_id, rnti);
-		UE_list->eNB_UE_stats[CC_id][UE_id].harq_pid = harq_pid;
-		UE_list->eNB_UE_stats[CC_id][UE_id].harq_round = round;
-
-		//nb_rb = UE_list->UE_template[CC_id][UE_id].nb_rb[harq_pid];
-		//Find the number of resource blocks and set them to the template for retransmissions
-		nb_rb = get_min_rb_unit(mod_id, CC_id);
-		uint16_t stats_tbs =
-		    mac_xface->get_TBS_DL(dl_dci->mcs[0], nb_rb);
-
-		while (stats_tbs < TBS) {
-		    nb_rb += get_min_rb_unit(mod_id, CC_id);
-		    stats_tbs =
-			mac_xface->get_TBS_DL(dl_dci->mcs[0], nb_rb);
-		}
-
-		//      LOG_I(FLEXRAN_AGENT, "The MCS was %d\n", dl_dci->mcs[0]);
-
-		UE_list->eNB_UE_stats[CC_id][UE_id].rbs_used = nb_rb;
-		UE_list->eNB_UE_stats[CC_id][UE_id].total_rbs_used +=
-		    nb_rb;
-		UE_list->eNB_UE_stats[CC_id][UE_id].dlsch_mcs1 =
-		    dl_dci->mcs[0];
-		UE_list->eNB_UE_stats[CC_id][UE_id].dlsch_mcs2 =
-		    dl_dci->mcs[0];
-		UE_list->eNB_UE_stats[CC_id][UE_id].TBS = TBS;
-
-		UE_list->eNB_UE_stats[CC_id][UE_id].overhead_bytes =
-		    TBS - sdu_length_total;
-		UE_list->eNB_UE_stats[CC_id][UE_id].total_sdu_bytes +=
-		    sdu_length_total;
-		UE_list->eNB_UE_stats[CC_id][UE_id].total_pdu_bytes += TBS;
-		UE_list->eNB_UE_stats[CC_id][UE_id].total_num_pdus += 1;
-
-		//eNB_UE_stats->dlsch_mcs1 = cqi_to_mcs[eNB_UE_stats->DL_cqi[0]];
-		//eNB_UE_stats->dlsch_mcs1 = cmin(eNB_UE_stats->dlsch_mcs1, openair_daq_vars.target_ue_dl_mcs);
-	    } else {
-		LOG_D(FLEXRAN_AGENT,
-		      "No need to schedule a dci after all. Just drop it\n");
-		harq_pid_updated[UE_id][harq_pid] = 1;
-		harq_pid_round[UE_id][harq_pid] = 0;
-		continue;
-	    }
-	} else {
-	    // No need to create anything apart of DCI in case of retransmission
-	    /*TODO: Must add these */
-	    //      eNB_UE_stats->dlsch_trials[round]++;
-	    //UE_list->eNB_UE_stats[CC_id][UE_id].num_retransmission+=1;
-	    //UE_list->eNB_UE_stats[CC_id][UE_id].rbs_used_retx=nb_rb;
-	    //UE_list->eNB_UE_stats[CC_id][UE_id].total_rbs_used_retx+=nb_rb;
-	    //UE_list->eNB_UE_stats[CC_id][UE_id].ncce_used_retx=nCCECC_id];
-	}
-
-	//    UE_list->UE_template[CC_id][UE_id].oldNDI[dl_dci->harq_process] = dl_dci->ndi[0];
-	//    eNB_UE_stats->dlsch_mcs1 = dl_dci->mcs[0];
-
-	//Fill the proper DCI of OAI
-	flexran_fill_oai_dci(mod_id, CC_id, rnti, dl_dci);
-    }
-}
-
-void
-flexran_fill_oai_dci(mid_t mod_id, uint32_t CC_id, uint32_t rnti,
-		     Protocol__FlexDlDci * dl_dci)
-{
-
-    void *DLSCH_dci = NULL;
-    DCI_PDU *DCI_pdu;
-
-    unsigned char harq_pid = 0;
-    //  unsigned char round = 0;
-    LTE_DL_FRAME_PARMS *frame_parms[MAX_NUM_CCs];
-    int size_bits = 0, size_bytes = 0;
-    eNB_MAC_INST *eNB = &eNB_mac_inst[mod_id];
-    UE_list_t *UE_list = &eNB->UE_list;
-    LTE_eNB_UE_stats *eNB_UE_stats = NULL;
-
-    int UE_id = find_ue(rnti, PHY_vars_eNB_g[mod_id][CC_id]);
-
-    uint32_t format;
-
-    harq_pid = dl_dci->harq_process;
-    //  round = dl_dci->rv[0];
-
-    // Note this code is for a specific DCI format
-    DLSCH_dci =
-	(void *) UE_list->UE_template[CC_id][UE_id].DLSCH_DCI[harq_pid];
-    DCI_pdu = &eNB->common_channels[CC_id].DCI_pdu;
-
-    frame_parms[CC_id] = mac_xface->get_lte_frame_parms(mod_id, CC_id);
-
-    if (dl_dci->has_tpc == 1) {
-	// Check if tpc has been set and reset measurement */
-	if ((dl_dci->tpc == 0) || (dl_dci->tpc == 2)) {
-	    eNB_UE_stats =
-		mac_xface->get_eNB_UE_stats(mod_id, CC_id, rnti);
-	    eNB_UE_stats->Po_PUCCH_update = 0;
-	}
-    }
-
-
-    switch (frame_parms[CC_id]->N_RB_DL) {
-    case 6:
-	if (frame_parms[CC_id]->frame_type == TDD) {
-	    if (dl_dci->format == PROTOCOL__FLEX_DCI_FORMAT__FLDCIF_1) {
-		FILL_DCI_TDD_1(DCI1_1_5MHz_TDD_t, DLSCH_dci, dl_dci);
-		size_bytes = sizeof(DCI1_1_5MHz_TDD_t);
-		size_bits = sizeof_DCI1_1_5MHz_TDD_t;
-	    } else if (dl_dci->format ==
-		       PROTOCOL__FLEX_DCI_FORMAT__FLDCIF_2A) {
-		//TODO
-	    } else if (dl_dci->format ==
-		       PROTOCOL__FLEX_DCI_FORMAT__FLDCIF_1D) {
-		//TODO
-	    }
-	} else {
-	    if (dl_dci->format == PROTOCOL__FLEX_DCI_FORMAT__FLDCIF_1) {
-		FILL_DCI_FDD_1(DCI1_1_5MHz_FDD_t, DLSCH_dci, dl_dci);
-		size_bytes = sizeof(DCI1_1_5MHz_FDD_t);
-		size_bits = sizeof_DCI1_1_5MHz_FDD_t;
-	    } else if (dl_dci->format ==
-		       PROTOCOL__FLEX_DCI_FORMAT__FLDCIF_2A) {
-		//TODO
-	    } else if (dl_dci->format ==
-		       PROTOCOL__FLEX_DCI_FORMAT__FLDCIF_1D) {
-		//TODO
-	    }
-	}
-	break;
-    case 25:
-	if (frame_parms[CC_id]->frame_type == TDD) {
-	    if (dl_dci->format == PROTOCOL__FLEX_DCI_FORMAT__FLDCIF_1) {
-		FILL_DCI_TDD_1(DCI1_5MHz_TDD_t, DLSCH_dci, dl_dci);
-		size_bytes = sizeof(DCI1_5MHz_TDD_t);
-		size_bits = sizeof_DCI1_5MHz_TDD_t;
-	    } else if (dl_dci->format ==
-		       PROTOCOL__FLEX_DCI_FORMAT__FLDCIF_2A) {
-		//TODO
-	    } else if (dl_dci->format ==
-		       PROTOCOL__FLEX_DCI_FORMAT__FLDCIF_1D) {
-		//TODO
-	    }
-	} else {
-	    if (dl_dci->format == PROTOCOL__FLEX_DCI_FORMAT__FLDCIF_1) {
-		FILL_DCI_FDD_1(DCI1_5MHz_FDD_t, DLSCH_dci, dl_dci);
-		size_bytes = sizeof(DCI1_5MHz_FDD_t);
-		size_bits = sizeof_DCI1_5MHz_FDD_t;
-	    } else if (dl_dci->format ==
-		       PROTOCOL__FLEX_DCI_FORMAT__FLDCIF_2A) {
-		//TODO
-	    } else if (dl_dci->format ==
-		       PROTOCOL__FLEX_DCI_FORMAT__FLDCIF_1D) {
-		//TODO
-	    }
-	}
-	break;
-    case 50:
-	if (frame_parms[CC_id]->frame_type == TDD) {
-	    if (dl_dci->format == PROTOCOL__FLEX_DCI_FORMAT__FLDCIF_1) {
-		FILL_DCI_TDD_1(DCI1_10MHz_TDD_t, DLSCH_dci, dl_dci);
-		size_bytes = sizeof(DCI1_10MHz_TDD_t);
-		size_bits = sizeof_DCI1_10MHz_TDD_t;
-	    } else if (dl_dci->format ==
-		       PROTOCOL__FLEX_DCI_FORMAT__FLDCIF_2A) {
-		//TODO
-	    } else if (dl_dci->format ==
-		       PROTOCOL__FLEX_DCI_FORMAT__FLDCIF_1D) {
-		//TODO
-	    }
-	} else {
-	    if (dl_dci->format == PROTOCOL__FLEX_DCI_FORMAT__FLDCIF_1) {
-		FILL_DCI_FDD_1(DCI1_10MHz_FDD_t, DLSCH_dci, dl_dci);
-		size_bytes = sizeof(DCI1_10MHz_FDD_t);
-		size_bits = sizeof_DCI1_10MHz_FDD_t;
-	    } else if (dl_dci->format ==
-		       PROTOCOL__FLEX_DCI_FORMAT__FLDCIF_2A) {
-		//TODO
-	    } else if (dl_dci->format ==
-		       PROTOCOL__FLEX_DCI_FORMAT__FLDCIF_1D) {
-		//TODO
-	    }
-	}
-	break;
-    case 100:
-	if (frame_parms[CC_id]->frame_type == TDD) {
-	    if (dl_dci->format == PROTOCOL__FLEX_DCI_FORMAT__FLDCIF_1) {
-		FILL_DCI_TDD_1(DCI1_20MHz_TDD_t, DLSCH_dci, dl_dci);
-		size_bytes = sizeof(DCI1_20MHz_TDD_t);
-		size_bits = sizeof_DCI1_20MHz_TDD_t;
-	    } else if (dl_dci->format ==
-		       PROTOCOL__FLEX_DCI_FORMAT__FLDCIF_2A) {
-		//TODO
-	    } else if (dl_dci->format ==
-		       PROTOCOL__FLEX_DCI_FORMAT__FLDCIF_1D) {
-		//TODO
-	    }
-	} else {
-	    if (dl_dci->format == PROTOCOL__FLEX_DCI_FORMAT__FLDCIF_1) {
-		FILL_DCI_FDD_1(DCI1_20MHz_FDD_t, DLSCH_dci, dl_dci);
-		size_bytes = sizeof(DCI1_20MHz_FDD_t);
-		size_bits = sizeof_DCI1_20MHz_FDD_t;
-	    } else if (dl_dci->format ==
-		       PROTOCOL__FLEX_DCI_FORMAT__FLDCIF_2A) {
-		//TODO
-	    } else if (dl_dci->format ==
-		       PROTOCOL__FLEX_DCI_FORMAT__FLDCIF_1D) {
-		//TODO
-	    }
-	}
-	break;
-    }
-
-    //Set format to the proper type
-    switch (dl_dci->format) {
-    case PROTOCOL__FLEX_DCI_FORMAT__FLDCIF_1:
-	format = format1;
-	break;
-    case PROTOCOL__FLEX_DCI_FORMAT__FLDCIF_1A:
-	format = format1A;
-	break;
-    case PROTOCOL__FLEX_DCI_FORMAT__FLDCIF_1B:
-	format = format1B;
-	break;
-    case PROTOCOL__FLEX_DCI_FORMAT__FLDCIF_1C:
-	format = format1C;
-	break;
-    case PROTOCOL__FLEX_DCI_FORMAT__FLDCIF_1D:
-	format = format1E_2A_M10PRB;
-	break;
-    case PROTOCOL__FLEX_DCI_FORMAT__FLDCIF_2:
-	format = format2;
-	break;
-    case PROTOCOL__FLEX_DCI_FORMAT__FLDCIF_2A:
-	format = format2A;
-	break;
-    case PROTOCOL__FLEX_DCI_FORMAT__FLDCIF_2B:
-	format = format2B;
-	break;
-    case PROTOCOL__FLEX_DCI_FORMAT__FLDCIF_3:
-	format = 3;
-	break;
-    default:
-	/*TODO: Need to deal with unsupported DCI type */
-	return;
-    }
-
-    add_ue_spec_dci(DCI_pdu,
-		    DLSCH_dci,
-		    rnti,
-		    size_bytes, dl_dci->aggr_level, size_bits, format, 0);
-}
diff --git a/openair2/LAYER2/MAC/flexran_agent_scheduler_dlsch_ue.c b/openair2/LAYER2/MAC/flexran_agent_scheduler_dlsch_ue.c
deleted file mode 100644
index 6445fa0845..0000000000
--- a/openair2/LAYER2/MAC/flexran_agent_scheduler_dlsch_ue.c
+++ /dev/null
@@ -1,1814 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-/*! \file flexran_agent_scheduler_dlsch_ue.c
- * \brief procedures related to eNB for the DLSCH transport channel
- * \author Xenofon Foukas, Navid Nikaein and Raymond Knopp
- * \date 2016
- * \email: x.foukas@sms.ed.ac.uk
- * \version 0.1
- * @ingroup _mac
-
- */
-
-#include "assertions.h"
-#include "PHY/defs.h"
-#include "PHY/extern.h"
-
-#include "SCHED/defs.h"
-#include "SCHED/extern.h"
-
-#include "LAYER2/MAC/flexran_agent_mac_proto.h"
-#include "LAYER2/MAC/defs.h"
-#include "LAYER2/MAC/proto.h"
-#include "LAYER2/MAC/extern.h"
-#include "UTIL/LOG/log.h"
-#include "UTIL/LOG/vcd_signal_dumper.h"
-#include "UTIL/OPT/opt.h"
-#include "OCG.h"
-#include "OCG_extern.h"
-
-#include "RRC/LITE/extern.h"
-#include "RRC/L2_INTERFACE/openair_rrc_L2_interface.h"
-
-#include "ENB_APP/flexran_agent_defs.h"
-#include "flexran_agent_ran_api.h"
-#include "pdcp.h"
-
-#include "header.pb-c.h"
-#include "flexran.pb-c.h"
-#include "flexran_agent_mac.h"
-#include <dlfcn.h>
-
-#include "SIMULATION/TOOLS/defs.h"	// for taus
-
-#if defined(ENABLE_ITTI)
-#include "intertask_interface.h"
-#endif
-
-#define ENABLE_MAC_PAYLOAD_DEBUG
-
-/**
- * Local variables to support slicing
- * 
- */
-
-
-/*!\brief  UE ULSCH scheduling states*/
-typedef enum {
-    MIN_SLICE_STRATEGY = 0,
-    SLICE_MASK,
-    UEID_TO_SLICEID,
-    MAX_SLICE_STRATEGY
-} SLICING_STRATEGY;
-
-// this assumes a max of of 16 UE per eNB/CC
-#define SLICE0_MASK 0x000f
-#define SLICE1_MASK 0x00f0
-#define SLICE2_MASK 0x0f00
-#define SLICE3_MASK 0xf000
-
-
-// number of active slices for  past and current time
-int n_active_slices = 1;
-int n_active_slices_current = 1;
-
-// ue to slice mapping
-int slicing_strategy = UEID_TO_SLICEID;
-int slicing_strategy_current = UEID_TO_SLICEID;
-
-// RB share for each slice for past and current time
-float avg_slice_percentage=0.25;
-float slice_percentage[MAX_NUM_SLICES] = {1.0, 0.0, 0.0, 0.0};
-float slice_percentage_current[MAX_NUM_SLICES] = {1.0, 0.0, 0.0, 0.0};
-float total_slice_percentage = 0;
-float total_slice_percentage_current = 0;
-
-// MAX MCS for each slice for past and current time
-int slice_maxmcs[MAX_NUM_SLICES] = { 28, 28, 28, 28 };
-int slice_maxmcs_current[MAX_NUM_SLICES] = { 28, 28, 28, 28 };
-
-int update_dl_scheduler[MAX_NUM_SLICES] = { 1, 1, 1, 1 };
-int update_dl_scheduler_current[MAX_NUM_SLICES] = { 1, 1, 1, 1 };
-
-// name of available scheduler
-char *dl_scheduler_type[MAX_NUM_SLICES] =
-    { "flexran_schedule_ue_spec_embb",
-    "flexran_schedule_ue_spec_urllc",
-    "flexran_schedule_ue_spec_mmtc",
-    "flexran_schedule_ue_spec_be"	// best effort 
-};
-
-// pointer to the slice specific scheduler 
-slice_scheduler_dl slice_sched_dl[MAX_NUM_SLICES] = {0};
-
-
-/**
- * preprocessor functions for scheduling
- *
- */
-
-
-// This function stores the downlink buffer for all the logical channels
-void
-_store_dlsch_buffer(module_id_t Mod_id,
-		    int slice_id, frame_t frameP, sub_frame_t subframeP)
-{
-
-    int UE_id, i;
-    rnti_t rnti;
-    mac_rlc_status_resp_t rlc_status;
-    UE_list_t *UE_list = &eNB_mac_inst[Mod_id].UE_list;
-    UE_TEMPLATE *UE_template;
-
-    for (UE_id = 0; UE_id < NUMBER_OF_UE_MAX; UE_id++) {
-	if (UE_list->active[UE_id] != TRUE)
-	    continue;
-
-	if (flexran_slice_member(UE_id, slice_id) == 0)
-	    continue;
-
-	UE_template =
-	    &UE_list->UE_template[UE_PCCID(Mod_id, UE_id)][UE_id];
-
-	// clear logical channel interface variables
-	UE_template->dl_buffer_total = 0;
-	UE_template->dl_pdus_total = 0;
-
-	for (i = 0; i < MAX_NUM_LCID; i++) {
-	    UE_template->dl_buffer_info[i] = 0;
-	    UE_template->dl_pdus_in_buffer[i] = 0;
-	    UE_template->dl_buffer_head_sdu_creation_time[i] = 0;
-	    UE_template->dl_buffer_head_sdu_remaining_size_to_send[i] = 0;
-	}
-
-	rnti = UE_RNTI(Mod_id, UE_id);
-
-	for (i = 0; i < MAX_NUM_LCID; i++) {	// loop over all the logical channels
-
-	    rlc_status =
-		mac_rlc_status_ind(Mod_id, rnti, Mod_id, frameP, subframeP,
-				   ENB_FLAG_YES, MBMS_FLAG_NO, i, 0);
-	    UE_template->dl_buffer_info[i] = rlc_status.bytes_in_buffer;	//storing the dlsch buffer for each logical channel
-	    UE_template->dl_pdus_in_buffer[i] = rlc_status.pdus_in_buffer;
-	    UE_template->dl_buffer_head_sdu_creation_time[i] =
-		rlc_status.head_sdu_creation_time;
-	    UE_template->dl_buffer_head_sdu_creation_time_max =
-		cmax(UE_template->dl_buffer_head_sdu_creation_time_max,
-		     rlc_status.head_sdu_creation_time);
-	    UE_template->dl_buffer_head_sdu_remaining_size_to_send[i] =
-		rlc_status.head_sdu_remaining_size_to_send;
-	    UE_template->dl_buffer_head_sdu_is_segmented[i] =
-		rlc_status.head_sdu_is_segmented;
-	    UE_template->dl_buffer_total += UE_template->dl_buffer_info[i];	//storing the total dlsch buffer
-	    UE_template->dl_pdus_total +=
-		UE_template->dl_pdus_in_buffer[i];
-
-#ifdef DEBUG_eNB_SCHEDULER
-
-	    /* note for dl_buffer_head_sdu_remaining_size_to_send[i] :
-	     * 0 if head SDU has not been segmented (yet), else remaining size not already segmented and sent
-	     */
-	    if (UE_template->dl_buffer_info[i] > 0)
-		LOG_D(MAC,
-		      "[eNB %d][SLICE %d] Frame %d Subframe %d : RLC status for UE %d in LCID%d: total of %d pdus and size %d, head sdu queuing time %d, remaining size %d, is segmeneted %d \n",
-		      Mod_id, slice_id, frameP, subframeP, UE_id,
-		      i, UE_template->dl_pdus_in_buffer[i],
-		      UE_template->dl_buffer_info[i],
-		      UE_template->dl_buffer_head_sdu_creation_time[i],
-		      UE_template->
-		      dl_buffer_head_sdu_remaining_size_to_send[i],
-		      UE_template->dl_buffer_head_sdu_is_segmented[i]);
-
-#endif
-
-	}
-
-	//#ifdef DEBUG_eNB_SCHEDULER
-	if (UE_template->dl_buffer_total > 0)
-	    LOG_D(MAC,
-		  "[eNB %d] Frame %d Subframe %d : RLC status for UE %d : total DL buffer size %d and total number of pdu %d \n",
-		  Mod_id, frameP, subframeP, UE_id,
-		  UE_template->dl_buffer_total,
-		  UE_template->dl_pdus_total);
-
-	//#endif
-    }
-}
-
-
-// This function returns the estimated number of RBs required by each UE for downlink scheduling
-void
-_assign_rbs_required(module_id_t Mod_id,
-		     int slice_id,
-		     frame_t frameP,
-		     sub_frame_t subframe,
-		     uint16_t
-		     nb_rbs_required[MAX_NUM_CCs][NUMBER_OF_UE_MAX],
-		     uint16_t nb_rbs_allowed_slice[MAX_NUM_CCs]
-		     [MAX_NUM_SLICES], int min_rb_unit[MAX_NUM_CCs])
-{
-
-
-    rnti_t rnti;
-    uint16_t TBS = 0;
-    LTE_eNB_UE_stats *eNB_UE_stats[MAX_NUM_CCs];
-    int UE_id, n, i, j, CC_id, pCCid, tmp;
-    UE_list_t *UE_list = &eNB_mac_inst[Mod_id].UE_list;
-    //  UE_TEMPLATE           *UE_template;
-
-    // clear rb allocations across all CC_ids
-    for (UE_id = 0; UE_id < NUMBER_OF_UE_MAX; UE_id++) {
-	if (UE_list->active[UE_id] != TRUE)
-	    continue;
-
-	if (flexran_slice_member(UE_id, slice_id) == 0)
-	    continue;
-
-	pCCid = UE_PCCID(Mod_id, UE_id);
-	rnti = UE_list->UE_template[pCCid][UE_id].rnti;
-
-	/* skip UE not present in PHY (for any of its active CCs) */
-	if (!phy_stats_exist(Mod_id, rnti))
-	    continue;
-
-	//update CQI information across component carriers
-	for (n = 0; n < UE_list->numactiveCCs[UE_id]; n++) {
-	    CC_id = UE_list->ordered_CCids[n][UE_id];
-	    eNB_UE_stats[CC_id] =
-		mac_xface->get_eNB_UE_stats(Mod_id, CC_id, rnti);
-	    eNB_UE_stats[CC_id]->dlsch_mcs1 =
-		cqi_to_mcs[flexran_get_ue_wcqi(Mod_id, UE_id)];
-	}
-
-	// provide the list of CCs sorted according to MCS
-	for (i = 0; i < UE_list->numactiveCCs[UE_id]; i++) {
-	    for (j = i + 1; j < UE_list->numactiveCCs[UE_id]; j++) {
-		DevAssert(j < MAX_NUM_CCs);
-
-		if (eNB_UE_stats[UE_list->ordered_CCids[i][UE_id]]->
-		    dlsch_mcs1 >
-		    eNB_UE_stats[UE_list->ordered_CCids[j][UE_id]]->
-		    dlsch_mcs1) {
-		    tmp = UE_list->ordered_CCids[i][UE_id];
-		    UE_list->ordered_CCids[i][UE_id] =
-			UE_list->ordered_CCids[j][UE_id];
-		    UE_list->ordered_CCids[j][UE_id] = tmp;
-		}
-	    }
-	}
-	/* NN --> RK
-	 * check the index of UE_template"
-	 */
-	if (UE_list->UE_template[pCCid][UE_id].dl_buffer_total> 0) {
-	  LOG_D(MAC,"[preprocessor] assign RB for UE %d\n",UE_id);
-	  
-	  for (i=0; i<UE_list->numactiveCCs[UE_id]; i++) {
-	    CC_id = UE_list->ordered_CCids[i][UE_id];
-	    eNB_UE_stats[CC_id] = mac_xface->get_eNB_UE_stats(Mod_id,CC_id,rnti);
-	    
-	    if (cqi_to_mcs[flexran_get_ue_wcqi(Mod_id, UE_id)] == 0) {//eNB_UE_stats[CC_id]->dlsch_mcs1==0) {
-	      nb_rbs_required[CC_id][UE_id] = 4;  // don't let the TBS get too small
-	    } else {
-	      nb_rbs_required[CC_id][UE_id] = min_rb_unit[CC_id];
-	    }
-	    
-	    TBS = mac_xface->get_TBS_DL(cqi_to_mcs[flexran_get_ue_wcqi(Mod_id, UE_id)], nb_rbs_required[CC_id][UE_id]);
-	    nb_rbs_allowed_slice[CC_id][slice_id] = flexran_nb_rbs_allowed_slice(slice_percentage[slice_id],
-										 flexran_get_N_RB_DL(Mod_id, CC_id));
-	    LOG_D(MAC,"[preprocessor] start RB assignement for UE %d CC_id %d dl buffer %d (RB unit %d, MCS %d, TBS %d) \n",
-		  UE_id, CC_id, UE_list->UE_template[pCCid][UE_id].dl_buffer_total,
-		  nb_rbs_required[CC_id][UE_id], flexran_get_ue_wcqi(Mod_id, UE_id), TBS);
-	    
-	    /* calculating required number of RBs for each UE */
-	    while (TBS < UE_list->UE_template[pCCid][UE_id].dl_buffer_total)  {
-	      nb_rbs_required[CC_id][UE_id] += min_rb_unit[CC_id];
-	      
-	      if (nb_rbs_required[CC_id][UE_id] > nb_rbs_allowed_slice[CC_id][slice_id]) {
-		TBS = mac_xface->get_TBS_DL(cqi_to_mcs[flexran_get_ue_wcqi(Mod_id, UE_id)], nb_rbs_allowed_slice[CC_id][slice_id]);
-		nb_rbs_required[CC_id][UE_id] = nb_rbs_allowed_slice[CC_id][slice_id];
-		break;
-	      }
-	      
-	      TBS = mac_xface->get_TBS_DL(cqi_to_mcs[flexran_get_ue_wcqi(Mod_id, UE_id)], nb_rbs_required[CC_id][UE_id]);
-	    } // end of while
-	    
-	    LOG_D(MAC,"[eNB %d][SLICE %d] Frame %d: UE %d on CC %d: RB unit %d,  nb_required RB %d (TBS %d, mcs %d)\n",
-		  Mod_id, slice_id,frameP,UE_id, CC_id,  min_rb_unit[CC_id], nb_rbs_required[CC_id][UE_id], TBS, cqi_to_mcs[flexran_get_ue_wcqi(Mod_id, UE_id)]);
-	  }
-	}
-    }
-}
-
-void
-_dlsch_scheduler_pre_processor_allocate(module_id_t Mod_id,
-					int UE_id,
-					uint8_t CC_id,
-					int N_RBG,
-					int transmission_mode,
-					int min_rb_unit,
-					uint8_t N_RB_DL,
-					uint16_t
-					nb_rbs_required[MAX_NUM_CCs]
-					[NUMBER_OF_UE_MAX],
-					uint16_t
-					nb_rbs_required_remaining
-					[MAX_NUM_CCs]
-					[NUMBER_OF_UE_MAX], unsigned char
-					rballoc_sub[MAX_NUM_CCs]
-					[N_RBG_MAX], unsigned char
-					MIMO_mode_indicator
-					[MAX_NUM_CCs][N_RBG_MAX])
-{
-    int i;
-    UE_list_t *UE_list = &eNB_mac_inst[Mod_id].UE_list;
-    UE_sched_ctrl *ue_sched_ctl = &UE_list->UE_sched_ctrl[UE_id];
-
-    for (i = 0; i < N_RBG; i++) {
-
-	if ((rballoc_sub[CC_id][i] == 0) &&
-	    (ue_sched_ctl->rballoc_sub_UE[CC_id][i] == 0) &&
-	    (nb_rbs_required_remaining[CC_id][UE_id] > 0) &&
-	    (ue_sched_ctl->pre_nb_available_rbs[CC_id] <
-	     nb_rbs_required[CC_id][UE_id])) {
-
-	    // if this UE is not scheduled for TM5
-	    if (ue_sched_ctl->dl_pow_off[CC_id] != 0) {
-
-		if ((i == N_RBG - 1)
-		    && ((N_RB_DL == 25) || (N_RB_DL == 50))) {
-		    rballoc_sub[CC_id][i] = 1;
-		    ue_sched_ctl->rballoc_sub_UE[CC_id][i] = 1;
-		    MIMO_mode_indicator[CC_id][i] = 1;
-		    if (transmission_mode == 5) {
-			ue_sched_ctl->dl_pow_off[CC_id] = 1;
-		    }
-		    nb_rbs_required_remaining[CC_id][UE_id] =
-			nb_rbs_required_remaining[CC_id][UE_id] -
-			min_rb_unit + 1;
-		    ue_sched_ctl->pre_nb_available_rbs[CC_id] =
-			ue_sched_ctl->pre_nb_available_rbs[CC_id] +
-			min_rb_unit - 1;
-		} else {
-		    if (nb_rbs_required_remaining[CC_id][UE_id] >=
-			min_rb_unit) {
-			rballoc_sub[CC_id][i] = 1;
-			ue_sched_ctl->rballoc_sub_UE[CC_id][i] = 1;
-			MIMO_mode_indicator[CC_id][i] = 1;
-			if (transmission_mode == 5) {
-			    ue_sched_ctl->dl_pow_off[CC_id] = 1;
-			}
-			nb_rbs_required_remaining[CC_id][UE_id] =
-			    nb_rbs_required_remaining[CC_id][UE_id] -
-			    min_rb_unit;
-			ue_sched_ctl->pre_nb_available_rbs[CC_id] =
-			    ue_sched_ctl->pre_nb_available_rbs[CC_id] +
-			    min_rb_unit;
-		    }
-		}
-	    }			// dl_pow_off[CC_id][UE_id] ! = 0
-	}
-    }
-}
-
-void
-_dlsch_scheduler_pre_processor_reset(int module_idP,
-				     int UE_id,
-				     uint8_t CC_id,
-				     int frameP,
-				     int subframeP,
-				     int N_RBG,
-				     uint16_t nb_rbs_required[MAX_NUM_CCs]
-				     [NUMBER_OF_UE_MAX],
-				     uint16_t
-				     nb_rbs_required_remaining
-				     [MAX_NUM_CCs][NUMBER_OF_UE_MAX],
-				     uint16_t
-				     nb_rbs_allowed_slice[MAX_NUM_CCs]
-				     [MAX_NUM_SLICES], unsigned char
-				     rballoc_sub[MAX_NUM_CCs]
-				     [N_RBG_MAX], unsigned char
-				     MIMO_mode_indicator[MAX_NUM_CCs]
-				     [N_RBG_MAX])
-{
-    int i, j;
-    UE_list_t *UE_list = &eNB_mac_inst[module_idP].UE_list;
-    UE_sched_ctrl *ue_sched_ctl = &UE_list->UE_sched_ctrl[UE_id];
-    uint8_t *vrb_map =
-	eNB_mac_inst[module_idP].common_channels[CC_id].vrb_map;
-    int RBGsize =
-	PHY_vars_eNB_g[module_idP][CC_id]->frame_parms.N_RB_DL / N_RBG;
-#ifdef SF05_LIMIT
-    //int subframe05_limit=0;
-    int sf05_upper = -1, sf05_lower = -1;
-#endif
-    //  LTE_eNB_UE_stats *eNB_UE_stats = mac_xface->get_eNB_UE_stats(module_idP,CC_id,rnti);
-
-    flexran_update_TA(module_idP, UE_id, CC_id);
-
-    if (UE_id == 0) {
-	VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME
-	    (VCD_SIGNAL_DUMPER_VARIABLES_UE0_TIMING_ADVANCE,
-	     ue_sched_ctl->ta_update);
-    }
-    nb_rbs_required[CC_id][UE_id] = 0;
-    ue_sched_ctl->pre_nb_available_rbs[CC_id] = 0;
-    ue_sched_ctl->dl_pow_off[CC_id] = 2;
-    nb_rbs_required_remaining[CC_id][UE_id] = 0;
-    for (i = 0; i < n_active_slices; i++)
-	nb_rbs_allowed_slice[CC_id][i] = 0;
-#ifdef SF05_LIMIT
-    switch (N_RBG) {
-    case 6:
-	sf05_lower = 0;
-	sf05_upper = 5;
-	break;
-    case 8:
-	sf05_lower = 2;
-	sf05_upper = 5;
-	break;
-    case 13:
-	sf05_lower = 4;
-	sf05_upper = 7;
-	break;
-    case 17:
-	sf05_lower = 7;
-	sf05_upper = 9;
-	break;
-    case 25:
-	sf05_lower = 11;
-	sf05_upper = 13;
-	break;
-    }
-#endif
-    // Initialize Subbands according to VRB map
-    for (i = 0; i < N_RBG; i++) {
-	ue_sched_ctl->rballoc_sub_UE[CC_id][i] = 0;
-	rballoc_sub[CC_id][i] = 0;
-#ifdef SF05_LIMIT
-	// for avoiding 6+ PRBs around DC in subframe 0-5 (avoid excessive errors)
-
-	if ((subframeP == 0 || subframeP == 5) &&
-	    (i >= sf05_lower && i <= sf05_upper))
-	    rballoc_sub[CC_id][i] = 1;
-#endif
-	// for SI-RNTI,RA-RNTI and P-RNTI allocations
-	for (j = 0; j < RBGsize; j++) {
-	    if (vrb_map[j + (i * RBGsize)] != 0) {
-		rballoc_sub[CC_id][i] = 1;
-		LOG_D(MAC, "Frame %d, subframe %d : vrb %d allocated\n",
-		      frameP, subframeP, j + (i * RBGsize));
-		break;
-	    }
-	}
-	LOG_D(MAC, "Frame %d Subframe %d CC_id %d RBG %i : rb_alloc %d\n",
-	      frameP, subframeP, CC_id, i, rballoc_sub[CC_id][i]);
-	MIMO_mode_indicator[CC_id][i] = 2;
-    }
-}
-
-// This function assigns pre-available RBS to each UE in specified sub-bands before scheduling is done
-void
-_dlsch_scheduler_pre_processor(module_id_t Mod_id,
-			       int slice_id,
-			       frame_t frameP,
-			       sub_frame_t subframeP,
-			       int N_RBG[MAX_NUM_CCs], int *mbsfn_flag)
-{
-
-    unsigned char rballoc_sub[MAX_NUM_CCs][N_RBG_MAX], total_ue_count;
-    unsigned char MIMO_mode_indicator[MAX_NUM_CCs][N_RBG_MAX];
-    int UE_id, i;
-    uint8_t round = 0;
-    uint8_t harq_pid = 0;
-    uint16_t ii, j;
-    uint16_t nb_rbs_required[MAX_NUM_CCs][NUMBER_OF_UE_MAX];
-    uint16_t nb_rbs_allowed_slice[MAX_NUM_CCs][MAX_NUM_SLICES];
-    uint16_t nb_rbs_required_remaining[MAX_NUM_CCs][NUMBER_OF_UE_MAX];
-    uint16_t nb_rbs_required_remaining_1[MAX_NUM_CCs][NUMBER_OF_UE_MAX];
-    uint16_t average_rbs_per_user[MAX_NUM_CCs] = { 0 };
-    rnti_t rnti;
-    int min_rb_unit[MAX_NUM_CCs];
-    uint16_t r1 = 0;
-    uint8_t CC_id;
-    UE_list_t *UE_list = &eNB_mac_inst[Mod_id].UE_list;
-    LTE_DL_FRAME_PARMS *frame_parms[MAX_NUM_CCs] = { 0 };
-
-    int transmission_mode = 0;
-    UE_sched_ctrl *ue_sched_ctl;
-
-
-    for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++) {
-
-	if (mbsfn_flag[CC_id] > 0)	// If this CC is allocated for MBSFN skip it here
-	    continue;
-
-	frame_parms[CC_id] = mac_xface->get_lte_frame_parms(Mod_id, CC_id);
-
-
-	min_rb_unit[CC_id] = get_min_rb_unit(Mod_id, CC_id);
-
-	for (i = 0; i < NUMBER_OF_UE_MAX; i++) {
-	    if (UE_list->active[i] != TRUE)
-		continue;
-
-	    UE_id = i;
-	    // Initialize scheduling information for all active UEs
-
-	    //if (flexran_slice_member(UE_id, slice_id) == 0)
-	    //continue;
-	    _dlsch_scheduler_pre_processor_reset(Mod_id,
-						 UE_id,
-						 CC_id,
-						 frameP,
-						 subframeP,
-						 N_RBG[CC_id],
-						 nb_rbs_required,
-						 nb_rbs_required_remaining,
-						 nb_rbs_allowed_slice,
-						 rballoc_sub,
-						 MIMO_mode_indicator);
-
-	}
-    }
-    
-  
-    /* Store the DLSCH buffer for each logical channel for each UE */
-    _store_dlsch_buffer (Mod_id,slice_id,frameP,subframeP);
-    
-    // Calculate the number of RBs required by each UE on the basis of logical channel's buffer
-    _assign_rbs_required (Mod_id,slice_id, frameP,subframeP,nb_rbs_required,nb_rbs_allowed_slice,min_rb_unit);
-    
-    // Sorts the user on the basis of dlsch logical channel buffer and CQI
-    sort_UEs (Mod_id,frameP,subframeP);
-    
-    total_ue_count = 0;
-    
-    // loop over all active UEs
-    for (i=UE_list->head; i>=0; i=UE_list->next[i]) { 
-      rnti = flexran_get_ue_crnti(Mod_id, i);
-      if(rnti == NOT_A_RNTI)
-	continue;
-      if (UE_list->UE_sched_ctrl[i].ul_out_of_sync == 1)
-	continue;
-      
-      UE_id = i;
-      
-      if (flexran_slice_member(UE_id, slice_id) == 0)
-	continue;
-      
-      if (!phy_stats_exist(Mod_id, rnti))
-	continue;
-      
-    for (ii=0; ii < UE_num_active_CC(UE_list,UE_id); ii++) {
-	CC_id = UE_list->ordered_CCids[ii][UE_id];
-	ue_sched_ctl = &UE_list->UE_sched_ctrl[UE_id];
-	ue_sched_ctl->max_allowed_rbs[CC_id]=nb_rbs_allowed_slice[CC_id][slice_id];
-	flexran_get_harq(Mod_id, CC_id, UE_id, frameP, subframeP, &harq_pid, &round, openair_harq_DL);
-	
-	// if there is no available harq_process, skip the UE
-	if (UE_list->UE_sched_ctrl[UE_id].harq_pid[CC_id]<0)
-	  continue;
-	
-	average_rbs_per_user[CC_id]=0;
-	
-	frame_parms[CC_id] = mac_xface->get_lte_frame_parms(Mod_id,CC_id);
-	
-	//      mac_xface->get_ue_active_harq_pid(Mod_id,CC_id,rnti,frameP,subframeP,&harq_pid,&round,0);
-	
-	if(round>0) {
-	  nb_rbs_required[CC_id][UE_id] = UE_list->UE_template[CC_id][UE_id].nb_rb[harq_pid];
-	}
-	
-	//nb_rbs_required_remaining[UE_id] = nb_rbs_required[UE_id];
-	if (nb_rbs_required[CC_id][UE_id] > 0) {
-	  total_ue_count = total_ue_count + 1;
-	}
-	
-	
-	// hypotetical assignement
-	/*
-	 * If schedule is enabled and if the priority of the UEs is modified
-	 * The average rbs per logical channel per user will depend on the level of
-	 * priority. Concerning the hypothetical assignement, we should assign more
-	 * rbs to prioritized users. Maybe, we can do a mapping between the
-	 * average rbs per user and the level of priority or multiply the average rbs
-	 * per user by a coefficient which represents the degree of priority.
-	 */
-	
-	if (total_ue_count == 0) {
-	  average_rbs_per_user[CC_id] = 0;
-	} else if( (min_rb_unit[CC_id] * total_ue_count) <= nb_rbs_allowed_slice[CC_id][slice_id] ) {
-	  average_rbs_per_user[CC_id] = (uint16_t) floor(nb_rbs_allowed_slice[CC_id][slice_id]/total_ue_count);
-	} else {
-	  average_rbs_per_user[CC_id] = min_rb_unit[CC_id]; // consider the total number of use that can be scheduled UE
-	}
-      }
-    }
-    
-    // note: nb_rbs_required is assigned according to total_buffer_dl
-    // extend nb_rbs_required to capture per LCID RB required
-    for(i=UE_list->head; i>=0; i=UE_list->next[i]) {
-      rnti = UE_RNTI(Mod_id,i);
-      
-      if(rnti == NOT_A_RNTI)
-	continue;
-      
-      if (UE_list->UE_sched_ctrl[i].ul_out_of_sync == 1)
-	continue;
-      
-      if (!phy_stats_exist(Mod_id, rnti))
-	continue;
-      
-      if (flexran_slice_member(i, slice_id) == 0)
-	continue;
-      
-      for (ii=0; ii<UE_num_active_CC(UE_list,i); ii++) {
-	CC_id = UE_list->ordered_CCids[ii][i];
-	
-	// control channel
-	if (mac_eNB_get_rrc_status(Mod_id,rnti) < RRC_RECONFIGURED) {
-	  nb_rbs_required_remaining_1[CC_id][i] = nb_rbs_required[CC_id][i];
-	} else {
-	  nb_rbs_required_remaining_1[CC_id][i] = cmin(average_rbs_per_user[CC_id],nb_rbs_required[CC_id][i]);
-	  
-	}
-      }
-      
-      // note: nb_rbs_required is assigned according to total_buffer_dl
-      // extend nb_rbs_required to capture per LCID RB required
-      for (i = UE_list->head; i >= 0; i = UE_list->next[i]) {
-	rnti = UE_RNTI(Mod_id, i);
-	
-	if (rnti == NOT_A_RNTI)
-	  continue;
-	
-	if (UE_list->UE_sched_ctrl[i].ul_out_of_sync == 1)
-	  continue;
-	
-	if (!phy_stats_exist(Mod_id, rnti))
-	  continue;
-	
-	if (flexran_slice_member(i, slice_id) == 0)
-	  continue;
-	
-	for (ii = 0; ii < UE_num_active_CC(UE_list, i); ii++) {
-	  CC_id = UE_list->ordered_CCids[ii][i];
-	  
-	  // control channel
-	  if (mac_eNB_get_rrc_status(Mod_id, rnti) < RRC_RECONFIGURED) {
-	    nb_rbs_required_remaining_1[CC_id][i] =
-	      nb_rbs_required[CC_id][i];
-	  } else {
-	    nb_rbs_required_remaining_1[CC_id][i] =
-	      cmin(average_rbs_per_user[CC_id],
-		   nb_rbs_required[CC_id][i]);
-	    
-	  }
-	}
-      }
-      
-      //Allocation to UEs is done in 2 rounds,
-      // 1st stage: average number of RBs allocated to each UE
-      // 2nd stage: remaining RBs are allocated to high priority UEs
-      for (r1 = 0; r1 < 2; r1++) {
-	
-	for (i = UE_list->head; i >= 0; i = UE_list->next[i]) {
-	  
-	  if (flexran_slice_member(i, slice_id) == 0)
-	    continue;
-	  
-	  for (ii = 0; ii < UE_num_active_CC(UE_list, i); ii++) {
-	    CC_id = UE_list->ordered_CCids[ii][i];
-	    
-	    if (r1 == 0) {
-	      nb_rbs_required_remaining[CC_id][i] =
-		nb_rbs_required_remaining_1[CC_id][i];
-	    } else {	// rb required based only on the buffer - rb allloctaed in the 1st round + extra reaming rb form the 1st round
-	      nb_rbs_required_remaining[CC_id][i] =
-		nb_rbs_required[CC_id][i] -
-		nb_rbs_required_remaining_1[CC_id][i] +
-		nb_rbs_required_remaining[CC_id][i];
-	    }
-	    
-	    if (nb_rbs_required[CC_id][i] > 0)
-	      LOG_D(MAC,
-		    "round %d : nb_rbs_required_remaining[%d][%d]= %d (remaining_1 %d, required %d,  pre_nb_available_rbs %d, N_RBG %d, rb_unit %d)\n",
-		    r1, CC_id, i,
-		    nb_rbs_required_remaining[CC_id][i],
-		    nb_rbs_required_remaining_1[CC_id][i],
-		    nb_rbs_required[CC_id][i],
-		    UE_list->UE_sched_ctrl[i].
-		    pre_nb_available_rbs[CC_id], N_RBG[CC_id],
-		    min_rb_unit[CC_id]);
-	    
-	  }
-	}
-	
-	if (total_ue_count > 0) {
-	  for (i = UE_list->head; i >= 0; i = UE_list->next[i]) {
-	    UE_id = i;
-	    
-	    if (flexran_slice_member(UE_id, slice_id) == 0)
-	      continue;
-	    
-	    for (ii = 0; ii < UE_num_active_CC(UE_list, UE_id); ii++) {
-	      CC_id = UE_list->ordered_CCids[ii][UE_id];
-	      ue_sched_ctl = &UE_list->UE_sched_ctrl[UE_id];
-	      flexran_get_harq(Mod_id, CC_id, UE_id, frameP,
-			       subframeP, &harq_pid, &round);
-	      rnti = UE_RNTI(Mod_id, UE_id);
-	      
-	      // LOG_D(MAC,"UE %d rnti 0x\n", UE_id, rnti );
-	      if (rnti == NOT_A_RNTI)
-		continue;
-	      
-	      if (UE_list->UE_sched_ctrl[UE_id].ul_out_of_sync == 1)
-		continue;
-	      
-	      if (!phy_stats_exist(Mod_id, rnti))
-		continue;
-	      
-	      transmission_mode =
-		mac_xface->get_transmission_mode(Mod_id, CC_id,
-						 rnti);
-	      //rrc_status = mac_eNB_get_rrc_status(Mod_id,rnti);
-	      /* 1st allocate for the retx */
-	      
-	      // retransmission in data channels
-	      // control channel in the 1st transmission
-	      // data channel for all TM
-	      LOG_T(MAC,
-		    "calling dlsch_scheduler_pre_processor_allocate .. \n ");
-	      _dlsch_scheduler_pre_processor_allocate(Mod_id, UE_id,
-						      CC_id,
-						      N_RBG[CC_id],
-						      transmission_mode,
-						      min_rb_unit
-						      [CC_id],
-						      frame_parms
-						      [CC_id]->
-						      N_RB_DL,
-						      nb_rbs_required,
-						      nb_rbs_required_remaining,
-						      rballoc_sub,
-						      MIMO_mode_indicator);
-	    }
-	  }
-	}			// total_ue_count
-      }				// end of for for r1 and r2
-      
-      for (i = UE_list->head; i >= 0; i = UE_list->next[i]) {
-	UE_id = i;
-	ue_sched_ctl = &UE_list->UE_sched_ctrl[UE_id];
-	
-	if (flexran_slice_member(UE_id, slice_id) == 0)
-	  continue;
-        
-	for (ii=0; ii<UE_num_active_CC(UE_list,UE_id); ii++) {
-          CC_id = UE_list->ordered_CCids[ii][UE_id];
-	  flexran_get_harq(Mod_id, CC_id, UE_id, frameP, subframeP, &harq_pid, &round, openair_harq_DL);	  
-          rnti = UE_RNTI(Mod_id,UE_id);
-
-          // LOG_D(MAC,"UE %d rnti 0x\n", UE_id, rnti );
-          if(rnti == NOT_A_RNTI)
-            continue;
-
-	  if (UE_list->UE_sched_ctrl[UE_id].ul_out_of_sync == 1)
-	    continue;
-
-	  if (ue_sched_ctl->pre_nb_available_rbs[CC_id] > 0) {
-	    LOG_D(MAC,
-		  "******************DL Scheduling Information for UE%d ************************\n",
-		  UE_id);
-	    LOG_D(MAC, "dl power offset UE%d = %d \n", UE_id,
-		  ue_sched_ctl->dl_pow_off[CC_id]);
-	    LOG_D(MAC,
-		  "***********RB Alloc for every subband for UE%d ***********\n",
-		  UE_id);
-	    
-	    for (j = 0; j < N_RBG[CC_id]; j++) {
-	      //PHY_vars_eNB_g[Mod_id]->mu_mimo_mode[UE_id].rballoc_sub[i] = rballoc_sub_UE[CC_id][UE_id][i];
-	      LOG_D(MAC, "RB Alloc for UE%d and Subband%d = %d\n",
-		    UE_id, j,
-		    ue_sched_ctl->rballoc_sub_UE[CC_id][j]);
-	    }
-	    
-	    //PHY_vars_eNB_g[Mod_id]->mu_mimo_mode[UE_id].pre_nb_available_rbs = pre_nb_available_rbs[CC_id][UE_id];
-	    LOG_D(MAC,
-		  "[eNB %d][SLICE %d] Total RBs allocated for UE%d = %d\n",
-		  Mod_id, slice_id, UE_id,
-		  ue_sched_ctl->pre_nb_available_rbs[CC_id]);
-	  }
-	}
-      }
-    }
-}
-
-#define SF05_LIMIT 1
-
-/*
- * Main Downlink Slicing
- *
- */
-
-void
-flexran_schedule_ue_dl_spec_default(mid_t   mod_id,
-				 uint32_t      frame,
-				 uint32_t      subframe,
-				 int           *mbsfn_flag,
-				 Protocol__FlexranMessage **dl_info)
-//------------------------------------------------------------------------------
-{
-  int i=0;
-  
-  flexran_agent_mac_create_empty_dl_config(mod_id, dl_info);
- 
-  total_slice_percentage=0;
-  avg_slice_percentage=1.0/n_active_slices;
-  
-  // reset the slice percentage for inactive slices 
-  for (i = n_active_slices; i< MAX_NUM_SLICES; i++) {
-    slice_percentage[i]=0;
-  }
-  for (i = 0; i < n_active_slices; i++) {
-    if (slice_percentage[i] < 0 ){
-      LOG_W(MAC, "[eNB %d] frame %d subframe %d:invalid slice %d percentage %f. resetting to zero",
-	    mod_id, frame, subframe, i, slice_percentage[i]);
-      slice_percentage[i]=0;
-    }
-    total_slice_percentage+=slice_percentage[i];
-  }
-
-  for (i = 0; i < n_active_slices; i++) {
-    
-    // Load any updated functions
-    if (update_dl_scheduler[i] > 0 ) {
-      slice_sched_dl[i] = dlsym(NULL, dl_scheduler_type[i]); 
-      update_dl_scheduler[i] = 0;
-      update_dl_scheduler_current[i] = 0;
-      LOG_N(MAC,"update dl scheduler slice %d\n", i);
-    }
-
-    if (total_slice_percentage <= 1.0){ // the new total RB share is within the range
-
-      // check if the number of slices has changed, and log 
-      if (n_active_slices_current != n_active_slices ){
-	if ((n_active_slices > 0) && (n_active_slices <= MAX_NUM_SLICES)) {
-	  LOG_N(MAC,"[eNB %d]frame %d subframe %d: number of active DL slices has changed: %d-->%d\n",
-		mod_id, frame, subframe, n_active_slices_current, n_active_slices);
-	  
-	  n_active_slices_current = n_active_slices;
-	  
-	} else {
-	  LOG_W(MAC,"invalid number of DL slices %d, revert to the previous value %d\n",n_active_slices, n_active_slices_current);
-	  n_active_slices = n_active_slices_current;
-	}
-      }
-      
-      // check if the slice rb share has changed, and log the console
-      if (slice_percentage_current[i] != slice_percentage[i]){ // new slice percentage
-	LOG_N(MAC,"[eNB %d][SLICE %d][DL] frame %d subframe %d: total percentage %f-->%f, slice RB percentage has changed: %f-->%f\n",
-	      mod_id, i, frame, subframe, total_slice_percentage_current, total_slice_percentage, slice_percentage_current[i], slice_percentage[i]);
-	total_slice_percentage_current= total_slice_percentage;
-	slice_percentage_current[i] = slice_percentage[i];
-	
-      } 
- 
-      // check if the slice max MCS, and log the console
-      if (slice_maxmcs_current[i] != slice_maxmcs[i]){
-	if ((slice_maxmcs[i] >= 0) && (slice_maxmcs[i] < 29)){
-	  LOG_N(MAC,"[eNB %d][SLICE %d][DL] frame %d subframe %d: slice MAX MCS has changed: %d-->%d\n",
-		mod_id, i, frame, subframe, slice_maxmcs_current[i], slice_maxmcs[i]);
-	  slice_maxmcs_current[i] = slice_maxmcs[i];
-	} else {
-	  LOG_W(MAC,"[eNB %d][SLICE %d][DL] invalid slice max mcs %d, revert the previous value %d\n",mod_id, i, slice_maxmcs[i],slice_maxmcs_current[i]);
-	  slice_maxmcs[i]= slice_maxmcs_current[i];
-	}
-      }
-      
-      // check if a new scheduler, and log the console
-      if (update_dl_scheduler_current[i] != update_dl_scheduler[i]){
-	LOG_N(MAC,"[eNB %d][SLICE %d][DL] frame %d subframe %d: DL scheduler for this slice is updated: %s \n",
-	      mod_id, i, frame, subframe, dl_scheduler_type[i]);
-	update_dl_scheduler_current[i] = update_dl_scheduler[i];
-      } 
-    
-    } else {
-      // here we can correct the values, e.g. reduce proportionally 
-      
-      if (n_active_slices == n_active_slices_current){
-	LOG_W(MAC,"[eNB %d][SLICE %d][DL] invalid total RB share (%f->%f), reduce proportionally the RB share by 0.1\n",
-	      mod_id,i,  
-	      total_slice_percentage_current, total_slice_percentage);
-	if (slice_percentage[i] >= avg_slice_percentage){
-	  slice_percentage[i]-=0.1;
-	  total_slice_percentage-=0.1;
-	}
-      } else {
-	LOG_W(MAC,"[eNB %d][SLICE %d][DL] invalid total RB share (%f->%f), revert the number of slice to its previous value (%d->%d)\n",
-	      mod_id,i,  
-	      total_slice_percentage_current, total_slice_percentage,
-	      n_active_slices, n_active_slices_current );
-	n_active_slices = n_active_slices_current;
-	slice_percentage[i] = slice_percentage_current[i];
-      }
-    }
-    
-    // Run each enabled slice-specific schedulers one by one
-    slice_sched_dl[i](mod_id, i, frame, subframe, mbsfn_flag,dl_info);
-  }
-}
-
-uint16_t flexran_nb_rbs_allowed_slice(float rb_percentage, int total_rbs)
-{
-    return (uint16_t) floor(rb_percentage * total_rbs);
-}
-
-int flexran_slice_maxmcs(int slice_id)
-{
-    return slice_maxmcs[slice_id];
-}
-
-int flexran_slice_member(int UE_id, int slice_id)
-{
-    // group membership definition
-    int slice_member = 0;
-
-    if ((slice_id < 0) || (slice_id > n_active_slices))
-	LOG_W(MAC, "out of range slice id %d\n", slice_id);
-
-    switch (slicing_strategy) {
-    case SLICE_MASK:
-	switch (slice_id) {
-	case 0:
-	    if (SLICE0_MASK & UE_id) {
-		slice_member = 1;
-	    }
-	    break;
-	case 1:
-	    if (SLICE1_MASK & UE_id) {
-		slice_member = 1;
-	    }
-	    break;
-	case 2:
-	    if (SLICE2_MASK & UE_id) {
-		slice_member = 1;
-	    }
-	    break;
-	case 3:
-	    if (SLICE3_MASK & UE_id) {
-		slice_member = 1;
-	    }
-	    break;
-	default:
-	    LOG_W(MAC, "unknown slice_id %d\n", slice_id);
-	    break;
-
-	}
-	break;
-    case UEID_TO_SLICEID:
-    default:
-	if ((UE_id % n_active_slices) == slice_id) {
-	    slice_member = 1;	// this ue is a member of this slice
-	}
-	break;
-    }
-
-    return slice_member;
-}
-
-/* more aggressive rb and mcs allocation with medium priority and the traffic qci */
-void
-flexran_schedule_ue_spec_embb(mid_t mod_id,
-			      int slice_id,
-			      uint32_t frame,
-			      uint32_t subframe,
-			      int *mbsfn_flag,
-			      Protocol__FlexranMessage ** dl_info)
-{
-  flexran_schedule_ue_dl_spec_common(mod_id,
-				  slice_id,
-				  frame,
-				  subframe,
-				  mbsfn_flag,
-				  dl_info);
-}
-
-/* more conservative mcs allocation with high priority and the traffic qci */
-void
-flexran_schedule_ue_spec_urllc(mid_t mod_id,
-			       int slice_id,
-			       uint32_t frame,
-			       uint32_t subframe,
-			       int *mbsfn_flag,
-			       Protocol__FlexranMessage ** dl_info)
-{
-  flexran_schedule_ue_dl_spec_common(mod_id,
-				  slice_id,
-				  frame,
-				  subframe,
-				  mbsfn_flag,
-				  dl_info);
-}
-
-/* constant rb allocation with low mcs with low priority and given the UE capabilities */
-void
-flexran_schedule_ue_spec_mmtc(mid_t mod_id,
-			      int slice_id,
-			      uint32_t frame,
-			      uint32_t subframe,
-			      int *mbsfn_flag,
-			      Protocol__FlexranMessage ** dl_info)
-{
-  flexran_schedule_ue_dl_spec_common(mod_id,
-				  slice_id,
-				  frame,
-				  subframe,
-				  mbsfn_flag,
-				  dl_info);
-}
-
-/* regular rb and mcs allocation with low priority */
-void
-flexran_schedule_ue_spec_be(mid_t mod_id,
-			    int slice_id,
-			    uint32_t frame,
-			    uint32_t subframe,
-			    int *mbsfn_flag,
-			    Protocol__FlexranMessage ** dl_info)
-{
-  flexran_schedule_ue_dl_spec_common(mod_id,
-				  slice_id,
-				  frame,
-				  subframe,
-				  mbsfn_flag,
-				  dl_info);
-}
-
-//------------------------------------------------------------------------------
-void
-flexran_schedule_ue_dl_spec_common(mid_t   mod_id,
-				int           slice_id, 
-				uint32_t      frame,
-				uint32_t      subframe,
-				int           *mbsfn_flag,
-				Protocol__FlexranMessage **dl_info)
-//------------------------------------------------------------------------------
-{
-    uint8_t CC_id;
-    int UE_id;
-    int N_RBG[MAX_NUM_CCs];
-    unsigned char aggregation;
-    mac_rlc_status_resp_t rlc_status;
-    unsigned char header_len = 0, header_len_last = 0, ta_len = 0;
-    uint16_t nb_rb, nb_rb_temp, total_nb_available_rb[MAX_NUM_CCs],
-	nb_available_rb;
-    uint16_t TBS, j, rnti;
-    uint8_t round = 0;
-    uint8_t harq_pid = 0;
-    uint16_t sdu_length_total = 0;
-    int mcs, mcs_tmp;
-    uint16_t min_rb_unit[MAX_NUM_CCs];
-    eNB_MAC_INST *eNB = &eNB_mac_inst[mod_id];
-    /* TODO: Must move the helper structs to scheduler implementation */
-    UE_list_t *UE_list = &eNB->UE_list;
-    int32_t normalized_rx_power, target_rx_power;
-    int32_t tpc = 1;
-    static int32_t tpc_accumulated = 0;
-    UE_sched_ctrl *ue_sched_ctl;
-    LTE_eNB_UE_stats *eNB_UE_stats = NULL;
-    Protocol__FlexDlData *dl_data[NUM_MAX_UE];
-    int num_ues_added = 0;
-    int channels_added = 0;
-
-    Protocol__FlexDlDci *dl_dci;
-    Protocol__FlexRlcPdu *rlc_pdus[11];
-    uint32_t ce_flags = 0;
-
-    uint8_t rballoc_sub[25];
-    int i;
-    uint32_t data_to_request;
-    uint32_t dci_tbs;
-    uint8_t ue_has_transmission = 0;
-    uint32_t ndi;
-
-#if 0
-
-    if (UE_list->head == -1) {
-	return;
-    }
-#endif
-
-  start_meas(&eNB->schedule_dlsch);
-  VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_SCHEDULE_DLSCH,VCD_FUNCTION_IN);
-
-  //weight = get_ue_weight(module_idP,UE_id);
-  aggregation = 1; // set to the maximum aggregation level
-
-  for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
-    min_rb_unit[CC_id] = get_min_rb_unit(mod_id, CC_id);
-    // get number of PRBs less those used by common channels
-    total_nb_available_rb[CC_id] = flexran_get_N_RB_DL(mod_id, CC_id);
-    for (i=0;i < flexran_get_N_RB_DL(mod_id, CC_id); i++)
-      if (eNB->common_channels[CC_id].vrb_map[i] != 0)
-	total_nb_available_rb[CC_id]--;
-    
-    N_RBG[CC_id] = flexran_get_N_RBG(mod_id, CC_id);
-
-    // store the global enb stats:
-    eNB->eNB_stats[CC_id].num_dlactive_UEs =  UE_list->num_UEs;
-    eNB->eNB_stats[CC_id].available_prbs =  total_nb_available_rb[CC_id];
-    eNB->eNB_stats[CC_id].total_available_prbs +=  total_nb_available_rb[CC_id];
-    eNB->eNB_stats[CC_id].dlsch_bytes_tx=0;
-    eNB->eNB_stats[CC_id].dlsch_pdus_tx=0;
-  }
-
-   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_DLSCH_PREPROCESSOR,VCD_FUNCTION_IN);
-
-   start_meas(&eNB->schedule_dlsch_preprocessor);
-   _dlsch_scheduler_pre_processor(mod_id,
-				  slice_id,
-				  frame,
-				  subframe,
-				  N_RBG,
-				  mbsfn_flag);
-   stop_meas(&eNB->schedule_dlsch_preprocessor);
-   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_DLSCH_PREPROCESSOR,VCD_FUNCTION_OUT);
-
-   for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
-    LOG_D(MAC, "doing schedule_ue_spec for CC_id %d\n",CC_id);
-
-    if (mbsfn_flag[CC_id]>0)
-      continue;
-    
-    for (UE_id=UE_list->head; UE_id>=0; UE_id=UE_list->next[UE_id]) {
-  
-      rnti = flexran_get_ue_crnti(mod_id, UE_id);
-      eNB_UE_stats = mac_xface->get_eNB_UE_stats(mod_id,CC_id,rnti);
-      ue_sched_ctl = &UE_list->UE_sched_ctrl[UE_id];
-      
-      if (eNB_UE_stats==NULL) {
-
-        	LOG_D(MAC,"[eNB] Cannot find eNB_UE_stats\n");
-                //  mac_xface->macphy_exit("[MAC][eNB] Cannot find eNB_UE_stats\n");
-        	continue;
-      }
-      
-      if (flexran_slice_member(UE_id, slice_id) == 0)
-      	continue;
-      
-      if (rnti==NOT_A_RNTI) {
-        LOG_D(MAC,"Cannot find rnti for UE_id %d (num_UEs %d)\n", UE_id,UE_list->num_UEs);
-        // mac_xface->macphy_exit("Cannot find rnti for UE_id");
-        continue;
-      }
-
-      switch(mac_xface->get_transmission_mode(mod_id,CC_id,rnti)){
-      case 1:
-      case 2:
-      case 7:
-        	aggregation = get_aggregation(get_bw_index(mod_id,CC_id), 
-				      eNB_UE_stats->DL_cqi[0],
-				      format1);
-      	break;
-      case 3:
-        	aggregation = get_aggregation(get_bw_index(mod_id,CC_id), 
-				      eNB_UE_stats->DL_cqi[0],
-				      format2A);
-      	break;
-      default:
-        	LOG_W(MAC,"Unsupported transmission mode %d\n", mac_xface->get_transmission_mode(mod_id,CC_id,rnti));
-        	aggregation = 2;
-      }
-     
-      if ((ue_sched_ctl->pre_nb_available_rbs[CC_id] == 0) ||  // no RBs allocated 
-	  CCE_allocation_infeasible(mod_id, CC_id, 0, subframe, aggregation, rnti)) {
-
-            LOG_D(MAC,"[eNB %d] Frame %d : no RB allocated for UE %d on CC_id %d: continue \n",
-                  mod_id, frame, UE_id, CC_id);
-            //if(mac_xface->get_transmission_mode(module_idP,rnti)==5)
-            continue; //to next user (there might be rbs availiable for other UEs in TM5
-            // else
-            //  break;
-      }
-
-      if (flexran_get_duplex_mode(mod_id, CC_id) == PROTOCOL__FLEX_DUPLEX_MODE__FLDM_TDD)  {
-        set_ue_dai (subframe,
-                    flexran_get_subframe_assignment(mod_id, CC_id),
-                    UE_id,
-                    CC_id,
-                    UE_list);
-        //TODO: update UL DAI after DLSCH scheduling
-        //set_ul_DAI(mod_id, UE_id, CC_id, frame, subframe,frame_parms);
-      }
-
-      channels_added = 0;
-
-      // After this point all the UEs will be scheduled
-      dl_data[num_ues_added] = (Protocol__FlexDlData *) malloc(sizeof(Protocol__FlexDlData));
-      protocol__flex_dl_data__init(dl_data[num_ues_added]);
-      dl_data[num_ues_added]->has_rnti = 1;
-      dl_data[num_ues_added]->rnti = rnti;
-      dl_data[num_ues_added]->n_rlc_pdu = 0;
-      dl_data[num_ues_added]->has_serv_cell_index = 1;
-      dl_data[num_ues_added]->serv_cell_index = CC_id;
-            
-      flexran_get_harq(mod_id, CC_id, UE_id, frame, subframe, &harq_pid, &round, openair_harq_DL);
-      sdu_length_total=0;
-      mcs = cqi_to_mcs[flexran_get_ue_wcqi(mod_id, UE_id)];
-      //      LOG_I(FLEXRAN_AGENT, "The MCS is %d\n", mcs);
-      mcs = cmin(mcs,flexran_slice_maxmcs(slice_id));
-// #ifdef EXMIMO
-
-//        if (mac_xface->get_transmission_mode(mod_id, CC_id, rnti) == 5) {
-// 	  mcs = cqi_to_mcs[flexran_get_ue_wcqi(mod_id, UE_id)];
-// 	  mcs =  cmin(mcs,16);
-//        }
-
-// #endif
-
-      /*Get pre available resource blocks based on buffers*/ 
-      nb_available_rb = ue_sched_ctl->pre_nb_available_rbs[CC_id];
-      // initializing the rb allocation indicator for each UE
-       for(j = 0; j < flexran_get_N_RBG(mod_id, CC_id); j++) {
-
-          UE_list->UE_template[CC_id][UE_id].rballoc_subband[harq_pid][j] = 0;
-        	rballoc_sub[j] = 0;
-      }
-
-      /* LOG_D(MAC,"[eNB %d] Frame %d: Scheduling UE %d on CC_id %d (rnti %x, harq_pid %d, round %d, rb %d, cqi %d, mcs %d, rrc %d)\n", */
-      /*       mod_id, frame, UE_id, CC_id, rnti, harq_pid, round, nb_available_rb, */
-      /*       eNB_UE_stats->DL_cqi[0], mcs, */
-      /*       UE_list->eNB_UE_stats[CC_id][UE_id].rrc_status); */
-
-      dl_dci = (Protocol__FlexDlDci*) malloc(sizeof(Protocol__FlexDlDci));
-      protocol__flex_dl_dci__init(dl_dci);
-      dl_data[num_ues_added]->dl_dci = dl_dci;
-
-      
-      dl_dci->has_rnti = 1;
-      dl_dci->rnti = rnti;
-      dl_dci->has_harq_process = 1;
-      dl_dci->harq_process = harq_pid;
-      
-      /* process retransmission  */
-      if (round > 0) {
-
-      	LOG_D(FLEXRAN_AGENT, "There was a retransmission just now and the round was %d\n", round);
-
-      	if (flexran_get_duplex_mode(mod_id, CC_id) == PROTOCOL__FLEX_DUPLEX_MODE__FLDM_TDD) {
-      	  UE_list->UE_template[CC_id][UE_id].DAI++;
-      	  update_ul_dci(mod_id, CC_id, rnti, UE_list->UE_template[CC_id][UE_id].DAI);
-      	  LOG_D(MAC,"DAI update: CC_id %d subframeP %d: UE %d, DAI %d\n",
-      		CC_id, subframe,UE_id,UE_list->UE_template[CC_id][UE_id].DAI);
-      	}
-
-      	mcs = UE_list->UE_template[CC_id][UE_id].mcs[harq_pid];
-
-      	  // get freq_allocation
-      	nb_rb = UE_list->UE_template[CC_id][UE_id].nb_rb[harq_pid];
-      	  
-      	/*TODO: Must add this to FlexRAN agent API */
-      	dci_tbs = mac_xface->get_TBS_DL(mcs, nb_rb);
-
-      	if (nb_rb <= nb_available_rb) {
-      	  
-      	  if(nb_rb == ue_sched_ctl->pre_nb_available_rbs[CC_id]) {
-      	    for(j = 0; j < flexran_get_N_RBG(mod_id, CC_id); j++) { // for indicating the rballoc for each sub-band
-      	      UE_list->UE_template[CC_id][UE_id].rballoc_subband[harq_pid][j] = ue_sched_ctl->rballoc_sub_UE[CC_id][j];
-                  }
-      	  } else {
-      	    nb_rb_temp = nb_rb;
-      	    j = 0;
-
-      	    while((nb_rb_temp > 0) && (j < flexran_get_N_RBG(mod_id, CC_id))) {
-      	      if(ue_sched_ctl->rballoc_sub_UE[CC_id][j] == 1) {
-      		UE_list->UE_template[CC_id][UE_id].rballoc_subband[harq_pid][j] = ue_sched_ctl->rballoc_sub_UE[CC_id][j];
-      		
-      		if((j == flexran_get_N_RBG(mod_id, CC_id) - 1) &&
-      		   ((flexran_get_N_RB_DL(mod_id, CC_id) == 25)||
-      		    (flexran_get_N_RB_DL(mod_id, CC_id) == 50))) {
-      		  nb_rb_temp = nb_rb_temp - min_rb_unit[CC_id]+1;
-      		} else {
-      		  nb_rb_temp = nb_rb_temp - min_rb_unit[CC_id];
-      		}
-      	      }
-      	      j = j + 1;
-      	    }
-      	  }
-
-      	  nb_available_rb -= nb_rb;
-      	  PHY_vars_eNB_g[mod_id][CC_id]->mu_mimo_mode[UE_id].pre_nb_available_rbs = nb_rb;
-      	  PHY_vars_eNB_g[mod_id][CC_id]->mu_mimo_mode[UE_id].dl_pow_off = ue_sched_ctl->dl_pow_off[CC_id];
-      	  
-      	  for(j=0; j < flexran_get_N_RBG(mod_id, CC_id); j++) {
-      	    PHY_vars_eNB_g[mod_id][CC_id]->mu_mimo_mode[UE_id].rballoc_sub[j] = UE_list->UE_template[CC_id][UE_id].rballoc_subband[harq_pid][j];
-      	    rballoc_sub[j] = UE_list->UE_template[CC_id][UE_id].rballoc_subband[harq_pid][j];
-      	  }
-
-      	  // Keep the old NDI, do not toggle
-      	  ndi = UE_list->UE_template[CC_id][UE_id].oldNDI[harq_pid];
-      	  tpc = UE_list->UE_template[CC_id][UE_id].oldTPC[harq_pid];
-      	  UE_list->UE_template[CC_id][UE_id].mcs[harq_pid] = mcs;
-
-      	  ue_has_transmission = 1;
-      	  num_ues_added++;
-      	} else {
-      	  LOG_D(MAC,"[eNB %d] Frame %d CC_id %d : don't schedule UE %d, its retransmission takes more resources than we have\n",
-                      mod_id, frame, CC_id, UE_id);
-      	  ue_has_transmission = 0;
-      	}
-      	//End of retransmission
-      }
-
-       else { /* This is a potentially new SDU opportunity */
-	rlc_status.bytes_in_buffer = 0;
-        // Now check RLC information to compute number of required RBs
-        // get maximum TBS size for RLC request
-        //TBS = mac_xface->get_TBS(eNB_UE_stats->DL_cqi[0]<<1,nb_available_rb);
-        TBS = mac_xface->get_TBS_DL(mcs, nb_available_rb);
-	dci_tbs = TBS;
-	LOG_D(FLEXRAN_AGENT, "TBS is %d\n", TBS);
-	
-        // check first for RLC data on DCCH
-        // add the length for  all the control elements (timing adv, drx, etc) : header + payload
-
-	ta_len = (ue_sched_ctl->ta_update != 0) ? 2 : 0;
-	
-	dl_data[num_ues_added]->n_ce_bitmap = 2;
-	dl_data[num_ues_added]->ce_bitmap = (uint32_t *) calloc(2, sizeof(uint32_t));
-
-	if (ta_len > 0) {
-	  ce_flags |= PROTOCOL__FLEX_CE_TYPE__FLPCET_TA;
-	}
-
-	/*TODO: Add other flags if DRX and other CE are required*/
-	
-	// Add the control element flags to the flexran message
-	dl_data[num_ues_added]->ce_bitmap[0] = ce_flags;
-	dl_data[num_ues_added]->ce_bitmap[1] = ce_flags;
-
-	// TODO : Need to prioritize DRBs
-	// Loop through the UE logical channels (DCCH, DCCH1, DTCH for now)
-	header_len = 0;
-	header_len_last = 0;
-	sdu_length_total = 0;
-	for (j = 1; j < NB_RB_MAX; j++) {
-	  header_len += 3;
-	  // Need to see if we have space for data from this channel
-	  if (dci_tbs - ta_len - header_len - sdu_length_total > 0) {
-	     LOG_D(MAC, "[TEST]Requested %d bytes from RLC buffer on channel %d during first call\n", dci_tbs-ta_len-header_len, j);
-	     //If we have space, we need to see how much data we can request at most (if any available)
-	     rlc_status = mac_rlc_status_ind(mod_id,
-					     rnti,
-					     mod_id,
-					     frame,
-						 subframe,
-					     ENB_FLAG_YES,
-					     MBMS_FLAG_NO,
-					     j,
-					     (dci_tbs - ta_len - header_len - sdu_length_total)); // transport block set size
-
-	     //If data are available in channel j
-	     if (rlc_status.bytes_in_buffer > 0) {
-	       LOG_D(MAC, "[TEST]Have %d bytes in DCCH buffer during first call\n", rlc_status.bytes_in_buffer);
-	       //Fill in as much as possible
-	       data_to_request = cmin(dci_tbs - ta_len - header_len - sdu_length_total, rlc_status.bytes_in_buffer);
-	       LOG_D(FLEXRAN_AGENT, "Will request %d bytes from channel %d\n", data_to_request, j);
-
-	       if (data_to_request < 128) { //The header will be one byte less
-        		 header_len--;
-        		 header_len_last = 2;
-	       }
-          else {
-
-        		 header_len_last = 3;
-	       }
-	       /* if (j == 1 || j == 2) {
-		  data_to_request+=0; 
-		  } */
-	       LOG_D(MAC, "[TEST]Will request %d from channel %d\n", data_to_request, j);
-	       rlc_pdus[channels_added] = (Protocol__FlexRlcPdu *) malloc(sizeof(Protocol__FlexRlcPdu));
-	       protocol__flex_rlc_pdu__init(rlc_pdus[channels_added]);
-	       rlc_pdus[channels_added]->n_rlc_pdu_tb = 2;
-	       rlc_pdus[channels_added]->rlc_pdu_tb = (Protocol__FlexRlcPduTb **) malloc(sizeof(Protocol__FlexRlcPduTb *) * 2);
-	       rlc_pdus[channels_added]->rlc_pdu_tb[0] = (Protocol__FlexRlcPduTb *) malloc(sizeof(Protocol__FlexRlcPduTb));
-	       protocol__flex_rlc_pdu_tb__init(rlc_pdus[channels_added]->rlc_pdu_tb[0]);
-	       rlc_pdus[channels_added]->rlc_pdu_tb[0]->has_logical_channel_id = 1;
-	       rlc_pdus[channels_added]->rlc_pdu_tb[0]->logical_channel_id = j;
-	       rlc_pdus[channels_added]->rlc_pdu_tb[0]->has_size = 1;
-	       rlc_pdus[channels_added]->rlc_pdu_tb[0]->size = data_to_request;
-	       rlc_pdus[channels_added]->rlc_pdu_tb[1] = (Protocol__FlexRlcPduTb *) malloc(sizeof(Protocol__FlexRlcPduTb));
-	       protocol__flex_rlc_pdu_tb__init(rlc_pdus[channels_added]->rlc_pdu_tb[1]);
-	       rlc_pdus[channels_added]->rlc_pdu_tb[1]->has_logical_channel_id = 1;
-	       rlc_pdus[channels_added]->rlc_pdu_tb[1]->logical_channel_id = j;
-	       rlc_pdus[channels_added]->rlc_pdu_tb[1]->has_size = 1;
-	       rlc_pdus[channels_added]->rlc_pdu_tb[1]->size = data_to_request;
-	       dl_data[num_ues_added]->n_rlc_pdu++;
-	       channels_added++;
-	       //Set this to the max value that we might request
-	       sdu_length_total += data_to_request;
-	     } else {
-	       //Take back the assumption of a header for this channel
-	       header_len -= 3;
-	     } //End rlc_status.bytes_in_buffer <= 0
-	  } //end of if dci_tbs - ta_len - header_len > 0
-	} // End of iterating the logical channels
-	
-	// Add rlc_pdus to the dl_data message
-	dl_data[num_ues_added]->rlc_pdu = (Protocol__FlexRlcPdu **) malloc(sizeof(Protocol__FlexRlcPdu *) *
-									  dl_data[num_ues_added]->n_rlc_pdu);
-	for (i = 0; i < dl_data[num_ues_added]->n_rlc_pdu; i++) {
-	  dl_data[num_ues_added]->rlc_pdu[i] = rlc_pdus[i];
-	}
-	
-	if (header_len == 0) {
-	  LOG_D(FLEXRAN_AGENT, "Header was empty\n");
-	  header_len_last = 0;
-	} 
-	
-	// there is a payload
-        if ((dl_data[num_ues_added]->n_rlc_pdu > 0)) {
-	  // Now compute number of required RBs for total sdu length
-          // Assume RAH format 2
-          // adjust  header lengths
-	  LOG_D(FLEXRAN_AGENT, "We have %d bytes to transfer\n", sdu_length_total);
-	  if (header_len != 0) {
-	    LOG_D(FLEXRAN_AGENT, "Header length was %d ", header_len);
-	    header_len_last--;
-	    header_len -= header_len_last;
-	    LOG_D(FLEXRAN_AGENT, "so we resized it to %d\n", header_len);
-	  }
-	  
-	  /* if (header_len == 2 || header_len == 3) { //Only one SDU, remove length field */
-	  /*   header_len = 1; */
-	  /* } else { //Remove length field from the last SDU */
-	  /*   header_len--; */
-	  /* } */
-
-	  mcs_tmp = mcs;
-	  if (mcs_tmp == 0) {
-            nb_rb = 4;  // don't let the TBS get too small
-          } else {
-            nb_rb=min_rb_unit[CC_id];
-          }
-
-	  LOG_D(MAC,"[TEST]The initial number of resource blocks was %d\n", nb_rb);
-	  LOG_D(MAC,"[TEST] The initial mcs was %d\n", mcs_tmp);
-
-	  TBS = mac_xface->get_TBS_DL(mcs_tmp, nb_rb);
-	  LOG_D(MAC,"[TEST]The TBS during rate matching was %d\n", TBS);
-
-	  while (TBS < (sdu_length_total + header_len + ta_len))  {
-            nb_rb += min_rb_unit[CC_id];  //
-	    LOG_D(MAC, "[TEST]Had to increase the number of RBs\n");
-            if (nb_rb > nb_available_rb) { // if we've gone beyond the maximum number of RBs
-              // (can happen if N_RB_DL is odd)
-              TBS = mac_xface->get_TBS_DL(mcs_tmp, nb_available_rb);
-              nb_rb = nb_available_rb;
-              break;
-            }
-
-            TBS = mac_xface->get_TBS_DL(mcs_tmp, nb_rb);
-          }
-
-	  if(nb_rb == ue_sched_ctl->pre_nb_available_rbs[CC_id]) {
-	    LOG_D(MAC, "[TEST]We had the exact number of rbs. Time to fill the rballoc subband\n");
-            for(j = 0; j < flexran_get_N_RBG(mod_id, CC_id); j++) { // for indicating the rballoc for each sub-band
-              UE_list->UE_template[CC_id][UE_id].rballoc_subband[harq_pid][j] = ue_sched_ctl->rballoc_sub_UE[CC_id][j];
-            }
-          }
-           else {
-	    nb_rb_temp = nb_rb;
-            j = 0;
-	    LOG_D(MAC, "[TEST]Will only partially fill the bitmap\n");
-	    while((nb_rb_temp > 0) && (j < flexran_get_N_RBG(mod_id, CC_id))) {
-              if(ue_sched_ctl->rballoc_sub_UE[CC_id][j] == 1) {
-                UE_list->UE_template[CC_id][UE_id].rballoc_subband[harq_pid][j] = ue_sched_ctl->rballoc_sub_UE[CC_id][j];
-                if ((j == flexran_get_N_RBG(mod_id, CC_id) - 1) &&
-                    ((flexran_get_N_RB_DL(mod_id, CC_id) == 25)||
-                     (flexran_get_N_RB_DL(mod_id, CC_id) == 50))) {
-                  nb_rb_temp = nb_rb_temp - min_rb_unit[CC_id] + 1;
-                } else {
-                  nb_rb_temp = nb_rb_temp - min_rb_unit[CC_id];
-                }
-              }
-              j = j+1;
-            }
-	  }
-	  
-	  PHY_vars_eNB_g[mod_id][CC_id]->mu_mimo_mode[UE_id].pre_nb_available_rbs = nb_rb;
-          PHY_vars_eNB_g[mod_id][CC_id]->mu_mimo_mode[UE_id].dl_pow_off = ue_sched_ctl->dl_pow_off[CC_id];
-
-	  for(j = 0; j < flexran_get_N_RBG(mod_id, CC_id); j++) {
-            PHY_vars_eNB_g[mod_id][CC_id]->mu_mimo_mode[UE_id].rballoc_sub[j] = UE_list->UE_template[CC_id][UE_id].rballoc_subband[harq_pid][j];
-          }
-
-	  // decrease mcs until TBS falls below required length
-          while ((TBS > (sdu_length_total + header_len + ta_len)) && (mcs_tmp > 0)) {
-            mcs_tmp--;
-            TBS = mac_xface->get_TBS_DL(mcs_tmp, nb_rb);
-          }
-
-	  // if we have decreased too much or we don't have enough RBs, increase MCS
-          while ((TBS < (sdu_length_total + header_len + ta_len)) &&
-		 ((( ue_sched_ctl->dl_pow_off[CC_id] > 0) && (mcs_tmp < 28))											     || ( (ue_sched_ctl->dl_pow_off[CC_id]==0) && (mcs_tmp <= 15)))) {
-            mcs_tmp++;
-            TBS = mac_xface->get_TBS_DL(mcs_tmp, nb_rb);
-          }
-
-	  dci_tbs = TBS;
-	  mcs = mcs_tmp;
-	  LOG_D(FLEXRAN_AGENT, "Final mcs was %d\n", mcs); 
-	  
-	  dl_dci->has_aggr_level = 1;
-	  dl_dci->aggr_level = aggregation;
-	  
-          UE_list->UE_template[CC_id][UE_id].nb_rb[harq_pid] = nb_rb;
-
-	  // if (flexran_get_duplex_mode(mod_id, CC_id) == PROTOCOL__FLEX_DUPLEX_MODE__FLDM_TDD) {
-   //          UE_list->UE_template[CC_id][UE_id].DAI++;
-   //          //  printf("DAI update: subframeP %d: UE %d, DAI %d\n",subframeP,UE_id,UE_list->UE_template[CC_id][UE_id].DAI);
-	    //#warning only for 5MHz channel
-          //   update_ul_dci(mod_id, CC_id, rnti, UE_list->UE_template[CC_id][UE_id].DAI);
-          // }
-
-	  // do PUCCH power control
-          // this is the normalized RX power
-	  normalized_rx_power = flexran_get_p0_pucch_dbm(mod_id,UE_id, CC_id); //eNB_UE_stats->Po_PUCCH_dBm; 
-	  target_rx_power = flexran_get_p0_nominal_pucch(mod_id, CC_id) + 20; //mac_xface->get_target_pucch_rx_power(mod_id, CC_id) + 20;
-	  // this assumes accumulated tpc
-	  // make sure that we are only sending a tpc update once a frame, otherwise the control loop will freak out
-	  int32_t framex10psubframe = UE_list->UE_template[CC_id][UE_id].pucch_tpc_tx_frame*10+UE_list->UE_template[CC_id][UE_id].pucch_tpc_tx_subframe;
-
-	  if (((framex10psubframe+10)<=(frame*10+subframe)) || //normal case
-	      ((framex10psubframe>(frame*10+subframe)) && (((10240-framex10psubframe+frame*10+subframe)>=10)))) //frame wrap-around
-	    if (flexran_get_p0_pucch_status(mod_id, UE_id, CC_id) == 1) {
-  	      flexran_update_p0_pucch(mod_id, UE_id, CC_id);
-
-	      UE_list->UE_template[CC_id][UE_id].pucch_tpc_tx_frame = frame;
-	      UE_list->UE_template[CC_id][UE_id].pucch_tpc_tx_subframe = subframe;
-	      if (normalized_rx_power>(target_rx_power+1)) {
-		tpc = 0; //-1
-		tpc_accumulated--;
-	      } else if (normalized_rx_power<(target_rx_power-1)) {
-		tpc = 2; //+1
-		tpc_accumulated++;
-	      } else {
-		tpc = 1; //0
-	      }
-	      LOG_D(MAC,"[eNB %d] DLSCH scheduler: frame %d, subframe %d, harq_pid %d, tpc %d, accumulated %d, normalized/target rx power %d/%d\n",
-		    mod_id, frame, subframe, harq_pid, tpc,
-		    tpc_accumulated, normalized_rx_power, target_rx_power);
-	    } // Po_PUCCH has been updated 
-	    else {
-	      tpc = 1; //0
-	    } // time to do TPC update 
-	  else {
-	    tpc = 1; //0
-	  }
-
-	  for(i=0; i<PHY_vars_eNB_g[mod_id][CC_id]->frame_parms.N_RBG; i++) {
-	    rballoc_sub[i] = UE_list->UE_template[CC_id][UE_id].rballoc_subband[harq_pid][i];
-          }	
-
-	   // Toggle NDI
-          LOG_D(MAC,"CC_id %d Frame %d, subframeP %d: Toggling Format1 NDI for UE %d (rnti %x/%d) oldNDI %d\n",
-                CC_id, frame, subframe, UE_id,
-                UE_list->UE_template[CC_id][UE_id].rnti,harq_pid, UE_list->UE_template[CC_id][UE_id].oldNDI[harq_pid]);
-          UE_list->UE_template[CC_id][UE_id].oldNDI[harq_pid]= 1 - UE_list->UE_template[CC_id][UE_id].oldNDI[harq_pid];
-	  ndi =  UE_list->UE_template[CC_id][UE_id].oldNDI[harq_pid];
-	  
-	  UE_list->UE_template[CC_id][UE_id].mcs[harq_pid] = mcs;
-	  UE_list->UE_template[CC_id][UE_id].oldTPC[harq_pid] = tpc;
-
-	  // Increase the pointer for the number of scheduled UEs
-	  num_ues_added++;
-	  ue_has_transmission = 1;
-	}  else { // There is no data from RLC or MAC header, so don't schedule
-	  ue_has_transmission = 0;
-	}
-      } // End of new scheduling
-        
-      // If we has transmission or retransmission
-      if (ue_has_transmission) {
-        	switch (mac_xface->get_transmission_mode(mod_id, CC_id, rnti)) {
-        	case 1:
-        	case 2:
-        	default:
-        	  dl_dci->has_res_alloc = 1;
-        	  dl_dci->res_alloc = 0;
-        	  dl_dci->has_vrb_format = 1;
-        	  dl_dci->vrb_format = PROTOCOL__FLEX_VRB_FORMAT__FLVRBF_LOCALIZED;
-        	  dl_dci->has_format = 1;
-        	  dl_dci->format = PROTOCOL__FLEX_DCI_FORMAT__FLDCIF_1;
-        	  dl_dci->has_rb_bitmap = 1;
-        	  dl_dci->rb_bitmap = allocate_prbs_sub(nb_rb, rballoc_sub);
-        	  dl_dci->has_rb_shift = 1;
-        	  dl_dci->rb_shift = 0;
-        	  dl_dci->n_ndi = 1;
-        	  dl_dci->ndi = (uint32_t *) malloc(sizeof(uint32_t) * dl_dci->n_ndi);
-        	  dl_dci->ndi[0] = ndi;
-        	  dl_dci->n_rv = 1;
-        	  dl_dci->rv = (uint32_t *) malloc(sizeof(uint32_t) * dl_dci->n_rv);
-        	  dl_dci->rv[0] = round & 3;
-        	  dl_dci->has_tpc = 1;
-        	  dl_dci->tpc = tpc;
-        	  dl_dci->n_mcs = 1;
-        	  dl_dci->mcs = (uint32_t *) malloc(sizeof(uint32_t) * dl_dci->n_mcs);
-        	  dl_dci->mcs[0] = mcs;
-        	  dl_dci->n_tbs_size = 1;
-        	  dl_dci->tbs_size = (uint32_t *) malloc(sizeof(uint32_t) * dl_dci->n_tbs_size);
-        	  dl_dci->tbs_size[0] = dci_tbs;
-        	  if (flexran_get_duplex_mode(mod_id, CC_id) == PROTOCOL__FLEX_DUPLEX_MODE__FLDM_TDD) {
-        	    dl_dci->has_dai = 1;
-        	    dl_dci->dai = (UE_list->UE_template[CC_id][UE_id].DAI-1)&3;
-        	  }
-        	  break;
-        	case 3:
-        	  dl_dci->has_res_alloc = 1;
-        	  dl_dci->res_alloc = 0;
-        	  dl_dci->has_vrb_format = 1;
-        	  dl_dci->vrb_format = PROTOCOL__FLEX_VRB_FORMAT__FLVRBF_LOCALIZED;
-        	  dl_dci->has_format = 1;
-        	  dl_dci->format = PROTOCOL__FLEX_DCI_FORMAT__FLDCIF_2A;
-        	  dl_dci->has_rb_bitmap = 1;
-        	  dl_dci->rb_bitmap = allocate_prbs_sub(nb_rb, rballoc_sub);
-        	  dl_dci->has_rb_shift = 1;
-        	  dl_dci->rb_shift = 0;
-        	  dl_dci->n_ndi = 2;
-        	  dl_dci->ndi = (uint32_t *) malloc(sizeof(uint32_t) * dl_dci->n_ndi);
-        	  dl_dci->ndi[0] = ndi;
-        	  dl_dci->ndi[1] = ndi;
-        	  dl_dci->n_rv = 2;
-        	  dl_dci->rv = (uint32_t *) malloc(sizeof(uint32_t) * dl_dci->n_rv);
-        	  dl_dci->rv[0] = round & 3;
-        	  dl_dci->rv[1] = round & 3;
-        	  dl_dci->has_tpc = 1;
-        	  dl_dci->tpc = tpc;
-        	  dl_dci->n_mcs = 2;
-        	  dl_dci->mcs = (uint32_t *) malloc(sizeof(uint32_t) * dl_dci->n_mcs);
-        	  dl_dci->mcs[0] = mcs;
-        	  dl_dci->mcs[1] = mcs;
-        	  dl_dci->n_tbs_size = 2;
-        	  dl_dci->tbs_size = (uint32_t *) malloc(sizeof(uint32_t) * dl_dci->n_tbs_size);
-        	  dl_dci->tbs_size[0] = dci_tbs;
-        	  dl_dci->tbs_size[1] = dci_tbs;
-        	  if (flexran_get_duplex_mode(mod_id, CC_id) == PROTOCOL__FLEX_DUPLEX_MODE__FLDM_TDD) {
-        	    dl_dci->has_dai = 1;
-        	    dl_dci->dai = (UE_list->UE_template[CC_id][UE_id].DAI-1)&3;
-        	  }
-        	  break;
-        	case 4:
-        	  dl_dci->has_res_alloc = 1;
-        	  dl_dci->res_alloc = 0;
-        	  dl_dci->has_vrb_format = 1;
-        	  dl_dci->vrb_format = PROTOCOL__FLEX_VRB_FORMAT__FLVRBF_LOCALIZED;
-        	  dl_dci->has_format = 1;
-        	  dl_dci->format = PROTOCOL__FLEX_DCI_FORMAT__FLDCIF_2A;
-        	  dl_dci->has_rb_bitmap = 1;
-        	  dl_dci->rb_bitmap = allocate_prbs_sub(nb_rb, rballoc_sub);
-        	  dl_dci->has_rb_shift = 1;
-        	  dl_dci->rb_shift = 0;
-        	  dl_dci->n_ndi = 2;
-        	  dl_dci->ndi = (uint32_t *) malloc(sizeof(uint32_t) * dl_dci->n_ndi);
-        	  dl_dci->ndi[0] = ndi;
-        	  dl_dci->ndi[1] = ndi;
-        	  dl_dci->n_rv = 2;
-        	  dl_dci->rv = (uint32_t *) malloc(sizeof(uint32_t) * dl_dci->n_rv);
-        	  dl_dci->rv[0] = round & 3;
-        	  dl_dci->rv[1] = round & 3;
-        	  dl_dci->has_tpc = 1;
-        	  dl_dci->tpc = tpc;
-        	  dl_dci->n_mcs = 2;
-        	  dl_dci->mcs = (uint32_t *) malloc(sizeof(uint32_t) * dl_dci->n_mcs);
-        	  dl_dci->mcs[0] = mcs;
-        	  dl_dci->mcs[1] = mcs;
-        	  dl_dci->n_tbs_size = 2;
-        	  dl_dci->tbs_size = (uint32_t *) malloc(sizeof(uint32_t) * dl_dci->n_tbs_size);
-        	  dl_dci->tbs_size[0] = dci_tbs;
-        	  dl_dci->tbs_size[1] = dci_tbs;
-        	  if (flexran_get_duplex_mode(mod_id, CC_id) == PROTOCOL__FLEX_DUPLEX_MODE__FLDM_TDD) {
-        	    dl_dci->has_dai = 1;
-        	    dl_dci->dai = (UE_list->UE_template[CC_id][UE_id].DAI-1)&3;
-        	  }
-        	  break;
-        	case 5:
-        	  dl_dci->has_res_alloc = 1;
-        	  dl_dci->res_alloc = 0;
-        	  dl_dci->has_vrb_format = 1;
-        	  dl_dci->vrb_format = PROTOCOL__FLEX_VRB_FORMAT__FLVRBF_LOCALIZED;
-        	  dl_dci->has_format = 1;
-        	  dl_dci->format = PROTOCOL__FLEX_DCI_FORMAT__FLDCIF_1D;
-        	  dl_dci->has_rb_bitmap = 1;
-        	  dl_dci->rb_bitmap = allocate_prbs_sub(nb_rb, rballoc_sub);
-        	  dl_dci->has_rb_shift = 1;
-        	  dl_dci->rb_shift = 0;
-        	  dl_dci->n_ndi = 1;
-        	  dl_dci->ndi[0] = ndi;
-        	  dl_dci->n_rv = 1;
-        	  dl_dci->rv = (uint32_t *) malloc(sizeof(uint32_t) * dl_dci->n_rv);
-        	  dl_dci->rv[0] = round & 3;
-        	  dl_dci->has_tpc = 1;
-        	  dl_dci->tpc = tpc;
-        	  dl_dci->n_mcs = 1;
-        	  dl_dci->mcs = (uint32_t *) malloc(sizeof(uint32_t) * dl_dci->n_mcs);
-        	  dl_dci->mcs[0] = mcs;
-        	  dl_dci->n_tbs_size = 1;
-        	  dl_dci->tbs_size = (uint32_t *) malloc(sizeof(uint32_t) * dl_dci->n_tbs_size);
-        	  dl_dci->tbs_size[0] = dci_tbs;
-        	  if (flexran_get_duplex_mode(mod_id, CC_id) == PROTOCOL__FLEX_DUPLEX_MODE__FLDM_TDD) {
-        	    dl_dci->has_dai = 1;
-        	    dl_dci->dai = (UE_list->UE_template[CC_id][UE_id].DAI-1)&3;
-        	  }
-        	  
-        	  if(ue_sched_ctl->dl_pow_off[CC_id] == 2) {
-        	    ue_sched_ctl->dl_pow_off[CC_id] = 1;
-        	  }
-        	  
-        	  dl_dci->has_dl_power_offset = 1;
-        	  dl_dci->dl_power_offset = ue_sched_ctl->dl_pow_off[CC_id];
-        	  dl_dci->has_precoding_info = 1;
-        	  dl_dci->precoding_info = 5; // Is this right??
-        	  
-        	  break;
-        	case 6:
-        	  dl_dci->has_res_alloc = 1;
-        	  dl_dci->res_alloc = 0;
-        	  dl_dci->has_vrb_format = 1;
-        	  dl_dci->vrb_format = PROTOCOL__FLEX_VRB_FORMAT__FLVRBF_LOCALIZED;
-        	  dl_dci->has_format = 1;
-        	  dl_dci->format = PROTOCOL__FLEX_DCI_FORMAT__FLDCIF_1D;
-        	  dl_dci->has_rb_bitmap = 1;
-        	  dl_dci->rb_bitmap = allocate_prbs_sub(nb_rb, rballoc_sub);
-        	  dl_dci->has_rb_shift = 1;
-        	  dl_dci->rb_shift = 0;
-        	  dl_dci->n_ndi = 1;
-        	  dl_dci->ndi = (uint32_t *) malloc(sizeof(uint32_t) * dl_dci->n_ndi);
-        	  dl_dci->ndi[0] = ndi;
-        	  dl_dci->n_rv = 1;
-        	  dl_dci->rv = (uint32_t *) malloc(sizeof(uint32_t) * dl_dci->n_rv);
-        	  dl_dci->rv[0] = round & 3;
-        	  dl_dci->has_tpc = 1;
-        	  dl_dci->tpc = tpc;
-        	  dl_dci->n_mcs = 1;
-        	  dl_dci->mcs = (uint32_t *) malloc(sizeof(uint32_t) * dl_dci->n_mcs);
-        	  dl_dci->mcs[0] = mcs;
-        	  if (flexran_get_duplex_mode(mod_id, CC_id) == PROTOCOL__FLEX_DUPLEX_MODE__FLDM_TDD) {
-        	    dl_dci->has_dai = 1;
-        	    dl_dci->dai = (UE_list->UE_template[CC_id][UE_id].DAI-1)&3;
-        	  }
-
-        	  dl_dci->has_dl_power_offset = 1;
-        	  dl_dci->dl_power_offset = ue_sched_ctl->dl_pow_off[CC_id];
-        	  dl_dci->has_precoding_info = 1;
-        	  dl_dci->precoding_info = 5; // Is this right??
-        	  break;
-        	}
-      }
-      
-      // if (flexran_get_duplex_mode(mod_id, CC_id) == PROTOCOL__FLEX_DUPLEX_MODE__FLDM_TDD) {
-        
-	/* TODO */
-	//set_ul_DAI(mod_id, UE_id, CC_id, frame, subframe, frame_parms);
-      // }
-    } // UE_id loop
-   } // CC_id loop
-
-   // Add all the dl_data elements to the flexran message
-   int offset = (*dl_info)->dl_mac_config_msg->n_dl_ue_data;
-   (*dl_info)->dl_mac_config_msg->n_dl_ue_data += num_ues_added;
-   if ( num_ues_added > 0 ){
-     (*dl_info)->dl_mac_config_msg->dl_ue_data = (Protocol__FlexDlData **) realloc( (*dl_info)->dl_mac_config_msg->dl_ue_data,
-										    sizeof(Protocol__FlexDlData *) * ((*dl_info)->dl_mac_config_msg->n_dl_ue_data));
-     if ((*dl_info)->dl_mac_config_msg->dl_ue_data == NULL ){
-       LOG_E(MAC, "Request for memory reallocation failed\n");
-       return;
-     }
-     for (i = 0; i < num_ues_added; i++) {
-       (*dl_info)->dl_mac_config_msg->dl_ue_data[offset+i] = dl_data[i];
-     }
-   }
-      
-   stop_meas(&eNB->schedule_dlsch);
-   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_SCHEDULE_DLSCH,VCD_FUNCTION_OUT);
-}
diff --git a/openair2/LAYER2/MAC/flexran_agent_scheduler_dlsch_ue_remote.c b/openair2/LAYER2/MAC/flexran_agent_scheduler_dlsch_ue_remote.c
deleted file mode 100644
index 2b0bf72015..0000000000
--- a/openair2/LAYER2/MAC/flexran_agent_scheduler_dlsch_ue_remote.c
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-/*! \file flexran_agent_scheduler_dlsch_ue_remote.c
- * \brief procedures related to remote scheduling in the DLSCH transport channel
- * \author Xenofon Foukas
- * \date 2016
- * \email: x.foukas@sms.ed.ac.uk
- * \version 0.1
- * @ingroup _mac
-
- */
-
-#include "flexran_agent_common_internal.h"
-#include "flexran_agent_ran_api.h"
-#include "flexran_agent_scheduler_dlsch_ue_remote.h"
-
-#include "LAYER2/MAC/defs.h"
-#include "LAYER2/MAC/extern.h"
-
-struct DlMacConfigHead queue_head;
-
-int queue_initialized = 0;
-
-//uint32_t skip_subframe = 1;
-//uint32_t period = 10;
-//uint32_t sched [] = {1, 2, 3};
-
-void
-flexran_schedule_ue_spec_remote(mid_t mod_id, uint32_t frame,
-				uint32_t subframe, int *mbsfn_flag,
-				Protocol__FlexranMessage ** dl_info)
-{
-
-
-    //if ((subframe == skip_subframe) && (frame % period == 0)) {
-    //  LOG_I(MAC, "Will skip subframe %d %d\n", subframe, frame);
-    //  for (int i = 0; i < 3; i++) {
-    //    LOG_I(MAC, "%d\n", sched[i]);
-    //  }
-    //}
-
-    /* if (frame == 500 && subframe == 1) { */
-    /*   char policy[] = "rrc: \n - ul_scheduler: \n    behavior : tester_function\n    parameters:\n      period: !!int 3\nmac: \n - dl_scheduler: \n    parameters: \n      period : !!int 40\n      skip_subframe : !!int 3\n      sched : [!!int 4, !!int 5, !!int 6]"; */
-    /*   apply_reconfiguration_policy(mod_id, policy, strlen(policy)); */
-    /* } */
-
-    eNB_MAC_INST *eNB;
-
-    if (!queue_initialized) {
-	TAILQ_INIT(&queue_head);
-	queue_initialized = 1;
-    }
-
-    eNB = &eNB_mac_inst[mod_id];
-
-    dl_mac_config_element_t *dl_config_elem;
-
-    int diff;
-    LOG_D(MAC, "[TEST] Current frame and subframe %d, %d\n", frame,
-	  subframe);
-    // First we check to see if we have a scheduling decision for this sfn_sf already in our queue
-    while (queue_head.tqh_first != NULL) {
-	dl_config_elem = queue_head.tqh_first;
-
-	diff =
-	    get_sf_difference(mod_id,
-			      dl_config_elem->dl_info->
-			      dl_mac_config_msg->sfn_sf);
-	// Check if this decision is for now, for a later or a previous subframe
-	if (diff == 0) {	// Now
-	    LOG_D(MAC,
-		  "Found a decision for this subframe in the queue. Let's use it!\n");
-	    TAILQ_REMOVE(&queue_head, queue_head.tqh_first, configs);
-	    *dl_info = dl_config_elem->dl_info;
-	    free(dl_config_elem);
-	    eNB->eNB_stats[mod_id].sched_decisions++;
-	    return;
-	} else if (diff < 0) {	//previous subframe , delete message and free memory
-	    LOG_D(MAC,
-		  "Found a decision for a previous subframe in the queue. Let's get rid of it\n");
-	    TAILQ_REMOVE(&queue_head, queue_head.tqh_first, configs);
-	    flexran_agent_mac_destroy_dl_config(dl_config_elem->dl_info);
-	    free(dl_config_elem);
-	    eNB->eNB_stats[mod_id].sched_decisions++;
-	    eNB->eNB_stats[mod_id].missed_deadlines++;
-	} else {		// next subframe, nothing to do now
-	    LOG_D(MAC,
-		  "Found a decision for a future subframe in the queue. Nothing to do now\n");
-	    flexran_agent_mac_create_empty_dl_config(mod_id, dl_info);
-	    return;
-	}
-    }
-
-    //Done with the local cache. Now we need to check if something new arrived
-    flexran_agent_get_pending_dl_mac_config(mod_id, dl_info);
-    while (*dl_info != NULL) {
-
-	diff =
-	    get_sf_difference(mod_id,
-			      (*dl_info)->dl_mac_config_msg->sfn_sf);
-	if (diff == 0) {	// Got a command for this sfn_sf
-	    LOG_D(MAC,
-		  "Found a decision for this subframe pending. Let's use it\n");
-	    eNB->eNB_stats[mod_id].sched_decisions++;
-	    return;
-	} else if (diff < 0) {
-	    LOG_D(MAC,
-		  "Found a decision for a previous subframe. Let's get rid of it\n");
-	    flexran_agent_mac_destroy_dl_config(*dl_info);
-	    *dl_info = NULL;
-	    flexran_agent_get_pending_dl_mac_config(mod_id, dl_info);
-	    eNB->eNB_stats[mod_id].sched_decisions++;
-	    eNB->eNB_stats[mod_id].missed_deadlines++;
-	} else {		// Intended for future subframe. Store it in local cache
-	    LOG_D(MAC,
-		  "Found a decision for a future subframe in the queue. Let's store it in the cache\n");
-	    dl_mac_config_element_t *e =
-		malloc(sizeof(dl_mac_config_element_t));
-	    e->dl_info = *dl_info;
-	    TAILQ_INSERT_TAIL(&queue_head, e, configs);
-	    flexran_agent_mac_create_empty_dl_config(mod_id, dl_info);
-	    // No need to look for another. Messages arrive ordered
-	    return;
-	}
-    }
-
-    // We found no pending command, so we will simply pass an empty one
-    flexran_agent_mac_create_empty_dl_config(mod_id, dl_info);
-}
-
-int get_sf_difference(mid_t mod_id, uint32_t sfn_sf)
-{
-    int diff_in_subframes;
-
-    uint16_t current_frame = flexran_get_current_system_frame_num(mod_id);
-    uint16_t current_subframe = flexran_get_current_subframe(mod_id);
-    uint32_t current_sfn_sf = flexran_get_sfn_sf(mod_id);
-
-    if (sfn_sf == current_sfn_sf) {
-	return 0;
-    }
-
-    uint16_t frame_mask = ((1 << 12) - 1);
-    uint16_t frame = (sfn_sf & (frame_mask << 4)) >> 4;
-
-    uint16_t sf_mask = ((1 << 4) - 1);
-    uint16_t subframe = (sfn_sf & sf_mask);
-
-    LOG_D(MAC, "[TEST] Target frame and subframe %d, %d\n", frame,
-	  subframe);
-
-    if (frame == current_frame) {
-	return subframe - current_subframe;
-    } else if (frame > current_frame) {
-	diff_in_subframes =
-	    ((frame * 10) + subframe) - ((current_frame * 10) +
-					 current_subframe);
-
-	//    diff_in_subframes = 9 - current_subframe;
-	//diff_in_subframes += (subframe + 1);
-	//diff_in_subframes += (frame-2) * 10;
-	if (diff_in_subframes > SCHED_AHEAD_SUBFRAMES) {
-	    return -1;
-	} else {
-	    return 1;
-	}
-    } else {			//frame < current_frame
-	//diff_in_subframes = 9 - current_subframe;
-	//diff_in_subframes += (subframe + 1);
-	//if (frame > 0) {
-	//  diff_in_subframes += (frame - 1) * 10;
-	//}
-	//diff_in_subframes += (1023 - current_frame) * 10;
-	diff_in_subframes =
-	    10240 - ((current_frame * 10) + current_subframe) +
-	    ((frame * 10) + subframe);
-	if (diff_in_subframes > SCHED_AHEAD_SUBFRAMES) {
-	    return -1;
-	} else {
-	    return 1;
-	}
-    }
-}
diff --git a/openair2/LAYER2/MAC/flexran_agent_scheduler_dlsch_ue_remote.h b/openair2/LAYER2/MAC/flexran_agent_scheduler_dlsch_ue_remote.h
deleted file mode 100644
index 449ba1e8cd..0000000000
--- a/openair2/LAYER2/MAC/flexran_agent_scheduler_dlsch_ue_remote.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-/*! \file flexran_agent_scheduler_dlsch_ue_remote.h
- * \brief Local stub for remote scheduler used by the controller
- * \author Xenofon Foukas
- * \date 2016
- * \email: x.foukas@sms.ed.ac.uk
- * \version 0.1
- * @ingroup _mac
-
- */
-
-#ifndef __LAYER2_MAC_FLEXRAN_AGENT_SCHEDULER_DLSCH_UE_REMOTE_H__
-#define __LAYER2_MAC_FLEXRAN_AGENT_SCHEDULER_DLSCH_UE_REMOTE_H___
-
-#include "flexran.pb-c.h"
-#include "header.pb-c.h"
-
-#include "ENB_APP/flexran_agent_defs.h"
-#include "flexran_agent_mac.h"
-#include "LAYER2/MAC/flexran_agent_mac_proto.h"
-
-#include <sys/queue.h>
-
-// Maximum value of schedule ahead of time
-// Required to identify if a dl_command is for the future or not
-#define SCHED_AHEAD_SUBFRAMES 20
-
-typedef struct dl_mac_config_element_s {
-    Protocol__FlexranMessage *dl_info;
-     TAILQ_ENTRY(dl_mac_config_element_s) configs;
-} dl_mac_config_element_t;
-
-TAILQ_HEAD(DlMacConfigHead, dl_mac_config_element_s);
-
-/*
- * Default scheduler used by the eNB agent
- */
-void flexran_schedule_ue_spec_remote(mid_t mod_id, uint32_t frame,
-				     uint32_t subframe, int *mbsfn_flag,
-				     Protocol__FlexranMessage ** dl_info);
-
-
-// Find the difference in subframes from the given subframe
-// negative for older value
-// 0 for equal
-// positive for future value
-// Based on  
-int get_sf_difference(mid_t mod_id, uint32_t sfn_sf);
-
-#endif
diff --git a/openair2/LAYER2/MAC/flexran_agent_scheduler_ulsch_ue.c b/openair2/LAYER2/MAC/flexran_agent_scheduler_ulsch_ue.c
deleted file mode 100644
index 86ea61d943..0000000000
--- a/openair2/LAYER2/MAC/flexran_agent_scheduler_ulsch_ue.c
+++ /dev/null
@@ -1,1112 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.0  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-/*! \file eNB_scheduler_ulsch.c
- * \brief FlexRAN eNB procedures for the ULSCH transport channel
- * \author Navid Nikaein and shahab SHARIAT BAGHERI
- * \date 2017
- * \version 1.0
- * @ingroup _mac
-
- */
-
-#include "assertions.h"
-#include "PHY/defs.h"
-#include "PHY/extern.h"
-
-#include "SCHED/defs.h"
-#include "SCHED/extern.h"
-
-#include "LAYER2/MAC/flexran_agent_mac_proto.h"
-#include "LAYER2/MAC/defs.h"
-#include "LAYER2/MAC/proto.h"
-#include "LAYER2/MAC/extern.h"
-#include "UTIL/LOG/log.h"
-#include "UTIL/LOG/vcd_signal_dumper.h"
-#include "UTIL/OPT/opt.h"
-#include "OCG.h"
-#include "OCG_extern.h"
-
-#include "RRC/LITE/extern.h"
-#include "RRC/L2_INTERFACE/openair_rrc_L2_interface.h"
-
-//#include "LAYER2/MAC/pre_processor.c"
-#include "ENB_APP/flexran_agent_defs.h"
-#include "flexran_agent_ran_api.h"
-#include "pdcp.h"
-
-#include "header.pb-c.h"
-#include "flexran.pb-c.h"
-#include "flexran_agent_mac.h"
-
-#if defined(ENABLE_ITTI)
-# include "intertask_interface.h"
-#endif
-
-#include "T.h"
-
-#include <dlfcn.h>
-
-/* number of active slices for  past and current time*/
-int n_active_slices_uplink = 1;
-int n_active_slices_current_uplink = 1;
-
-/* RB share for each slice for past and current time*/
-float avg_slice_percentage_uplink=0.25;
-float slice_percentage_uplink[MAX_NUM_SLICES] = {1.0, 0.0, 0.0, 0.0};
-float slice_percentage_current_uplink[MAX_NUM_SLICES] = {1.0, 0.0, 0.0, 0.0};
-float total_slice_percentage_uplink = 0;
-float total_slice_percentage_current_uplink = 0;
-
-// MAX MCS for each slice for past and current time
-int slice_maxmcs_uplink[MAX_NUM_SLICES] = {16, 16, 16, 16};
-int slice_maxmcs_current_uplink[MAX_NUM_SLICES] = {16,16,16,16};
-
-/*resource blocks allowed*/
-uint16_t         nb_rbs_allowed_slice_uplink[MAX_NUM_CCs][MAX_NUM_SLICES];      
-/*Slice Update */
-int update_ul_scheduler[MAX_NUM_SLICES] = {1, 1, 1, 1};
-int update_ul_scheduler_current[MAX_NUM_SLICES] = {1, 1, 1, 1};
-
- /* Slice Function Pointer */
-slice_scheduler_ul slice_sched_ul[MAX_NUM_SLICES] = {0};
-
-/* name of available scheduler*/
-char *ul_scheduler_type[MAX_NUM_SLICES] = {"flexran_schedule_ue_ul_spec_embb",
-					   "flexran_schedule_ue_ul_spec_embb",
-					   "flexran_schedule_ue_ul_spec_embb",
-					   "flexran_schedule_ue_ul_spec_embb"      // best effort 
-};
-
-
-uint16_t flexran_nb_rbs_allowed_slice_uplink(float rb_percentage, int total_rbs){
-  return  (uint16_t) floor(rb_percentage * total_rbs); 
-}
-
-
-void _assign_max_mcs_min_rb(module_id_t module_idP, int slice_id, int frameP, sub_frame_t subframeP, uint16_t *first_rb)
-{
-
-  int                i;
-  uint16_t           n,UE_id;
-  uint8_t            CC_id;
-  rnti_t             rnti           = -1;
-  int                mcs;
-  int                rb_table_index=0,tbs,tx_power;
-  eNB_MAC_INST       *eNB = &eNB_mac_inst[module_idP];
-  UE_list_t          *UE_list = &eNB->UE_list;
-
-  UE_TEMPLATE       *UE_template;
-  LTE_DL_FRAME_PARMS   *frame_parms;
-
-   
-  for (i = 0; i < NUMBER_OF_UE_MAX; i++) {
-    if (UE_list->active[i] != TRUE) continue;
-
-    rnti = UE_RNTI(module_idP,i);
-
-    if (rnti==NOT_A_RNTI)
-      continue;
-    if (UE_list->UE_sched_ctrl[i].ul_out_of_sync == 1)
-      continue;
-    if (!phy_stats_exist(module_idP, rnti))
-      continue;
-
-    if (UE_list->UE_sched_ctrl[i].phr_received == 1)
-      mcs = 20; // if we've received the power headroom information the UE, we can go to maximum mcs
-    else
-      mcs = 10; // otherwise, limit to QPSK PUSCH
-
-    UE_id = i;
-
-    for (n=0; n<UE_list->numactiveULCCs[UE_id]; n++) {
-      // This is the actual CC_id in the list
-      CC_id = UE_list->ordered_ULCCids[n][UE_id];
-
-      if (CC_id >= MAX_NUM_CCs) {
-        LOG_E( MAC, "CC_id %u should be < %u, loop n=%u < numactiveULCCs[%u]=%u",
-               CC_id,
-               MAX_NUM_CCs,
-               n,
-               UE_id,
-               UE_list->numactiveULCCs[UE_id]);
-      }
-
-      AssertFatal( CC_id < MAX_NUM_CCs, "CC_id %u should be < %u, loop n=%u < numactiveULCCs[%u]=%u",
-                   CC_id,
-                   MAX_NUM_CCs,
-                   n,
-                   UE_id,
-                   UE_list->numactiveULCCs[UE_id]);
-      frame_parms=mac_xface->get_lte_frame_parms(module_idP,CC_id);
-      UE_template = &UE_list->UE_template[CC_id][UE_id];
-      nb_rbs_allowed_slice_uplink[CC_id][UE_id] = flexran_nb_rbs_allowed_slice_uplink(slice_percentage_uplink[UE_id], flexran_get_N_RB_UL(module_idP, CC_id));
-      // if this UE has UL traffic
-      if (UE_template->ul_total_buffer > 0 ) {
-
-        tbs = mac_xface->get_TBS_UL(mcs,3);  // 1 or 2 PRB with cqi enabled does not work well!
-        // fixme: set use_srs flag
-        tx_power= mac_xface->estimate_ue_tx_power(tbs,rb_table[rb_table_index],0,frame_parms->Ncp,0);
-
-        while ((((UE_template->phr_info - tx_power) < 0 ) || (tbs > UE_template->ul_total_buffer))&&
-               (mcs > 3)) {
-          // LOG_I(MAC,"UE_template->phr_info %d tx_power %d mcs %d\n", UE_template->phr_info,tx_power, mcs);
-          mcs--;
-          tbs = mac_xface->get_TBS_UL(mcs,rb_table[rb_table_index]);
-          tx_power = mac_xface->estimate_ue_tx_power(tbs,rb_table[rb_table_index],0,frame_parms->Ncp,0); // fixme: set use_srs
-        }
-
-        while ((tbs < UE_template->ul_total_buffer) &&
-               (rb_table[rb_table_index]<(nb_rbs_allowed_slice_uplink[CC_id][UE_id]-first_rb[CC_id])) &&
-               ((UE_template->phr_info - tx_power) > 0) &&
-               (rb_table_index < 32 )) {
-          //  LOG_I(MAC,"tbs %d ul buffer %d rb table %d max ul rb %d\n", tbs, UE_template->ul_total_buffer, rb_table[rb_table_index], frame_parms->N_RB_UL-first_rb[CC_id]);
-          rb_table_index++;
-          tbs = mac_xface->get_TBS_UL(mcs,rb_table[rb_table_index]);
-          tx_power = mac_xface->estimate_ue_tx_power(tbs,rb_table[rb_table_index],0,frame_parms->Ncp,0);
-        }
-
-        UE_template->ue_tx_power = tx_power;
-
-        if (rb_table[rb_table_index]>(nb_rbs_allowed_slice_uplink[CC_id][UE_id]-first_rb[CC_id]-1)) {
-          rb_table_index--;
-        }
-
-        // 1 or 2 PRB with cqi enabled does not work well!
-  if (rb_table[rb_table_index]<3) {
-          rb_table_index=2; //3PRB
-        }
-
-        UE_template->pre_assigned_mcs_ul=mcs;
-        UE_template->pre_allocated_rb_table_index_ul=rb_table_index;
-        UE_template->pre_allocated_nb_rb_ul= rb_table[rb_table_index];
-        LOG_D(MAC,"[eNB %d] frame %d subframe %d: for UE %d CC %d: pre-assigned mcs %d, pre-allocated rb_table[%d]=%d RBs (phr %d, tx power %d)\n",
-              module_idP, frameP, subframeP, UE_id, CC_id,
-              UE_template->pre_assigned_mcs_ul,
-              UE_template->pre_allocated_rb_table_index_ul,
-              UE_template->pre_allocated_nb_rb_ul,
-              UE_template->phr_info,tx_power);
-      } else {
-        UE_template->pre_allocated_rb_table_index_ul=-1;
-        UE_template->pre_allocated_nb_rb_ul=0;
-      }
-    }
-  }
-}
-
-
-
-
-void _ulsch_scheduler_pre_processor(module_id_t module_idP,
-                                   int slice_id,                                                     
-                                   int frameP,
-                                   sub_frame_t subframeP,
-                                   uint16_t *first_rb)
-{
-
-  int16_t            i;
-  uint16_t           UE_id,n,r;
-  uint8_t            CC_id, round, harq_pid;
-  uint16_t           nb_allocated_rbs[MAX_NUM_CCs][NUMBER_OF_UE_MAX],total_allocated_rbs[MAX_NUM_CCs],average_rbs_per_user[MAX_NUM_CCs];
-  uint16_t          nb_rbs_allowed_slice_uplink[MAX_NUM_CCs][MAX_NUM_SLICES];
-  int16_t            total_remaining_rbs[MAX_NUM_CCs];
-  uint16_t           max_num_ue_to_be_scheduled=0,total_ue_count=0;
-  rnti_t             rnti= -1;
-  UE_list_t          *UE_list = &eNB_mac_inst[module_idP].UE_list;
-  UE_TEMPLATE        *UE_template = 0;
-  // LTE_DL_FRAME_PARMS   *frame_parms; //Not used yet
-  UE_sched_ctrl *ue_sched_ctl;
-  
-
-  //LOG_I(MAC,"assign max mcs min rb\n");
-  // maximize MCS and then allocate required RB according to the buffer occupancy with the limit of max available UL RB
-  _assign_max_mcs_min_rb(module_idP, slice_id, frameP, subframeP, first_rb);
-
-  //LOG_I(MAC,"sort ue \n");
-  // sort ues
-  sort_ue_ul (module_idP,frameP, subframeP);
-
-
-  // we need to distribute RBs among UEs
-  // step1:  reset the vars
-  for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
-    total_allocated_rbs[CC_id]=0;
-    total_remaining_rbs[CC_id]=0;
-    average_rbs_per_user[CC_id]=0;
-
-    for (i=UE_list->head_ul; i>=0; i=UE_list->next_ul[i]) {
-      nb_allocated_rbs[CC_id][i]=0;
-    }
-  }
-
-  //LOG_I(MAC,"step2 \n");
-  // step 2: calculate the average rb per UE
-  total_ue_count =0;
-  max_num_ue_to_be_scheduled=0;
-
-  for (i=UE_list->head_ul; i>=0; i=UE_list->next_ul[i]) {
-
-    rnti = UE_RNTI(module_idP,i);
-
-    if (rnti==NOT_A_RNTI)
-      continue;
-
-    if (UE_list->UE_sched_ctrl[i].ul_out_of_sync == 1)
-      continue;
-
-    if (!phy_stats_exist(module_idP, rnti))
-      continue;
-
-    UE_id = i;
-
-    for (n=0; n<UE_list->numactiveULCCs[UE_id]; n++) {
-      // This is the actual CC_id in the list
-      CC_id = UE_list->ordered_ULCCids[n][UE_id];
-      UE_template = &UE_list->UE_template[CC_id][UE_id];
-      average_rbs_per_user[CC_id]=0;
-      // frame_parms = mac_xface->get_lte_frame_parms(module_idP,CC_id);
-
-      if (UE_template->pre_allocated_nb_rb_ul > 0) {
-        total_ue_count+=1;
-      }
-      /*
-      if((mac_xface->get_nCCE_max(module_idP,CC_id,3,subframeP) - nCCE_to_be_used[CC_id])  > (1<<aggregation)) {
-        nCCE_to_be_used[CC_id] = nCCE_to_be_used[CC_id] + (1<<aggregation);
-        max_num_ue_to_be_scheduled+=1;
-  }*/
-
-      max_num_ue_to_be_scheduled+=1;
-
-     nb_rbs_allowed_slice_uplink[CC_id][UE_id] = flexran_nb_rbs_allowed_slice_uplink(slice_percentage_uplink[UE_id], flexran_get_N_RB_UL(module_idP, CC_id));
-
-      if (total_ue_count == 0) {
-        average_rbs_per_user[CC_id] = 0;
-      } else if (total_ue_count == 1 ) { // increase the available RBs, special case,
-        average_rbs_per_user[CC_id] = nb_rbs_allowed_slice_uplink[CC_id][i]-first_rb[CC_id]+1;
-      } else if( (total_ue_count <= (nb_rbs_allowed_slice_uplink[CC_id][i]-first_rb[CC_id])) &&
-                 (total_ue_count <= max_num_ue_to_be_scheduled)) {
-        average_rbs_per_user[CC_id] = (uint16_t) floor((nb_rbs_allowed_slice_uplink[CC_id][i]-first_rb[CC_id])/total_ue_count);
-      } else if (max_num_ue_to_be_scheduled > 0 ) {
-        average_rbs_per_user[CC_id] = (uint16_t) floor((nb_rbs_allowed_slice_uplink[CC_id][i]-first_rb[CC_id])/max_num_ue_to_be_scheduled);
-      } else {
-        average_rbs_per_user[CC_id]=1;
-        LOG_W(MAC,"[eNB %d] frame %d subframe %d: UE %d CC %d: can't get average rb per user (should not be here)\n",
-              module_idP,frameP,subframeP,UE_id,CC_id);
-      }
-    }
-  }
-  if (total_ue_count > 0)
-    LOG_D(MAC,"[eNB %d] Frame %d subframe %d: total ue to be scheduled %d/%d\n",
-    module_idP, frameP, subframeP,total_ue_count, max_num_ue_to_be_scheduled);
-
-  //LOG_D(MAC,"step3\n");
-
-  // step 3: assigne RBS
-  for (i=UE_list->head_ul; i>=0; i=UE_list->next_ul[i]) {
-    rnti = UE_RNTI(module_idP,i);
-
-    if (rnti==NOT_A_RNTI)
-      continue;
-    if (UE_list->UE_sched_ctrl[i].ul_out_of_sync == 1)
-      continue;
-    if (!phy_stats_exist(module_idP, rnti))
-      continue;
-
-    UE_id = i;
-
-    for (n=0; n<UE_list->numactiveULCCs[UE_id]; n++) {
-      // This is the actual CC_id in the list
-      CC_id = UE_list->ordered_ULCCids[n][UE_id];
-      ue_sched_ctl = &UE_list->UE_sched_ctrl[UE_id];      
-      ue_sched_ctl->max_allowed_rbs[CC_id]=nb_rbs_allowed_slice_uplink[CC_id][UE_id];
-      // mac_xface->get_ue_active_harq_pid(module_idP,CC_id,rnti,frameP,subframeP,&harq_pid,&round,openair_harq_UL);
-      flexran_get_harq(module_idP, CC_id, UE_id, frameP, subframeP, &harq_pid, &round, openair_harq_UL);
-      if(round>0) {
-        nb_allocated_rbs[CC_id][UE_id] = UE_list->UE_template[CC_id][UE_id].nb_rb_ul[harq_pid];
-      } else {
-        nb_allocated_rbs[CC_id][UE_id] = cmin(UE_list->UE_template[CC_id][UE_id].pre_allocated_nb_rb_ul, average_rbs_per_user[CC_id]);
-      }
-
-      total_allocated_rbs[CC_id]+= nb_allocated_rbs[CC_id][UE_id];
-
-    }
-  }
-
-  // step 4: assigne the remaining RBs and set the pre_allocated rbs accordingly
-  for(r=0; r<2; r++) {
-
-    for (i=UE_list->head_ul; i>=0; i=UE_list->next_ul[i]) {
-      rnti = UE_RNTI(module_idP,i);
-
-      if (rnti==NOT_A_RNTI)
-        continue;
-      if (UE_list->UE_sched_ctrl[i].ul_out_of_sync == 1)
-  continue;
-      if (!phy_stats_exist(module_idP, rnti))
-        continue;
-
-      UE_id = i;
-
-      for (n=0; n<UE_list->numactiveULCCs[UE_id]; n++) {
-        // This is the actual CC_id in the list
-        CC_id = UE_list->ordered_ULCCids[n][UE_id];
-        UE_template = &UE_list->UE_template[CC_id][UE_id];        
-        // frame_parms = mac_xface->get_lte_frame_parms(module_idP,CC_id);
-        total_remaining_rbs[CC_id]=nb_rbs_allowed_slice_uplink[CC_id][UE_id] - first_rb[CC_id] - total_allocated_rbs[CC_id];
-
-        if (total_ue_count == 1 ) {
-          total_remaining_rbs[CC_id]+=1;
-        }
-
-        if ( r == 0 ) {
-          while ( (UE_template->pre_allocated_nb_rb_ul > 0 ) &&
-                  (nb_allocated_rbs[CC_id][UE_id] < UE_template->pre_allocated_nb_rb_ul) &&
-                  (total_remaining_rbs[CC_id] > 0)) {
-            nb_allocated_rbs[CC_id][UE_id] = cmin(nb_allocated_rbs[CC_id][UE_id]+1,UE_template->pre_allocated_nb_rb_ul);
-            total_remaining_rbs[CC_id]--;
-            total_allocated_rbs[CC_id]++;
-          }
-        } else {
-          UE_template->pre_allocated_nb_rb_ul= nb_allocated_rbs[CC_id][UE_id];
-          LOG_D(MAC,"******************UL Scheduling Information for UE%d CC_id %d ************************\n",UE_id, CC_id);
-          LOG_D(MAC,"[eNB %d] total RB allocated for UE%d CC_id %d  = %d\n", module_idP, UE_id, CC_id, UE_template->pre_allocated_nb_rb_ul);
-        }
-      }
-    }
-  }
-
-  for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
-    // frame_parms= mac_xface->get_lte_frame_parms(module_idP,CC_id);
-
-    if (total_allocated_rbs[CC_id]>0) {
-      LOG_D(MAC,"[eNB %d] total RB allocated for all UEs = %d/%d\n", module_idP, total_allocated_rbs[CC_id], nb_rbs_allowed_slice_uplink[CC_id][slice_id] - first_rb[CC_id]);
-    }
-  }
-}
-
-/*
- * Main Uplink Slicing 
- *
- */
-
-void
-flexran_schedule_ue_ul_spec_default(mid_t   mod_id,
-				 uint32_t      frame,
-				 uint32_t      cooperation_flag,
-				 int           subframe,
-				 unsigned char sched_subframe,
-				 Protocol__FlexranMessage **ul_info)
-//------------------------------------------------------------------------------
-{
-  int i=0;
-  
-  flexran_agent_mac_create_empty_ul_config(mod_id, ul_info);
-   
-  total_slice_percentage_uplink=0;
-  avg_slice_percentage_uplink=1.0/n_active_slices_uplink;
-  
-  // reset the slice percentage for inactive slices
-  for (i = n_active_slices_uplink; i< MAX_NUM_SLICES; i++) {
-    slice_percentage_uplink[i]=0;
-  }
-  for (i = 0; i < n_active_slices_uplink; i++) {
-    if (slice_percentage_uplink[i] < 0 ){
-      LOG_W(MAC, "[eNB %d] frame %d subframe %d:invalid slice %d percentage %f. resetting to zero",
-	    mod_id, frame, subframe, i, slice_percentage_uplink[i]);
-      slice_percentage_uplink[i]=0;
-    }
-    total_slice_percentage_uplink+=slice_percentage_uplink[i];
-  }
- 
-  for (i = 0; i < n_active_slices_uplink; i++) {
-    
-    // Load any updated functions
-    if (update_ul_scheduler[i] > 0 ) {
-      slice_sched_ul[i] = dlsym(NULL, ul_scheduler_type[i]); 
-      update_ul_scheduler[i] = 0;
-      update_ul_scheduler_current[i] = 0;
-      //slice_percentage_current_uplink[i]= slice_percentage_uplink[i];
-      //total_slice_percentage_current_uplink+=slice_percentage_uplink[i];
-      //if (total_slice_percentage_current_uplink> 1) 
-      //	total_slice_percentage_current_uplink=1;
-      LOG_N(MAC,"update ul scheduler slice %d\n", i);
-    }
-    // the new total RB share is within the range
-    if (total_slice_percentage_uplink <= 1.0){
-
-      // check if the number of slices has changed, and log 
-      if (n_active_slices_current_uplink != n_active_slices_uplink ){
-	if ((n_active_slices_uplink > 0) && (n_active_slices_uplink <= MAX_NUM_SLICES)) {
-	  LOG_N(MAC,"[eNB %d]frame %d subframe %d: number of active UL slices has changed: %d-->%d\n",
-		mod_id, frame, subframe, n_active_slices_current_uplink, n_active_slices_uplink);
-	  
-	  n_active_slices_current_uplink = n_active_slices_uplink;
-	  
-	} else {
-	  LOG_W(MAC,"invalid number of UL slices %d, revert to the previous value %d\n",n_active_slices_uplink, n_active_slices_current_uplink);
-	  n_active_slices_uplink = n_active_slices_current_uplink;
-	}
-      }
-    
-    // check if the slice rb share has changed, and log the console
-      if (slice_percentage_current_uplink[i] != slice_percentage_uplink[i]){ 
-      LOG_N(MAC,"[eNB %d][SLICE %d][UL] frame %d subframe %d: total percentage %f-->%f, slice RB percentage has changed: %f-->%f\n",
-	      mod_id, i, frame, subframe, total_slice_percentage_current_uplink, total_slice_percentage_uplink, slice_percentage_current_uplink[i], slice_percentage_uplink[i]);
-	total_slice_percentage_current_uplink= total_slice_percentage_uplink;
-	slice_percentage_current_uplink[i] = slice_percentage_uplink[i];	
-	
-      } 
-      
-      // check if the slice max MCS, and log the console
-      if (slice_maxmcs_current_uplink[i] != slice_maxmcs_uplink[i]){
-	if ((slice_maxmcs_uplink[i] >= 0) && (slice_maxmcs_uplink[i] <= 16)){
-	  LOG_N(MAC,"[eNB %d][SLICE %d][UL] frame %d subframe %d: slice MAX MCS has changed: %d-->%d\n",
-		mod_id, i, frame, subframe, slice_maxmcs_current_uplink[i], slice_maxmcs_uplink[i]);
-	  slice_maxmcs_current_uplink[i] = slice_maxmcs_uplink[i];
-	} else {
-	  LOG_W(MAC,"[eNB %d][SLICE %d][UL] invalid slice max mcs %d, revert the previous value %d\n",mod_id, i, slice_maxmcs_uplink[i],slice_maxmcs_current_uplink[i]);
-	  slice_maxmcs_uplink[i]= slice_maxmcs_current_uplink[i];
-	  
-	}
-      }
-      
-      // check if a new scheduler, and log the console
-      if (update_ul_scheduler_current[i] != update_ul_scheduler[i]){
-	LOG_N(MAC,"[eNB %d][SLICE %d][UL] frame %d subframe %d: UL scheduler for this slice is updated: %s \n",
-	      mod_id, i, frame, subframe, ul_scheduler_type[i]);
-	
-	update_ul_scheduler_current[i] = update_ul_scheduler[i];
-      }
-    }
-      else {
-	
-	if (n_active_slices_uplink == n_active_slices_current_uplink){
-	  LOG_W(MAC,"[eNB %d][SLICE %d][UL] invalid total RB share (%f->%f), reduce proportionally the RB share by 0.1\n",
-		mod_id,i,  
-		total_slice_percentage_current_uplink, total_slice_percentage_uplink);
-	  if (slice_percentage_uplink[i] > avg_slice_percentage_uplink){
-	    slice_percentage_uplink[i]-=0.1;
-	    total_slice_percentage_uplink-=0.1;
-	  }
-	} else {
-	  // here we can correct the values, e.g. reduce proportionally 
-	  LOG_W(MAC,"[eNB %d][SLICE %d][UL] invalid total RB share (%f->%f), revert the  number of slice to its previous value (%d->%d)\n",
-		mod_id,i,  
-		total_slice_percentage_current_uplink, total_slice_percentage_uplink,
-		n_active_slices_uplink, n_active_slices_current_uplink);
-	  n_active_slices_uplink = n_active_slices_current_uplink;
-	  slice_percentage_uplink[i] = slice_percentage_current_uplink[i];
-	}
-      }
-     
-    // Run each enabled slice-specific schedulers one by one
-    slice_sched_ul[i](mod_id, frame, cooperation_flag, subframe, sched_subframe,ul_info);
-  }
-}
-
-void
-flexran_schedule_ue_ul_spec_embb(mid_t  mod_id,
-				 frame_t frame, 
-				 unsigned char cooperation_flag,
-				 uint32_t      subframe,
-				 unsigned char sched_subframe,
-				 Protocol__FlexranMessage **ul_info)
-  
-{
-  flexran_agent_schedule_ulsch_ue_spec(mod_id,
-				       frame,
-				       cooperation_flag,
-				       subframe,
-				       sched_subframe,
-				       ul_info);
-  
-}
-
-
-void flexran_agent_schedule_ulsch_ue_spec(mid_t module_idP, 
-		    frame_t frameP,
-		    unsigned char cooperation_flag,
-		    sub_frame_t subframeP, 
-		    unsigned char sched_subframe,
-        Protocol__FlexranMessage **ul_info) {
-
-
-  uint16_t first_rb[MAX_NUM_CCs],i;
-  int CC_id;
-  eNB_MAC_INST *eNB=&eNB_mac_inst[module_idP];
-
-  start_meas(&eNB->schedule_ulsch);
-
-
-  for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
-
-    //leave out first RB for PUCCH
-    first_rb[CC_id] = 1;
-
-    // UE data info;
-    // check which UE has data to transmit
-    // function to decide the scheduling
-    // e.g. scheduling_rslt = Greedy(granted_UEs, nb_RB)
-
-    // default function for default scheduling
-    //
-
-    // output of scheduling, the UE numbers in RBs, where it is in the code???
-    // check if RA (Msg3) is active in this subframeP, if so skip the PRBs used for Msg3
-    // Msg3 is using 1 PRB so we need to increase first_rb accordingly
-    // not sure about the break (can there be more than 1 active RA procedure?)
-
-    for (i=0; i<NB_RA_PROC_MAX; i++) {
-      if ((eNB->common_channels[CC_id].RA_template[i].RA_active == TRUE) &&
-          (eNB->common_channels[CC_id].RA_template[i].generate_rar == 0) &&
-          (eNB->common_channels[CC_id].RA_template[i].generate_Msg4 == 0) &&
-          (eNB->common_channels[CC_id].RA_template[i].wait_ack_Msg4 == 0) &&
-          (eNB->common_channels[CC_id].RA_template[i].Msg3_subframe == sched_subframe)) {
-        first_rb[CC_id]++;
-        eNB->common_channels[CC_id].RA_template[i].Msg3_subframe = -1;
-        break;
-      }
-    }
-
-    /*
-    if (mac_xface->is_prach_subframe(&(mac_xface->lte_frame_parms),frameP,subframeP)) {
-      first_rb[CC_id] = (mac_xface->get_prach_prb_offset(&(mac_xface->lte_frame_parms),
-    */
-
-  }
-
-  flexran_agent_schedule_ulsch_rnti(module_idP, cooperation_flag, frameP, subframeP, sched_subframe,first_rb);
-
-  stop_meas(&eNB->schedule_ulsch);
-
-}
-
-
-
-void flexran_agent_schedule_ulsch_rnti(module_id_t   module_idP,
-                         unsigned char cooperation_flag,
-                         frame_t       frameP,
-                         sub_frame_t   subframeP,
-                         unsigned char sched_subframe,
-                         uint16_t     *first_rb)
-{
-
-  int                UE_id;
-  uint8_t            aggregation    = 2;
-  rnti_t             rnti           = -1;
-  uint8_t            round          = 0;
-  uint8_t            harq_pid       = 0;
-  void              *ULSCH_dci      = NULL;
-  LTE_eNB_UE_stats  *eNB_UE_stats   = NULL;
-  DCI_PDU           *DCI_pdu;
-  uint8_t                 status         = 0;
-  uint8_t                 rb_table_index = -1;
-  uint16_t                TBS = 0;
-  //  int32_t                buffer_occupancy=0;
-  uint32_t                cqi_req,cshift,ndi,mcs=0,rballoc,tpc;
-  int32_t                 normalized_rx_power, target_rx_power=-90;
-  static int32_t          tpc_accumulated=0;
-
-  int n,CC_id = 0;
-  eNB_MAC_INST      *eNB=&eNB_mac_inst[module_idP];
-  UE_list_t         *UE_list=&eNB->UE_list;
-  UE_TEMPLATE       *UE_template;
-  UE_sched_ctrl     *UE_sched_ctrl;
-
-  //  int                rvidx_tab[4] = {0,2,3,1};
-  LTE_DL_FRAME_PARMS   *frame_parms;
-  int drop_ue=0;
-
-  //  LOG_I(MAC,"entering ulsch preprocesor\n");
-
-
-  /*TODO*/
-  int slice_id = 0;
-
-  
-  _ulsch_scheduler_pre_processor(module_idP,
-                                slice_id,  
-                                frameP,
-                                subframeP,
-                                first_rb);
-
-  //  LOG_I(MAC,"exiting ulsch preprocesor\n");
-
-  // loop over all active UEs
-  for (UE_id=UE_list->head_ul; UE_id>=0; UE_id=UE_list->next_ul[UE_id]) {
-
-    // don't schedule if Msg4 is not received yet
-    if (UE_list->UE_template[UE_PCCID(module_idP,UE_id)][UE_id].configured==FALSE) {
-      LOG_I(MAC,"[eNB %d] frame %d subfarme %d, UE %d: not configured, skipping UE scheduling \n", 
-	    module_idP,frameP,subframeP,UE_id);
-      continue;
-    }
-
-    rnti = flexran_get_ue_crnti(module_idP, UE_id);
-
-    if (rnti==NOT_A_RNTI) {
-      LOG_W(MAC,"[eNB %d] frame %d subfarme %d, UE %d: no RNTI \n", module_idP,frameP,subframeP,UE_id);
-      continue;
-    }
-
-    /* let's drop the UE if get_eNB_UE_stats returns NULL when calling it with any of the UE's active UL CCs */
-    /* TODO: refine? */
-    drop_ue = 0;
-    for (n=0; n<UE_list->numactiveULCCs[UE_id]; n++) {
-      CC_id = UE_list->ordered_ULCCids[n][UE_id];
-      if (mac_xface->get_eNB_UE_stats(module_idP,CC_id,rnti) == NULL) {
-        LOG_W(MAC,"[eNB %d] frame %d subframe %d, UE %d/%x CC %d: no PHY context\n", module_idP,frameP,subframeP,UE_id,rnti,CC_id);
-        drop_ue = 1;
-        break;
-      }
-    }
-    if (drop_ue == 1) {
-/* we can't come here, ulsch_scheduler_pre_processor won't put in the list a UE with no PHY context */
-abort();
-      /* TODO: this is a hack. Sometimes the UE has no PHY context but
-       * is still present in the MAC with 'ul_failure_timer' = 0 and
-       * 'ul_out_of_sync' = 0. It seems wrong and the UE stays there forever. Let's
-       * start an UL out of sync procedure in this case.
-       * The root cause of this problem has to be found and corrected.
-       * In the meantime, this hack...
-       */
-      if (UE_list->UE_sched_ctrl[UE_id].ul_failure_timer == 0 &&
-          UE_list->UE_sched_ctrl[UE_id].ul_out_of_sync == 0) {
-        LOG_W(MAC,"[eNB %d] frame %d subframe %d, UE %d/%x CC %d: UE in weird state, let's put it 'out of sync'\n",
-              module_idP,frameP,subframeP,UE_id,rnti,CC_id);
-        // inform RRC of failure and clear timer
-        mac_eNB_rrc_ul_failure(module_idP,CC_id,frameP,subframeP,rnti);
-        UE_list->UE_sched_ctrl[UE_id].ul_failure_timer=0;
-        UE_list->UE_sched_ctrl[UE_id].ul_out_of_sync=1;
-      }
-      continue;
-    }
-
-    // loop over all active UL CC_ids for this UE
-    for (n=0; n<UE_list->numactiveULCCs[UE_id]; n++) {
-      // This is the actual CC_id in the list
-      CC_id = UE_list->ordered_ULCCids[n][UE_id];
-      frame_parms = mac_xface->get_lte_frame_parms(module_idP,CC_id);
-      eNB_UE_stats = mac_xface->get_eNB_UE_stats(module_idP,CC_id,rnti);
-
-      aggregation=get_aggregation(get_bw_index(module_idP,CC_id), 
-				  eNB_UE_stats->DL_cqi[0],
-				  format0);
-      
-      if (CCE_allocation_infeasible(module_idP,CC_id,0,subframeP,aggregation,rnti)) {
-        LOG_W(MAC,"[eNB %d] frame %d subframe %d, UE %d/%x CC %d: not enough nCCE\n", module_idP,frameP,subframeP,UE_id,rnti,CC_id);
-        continue; // break;
-      } else{
-	LOG_D(MAC,"[eNB %d] frame %d subframe %d, UE %d/%x CC %d mode %s: aggregation level %d\n", 
-	      module_idP,frameP,subframeP,UE_id,rnti,CC_id, mode_string[eNB_UE_stats->mode], 1<<aggregation);
-      }
-
-
-      if (eNB_UE_stats->mode == PUSCH) { // ue has a ulsch channel
-
-        DCI_pdu = &eNB->common_channels[CC_id].DCI_pdu;
-        UE_template   = &UE_list->UE_template[CC_id][UE_id];
-        UE_sched_ctrl = &UE_list->UE_sched_ctrl[UE_id];
-
-        if (flexran_get_harq(module_idP, CC_id, UE_id, frameP, subframeP, &harq_pid, &round, openair_harq_UL) == -1 ) {
-          LOG_W(MAC,"[eNB %d] Scheduler Frame %d, subframeP %d: candidate harq_pid from PHY for UE %d CC %d RNTI %x\n",
-                module_idP,frameP,subframeP, UE_id, CC_id, rnti);
-          continue;
-        } else
-          LOG_T(MAC,"[eNB %d] Frame %d, subframeP %d, UE %d CC %d : got harq pid %d  round %d (rnti %x,mode %s)\n",
-                module_idP,frameP,subframeP,UE_id,CC_id, harq_pid, round,rnti,mode_string[eNB_UE_stats->mode]);
-
-	PHY_vars_eNB_g[module_idP][CC_id]->pusch_stats_BO[UE_id][(frameP*10)+subframeP] = UE_template->ul_total_buffer;
-	VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME(VCD_SIGNAL_DUMPER_VARIABLES_UE0_BO,PHY_vars_eNB_g[module_idP][CC_id]->pusch_stats_BO[UE_id][(frameP*10)+subframeP]);	
-        if (((UE_is_to_be_scheduled(module_idP,CC_id,UE_id)>0)) || (round>0))// || ((frameP%10)==0))
-          // if there is information on bsr of DCCH, DTCH or if there is UL_SR, or if there is a packet to retransmit, or we want to schedule a periodic feedback every 10 frames
-        {
-	  LOG_D(MAC,"[eNB %d][PUSCH] Frame %d subframe %d Scheduling UE %d/%x in round %d(SR %d,UL_inactivity timer %d,UL_failure timer %d)\n",
-		module_idP,frameP,subframeP,UE_id,rnti,round,UE_template->ul_SR,
-		UE_sched_ctrl->ul_inactivity_timer,
-		UE_sched_ctrl->ul_failure_timer);
-          // reset the scheduling request
-          UE_template->ul_SR = 0;
-          // status = mac_eNB_get_rrc_status(module_idP,rnti);
-          status = flexran_get_rrc_status(module_idP, rnti);
-
-	  if (status < RRC_CONNECTED)
-	    cqi_req = 0;
-	  else if (UE_sched_ctrl->cqi_req_timer>30) {
-	    cqi_req = 1;
-	    UE_sched_ctrl->cqi_req_timer=0;
-	  }
-	  else
-	    cqi_req = 0;
-
-          //power control
-          //compute the expected ULSCH RX power (for the stats)
-
-          // this is the normalized RX power and this should be constant (regardless of mcs
-          normalized_rx_power = eNB_UE_stats->UL_rssi[0];
-          target_rx_power = mac_xface->get_target_pusch_rx_power(module_idP,CC_id);
-
-          // this assumes accumulated tpc
-	  // make sure that we are only sending a tpc update once a frame, otherwise the control loop will freak out
-	  int32_t framex10psubframe = UE_template->pusch_tpc_tx_frame*10+UE_template->pusch_tpc_tx_subframe;
-          if (((framex10psubframe+10)<=(frameP*10+subframeP)) || //normal case
-	      ((framex10psubframe>(frameP*10+subframeP)) && (((10240-framex10psubframe+frameP*10+subframeP)>=10)))) //frame wrap-around
-	    {
-	    UE_template->pusch_tpc_tx_frame=frameP;
-	    UE_template->pusch_tpc_tx_subframe=subframeP;
-            if (normalized_rx_power>(target_rx_power+1)) {
-              tpc = 0; //-1
-              tpc_accumulated--;
-            } else if (normalized_rx_power<(target_rx_power-1)) {
-              tpc = 2; //+1
-              tpc_accumulated++;
-            } else {
-              tpc = 1; //0
-            }
-          } else {
-            tpc = 1; //0
-          }
-
-	  if (tpc!=1) {
-	    LOG_D(MAC,"[eNB %d] ULSCH scheduler: frame %d, subframe %d, harq_pid %d, tpc %d, accumulated %d, normalized/target rx power %d/%d\n",
-		  module_idP,frameP,subframeP,harq_pid,tpc,
-		  tpc_accumulated,normalized_rx_power,target_rx_power);
-	  }
-
-          // new transmission
-          if (round==0) {
-
-            ndi = 1-UE_template->oldNDI_UL[harq_pid];
-            UE_template->oldNDI_UL[harq_pid]=ndi;
-	    UE_list->eNB_UE_stats[CC_id][UE_id].normalized_rx_power=normalized_rx_power;
-	    UE_list->eNB_UE_stats[CC_id][UE_id].target_rx_power=target_rx_power;
-	    UE_list->eNB_UE_stats[CC_id][UE_id].ulsch_mcs1=UE_template->pre_assigned_mcs_ul;
-            mcs = UE_template->pre_assigned_mcs_ul;//cmin (UE_template->pre_assigned_mcs_ul, openair_daq_vars.target_ue_ul_mcs); // adjust, based on user-defined MCS
-            if (UE_template->pre_allocated_rb_table_index_ul >=0) {
-              rb_table_index=UE_template->pre_allocated_rb_table_index_ul;
-            } else {
-	      mcs=10;//cmin (10, openair_daq_vars.target_ue_ul_mcs);
-              rb_table_index=5; // for PHR
-	    }
-
-            UE_list->eNB_UE_stats[CC_id][UE_id].ulsch_mcs2=mcs;
-	    //            buffer_occupancy = UE_template->ul_total_buffer;
-
-            while (((rb_table[rb_table_index]>(nb_rbs_allowed_slice_uplink[CC_id][UE_id]-1-first_rb[CC_id])) ||
-		    (rb_table[rb_table_index]>45)) &&
-                   (rb_table_index>0)) {
-              rb_table_index--;
-            }
-
-            TBS = mac_xface->get_TBS_UL(mcs,rb_table[rb_table_index]);
-	    UE_list->eNB_UE_stats[CC_id][UE_id].total_rbs_used_rx+=rb_table[rb_table_index];
-	    UE_list->eNB_UE_stats[CC_id][UE_id].ulsch_TBS=TBS;
-	    //            buffer_occupancy -= TBS;
-            rballoc = mac_xface->computeRIV(frame_parms->N_RB_UL,
-                                            first_rb[CC_id],
-                                            rb_table[rb_table_index]);
-
-            T(T_ENB_MAC_UE_UL_SCHEDULE, T_INT(module_idP), T_INT(CC_id), T_INT(rnti), T_INT(frameP),
-              T_INT(subframeP), T_INT(harq_pid), T_INT(mcs), T_INT(first_rb[CC_id]), T_INT(rb_table[rb_table_index]),
-              T_INT(TBS), T_INT(ndi));
-
-	    if (mac_eNB_get_rrc_status(module_idP,rnti) < RRC_CONNECTED)
-	      LOG_I(MAC,"[eNB %d][PUSCH %d/%x] CC_id %d Frame %d subframeP %d Scheduled UE %d (mcs %d, first rb %d, nb_rb %d, rb_table_index %d, TBS %d, harq_pid %d)\n",
-		    module_idP,harq_pid,rnti,CC_id,frameP,subframeP,UE_id,mcs,
-		    first_rb[CC_id],rb_table[rb_table_index],
-		    rb_table_index,TBS,harq_pid);
-
-	    // bad indices : 20 (40 PRB), 21 (45 PRB), 22 (48 PRB)
-            // increment for next UE allocation
-            first_rb[CC_id]+=rb_table[rb_table_index];
-            //store for possible retransmission
-            UE_template->nb_rb_ul[harq_pid] = rb_table[rb_table_index];
-	    UE_sched_ctrl->ul_scheduled |= (1<<harq_pid);
-	    if (UE_id == UE_list->head)
-	      VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME(VCD_SIGNAL_DUMPER_VARIABLES_UE0_SCHEDULED,UE_sched_ctrl->ul_scheduled);
-
-	    // adjust total UL buffer status by TBS, wait for UL sdus to do final update
-	    LOG_D(MAC,"[eNB %d] CC_id %d UE %d/%x : adjusting ul_total_buffer, old %d, TBS %d\n", module_idP,CC_id,UE_id,rnti,UE_template->ul_total_buffer,TBS);
-	    if (UE_template->ul_total_buffer > TBS)
-	      UE_template->ul_total_buffer -= TBS;
-	    else
-	      UE_template->ul_total_buffer = 0;
-	    LOG_D(MAC,"ul_total_buffer, new %d\n", UE_template->ul_total_buffer);
-	    // Cyclic shift for DM RS
-	    cshift = 0;// values from 0 to 7 can be used for mapping the cyclic shift (36.211 , Table 5.5.2.1.1-1)
-	    	    
-	    if (frame_parms->frame_type == TDD) {
-	      switch (frame_parms->N_RB_UL) {
-	      case 6:
-		ULSCH_dci = UE_template->ULSCH_DCI[harq_pid];
-		
-		((DCI0_1_5MHz_TDD_1_6_t *)ULSCH_dci)->type     = 0;
-		((DCI0_1_5MHz_TDD_1_6_t *)ULSCH_dci)->hopping  = 0;
-		((DCI0_1_5MHz_TDD_1_6_t *)ULSCH_dci)->rballoc  = rballoc;
-		((DCI0_1_5MHz_TDD_1_6_t *)ULSCH_dci)->mcs      = mcs;
-		((DCI0_1_5MHz_TDD_1_6_t *)ULSCH_dci)->ndi      = ndi;
-		((DCI0_1_5MHz_TDD_1_6_t *)ULSCH_dci)->TPC      = tpc;
-		((DCI0_1_5MHz_TDD_1_6_t *)ULSCH_dci)->cshift   = cshift;
-		((DCI0_1_5MHz_TDD_1_6_t *)ULSCH_dci)->padding  = 0;
-		((DCI0_1_5MHz_TDD_1_6_t *)ULSCH_dci)->dai      = UE_template->DAI_ul[sched_subframe];
-		((DCI0_1_5MHz_TDD_1_6_t *)ULSCH_dci)->cqi_req  = cqi_req;
-		
-		add_ue_spec_dci(DCI_pdu,
-				ULSCH_dci,
-				rnti,
-				sizeof(DCI0_1_5MHz_TDD_1_6_t),
-				aggregation,
-				sizeof_DCI0_1_5MHz_TDD_1_6_t,
-				format0,
-				0);
-		break;
-		
-	      default:
-	      case 25:
-		ULSCH_dci = UE_template->ULSCH_DCI[harq_pid];
-		
-		((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->type     = 0;
-		((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->hopping  = 0;
-		((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->rballoc  = rballoc;
-		((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->mcs      = mcs;
-		((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->ndi      = ndi;
-		((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->TPC      = tpc;
-		((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->cshift   = cshift;
-		((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->padding  = 0;
-		((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->dai      = UE_template->DAI_ul[sched_subframe];
-		((DCI0_5MHz_TDD_1_6_t *)ULSCH_dci)->cqi_req  = cqi_req;
-		
-		add_ue_spec_dci(DCI_pdu,
-				ULSCH_dci,
-				rnti,
-				sizeof(DCI0_5MHz_TDD_1_6_t),
-				aggregation,
-				sizeof_DCI0_5MHz_TDD_1_6_t,
-				format0,
-				0);
-		break;
-		
-	      case 50:
-		ULSCH_dci = UE_template->ULSCH_DCI[harq_pid];
-		
-		((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->type     = 0;
-		((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->hopping  = 0;
-		((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->rballoc  = rballoc;
-		((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->mcs      = mcs;
-		((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->ndi      = ndi;
-		((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->TPC      = tpc;
-		((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->cshift   = cshift;
-		((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->padding  = 0;
-		((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->dai      = UE_template->DAI_ul[sched_subframe];
-		((DCI0_10MHz_TDD_1_6_t *)ULSCH_dci)->cqi_req  = cqi_req;
-		
-		add_ue_spec_dci(DCI_pdu,
-				ULSCH_dci,
-				rnti,
-				sizeof(DCI0_10MHz_TDD_1_6_t),
-				aggregation,
-				sizeof_DCI0_10MHz_TDD_1_6_t,
-				format0,
-				0);
-		break;
-		
-	      case 100:
-		ULSCH_dci = UE_template->ULSCH_DCI[harq_pid];
-		
-		((DCI0_20MHz_TDD_1_6_t *)ULSCH_dci)->type     = 0;
-		((DCI0_20MHz_TDD_1_6_t *)ULSCH_dci)->hopping  = 0;
-		((DCI0_20MHz_TDD_1_6_t *)ULSCH_dci)->rballoc  = rballoc;
-		((DCI0_20MHz_TDD_1_6_t *)ULSCH_dci)->mcs      = mcs;
-		((DCI0_20MHz_TDD_1_6_t *)ULSCH_dci)->ndi      = ndi;
-		((DCI0_20MHz_TDD_1_6_t *)ULSCH_dci)->TPC      = tpc;
-		((DCI0_20MHz_TDD_1_6_t *)ULSCH_dci)->cshift   = cshift;
-		((DCI0_20MHz_TDD_1_6_t *)ULSCH_dci)->padding  = 0;
-		((DCI0_20MHz_TDD_1_6_t *)ULSCH_dci)->dai      = UE_template->DAI_ul[sched_subframe];
-		((DCI0_20MHz_TDD_1_6_t *)ULSCH_dci)->cqi_req  = cqi_req;
-		
-		add_ue_spec_dci(DCI_pdu,
-				ULSCH_dci,
-				rnti,
-				sizeof(DCI0_20MHz_TDD_1_6_t),
-				aggregation,
-				sizeof_DCI0_20MHz_TDD_1_6_t,
-				format0,
-				0);
-		break;
-	      }
-	    } // TDD
-	    else { //FDD
-	      switch (frame_parms->N_RB_UL) {
-	      case 25:
-	      default:
-		
-		ULSCH_dci          = UE_template->ULSCH_DCI[harq_pid];
-		
-		((DCI0_5MHz_FDD_t *)ULSCH_dci)->type     = 0;
-		((DCI0_5MHz_FDD_t *)ULSCH_dci)->hopping  = 0;
-		((DCI0_5MHz_FDD_t *)ULSCH_dci)->rballoc  = rballoc;
-		((DCI0_5MHz_FDD_t *)ULSCH_dci)->mcs      = mcs;
-		((DCI0_5MHz_FDD_t *)ULSCH_dci)->ndi      = ndi;
-		((DCI0_5MHz_FDD_t *)ULSCH_dci)->TPC      = tpc;
-		((DCI0_5MHz_FDD_t *)ULSCH_dci)->cshift   = cshift;
-		((DCI0_5MHz_FDD_t *)ULSCH_dci)->padding  = 0;
-		((DCI0_5MHz_FDD_t *)ULSCH_dci)->cqi_req  = cqi_req;
-		
-		add_ue_spec_dci(DCI_pdu,
-				ULSCH_dci,
-				rnti,
-				sizeof(DCI0_5MHz_FDD_t),
-				aggregation,
-				sizeof_DCI0_5MHz_FDD_t,
-				format0,
-				0);
-		break;
-		
-	      case 6:
-		ULSCH_dci          = UE_template->ULSCH_DCI[harq_pid];
-		
-		((DCI0_1_5MHz_FDD_t *)ULSCH_dci)->type     = 0;
-		((DCI0_1_5MHz_FDD_t *)ULSCH_dci)->hopping  = 0;
-		((DCI0_1_5MHz_FDD_t *)ULSCH_dci)->rballoc  = rballoc;
-		((DCI0_1_5MHz_FDD_t *)ULSCH_dci)->mcs      = mcs;
-		((DCI0_1_5MHz_FDD_t *)ULSCH_dci)->ndi      = ndi;
-		((DCI0_1_5MHz_FDD_t *)ULSCH_dci)->TPC      = tpc;
-		((DCI0_1_5MHz_FDD_t *)ULSCH_dci)->cshift   = cshift;
-		((DCI0_1_5MHz_FDD_t *)ULSCH_dci)->padding  = 0;
-		((DCI0_1_5MHz_FDD_t *)ULSCH_dci)->cqi_req  = cqi_req;
-		
-		add_ue_spec_dci(DCI_pdu,
-				ULSCH_dci,
-				rnti,
-				sizeof(DCI0_1_5MHz_FDD_t),
-				aggregation,
-				sizeof_DCI0_1_5MHz_FDD_t,
-				format0,
-				0);
-		break;
-		
-	      case 50:
-		ULSCH_dci          = UE_template->ULSCH_DCI[harq_pid];
-		
-		((DCI0_10MHz_FDD_t *)ULSCH_dci)->type     = 0;
-		((DCI0_10MHz_FDD_t *)ULSCH_dci)->hopping  = 0;
-		((DCI0_10MHz_FDD_t *)ULSCH_dci)->rballoc  = rballoc;
-		((DCI0_10MHz_FDD_t *)ULSCH_dci)->mcs      = mcs;
-		((DCI0_10MHz_FDD_t *)ULSCH_dci)->ndi      = ndi;
-		((DCI0_10MHz_FDD_t *)ULSCH_dci)->TPC      = tpc;
-		((DCI0_10MHz_FDD_t *)ULSCH_dci)->padding  = 0;
-		((DCI0_10MHz_FDD_t *)ULSCH_dci)->cshift   = cshift;
-		((DCI0_10MHz_FDD_t *)ULSCH_dci)->cqi_req  = cqi_req;
-		
-		add_ue_spec_dci(DCI_pdu,
-				ULSCH_dci,
-				rnti,
-				sizeof(DCI0_10MHz_FDD_t),
-				aggregation,
-				sizeof_DCI0_10MHz_FDD_t,
-				format0,
-				0);
-		break;
-		
-	      case 100:
-		ULSCH_dci          = UE_template->ULSCH_DCI[harq_pid];
-		
-		((DCI0_20MHz_FDD_t *)ULSCH_dci)->type     = 0;
-		((DCI0_20MHz_FDD_t *)ULSCH_dci)->hopping  = 0;
-		((DCI0_20MHz_FDD_t *)ULSCH_dci)->rballoc  = rballoc;
-		((DCI0_20MHz_FDD_t *)ULSCH_dci)->mcs      = mcs;
-		((DCI0_20MHz_FDD_t *)ULSCH_dci)->ndi      = ndi;
-		((DCI0_20MHz_FDD_t *)ULSCH_dci)->TPC      = tpc;
-		((DCI0_20MHz_FDD_t *)ULSCH_dci)->padding  = 0;
-		((DCI0_20MHz_FDD_t *)ULSCH_dci)->cshift   = cshift;
-		((DCI0_20MHz_FDD_t *)ULSCH_dci)->cqi_req  = cqi_req;
-		
-		add_ue_spec_dci(DCI_pdu,
-				ULSCH_dci,
-				rnti,
-				sizeof(DCI0_20MHz_FDD_t),
-				aggregation,
-				sizeof_DCI0_20MHz_FDD_t,
-				format0,
-				0);
-		break;
-		
-	      }
-	    }
-
-
-	    add_ue_ulsch_info(module_idP,
-			      CC_id,
-			      UE_id,
-			      subframeP,
-			      S_UL_SCHEDULED);
-	    
-	    LOG_D(MAC,"[eNB %d] CC_id %d Frame %d, subframeP %d: Generated ULSCH DCI for next UE_id %d, format 0\n", module_idP,CC_id,frameP,subframeP,UE_id);
-#ifdef DEBUG
-	    dump_dci(frame_parms, &DCI_pdu->dci_alloc[DCI_pdu->Num_common_dci+DCI_pdu->Num_ue_spec_dci-1]);
-#endif
-	    
-          }
-	  else {
-            T(T_ENB_MAC_UE_UL_SCHEDULE_RETRANSMISSION, T_INT(module_idP), T_INT(CC_id), T_INT(rnti), T_INT(frameP),
-              T_INT(subframeP), T_INT(harq_pid), T_INT(mcs), T_INT(first_rb[CC_id]), T_INT(rb_table[rb_table_index]),
-              T_INT(round));
-
-            LOG_D(MAC,"[eNB %d][PUSCH %d/%x] CC_id %d Frame %d subframeP %d Scheduled (PHICH) UE %d (mcs %d, first rb %d, nb_rb %d, rb_table_index %d, TBS %d, harq_pid %d,round %d)\n",
-                  module_idP,harq_pid,rnti,CC_id,frameP,subframeP,UE_id,mcs,
-                  first_rb[CC_id],rb_table[rb_table_index],
-                  rb_table_index,TBS,harq_pid,round);
-	  }/* 
-	  else if (round > 0) { //we schedule a retransmission
-
-            ndi = UE_template->oldNDI_UL[harq_pid];
-
-            if ((round&3)==0) {
-              mcs = openair_daq_vars.target_ue_ul_mcs;
-            } else {
-              mcs = rvidx_tab[round&3] + 28; //not correct for round==4!
-
-            }
-
-            LOG_I(MAC,"[eNB %d][PUSCH %d/%x] CC_id %d Frame %d subframeP %d Scheduled UE retransmission (mcs %d, first rb %d, nb_rb %d, harq_pid %d, round %d)\n",
-                  module_idP,UE_id,rnti,CC_id,frameP,subframeP,mcs,
-                  first_rb[CC_id],UE_template->nb_rb_ul[harq_pid],
-		  harq_pid, round);
-
-            rballoc = mac_xface->computeRIV(frame_parms->N_RB_UL,
-                                            first_rb[CC_id],
-                                            UE_template->nb_rb_ul[harq_pid]);
-            first_rb[CC_id]+=UE_template->nb_rb_ul[harq_pid];  // increment for next UE allocation
-         
-	    UE_list->eNB_UE_stats[CC_id][UE_id].num_retransmission_rx+=1;
-	    UE_list->eNB_UE_stats[CC_id][UE_id].rbs_used_retx_rx=UE_template->nb_rb_ul[harq_pid];
-	    UE_list->eNB_UE_stats[CC_id][UE_id].total_rbs_used_rx+=UE_template->nb_rb_ul[harq_pid];
-	    UE_list->eNB_UE_stats[CC_id][UE_id].ulsch_mcs1=mcs;
-	    UE_list->eNB_UE_stats[CC_id][UE_id].ulsch_mcs2=mcs;
-	  }
-	   */
-
-        } // UE_is_to_be_scheduled
-      } // UE is in PUSCH
-    } // loop over UE_id
-  } // loop of CC_id
-}
-
diff --git a/openair2/LAYER2/MAC/flexran_dci_conversions.h b/openair2/LAYER2/MAC/flexran_dci_conversions.h
deleted file mode 100644
index 5c18b43104..0000000000
--- a/openair2/LAYER2/MAC/flexran_dci_conversions.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-/*! \file flexran_dci_conversions.h
- * \brief Conversion helpers from flexran messages to OAI formats DCI  
- * \author Xenofon Foukas
- * \date 2016
- * \version 0.1
- */
-
-#ifndef LAYER2_MAC_FLEXRAN_DCI_CONVERISIONS_H__
-#define LAYER2_MAC_DCI_FLEXRAN_CONVERISIONS_H__
-
-#define FILL_DCI_FDD_1(TYPE, DCI, FLEXRAN_DCI) \
-  ((TYPE*)DCI)->harq_pid = FLEXRAN_DCI->harq_process; \
-  ((TYPE*)DCI)->rv = FLEXRAN_DCI->rv[0]; \
-  ((TYPE*)DCI)->rballoc = FLEXRAN_DCI->rb_bitmap; \
-  ((TYPE*)DCI)->rah = FLEXRAN_DCI->res_alloc; \
-  ((TYPE*)DCI)->mcs = FLEXRAN_DCI->mcs[0]; \
-  ((TYPE*)DCI)->TPC = FLEXRAN_DCI->tpc; \
-  ((TYPE*)DCI)->ndi = FLEXRAN_DCI->ndi[0];
-
-#define FILL_DCI_TDD_1(TYPE, DCI, FLEXRAN_DCI) \
-  ((TYPE*)DCI)->harq_pid = FLEXRAN_DCI->harq_process; \
-  ((TYPE*)DCI)->rv = FLEXRAN_DCI->rv[0]; \
-  ((TYPE*)DCI)->dai = FLEXRAN_DCI->dai; \
-  ((TYPE*)DCI)->rballoc = FLEXRAN_DCI->rb_bitmap; \
-  ((TYPE*)DCI)->rah = FLEXRAN_DCI->res_alloc; \
-  ((TYPE*)DCI)->mcs = FLEXRAN_DCI->mcs[0]; \
-  ((TYPE*)DCI)->TPC = FLEXRAN_DCI->tpc; \
-  ((TYPE*)DCI)->ndi = FLEXRAN_DCI->ndi[0];
-
-#endif
-- 
GitLab