Skip to content

O
OpenXG-RAN
Commit 44e1b7fb authored by Haruki NAOI's avatar Haruki NAOI
Browse files
Options

clean: mimo c-plane issue 

(cherry picked from commit d553f48d6784894d73670670eb33a2b49132df71)
parent 59c5842b
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 19 deletions
openair2/LAYER2/MAC/eNB_scheduler_bch.c
View file @ 44e1b7fb
...@@ -1105,17 +1105,24 @@ schedule_SI(module_id_t module_idP, frame_t frameP, sub_frame_t subframeP) ...@@ -1105,17 +1105,24 @@ schedule_SI(module_id_t module_idP, frame_t frameP, sub_frame_t subframeP)
first_rb = 6; first_rb = 6;
break; break;
case 25: case 25:
//first_rb = 11; #ifndef PHY_RM
first_rb = 21; first_rb = 11;
#else
first_rb = 21;
#endif
break; break;
case 50: case 50:
//first_rb = 23; #ifndef PHY_RM
first_rb = 46; first_rb = 23;
break; #else
first_rb = 46;
#endif break;
case 100: case 100:
//first_rb = 48; #ifndef PHY_RM
first_rb = 96; first_rb = 48;
break; #else
first_rb = 96;
#endif break;
} }
vrb_map[first_rb] = 1; vrb_map[first_rb] = 1;
...@@ -1126,34 +1133,54 @@ schedule_SI(module_id_t module_idP, frame_t frameP, sub_frame_t subframeP) ...@@ -1126,34 +1133,54 @@ schedule_SI(module_id_t module_idP, frame_t frameP, sub_frame_t subframeP)
// Get MCS for length of SI, 3 PRBs // Get MCS for length of SI, 3 PRBs
if (bcch_sdu_length <= 7) { if (bcch_sdu_length <= 7) {
mcs = 0; mcs = 0;
bcch_sdu_length = 7; #ifdef PHY_RM
bcch_sdu_length = 7;
#endif
} else if (bcch_sdu_length <= 11) { } else if (bcch_sdu_length <= 11) {
mcs = 1; mcs = 1;
bcch_sdu_length = 11; #ifdef PHY_RM
bcch_sdu_length = 11;
#endif
} else if (bcch_sdu_length <= 18) { } else if (bcch_sdu_length <= 18) {
mcs = 2; mcs = 2;
bcch_sdu_length = 18; #ifdef PHY_RM
bcch_sdu_length = 18;
#endif
} else if (bcch_sdu_length <= 22) { } else if (bcch_sdu_length <= 22) {
mcs = 3; mcs = 3;
bcch_sdu_length = 22; #ifdef PHY_RM
bcch_sdu_length = 22;
#endif
} else if (bcch_sdu_length <= 26) { } else if (bcch_sdu_length <= 26) {
mcs = 4; mcs = 4;
bcch_sdu_length = 26; #ifdef PHY_RM
bcch_sdu_length = 26;
#endif
} else if (bcch_sdu_length <= 28) { } else if (bcch_sdu_length <= 28) {
mcs = 5; mcs = 5;
bcch_sdu_length = 28; #ifdef PHY_RM
bcch_sdu_length = 28;
#endif
} else if (bcch_sdu_length <= 32) { } else if (bcch_sdu_length <= 32) {
mcs = 6; mcs = 6;
bcch_sdu_length = 32; #ifdef PHY_RM
bcch_sdu_length = 32;
#endif
} else if (bcch_sdu_length <= 41) { } else if (bcch_sdu_length <= 41) {
mcs = 7; mcs = 7;
bcch_sdu_length = 41; #ifdef PHY_RM
bcch_sdu_length = 41;
#endif
} else if (bcch_sdu_length <= 49) { } else if (bcch_sdu_length <= 49) {
mcs = 8; mcs = 8;
bcch_sdu_length = 49; #ifdef PHY_RM
bcch_sdu_length = 49;
#endif
} else if (bcch_sdu_length <= 59) { } else if (bcch_sdu_length <= 59) {
mcs = 9; mcs = 9;
bcch_sdu_length = 59; #ifdef PHY_RM
bcch_sdu_length = 59;
#endif
} }
else AssertFatal(1==0,"Cannot Assign mcs for bcch_sdu_length %d (max mcs 9)\n",bcch_sdu_length); else AssertFatal(1==0,"Cannot Assign mcs for bcch_sdu_length %d (max mcs 9)\n",bcch_sdu_length);
......
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