Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenXG
OpenXG UE
Commits
a053d35e
Commit
a053d35e
authored
Dec 18, 2019
by
Haruki NAOI
Committed by
shono.takafumi
Nov 26, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix: add SNR filter for ULSCH AMC.
parent
01c2df5a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
9 deletions
+22
-9
openair2/LAYER2/MAC/defs.h
openair2/LAYER2/MAC/defs.h
+1
-0
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
+9
-6
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
+1
-1
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+10
-2
openair2/LAYER2/MAC/mac.h
openair2/LAYER2/MAC/mac.h
+1
-0
No files found.
openair2/LAYER2/MAC/defs.h
View file @
a053d35e
...
...
@@ -832,6 +832,7 @@ typedef struct {
uint8_t
pucch3_snr
[
NFAPI_CC_MAX
];
uint8_t
pusch_snr
[
NFAPI_CC_MAX
];
uint8_t
pusch_snr_avg
[
NFAPI_CC_MAX
];
uint8_t
pusch_snr_amc
[
NFAPI_CC_MAX
];
uint16_t
feedback_cnt
[
NFAPI_CC_MAX
];
uint16_t
timing_advance
;
uint16_t
timing_advance_r9
;
...
...
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
View file @
a053d35e
...
...
@@ -2572,7 +2572,7 @@ void ulsch_scheduler_pre_processor_fairRR(module_id_t module_idP,
uint16_t
first_rb
[
MAX_NUM_CCs
];
uint8_t
mcs
;
uint8_t
snr
;
uint8_t
snr2mcs_offset
=
4
;
uint8_t
snr2mcs_offset
=
0
;
uint8_t
rb_table_index
;
uint8_t
num_pucch_rb
;
uint32_t
tbs
;
...
...
@@ -2667,10 +2667,13 @@ void ulsch_scheduler_pre_processor_fairRR(module_id_t module_idP,
UE_template
=
&
UE_info
->
UE_template
[
CC_id
][
UE_id
];
if
(
UE_info
->
UE_sched_ctrl
[
UE_id
].
phr_received
==
1
)
{
snr
=
(
5
*
UE_info
->
UE_sched_ctrl
[
UE_id
].
pusch_snr
[
CC_id
]
-
640
)
/
10
;
snr
=
(
5
*
UE_info
->
UE_sched_ctrl
[
UE_id
].
pusch_snr
_amc
[
CC_id
]
-
640
)
/
10
;
if
((
snr
+
snr2mcs_offset
)
>=
20
)
{
mcs
=
20
;
}
else
if
((
snr
+
snr2mcs_offset
)
<
3
)
{
mcs
=
3
;
}
else
{
mcs
=
snr
+
snr2mcs_offset
;
}
...
...
@@ -3204,8 +3207,8 @@ void schedule_ulsch_rnti_fairRR(module_id_t module_idP,
nfapi_hi_dci0_request_t
*
nfapi_hi_dci0_req
=
&
eNB
->
HI_DCI0_req
[
CC_id
][
subframeP
];
nfapi_hi_dci0_req
->
sfn_sf
=
frameP
<<
4
|
subframeP
;
// sfnsf_add_subframe(sched_frame, sched_subframeP, 0); // sunday!
nfapi_hi_dci0_req
->
header
.
message_id
=
NFAPI_HI_DCI0_REQUEST
;
LOG_D
(
MAC
,
"[PUSCH %d] Frame %d, Subframe %d: Adding UL CONFIG.Request for UE %d/%x, ulsch_frame %d, ulsch_subframe %d
\n
"
,
harq_pid
,
frameP
,
subframeP
,
UE_id
,
rnti
,
sched_frame
,
sched_subframeP
);
LOG_D
(
MAC
,
"[PUSCH %d] Frame %d, Subframe %d: Adding UL CONFIG.Request for UE %d/%x, ulsch_frame %d, ulsch_subframe %d
mcs %d first_rb %d num_rb %d round %d
\n
"
,
harq_pid
,
frameP
,
subframeP
,
UE_id
,
rnti
,
sched_frame
,
sched_subframeP
,
UE_template
->
mcs_UL
[
harq_pid
],
first_rb
[
CC_id
],
rb_table
[
rb_table_index
],
0
);
ul_req_index
=
0
;
dlsch_flag
=
0
;
...
...
@@ -3355,8 +3358,8 @@ void schedule_ulsch_rnti_fairRR(module_id_t module_idP,
hi_dci0_pdu
->
dci_pdu
.
dci_pdu_rel8
.
harq_pid
=
harq_pid
;
hi_dci0_req
->
number_of_dci
++
;
// Add UL_config PDUs
LOG_D
(
MAC
,
"[PUSCH %d] Frame %d, Subframe %d: Adding UL CONFIG.Request for UE %d/%x, ulsch_frame %d, ulsch_subframe %d
\n
"
,
harq_pid
,
frameP
,
subframeP
,
UE_id
,
rnti
,
sched_frame
,
sched_subframeP
);
LOG_D
(
MAC
,
"[PUSCH %d] Frame %d, Subframe %d: Adding UL CONFIG.Request for UE %d/%x, ulsch_frame %d, ulsch_subframe %d
mcs %d first_rb %d num_rb %d round %d
\n
"
,
harq_pid
,
frameP
,
subframeP
,
UE_id
,
rnti
,
sched_frame
,
sched_subframeP
,
mcs_rv
,
ulsch_ue_select
[
CC_id
].
list
[
ulsch_ue_num
].
start_rb
,
ulsch_ue_select
[
CC_id
].
list
[
ulsch_ue_num
].
nb_rb
,
UE_sched_ctrl
->
round_UL
[
CC_id
][
harq_pid
]
);
ul_req_index
=
0
;
dlsch_flag
=
0
;
...
...
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
View file @
a053d35e
...
...
@@ -2218,7 +2218,7 @@ add_new_ue(module_id_t mod_idP,
UE_info
->
UE_sched_ctrl
[
UE_id
].
ta_update
=
31
;
UE_info
->
UE_sched_ctrl
[
UE_id
].
pusch_snr
[
cc_idP
]
=
0
;
UE_info
->
UE_sched_ctrl
[
UE_id
].
pusch_snr_avg
[
cc_idP
]
=
0
;
UE_info
->
UE_sched_ctrl
[
UE_id
].
pusch_snr_amc
[
cc_idP
]
=
0
;
for
(
j
=
0
;
j
<
8
;
j
++
)
{
UE_info
->
UE_template
[
cc_idP
][
UE_id
].
oldNDI
[
j
]
=
0
;
UE_info
->
UE_template
[
cc_idP
][
UE_id
].
oldNDI_UL
[
j
]
=
0
;
...
...
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
View file @
a053d35e
...
...
@@ -168,12 +168,20 @@ rx_sdu(const module_id_t enb_mod_idP,
UE_scheduling_control
->
ta_update
=
(
UE_scheduling_control
->
ta_update
*
3
+
timing_advance
)
/
4
;
UE_scheduling_control
->
pusch_snr
[
CC_idP
]
=
ul_cqi
;
double
tpc_forgetting_filter
=
0
.
75
;
double
snr_filter_tpc
=
0
.
75
;
if
(
UE_scheduling_control
->
pusch_snr_avg
[
CC_idP
]
==
0
)
{
UE_scheduling_control
->
pusch_snr_avg
[
CC_idP
]
=
ul_cqi
;
}
else
{
UE_scheduling_control
->
pusch_snr_avg
[
CC_idP
]
=
(
int
)((
double
)
UE_scheduling_control
->
pusch_snr_avg
[
CC_idP
]
*
tpc_forgetting_filter
+
(
double
)
ul_cqi
*
(
1
-
tpc_forgetting_filter
));
UE_scheduling_control
->
pusch_snr_avg
[
CC_idP
]
=
(
int
)((
double
)
UE_scheduling_control
->
pusch_snr_avg
[
CC_idP
]
*
snr_filter_tpc
+
(
double
)
ul_cqi
*
(
1
-
snr_filter_tpc
));
}
double
snr_filter_amc
=
0
.
5
;
if
(
UE_scheduling_control
->
pusch_snr_amc
[
CC_idP
]
==
0
)
{
UE_scheduling_control
->
pusch_snr_amc
[
CC_idP
]
=
ul_cqi
;
}
else
{
UE_scheduling_control
->
pusch_snr_amc
[
CC_idP
]
=
(
int
)((
double
)
UE_scheduling_control
->
pusch_snr_amc
[
CC_idP
]
*
snr_filter_amc
+
(
double
)
ul_cqi
*
(
1
-
snr_filter_amc
));
}
UE_scheduling_control
->
ul_consecutive_errors
=
0
;
...
...
openair2/LAYER2/MAC/mac.h
View file @
a053d35e
...
...
@@ -962,6 +962,7 @@ typedef struct {
uint8_t
pucch3_snr
[
NFAPI_CC_MAX
];
uint8_t
pusch_snr
[
NFAPI_CC_MAX
];
uint8_t
pusch_snr_avg
[
NFAPI_CC_MAX
];
uint8_t
pusch_snr_amc
[
NFAPI_CC_MAX
];
uint16_t
feedback_cnt
[
NFAPI_CC_MAX
];
uint16_t
timing_advance
;
uint16_t
timing_advance_r9
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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