From 0b405e3d2b71b704cd55c079534b0ad9db8cf7c8 Mon Sep 17 00:00:00 2001 From: Wang Tsu-Han <wangts@eurecom.fr> Date: Fri, 15 Jun 2018 12:14:34 +0200 Subject: [PATCH] throughput fix for sdu and config file change back to 93 --- openair1/SCHED/fapi_l1.c | 2 +- .../CONF/enb.band7.tm1.100PRB.usrpx310.conf | 2 +- targets/RT/USER/lte-ru.c | 7 +------ 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/openair1/SCHED/fapi_l1.c b/openair1/SCHED/fapi_l1.c index f721f7ae17..798a279c90 100644 --- a/openair1/SCHED/fapi_l1.c +++ b/openair1/SCHED/fapi_l1.c @@ -747,7 +747,7 @@ void schedule_response(Sched_Rsp_t *Sched_INFO) (dlsch_pdu_rel8->transport_blocks>0), "dlsch_pdu_rel8->transport_blocks = %d not in [1,2]\n", dlsch_pdu_rel8->transport_blocks); - if (sdu != NULL) + if (1)//(sdu != NULL) { //LOG_I(PHY,"NFAPI: executing handle_nfapi_dlsch_pdu()\n");/////////////*********added handle_nfapi_dlsch_pdu(eNB,NFAPI_SFNSF2SFN(DL_req->sfn_sf),NFAPI_SFNSF2SF(DL_req->sfn_sf),proc,dl_config_pdu, dlsch_pdu_rel8->transport_blocks-1, sdu); diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpx310.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpx310.conf index e617fdf39b..81ef6cf881 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpx310.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpx310.conf @@ -17,7 +17,7 @@ eNBs = mobile_country_code = "208"; - mobile_network_code = "92"; + mobile_network_code = "93"; tr_s_preference = "local_mac" diff --git a/targets/RT/USER/lte-ru.c b/targets/RT/USER/lte-ru.c index d3729f02d8..987b063360 100644 --- a/targets/RT/USER/lte-ru.c +++ b/targets/RT/USER/lte-ru.c @@ -1199,12 +1199,7 @@ void wakeup_eNBs(RU_t *ru) { { LOG_D(PHY,"ru->wakeup_rxtx:%p\n", ru->wakeup_rxtx); eNB_list[i]->proc.ru_proc = &ru->proc; - if(eNB_list[i]->single_thread_flag){ - char string[20]; - sprintf(string,"Incoming RU %d",ru->idx); - ru->eNB_top(eNB_list[0],ru->proc.frame_rx,ru->proc.subframe_rx,string,ru); - } - else if (ru->wakeup_rxtx!=0 && ru->wakeup_rxtx(eNB_list[i],ru) < 0) + if (ru->wakeup_rxtx!=0 && ru->wakeup_rxtx(eNB_list[i],ru) < 0) { LOG_E(PHY,"could not wakeup eNB rxtx process for subframe %d\n", ru->proc.subframe_rx); } -- 2.26.2