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
zzha zzha
OpenXG-RAN
Commits
8743f58d
Commit
8743f58d
authored
3 years ago
by
luispereira87
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve schedule msg3 and fix tda for mixed slots
parent
65bf29ee
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
14 deletions
+17
-14
ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpb210.conf
ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpb210.conf
+1
-1
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+9
-6
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+1
-1
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
...ENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
+3
-3
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
...ENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
+3
-3
No files found.
ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpb210.conf
View file @
8743f58d
...
...
@@ -142,7 +142,7 @@ gNBs =
initialULBWPk2_1
=
6
;
# used for mixed slot
initialULBWPmappingType_1
=
1
;
initialULBWPstartSymbolAndLength_1
=
69
;
# this is SS=0 L=12
initialULBWPstartSymbolAndLength_1
=
52
;
# this is SS=10 L=4
initialULBWPk2_2
=
7
;
# used for Msg.3 during RA
initialULBWPmappingType_2
=
1
;
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
View file @
8743f58d
...
...
@@ -704,21 +704,24 @@ void nr_get_Msg3alloc(module_id_t module_id,
ubwp
->
bwp_Common
->
pusch_ConfigCommon
->
choice
.
setup
->
pusch_TimeDomainAllocationList
:
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
pusch_ConfigCommon
->
choice
.
setup
->
pusch_TimeDomainAllocationList
;
uint8_t
k2
=
0
;
for
(
int
i
=
0
;
i
<
pusch_TimeDomainAllocationList
->
list
.
count
;
i
++
)
{
startSymbolAndLength
=
pusch_TimeDomainAllocationList
->
list
.
array
[
i
]
->
startSymbolAndLength
;
SLIV2SL
(
startSymbolAndLength
,
&
StartSymbolIndex
,
&
NrOfSymbols
);
// we want to transmit in the uplink symbols of mixed slot
if
(
NrOfSymbols
==
scc
->
tdd_UL_DL_ConfigurationCommon
->
pattern1
.
nrofUplinkSymbols
)
{
ra
->
Msg3_tda_id
=
i
;
break
;
k2
=
*
pusch_TimeDomainAllocationList
->
list
.
array
[
i
]
->
k2
;
temp_slot
=
current_slot
+
k2
+
DELTA
[
mu
];
// msg3 slot according to 8.3 in 38.213
ra
->
Msg3_slot
=
temp_slot
%
nr_slots_per_frame
[
mu
];
if
(
is_xlsch_in_slot
(
RC
.
nrmac
[
module_id
]
->
ulsch_slot_bitmap
[
ra
->
Msg3_slot
/
64
],
ra
->
Msg3_slot
))
{
ra
->
Msg3_tda_id
=
i
;
break
;
}
}
}
AssertFatal
(
ra
->
Msg3_tda_id
<
16
,
"Unable to find Msg3 time domain allocation in list
\n
"
);
uint8_t
k2
=
*
pusch_TimeDomainAllocationList
->
list
.
array
[
ra
->
Msg3_tda_id
]
->
k2
;
AssertFatal
(
ra
->
Msg3_tda_id
<
16
,
"Unable to find Msg3 time domain allocation in list
\n
"
)
;
temp_slot
=
current_slot
+
k2
+
DELTA
[
mu
];
// msg3 slot according to 8.3 in 38.213
ra
->
Msg3_slot
=
temp_slot
%
nr_slots_per_frame
[
mu
];
if
(
nr_slots_per_frame
[
mu
]
>
temp_slot
)
ra
->
Msg3_frame
=
current_frame
;
else
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
View file @
8743f58d
...
...
@@ -969,7 +969,7 @@ void pf_ul(module_id_t module_id,
gNB_MAC_INST
*
nrmac
=
RC
.
nrmac
[
module_id
];
NR_ServingCellConfigCommon_t
*
scc
=
nrmac
->
common_channels
[
CC_id
].
ServingCellConfigCommon
;
NR_UE_info_t
*
UE_info
=
&
nrmac
->
UE_info
;
const
int
min_rb
=
5
;
const
int
min_rb
=
16
;
float
coeff_ue
[
MAX_MOBILES_PER_GNB
];
// UEs that could be scheduled
int
ue_array
[
MAX_MOBILES_PER_GNB
];
...
...
This diff is collapsed.
Click to expand it.
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
View file @
8743f58d
Active_gNBs
= (
"gNB-Eurecom-
DU
"
);
Active_gNBs
= (
"gNB-Eurecom-
5GNRBox
"
);
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity
=
"none"
;
...
...
@@ -7,7 +7,7 @@ gNBs =
{
//////////
Identification
parameters
:
gNB_ID
=
0
xe00
;
gNB_name
=
"gNB-Eurecom-
DU
"
;
gNB_name
=
"gNB-Eurecom-
5GNRBox
"
;
//
Tracking
area
code
,
0
x0000
and
0
xfffe
are
reserved
values
tracking_area_code
=
1
;
...
...
@@ -142,7 +142,7 @@ gNBs =
initialULBWPk2_1
=
6
;
# used for mixed slot
initialULBWPmappingType_1
=
1
;
initialULBWPstartSymbolAndLength_1
=
69
;
# this is SS=0 L=12
initialULBWPstartSymbolAndLength_1
=
52
;
# this is SS=10 L=4
initialULBWPk2_2
=
7
;
# used for Msg.3 during RA
initialULBWPmappingType_2
=
1
;
...
...
This diff is collapsed.
Click to expand it.
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
View file @
8743f58d
Active_gNBs
= (
"gNB-Eurecom-
DU
"
);
Active_gNBs
= (
"gNB-Eurecom-
5GNRBox
"
);
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity
=
"none"
;
...
...
@@ -7,7 +7,7 @@ gNBs =
{
//////////
Identification
parameters
:
gNB_ID
=
0
xe00
;
gNB_name
=
"gNB-Eurecom-
DU
"
;
gNB_name
=
"gNB-Eurecom-
5GNRBox
"
;
//
Tracking
area
code
,
0
x0000
and
0
xfffe
are
reserved
values
tracking_area_code
=
1
;
...
...
@@ -142,7 +142,7 @@ gNBs =
initialULBWPk2_1
=
6
;
# used for mixed slot
initialULBWPmappingType_1
=
1
;
initialULBWPstartSymbolAndLength_1
=
69
;
# this is SS=0 L=12
initialULBWPstartSymbolAndLength_1
=
52
;
# this is SS=10 L=4
initialULBWPk2_2
=
7
;
# used for Msg.3 during RA
initialULBWPmappingType_2
=
1
;
...
...
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