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
cf54ec02
Commit
cf54ec02
authored
Jan 29, 2021
by
francescomani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix conflict not detected in sib1 generation + some cleanup
parent
80941d1b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
12 deletions
+22
-12
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+5
-5
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
+13
-5
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+2
-1
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+2
-1
No files found.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
View file @
cf54ec02
...
...
@@ -950,11 +950,11 @@ void nr_generate_Msg2(module_id_t module_idP,
nr_configure_dci
(
nr_mac
,
pdcch_pdu_rel15
,
RA_rnti
,
ss
,
coreset
,
scc
,
bwp
,
ra
->
beam_id
,
ss
,
coreset
,
scc
,
bwp
,
ra
->
beam_id
,
aggregation_level
,
CCEIndex
);
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
View file @
cf54ec02
...
...
@@ -410,13 +410,21 @@ void nr_fill_nfapi_dl_sib1_pdu(int Mod_idP,
nr_configure_pdcch
(
gNB_mac
,
pdcch_pdu_rel15
,
SI_RNTI
,
gNB_mac
->
sched_ctrlCommon
->
search_space
,
gNB_mac
->
sched_ctrlCommon
->
coreset
,
scc
,
bwp
,
gNB_mac
->
sched_ctrlCommon
->
aggregation_level
,
gNB_mac
->
sched_ctrlCommon
->
cce_index
);
bwp
);
nr_configure_dci
(
gNB_mac
,
pdcch_pdu_rel15
,
SI_RNTI
,
gNB_mac
->
sched_ctrlCommon
->
search_space
,
gNB_mac
->
sched_ctrlCommon
->
coreset
,
scc
,
bwp
,
0
,
// beam index is not used in configure dci
gNB_mac
->
sched_ctrlCommon
->
aggregation_level
,
gNB_mac
->
sched_ctrlCommon
->
cce_index
);
int
dci_formats
[
2
];
int
rnti_types
[
2
];
...
...
@@ -504,4 +512,4 @@ void schedule_nr_sib1(module_id_t module_idP, frame_t frameP, sub_frame_t slotP)
gNB_mac
->
TX_req
[
CC_id
].
SFN
=
frameP
;
gNB_mac
->
TX_req
[
CC_id
].
Slot
=
slotP
;
}
}
\ No newline at end of file
}
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
View file @
cf54ec02
...
...
@@ -506,6 +506,7 @@ void nr_configure_dci(gNB_MAC_INST *nr_mac,
uint8_t
beam_index
,
uint8_t
aggregation_level
,
int
CCEIndex
)
{
pdcch_pdu
->
dci_pdu
.
RNTI
[
pdcch_pdu
->
numDlDci
]
=
rnti
;
if
(
coreset
->
pdcch_DMRS_ScramblingID
!=
NULL
&&
...
...
@@ -701,7 +702,7 @@ void nr_fill_nfapi_dl_pdu(int Mod_idP,
sched_ctrl
->
coreset
,
scc
,
bwp
,
UE_beam_index
,
UE_beam_index
,
sched_ctrl
->
aggregation_level
,
sched_ctrl
->
cce_index
);
pdcch_pdu_rel15
->
numDlDci
++
;
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
View file @
cf54ec02
...
...
@@ -787,9 +787,10 @@ void nr_schedule_ulsch(module_id_t module_id,
sched_ctrl
->
coreset
,
scc
,
sched_ctrl
->
active_bwp
,
UE_info
->
UE_beam_index
[
UE_id
],
UE_info
->
UE_beam_index
[
UE_id
],
sched_ctrl
->
aggregation_level
,
sched_ctrl
->
cce_index
);
pdcch_pdu_rel15
->
numDlDci
++
;
dci_pdu_rel15_t
dci_pdu_rel15
[
MAX_DCI_CORESET
];
...
...
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