From a5c43d995992ec4c2a592aea61e3df0112dcaf49 Mon Sep 17 00:00:00 2001 From: ismagom Date: Mon, 31 Aug 2015 10:06:11 +0200 Subject: [PATCH] Merged --- srsapps/ue/mac/src/mux.cc | 6 +++--- srsapps/ue/phy/src/phch_recv.cc | 2 -- srslte/lib/phch/src/sch.c | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/srsapps/ue/mac/src/mux.cc b/srsapps/ue/mac/src/mux.cc index ca392fe83..167f3aac6 100644 --- a/srsapps/ue/mac/src/mux.cc +++ b/srsapps/ue/mac/src/mux.cc @@ -134,8 +134,6 @@ sch_subh::cetype bsr_format_convert(bsr_proc::bsr_format_t format) { uint8_t* mux::pdu_get(uint8_t *payload, uint32_t pdu_sz) { - pdu_msg.init_tx(payload, pdu_sz, true); - if (pthread_mutex_trylock(&mutex)) { printf("M");fflush(stdout); pthread_mutex_lock(&mutex); @@ -153,7 +151,9 @@ uint8_t* mux::pdu_get(uint8_t *payload, uint32_t pdu_sz) } // Logical Channel Procedure - + + pdu_msg.init_tx(payload, pdu_sz, true); + // MAC control element for C-RNTI or data from UL-CCCH bool is_first = true; if (!allocate_sdu(0, &pdu_msg, &is_first)) { diff --git a/srsapps/ue/phy/src/phch_recv.cc b/srsapps/ue/phy/src/phch_recv.cc index e410d8684..c53f8fb3e 100644 --- a/srsapps/ue/phy/src/phch_recv.cc +++ b/srsapps/ue/phy/src/phch_recv.cc @@ -320,9 +320,7 @@ void phch_recv::run_thread() prach_buffer->send(radio_h, cfo, tx_time_prach); radio_h->tx_end(); } - Debug("Starting worker id %d\n", worker->get_id()); workers_pool->start_worker(worker); - Debug("Done worker id %d\n", worker->get_id()); mac->tti_clock(tti); } else { worker->release(); diff --git a/srslte/lib/phch/src/sch.c b/srslte/lib/phch/src/sch.c index acd07fc6c..2b1f86b0a 100644 --- a/srslte/lib/phch/src/sch.c +++ b/srslte/lib/phch/src/sch.c @@ -438,7 +438,7 @@ static int decode_tb(srslte_sch_t *q, } if (!early_stop) { - printf("CB %d failed. TB is erroneous.\n",i-1); + INFO("CB %d failed. TB is erroneous.\n",i-1); return SRSLTE_ERROR; } else { INFO("END CB#%d: wp: %d, rp: %d\n", i, wp, rp);