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

Merge branch 'raa' into next

This commit is contained in:
Ismael Gomez 2018-03-02 18:08:53 +01:00
parent de747f4e1c 0fcb065ae8
commit 5fe066df69
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
srsue/hdr/mac/dl_harq.h
View File

@ -253,14 +253,14 @@ private:
n_retx = 0; n_retx = 0;
} }
// Save grant
grant.last_ndi[tid] = cur_grant.ndi[tid];
grant.last_tti = cur_grant.tti;
memcpy(&cur_grant, &grant, sizeof(Tgrant));
// If data has not yet been successfully decoded // If data has not yet been successfully decoded
if (!ack) { if (!ack) {
// Save grant
grant.last_ndi[tid] = cur_grant.ndi[tid];
grant.last_tti = cur_grant.tti;
memcpy(&cur_grant, &grant, sizeof(Tgrant));
// Instruct the PHY To combine the received data and attempt to decode it // Instruct the PHY To combine the received data and attempt to decode it
if (pid == HARQ_BCCH_PID) { if (pid == HARQ_BCCH_PID) {
payload_buffer_ptr = harq_entity->demux_unit->request_buffer_bcch(cur_grant.n_bytes[tid]); payload_buffer_ptr = harq_entity->demux_unit->request_buffer_bcch(cur_grant.n_bytes[tid]);
@ -281,7 +281,8 @@ private:
} else { } else {
action->default_ack[tid] = true; action->default_ack[tid] = true;
Warning("DL PID %d: Received duplicate TB. Discarting and retransmitting ACK\n", pid); Warning("DL PID %d: Received duplicate TB. Discarting and retransmitting ACK (grant_tti=%d, ndi=%d, sz=%d)\n",
pid, cur_grant.tti, cur_grant.ndi[tid], cur_grant.n_bytes[tid]);
} }
if (pid == HARQ_BCCH_PID || harq_entity->timer_aligment_timer->is_expired()) { if (pid == HARQ_BCCH_PID || harq_entity->timer_aligment_timer->is_expired()) {

2
srsue/hdr/phy/phch_common.h
View File

@ -27,7 +27,7 @@
#ifndef UEPHYWORKERCOMMON_H #ifndef UEPHYWORKERCOMMON_H
#define UEPHYWORKERCOMMON_H #define UEPHYWORKERCOMMON_H
#define TX_MODE_CONTINUOUS 1 #define TX_MODE_CONTINUOUS 0
#include <pthread.h> #include <pthread.h>

1
srsue/src/phy/phch_recv.cc
View File

@ -935,6 +935,7 @@ phch_recv::search::ret_code phch_recv::search::run(srslte_cell_t *cell)
if (ret < 0) { if (ret < 0) {
Error("SYNC: Error decoding MIB: Error searching PSS\n"); Error("SYNC: Error decoding MIB: Error searching PSS\n");
p->stop_rx();
return ERROR; return ERROR;
} else if (ret == 0) { } else if (ret == 0) {
p->stop_rx(); p->stop_rx();

1
srsue/src/upper/nas.cc
View File

@ -173,6 +173,7 @@ void nas::plmn_search_end() {
} else { } else {
nas_log->info("Finished searching PLMN in current EARFCN set but no networks were found.\n"); nas_log->info("Finished searching PLMN in current EARFCN set but no networks were found.\n");
if (state == EMM_STATE_REGISTERED_INITIATED && plmn_selection == PLMN_NOT_SELECTED) { if (state == EMM_STATE_REGISTERED_INITIATED && plmn_selection == PLMN_NOT_SELECTED) {
sleep(1);
rrc->plmn_search(); rrc->plmn_search();
} }
} }