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

Merge branch 'issue_incorrect_dci' into raa_new

This commit is contained in:
Ismael Gomez 2018-05-08 09:48:10 -05:00
parent f3f4528a2f
commit cac027d695
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -280,7 +280,10 @@ private:
memcpy(&cur_grant, &grant, sizeof(Tgrant)); memcpy(&cur_grant, &grant, sizeof(Tgrant));
if (payload_buffer_ptr) { if (payload_buffer_ptr) {
Warning("DL PID %d: Allocating buffer already allocated\n", pid); Warning("DL PID %d: Allocating buffer already allocated. Deallocating.\n", pid);
if (pid != HARQ_BCCH_PID) {
harq_entity->demux_unit->deallocate(payload_buffer_ptr);
}
} }
// 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
@ -296,7 +299,7 @@ private:
pthread_mutex_unlock(&mutex); pthread_mutex_unlock(&mutex);
return; return;
} }
action->decode_enabled[tid]= true; action->decode_enabled[tid] = true;
action->rv[tid] = cur_grant.rv[tid]; action->rv[tid] = cur_grant.rv[tid];
action->softbuffers[tid] = &softbuffer; action->softbuffers[tid] = &softbuffer;
memcpy(&action->phy_grant, &cur_grant.phy_grant, sizeof(Tphygrant)); memcpy(&action->phy_grant, &cur_grant.phy_grant, sizeof(Tphygrant));
@ -327,11 +330,13 @@ private:
} }
} }
pthread_mutex_unlock(&mutex); if (!action->decode_enabled[tid]) {
pthread_mutex_unlock(&mutex);
}
} }
void tb_decoded(bool ack_) { void tb_decoded(bool ack_) {
pthread_mutex_lock(&mutex);
ack = ack_; ack = ack_;
if (ack) { if (ack) {
if (pid == HARQ_BCCH_PID) { if (pid == HARQ_BCCH_PID) {