Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
oai
openairinterface5G
Commits
86f4d8c1
Commit
86f4d8c1
authored
Aug 20, 2018
by
Rajeev Gangula
Browse files
Remiving CQI scheduling on special SFs.
parent
e04b8241
Changes
2
Hide whitespace changes
Inline
Side-by-side
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
View file @
86f4d8c1
...
...
@@ -1696,9 +1696,9 @@ schedule_ue_spec_fairRR(module_id_t module_idP,
// this is the normalized RX power
eNB_UE_stats
=
&
UE_list
->
eNB_UE_stats
[
CC_id
][
UE_id
];
/*
TODO: fix how we deal with power, u
nit is not dBm, it's special from nfapi */
normalized_rx_power
=
ue_sched_ctl
->
pucch1_snr
[
CC_id
]
;
target_rx_power
=
208
;
/*
U
nit is not dBm, it's special from nfapi */
normalized_rx_power
=
(
5
*
ue_sched_ctl
->
pucch1_snr
[
CC_id
]
-
640
)
/
10
+
30
;
//(+eNB->measurements.n0_power_dB[0])
target_rx_power
=
eNB
->
puCch10xSnr
/
10
+
30
;
//(+eNB->measurements.n0_power_dB[0])
// this assumes accumulated tpc
// make sure that we are only sending a tpc update once a frame, otherwise the control loop will freak out
...
...
@@ -2690,9 +2690,25 @@ void schedule_ulsch_rnti_fairRR(module_id_t module_idP,
if
(
status
<
RRC_CONNECTED
)
cqi_req
=
0
;
else
if
(
UE_sched_ctrl
->
cqi_req_timer
>
30
)
{
cqi_req
=
1
;
UE_sched_ctrl
->
cqi_req_timer
=
0
;
UE_sched_ctrl
->
cqi_req_flag
|=
1
<<
sched_subframeP
;
cqi_req
=
1
;
// To be safe , do not ask CQI in special SFs:36.213/7.2.3 CQI definition
if
(
cc
->
tdd_Config
)
{
switch
(
cc
->
tdd_Config
->
subframeAssignment
)
{
case
1
:
if
(
subframeP
==
1
||
subframeP
==
6
)
cqi_req
=
0
;
break
;
case
3
:
if
(
subframeP
==
1
)
cqi_req
=
0
;
break
;
default:
LOG_E
(
MAC
,
" TDD config not supported
\n
"
);
break
;
}
}
if
(
cqi_req
==
1
){
UE_sched_ctrl
->
cqi_req_timer
=
0
;
UE_sched_ctrl
->
cqi_req_flag
|=
1
<<
sched_subframeP
;
}
}
else
cqi_req
=
0
;
...
...
@@ -2701,8 +2717,8 @@ void schedule_ulsch_rnti_fairRR(module_id_t module_idP,
//compute the expected ULSCH RX power (for the stats)
// this is the normalized RX power and this should be constant (regardless of mcs
normalized_rx_power
=
UE_sched_ctrl
->
pusch_snr
[
CC_id
]
;
target_rx_power
=
178
;
normalized_rx_power
=
(
5
*
UE_sched_ctrl
->
pusch_snr
[
CC_id
]
-
640
)
/
10
+
30
;
//(+eNB->measurements.n0_power_dB[0])
target_rx_power
=
eNB
->
puSch10xSnr
/
10
+
30
;
//(+eNB->measurements.n0_power_dB[0])
// this assumes accumulated tpc
// make sure that we are only sending a tpc update once a frame, otherwise the control loop will freak out
...
...
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
View file @
86f4d8c1
...
...
@@ -1337,10 +1337,24 @@ schedule_ulsch_rnti(module_id_t module_idP,
if
(
status
>=
RRC_CONNECTED
&&
UE_sched_ctrl
->
cqi_req_timer
>
30
)
{
if
(
UE_sched_ctrl
->
cqi_received
==
0
)
{
if
(
nfapi_mode
)
{
cqi_req
=
0
;
cqi_req
=
0
;
}
else
{
cqi_req
=
1
;
UE_sched_ctrl
->
cqi_req_flag
|=
1
<<
sched_subframeP
;
cqi_req
=
1
;
// To be safe , do not ask CQI in special Subframes:36.213/7.2.3 CQI definition
if
(
cc
[
CC_id
].
tdd_Config
)
{
switch
(
cc
[
CC_id
].
tdd_Config
->
subframeAssignment
)
{
case
1
:
if
(
subframeP
==
1
||
subframeP
==
6
)
cqi_req
=
0
;
break
;
case
3
:
if
(
subframeP
==
1
)
cqi_req
=
0
;
break
;
default:
LOG_E
(
MAC
,
" TDD config not supported
\n
"
);
break
;
}
}
if
(
cqi_req
==
1
)
UE_sched_ctrl
->
cqi_req_flag
|=
1
<<
sched_subframeP
;
}
}
else
if
(
UE_sched_ctrl
->
cqi_received
==
1
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment