Commit ebecb557 authored by wujing's avatar wujing

add if-else case for first_rb=3 when TDD config1 20MHz in ULSCH_pre_processor

parent c641f334
...@@ -2707,11 +2707,22 @@ void ulsch_scheduler_pre_processor(module_id_t module_idP, ...@@ -2707,11 +2707,22 @@ void ulsch_scheduler_pre_processor(module_id_t module_idP,
// MCS and RB assgin // MCS and RB assgin
for ( CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++ ) { for ( CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++ ) {
cc = &RC.mac[module_idP]->common_channels[CC_id];
frame_parms = &(RC.eNB[module_idP][CC_id]->frame_parms); frame_parms = &(RC.eNB[module_idP][CC_id]->frame_parms);
if(frame_parms->N_RB_UL == 25){ if (cc->tdd_Config) { //TDD
if (frame_parms->N_RB_UL == 25) {
first_rb[CC_id] = 1; first_rb[CC_id] = 1;
}else{ } else if (frame_parms->N_RB_UL == 50) {
first_rb[CC_id] = 2; first_rb[CC_id] = 2;
} else {
first_rb[CC_id] = 3;
}
} else {//FDD
if (frame_parms->N_RB_UL == 25) {
first_rb[CC_id] = 1;
} else {
first_rb[CC_id] = 2;
}
} }
ue_num_temp = ulsch_ue_select[CC_id].ue_num; ue_num_temp = ulsch_ue_select[CC_id].ue_num;
for ( ulsch_ue_num = 0; ulsch_ue_num < ulsch_ue_select[CC_id].ue_num; ulsch_ue_num++ ) { for ( ulsch_ue_num = 0; ulsch_ue_num < ulsch_ue_select[CC_id].ue_num; ulsch_ue_num++ ) {
...@@ -2731,7 +2742,6 @@ void ulsch_scheduler_pre_processor(module_id_t module_idP, ...@@ -2731,7 +2742,6 @@ void ulsch_scheduler_pre_processor(module_id_t module_idP,
} }
rnti = UE_RNTI(CC_id,UE_id); rnti = UE_RNTI(CC_id,UE_id);
cc = &RC.mac[module_idP]->common_channels[CC_id];
if (cc->tdd_Config) { if (cc->tdd_Config) {
if (frame_parms->N_RB_UL == 25) { if (frame_parms->N_RB_UL == 25) {
if (first_rb[CC_id] >= frame_parms->N_RB_UL-1 ) { if (first_rb[CC_id] >= frame_parms->N_RB_UL-1 ) {
......
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