PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merged

This commit is contained in:
ismagom 2015-08-31 10:06:11 +02:00
parent 38a13746be
commit a5c43d9959
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
srsapps/ue/mac/src/mux.cc
View File

@ -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) 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)) { if (pthread_mutex_trylock(&mutex)) {
printf("M");fflush(stdout); printf("M");fflush(stdout);
pthread_mutex_lock(&mutex); pthread_mutex_lock(&mutex);
@ -153,7 +151,9 @@ uint8_t* mux::pdu_get(uint8_t *payload, uint32_t pdu_sz)
} }
// Logical Channel Procedure // Logical Channel Procedure
pdu_msg.init_tx(payload, pdu_sz, true);
// MAC control element for C-RNTI or data from UL-CCCH // MAC control element for C-RNTI or data from UL-CCCH
bool is_first = true; bool is_first = true;
if (!allocate_sdu(0, &pdu_msg, &is_first)) { if (!allocate_sdu(0, &pdu_msg, &is_first)) {

2
srsapps/ue/phy/src/phch_recv.cc
View File

@ -320,9 +320,7 @@ void phch_recv::run_thread()
prach_buffer->send(radio_h, cfo, tx_time_prach); prach_buffer->send(radio_h, cfo, tx_time_prach);
radio_h->tx_end(); radio_h->tx_end();
} }
Debug("Starting worker id %d\n", worker->get_id());
workers_pool->start_worker(worker); workers_pool->start_worker(worker);
Debug("Done worker id %d\n", worker->get_id());
mac->tti_clock(tti); mac->tti_clock(tti);
} else { } else {
worker->release(); worker->release();

2
srslte/lib/phch/src/sch.c
View File

@ -438,7 +438,7 @@ static int decode_tb(srslte_sch_t *q,
} }
if (!early_stop) { 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; return SRSLTE_ERROR;
} else { } else {
INFO("END CB#%d: wp: %d, rp: %d\n", i, wp, rp); INFO("END CB#%d: wp: %d, rp: %d\n", i, wp, rp);