Commit 855d7ed3 authored by Haruki NAOI's avatar Haruki NAOI

Fix: getm for TDD configuration 1.

parent 6915af07
...@@ -1262,10 +1262,14 @@ getm_mac(COMMON_channels_t * cc,unsigned char subframe) ...@@ -1262,10 +1262,14 @@ getm_mac(COMMON_channels_t * cc,unsigned char subframe)
else { else {
switch (cc->tdd_Config->subframeAssignment) { switch (cc->tdd_Config->subframeAssignment) {
case 1: case 1:
if (subframe == 1) { if (subframe == 0) {
return(1); return(0);
} else if (subframe == 6) { } else if (subframe == 4) {
return(1); // To be updated return(0);
} else if (subframe == 5) {
return(0);
} else if (subframe == 9) {
return(0); // To be updated
} else { } else {
LOG_E(MAC,"getm_mac illegl subframe %d\n",subframe); LOG_E(MAC,"getm_mac illegl subframe %d\n",subframe);
return(0); return(0);
......
...@@ -200,10 +200,10 @@ rx_sdu(const module_id_t enb_mod_idP, ...@@ -200,10 +200,10 @@ rx_sdu(const module_id_t enb_mod_idP,
UE_id, UE_id,
current_rnti); current_rnti);
// if (ul_cqi > 200) { // too high energy pattern if (ul_cqi > 200) { // too high energy pattern
UE_scheduling_control->pusch_snr[CC_idP] = ul_cqi; UE_scheduling_control->pusch_snr[CC_idP] = ul_cqi;
LOG_W(MAC, "[MAC] Too high energy pattern\n"); LOG_W(MAC, "[MAC] Too high energy pattern\n");
// } }
if (UE_scheduling_control->round_UL[CC_idP][harq_pid] == 3) { if (UE_scheduling_control->round_UL[CC_idP][harq_pid] == 3) {
UE_scheduling_control->ul_scheduled &= (~(1 << harq_pid)); UE_scheduling_control->ul_scheduled &= (~(1 << harq_pid));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment