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
littleBu
OpenXG-RAN
Commits
92460a80
Commit
92460a80
authored
Nov 04, 2024
by
Guido Casati
Committed by
Guido Casati
Jan 28, 2025
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use is_mixed_slot in stack
parent
0b7bee96
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
8 deletions
+5
-8
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/config.c
+2
-4
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+1
-1
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
+1
-1
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+1
-2
No files found.
openair2/LAYER2/NR_MAC_gNB/config.c
View file @
92460a80
...
...
@@ -386,8 +386,7 @@ int get_first_ul_slot(const frame_structure_t *fs, bool mixed)
if
(
fs
->
is_tdd
)
{
for
(
int
i
=
0
;
i
<
fs
->
numb_slots_period
;
i
++
)
{
bool
is_mixed
=
fs
->
period_cfg
.
tdd_slot_bitmap
[
i
].
num_ul_symbols
&&
fs
->
period_cfg
.
tdd_slot_bitmap
[
i
].
slot_type
==
TDD_NR_MIXED_SLOT
;
if
((
mixed
&&
is_mixed
)
||
fs
->
period_cfg
.
tdd_slot_bitmap
[
i
].
slot_type
==
TDD_NR_UPLINK_SLOT
)
{
if
((
mixed
&&
is_ul_slot
(
i
,
fs
))
||
fs
->
period_cfg
.
tdd_slot_bitmap
[
i
].
slot_type
==
TDD_NR_UPLINK_SLOT
)
{
return
i
;
}
}
...
...
@@ -486,8 +485,7 @@ int get_ul_slot_offset(const frame_structure_t *fs, int idx, bool count_mixed)
/* Populate the indices of UL slots in the TDD period from the bitmap
count also mixed slots with UL symbols if flag count_mixed is present */
for
(
int
i
=
0
;
i
<
fs
->
numb_slots_period
;
i
++
)
{
bool
is_mixed
=
(
fs
->
period_cfg
.
tdd_slot_bitmap
[
i
].
num_ul_symbols
>
1
)
&&
(
fs
->
period_cfg
.
tdd_slot_bitmap
[
i
].
slot_type
==
TDD_NR_MIXED_SLOT
);
if
((
count_mixed
&&
is_mixed
)
||
fs
->
period_cfg
.
tdd_slot_bitmap
[
i
].
slot_type
==
TDD_NR_UPLINK_SLOT
)
{
if
((
count_mixed
&&
is_ul_slot
(
i
,
fs
))
||
fs
->
period_cfg
.
tdd_slot_bitmap
[
i
].
slot_type
==
TDD_NR_UPLINK_SLOT
)
{
ul_slot_idxs
[
ul_slot_count
++
]
=
i
;
}
}
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
View file @
92460a80
...
...
@@ -982,7 +982,7 @@ static bool get_feasible_msg3_tda(const NR_ServingCellConfigCommon_t *scc,
const
tdd_bitmap_t
*
tdd_slot_bitmap
=
fs
->
period_cfg
.
tdd_slot_bitmap
;
int
s
=
get_slot_idx_in_period
(
temp_slot
,
fs
);
// check if enough symbols in case of mixed slot
bool
is_mixed
=
(
tdd_slot_bitmap
[
s
].
slot_type
==
TDD_NR_MIXED_SLOT
);
bool
is_mixed
=
is_mixed_slot
(
s
,
fs
);
// if the mixed slot has not enough symbols, skip
if
(
is_mixed
&&
tdd_slot_bitmap
[
s
].
num_ul_symbols
<
3
)
continue
;
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
View file @
92460a80
...
...
@@ -65,7 +65,7 @@ int get_dl_tda(const gNB_MAC_INST *nrmac, int slot)
int
s
=
get_slot_idx_in_period
(
slot
,
fs
);
// if there is a mixed slot where we can transmit DL
const
tdd_bitmap_t
*
tdd_slot_bitmap
=
fs
->
period_cfg
.
tdd_slot_bitmap
;
if
(
tdd_slot_bitmap
[
s
].
num_dl_symbols
>
1
&&
(
tdd_slot_bitmap
[
s
].
slot_type
==
TDD_NR_MIXED_SLOT
))
{
if
(
tdd_slot_bitmap
[
s
].
num_dl_symbols
>
1
&&
is_mixed_slot
(
s
,
fs
))
{
return
2
;
}
}
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
View file @
92460a80
...
...
@@ -52,8 +52,7 @@ int get_ul_tda(gNB_MAC_INST *nrmac, int frame, int slot)
// if there is uplink symbols in mixed slot
int
s
=
get_slot_idx_in_period
(
slot
,
fs
);
tdd_bitmap_t
*
tdd_slot_bitmap
=
fs
->
period_cfg
.
tdd_slot_bitmap
;
if
((
tdd_slot_bitmap
[
s
].
num_ul_symbols
>
1
)
&&
(
tdd_slot_bitmap
[
s
].
slot_type
==
TDD_NR_MIXED_SLOT
))
{
if
((
tdd_slot_bitmap
[
s
].
num_ul_symbols
>
1
)
&&
is_mixed_slot
(
s
,
fs
))
{
return
2
;
}
}
...
...
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