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
wangjie
OpenXG-RAN
Commits
790a7721
Commit
790a7721
authored
Dec 05, 2020
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix after merge of branch 'origin/NR-PHY-MAC-IF-multi-UE'
parent
3f5c651c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
+5
-5
No files found.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
View file @
790a7721
...
@@ -86,7 +86,7 @@ void clear_nr_nfapi_information(gNB_MAC_INST * gNB,
...
@@ -86,7 +86,7 @@ void clear_nr_nfapi_information(gNB_MAC_INST * gNB,
frame_t
frameP
,
frame_t
frameP
,
sub_frame_t
slotP
){
sub_frame_t
slotP
){
NR_ServingCellConfigCommon_t
*
scc
=
gNB
->
common_channels
->
ServingCellConfigCommon
;
NR_ServingCellConfigCommon_t
*
scc
=
gNB
->
common_channels
->
ServingCellConfigCommon
;
const
int
num_slots
=
slots_per_frame
[
*
scc
->
ssbSubcarrierSpacing
];
const
int
num_slots
=
nr_
slots_per_frame
[
*
scc
->
ssbSubcarrierSpacing
];
nfapi_nr_dl_tti_request_t
*
DL_req
=
&
gNB
->
DL_req
[
0
];
nfapi_nr_dl_tti_request_t
*
DL_req
=
&
gNB
->
DL_req
[
0
];
nfapi_nr_ul_tti_request_t
*
future_ul_tti_req
=
nfapi_nr_ul_tti_request_t
*
future_ul_tti_req
=
...
@@ -373,7 +373,7 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
...
@@ -373,7 +373,7 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
// clear vrb_maps
// clear vrb_maps
memset
(
cc
[
CC_id
].
vrb_map
,
0
,
sizeof
(
uint16_t
)
*
275
);
memset
(
cc
[
CC_id
].
vrb_map
,
0
,
sizeof
(
uint16_t
)
*
275
);
// clear last scheduled slot's content (only)!
// clear last scheduled slot's content (only)!
const
int
num_slots
=
slots_per_frame
[
*
scc
->
ssbSubcarrierSpacing
];
const
int
num_slots
=
nr_
slots_per_frame
[
*
scc
->
ssbSubcarrierSpacing
];
const
int
last_slot
=
(
slot
+
num_slots
-
1
)
%
num_slots
;
const
int
last_slot
=
(
slot
+
num_slots
-
1
)
%
num_slots
;
uint16_t
*
vrb_map_UL
=
cc
[
CC_id
].
vrb_map_UL
;
uint16_t
*
vrb_map_UL
=
cc
[
CC_id
].
vrb_map_UL
;
memset
(
&
vrb_map_UL
[
last_slot
*
275
],
0
,
sizeof
(
uint16_t
)
*
275
);
memset
(
&
vrb_map_UL
[
last_slot
*
275
],
0
,
sizeof
(
uint16_t
)
*
275
);
...
@@ -396,9 +396,9 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
...
@@ -396,9 +396,9 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
slot, because otherwise we would allocate the current slot in
slot, because otherwise we would allocate the current slot in
UL_tti_req_ahead), but be aware that, e.g., K2 is allowed to be larger
UL_tti_req_ahead), but be aware that, e.g., K2 is allowed to be larger
(schedule_nr_prach will assert if resources are not free). */
(schedule_nr_prach will assert if resources are not free). */
const
sub_frame_t
n_slots_ahead
=
slots_per_frame
[
*
scc
->
ssbSubcarrierSpacing
]
-
1
;
const
sub_frame_t
n_slots_ahead
=
nr_
slots_per_frame
[
*
scc
->
ssbSubcarrierSpacing
]
-
1
;
const
frame_t
f
=
(
frame
+
(
slot
+
n_slots_ahead
)
/
slots_per_frame
[
*
scc
->
ssbSubcarrierSpacing
])
%
1024
;
const
frame_t
f
=
(
frame
+
(
slot
+
n_slots_ahead
)
/
nr_
slots_per_frame
[
*
scc
->
ssbSubcarrierSpacing
])
%
1024
;
const
sub_frame_t
s
=
(
slot
+
n_slots_ahead
)
%
slots_per_frame
[
*
scc
->
ssbSubcarrierSpacing
];
const
sub_frame_t
s
=
(
slot
+
n_slots_ahead
)
%
nr_
slots_per_frame
[
*
scc
->
ssbSubcarrierSpacing
];
schedule_nr_prach
(
module_idP
,
f
,
s
);
schedule_nr_prach
(
module_idP
,
f
,
s
);
}
}
...
...
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