Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
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-RAN
Commits
47a3ee09
Commit
47a3ee09
authored
Sep 01, 2020
by
Francesco Mani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
first version of function to prepare scheduling of csi meas reporting
parent
d34bef81
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
53 additions
and
3 deletions
+53
-3
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
+1
-1
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+50
-1
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
+2
-0
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
+0
-1
No files found.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
View file @
47a3ee09
...
...
@@ -472,7 +472,7 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
// This schedule CSI measurement reporting
if
(
UE_list
->
fiveG_connected
[
UE_id
]
==
true
)
nr_csi_meas_reporting
(
module_idP
,
UE_id
,
frame
,
slot
,
slots_per_frame
[
*
scc
->
ssbSubcarrierSpacing
]);
nr_csi_meas_reporting
(
module_idP
,
UE_id
,
frame
,
slot
,
num_slots_per_tdd
,
nr_ulmix_slots
,
slots_per_frame
[
*
scc
->
ssbSubcarrierSpacing
]);
// This schedule RA procedure if not in phy_test mode
// Otherwise already consider 5G already connected
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
View file @
47a3ee09
...
...
@@ -1559,13 +1559,18 @@ void nr_csi_meas_reporting(int Mod_idP,
int
UE_id
,
frame_t
frame
,
sub_frame_t
slot
,
int
slots_per_tdd
,
int
ul_slots
,
int
n_slots_frame
)
{
NR_UE_list_t
*
UE_list
=
&
RC
.
nrmac
[
Mod_idP
]
->
UE_list
;
NR_sched_pucch
*
curr_pucch
;
NR_PUCCH_ResourceSet_t
*
pucchresset
;
NR_CellGroupConfig_t
*
secondaryCellGroup
=
UE_list
->
secondaryCellGroup
[
UE_id
];
NR_CSI_MeasConfig_t
*
csi_measconfig
=
secondaryCellGroup
->
spCellConfig
->
spCellConfigDedicated
->
csi_MeasConfig
->
choice
.
setup
;
NR_BWP_Uplink_t
*
ubwp
=
secondaryCellGroup
->
spCellConfig
->
spCellConfigDedicated
->
uplinkConfig
->
uplinkBWP_ToAddModList
->
list
.
array
[
0
];
NR_PUCCH_Config_t
*
pucch_Config
=
ubwp
->
bwp_Dedicated
->
pucch_Config
->
choice
.
setup
;
AssertFatal
(
csi_measconfig
->
csi_ReportConfigToAddModList
->
list
.
count
>
0
,
"NO CSI report configuration available"
);
// TODO for now we assume only one csi report config available
...
...
@@ -1621,9 +1626,53 @@ void nr_csi_meas_reporting(int Mod_idP,
}
// schedule csi measurement reception according to 5.2.1.4 in 38.214
if
(
((
n_slots_frame
*
frame
+
slot
-
offset
)
%
period
)
==
0
)
{
curr_pucch
=
&
UE_list
->
UE_sched_ctrl
[
UE_id
].
sched_pucch
[
slot
-
slots_per_tdd
+
ul_slots
];
}
NR_PUCCH_CSI_Resource_t
*
pucchcsires
=
csirep
->
reportConfigType
.
choice
.
periodic
->
pucch_CSI_ResourceList
.
list
.
array
[
0
];
int
found
=
-
1
;
pucchresset
=
pucch_Config
->
resourceSetToAddModList
->
list
.
array
[
1
];
// set with formats >1
int
n_list
=
pucchresset
->
resourceList
.
list
.
count
;
for
(
int
i
=
0
;
i
<
n_list
;
i
++
)
{
if
(
*
pucchresset
->
resourceList
.
list
.
array
[
i
]
==
pucchcsires
->
pucch_Resource
)
found
=
i
;
}
AssertFatal
(
found
>-
1
,
"CSI resource not found among PUCCH resources"
);
curr_pucch
->
resource_indicator
=
found
;
n_list
=
pucch_Config
->
resourceToAddModList
->
list
.
count
;
// going through the list of PUCCH resources to find the one indexed by resource_id
for
(
int
i
=
0
;
i
<
n_list
;
i
++
)
{
NR_PUCCH_Resource_t
*
pucchres
=
pucch_Config
->
resourceToAddModList
->
list
.
array
[
i
];
if
(
pucchres
->
pucch_ResourceId
==
*
pucchresset
->
resourceList
.
list
.
array
[
found
])
{
switch
(
pucchres
->
format
.
present
){
case
NR_PUCCH_Resource__format_PR_format2
:
if
(
pucch_Config
->
format2
->
choice
.
setup
->
simultaneousHARQ_ACK_CSI
==
NULL
)
curr_pucch
->
simultaneous_harqcsi
=
false
;
else
curr_pucch
->
simultaneous_harqcsi
=
true
;
break
;
case
NR_PUCCH_Resource__format_PR_format3
:
if
(
pucch_Config
->
format3
->
choice
.
setup
->
simultaneousHARQ_ACK_CSI
==
NULL
)
curr_pucch
->
simultaneous_harqcsi
=
false
;
else
curr_pucch
->
simultaneous_harqcsi
=
true
;
break
;
case
NR_PUCCH_Resource__format_PR_format4
:
if
(
pucch_Config
->
format4
->
choice
.
setup
->
simultaneousHARQ_ACK_CSI
==
NULL
)
curr_pucch
->
simultaneous_harqcsi
=
false
;
else
curr_pucch
->
simultaneous_harqcsi
=
true
;
break
;
default:
AssertFatal
(
1
==
0
,
"Invalid PUCCH format type"
);
}
}
}
curr_pucch
->
csi_bits
=
25
;
// TODO function to compute CSI meas report bit size
}
}
...
...
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
View file @
47a3ee09
...
...
@@ -172,6 +172,8 @@ void nr_csi_meas_reporting(int Mod_idP,
int
UE_id
,
frame_t
frameP
,
sub_frame_t
slotP
,
int
slots_per_tdd
,
int
ul_slots
,
int
n_slots_frame
);
void
nr_acknack_scheduling
(
int
Mod_idP
,
...
...
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
View file @
47a3ee09
...
...
@@ -254,7 +254,6 @@ typedef struct NR_sched_pucch {
uint8_t
dai_c
;
uint8_t
timing_indicator
;
uint8_t
resource_indicator
;
bool
active
;
}
NR_sched_pucch
;
typedef
struct
NR_sched_pusch
{
...
...
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