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
promise
OpenXG-RAN
Commits
b1c84580
Commit
b1c84580
authored
Nov 20, 2020
by
Francesco Mani
Committed by
guhan
Feb 03, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
uci mac functions in a new file
parent
af8d1aef
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
947 additions
and
409 deletions
+947
-409
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
+53
-352
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+70
-0
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
+824
-57
No files found.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
View file @
b1c84580
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
View file @
b1c84580
...
...
@@ -2028,6 +2028,76 @@ void get_pdsch_to_harq_feedback(int Mod_idP,
int
checkTargetSSBInFirst64TCIStates_pdschConfig
(
int
ssb_index_t
,
int
Mod_idP
,
int
UE_id
)
{
NR_UE_info_t
*
UE_info
=
&
RC
.
nrmac
[
Mod_idP
]
->
UE_info
;
NR_CellGroupConfig_t
*
secondaryCellGroup
=
UE_info
->
secondaryCellGroup
[
UE_id
]
;
int
nb_tci_states
=
secondaryCellGroup
->
spCellConfig
->
spCellConfigDedicated
->
initialDownlinkBWP
->
pdsch_Config
->
choice
.
setup
->
tci_StatesToAddModList
->
list
.
count
;
NR_TCI_State_t
*
tci
=
NULL
;
int
i
;
for
(
i
=
0
;
i
<
nb_tci_states
&&
i
<
64
;
i
++
)
{
tci
=
(
NR_TCI_State_t
*
)
secondaryCellGroup
->
spCellConfig
->
spCellConfigDedicated
->
initialDownlinkBWP
->
pdsch_Config
->
choice
.
setup
->
tci_StatesToAddModList
->
list
.
array
[
i
];
if
(
tci
!=
NULL
)
{
if
(
tci
->
qcl_Type1
.
referenceSignal
.
present
==
NR_QCL_Info__referenceSignal_PR_ssb
)
{
if
(
tci
->
qcl_Type1
.
referenceSignal
.
choice
.
ssb
==
ssb_index_t
)
return
tci
->
tci_StateId
;
// returned TCI state ID
}
// if type2 is configured
else
if
(
tci
->
qcl_Type2
!=
NULL
&&
tci
->
qcl_Type2
->
referenceSignal
.
present
==
NR_QCL_Info__referenceSignal_PR_ssb
)
{
if
(
tci
->
qcl_Type2
->
referenceSignal
.
choice
.
ssb
==
ssb_index_t
)
return
tci
->
tci_StateId
;
// returned TCI state ID
}
else
LOG_I
(
MAC
,
"SSB index is not found in first 64 TCI states of TCI_statestoAddModList[%d]"
,
i
);
}
}
// tci state not identified in first 64 TCI States of PDSCH Config
return
-
1
;
}
int
checkTargetSSBInTCIStates_pdcchConfig
(
int
ssb_index_t
,
int
Mod_idP
,
int
UE_id
)
{
NR_UE_info_t
*
UE_info
=
&
RC
.
nrmac
[
Mod_idP
]
->
UE_info
;
NR_CellGroupConfig_t
*
secondaryCellGroup
=
UE_info
->
secondaryCellGroup
[
UE_id
]
;
int
nb_tci_states
=
secondaryCellGroup
->
spCellConfig
->
spCellConfigDedicated
->
initialDownlinkBWP
->
pdsch_Config
->
choice
.
setup
->
tci_StatesToAddModList
->
list
.
count
;
NR_TCI_State_t
*
tci
=
NULL
;
NR_TCI_StateId_t
*
tci_id
=
NULL
;
int
bwp_id
=
1
;
NR_BWP_Downlink_t
*
bwp
=
secondaryCellGroup
->
spCellConfig
->
spCellConfigDedicated
->
downlinkBWP_ToAddModList
->
list
.
array
[
bwp_id
-
1
];
NR_ControlResourceSet_t
*
coreset
=
bwp
->
bwp_Dedicated
->
pdcch_Config
->
choice
.
setup
->
controlResourceSetToAddModList
->
list
.
array
[
bwp_id
-
1
];
int
i
;
int
flag
=
0
;
int
tci_stateID
=
-
1
;
for
(
i
=
0
;
i
<
nb_tci_states
&&
i
<
128
;
i
++
)
{
tci
=
(
NR_TCI_State_t
*
)
secondaryCellGroup
->
spCellConfig
->
spCellConfigDedicated
->
initialDownlinkBWP
->
pdsch_Config
->
choice
.
setup
->
tci_StatesToAddModList
->
list
.
array
[
i
];
if
(
tci
!=
NULL
&&
tci
->
qcl_Type1
.
referenceSignal
.
present
==
NR_QCL_Info__referenceSignal_PR_ssb
)
{
if
(
tci
->
qcl_Type1
.
referenceSignal
.
choice
.
ssb
==
ssb_index_t
)
{
flag
=
1
;
tci_stateID
=
tci
->
tci_StateId
;
break
;
}
else
if
(
tci
->
qcl_Type2
!=
NULL
&&
tci
->
qcl_Type2
->
referenceSignal
.
present
==
NR_QCL_Info__referenceSignal_PR_ssb
)
{
flag
=
1
;
tci_stateID
=
tci
->
tci_StateId
;
break
;
}
}
if
(
flag
!=
0
&&
tci_stateID
!=
-
1
&&
coreset
!=
NULL
)
{
for
(
i
=
0
;
i
<
64
&&
i
<
coreset
->
tci_StatesPDCCH_ToAddList
->
list
.
count
;
i
++
)
{
tci_id
=
coreset
->
tci_StatesPDCCH_ToAddList
->
list
.
array
[
i
];
if
(
tci_id
!=
NULL
&&
*
tci_id
==
tci_stateID
)
return
tci_stateID
;
}
}
}
// Need to implement once configuration is received
return
-
1
;
}
/*void fill_nfapi_coresets_and_searchspaces(NR_CellGroupConfig_t *cg,
nfapi_nr_coreset_t *coreset,
nfapi_nr_search_space_t *search_space) {
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
View file @
b1c84580
This diff is collapsed.
Click to expand it.
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