mirror of https://github.com/PentHertz/srsLTE.git
Merged
This commit is contained in:
parent
38a13746be
commit
a5c43d9959
|
@ -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);
|
||||||
|
@ -154,6 +152,8 @@ 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)) {
|
||||||
|
|
|
@ -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();
|
||||||
|
|
|
@ -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);
|
||||||
|
|
Loading…
Reference in New Issue