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
lizhongxiao
OpenXG-RAN
Commits
dded67c1
Commit
dded67c1
authored
Oct 04, 2022
by
francescomani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
another fix for msg3 slot
parent
bf3e5cb7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
6 deletions
+7
-6
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+7
-6
No files found.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
View file @
dded67c1
...
@@ -885,7 +885,7 @@ void nr_get_Msg3alloc(module_id_t module_id,
...
@@ -885,7 +885,7 @@ void nr_get_Msg3alloc(module_id_t module_id,
int
StartSymbolIndex
=
0
;
int
StartSymbolIndex
=
0
;
int
NrOfSymbols
=
0
;
int
NrOfSymbols
=
0
;
int
startSymbolAndLength
=
0
;
int
startSymbolAndLength
=
0
;
int
temp
_slot
=
0
;
int
abs
_slot
=
0
;
ra
->
Msg3_tda_id
=
16
;
// initialization to a value above limit
ra
->
Msg3_tda_id
=
16
;
// initialization to a value above limit
NR_PUSCH_TimeDomainResourceAllocationList_t
*
pusch_TimeDomainAllocationList
=
ul_bwp
->
tdaList
;
NR_PUSCH_TimeDomainResourceAllocationList_t
*
pusch_TimeDomainAllocationList
=
ul_bwp
->
tdaList
;
...
@@ -907,7 +907,8 @@ void nr_get_Msg3alloc(module_id_t module_id,
...
@@ -907,7 +907,8 @@ void nr_get_Msg3alloc(module_id_t module_id,
SLIV2SL
(
pusch_TimeDomainAllocationList
->
list
.
array
[
i
]
->
startSymbolAndLength
,
&
start_symbol_index
,
&
nr_of_symbols
);
SLIV2SL
(
pusch_TimeDomainAllocationList
->
list
.
array
[
i
]
->
startSymbolAndLength
,
&
start_symbol_index
,
&
nr_of_symbols
);
LOG_D
(
NR_MAC
,
"Checking Msg3 TDA %d : k2 %d, sliv %d,S %d L %d
\n
"
,
i
,(
int
)
k2
,(
int
)
pusch_TimeDomainAllocationList
->
list
.
array
[
i
]
->
startSymbolAndLength
,
start_symbol_index
,
nr_of_symbols
);
LOG_D
(
NR_MAC
,
"Checking Msg3 TDA %d : k2 %d, sliv %d,S %d L %d
\n
"
,
i
,(
int
)
k2
,(
int
)
pusch_TimeDomainAllocationList
->
list
.
array
[
i
]
->
startSymbolAndLength
,
start_symbol_index
,
nr_of_symbols
);
// we want to transmit in the uplink symbols of mixed slot or the first uplink slot
// we want to transmit in the uplink symbols of mixed slot or the first uplink slot
temp_slot
=
(
current_slot
+
k2
+
DELTA
[
mu
])
%
nr_slots_per_frame
[
mu
];
// msg3 slot according to 8.3 in 38.213
abs_slot
=
(
current_slot
+
k2
+
DELTA
[
mu
]);
int
temp_slot
=
abs_slot
%
nr_slots_per_frame
[
mu
];
// msg3 slot according to 8.3 in 38.213
if
((
temp_slot
%
nb_slots_per_period
)
==
msg3_slot
&&
if
((
temp_slot
%
nb_slots_per_period
)
==
msg3_slot
&&
is_xlsch_in_slot
(
RC
.
nrmac
[
module_id
]
->
ulsch_slot_bitmap
[
temp_slot
/
64
],
temp_slot
))
{
is_xlsch_in_slot
(
RC
.
nrmac
[
module_id
]
->
ulsch_slot_bitmap
[
temp_slot
/
64
],
temp_slot
))
{
ra
->
Msg3_tda_id
=
i
;
ra
->
Msg3_tda_id
=
i
;
...
@@ -922,16 +923,16 @@ void nr_get_Msg3alloc(module_id_t module_id,
...
@@ -922,16 +923,16 @@ void nr_get_Msg3alloc(module_id_t module_id,
else
{
else
{
ra
->
Msg3_tda_id
=
0
;
ra
->
Msg3_tda_id
=
0
;
k2
=
*
pusch_TimeDomainAllocationList
->
list
.
array
[
0
]
->
k2
;
k2
=
*
pusch_TimeDomainAllocationList
->
list
.
array
[
0
]
->
k2
;
temp
_slot
=
current_slot
+
k2
+
DELTA
[
mu
];
// msg3 slot according to 8.3 in 38.213
abs
_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
];
ra
->
Msg3_slot
=
abs_slot
%
nr_slots_per_frame
[
mu
];
}
}
AssertFatal
(
ra
->
Msg3_tda_id
<
16
,
"Unable to find Msg3 time domain allocation in list
\n
"
);
AssertFatal
(
ra
->
Msg3_tda_id
<
16
,
"Unable to find Msg3 time domain allocation in list
\n
"
);
if
(
n_slots_frame
>
temp
_slot
)
if
(
n_slots_frame
>
abs
_slot
)
ra
->
Msg3_frame
=
current_frame
;
ra
->
Msg3_frame
=
current_frame
;
else
else
ra
->
Msg3_frame
=
(
current_frame
+
(
temp
_slot
/
n_slots_frame
))
%
1024
;
ra
->
Msg3_frame
=
(
current_frame
+
(
abs
_slot
/
n_slots_frame
))
%
1024
;
// beam association for FR2
// beam association for FR2
if
(
*
scc
->
downlinkConfigCommon
->
frequencyInfoDL
->
frequencyBandList
.
list
.
array
[
0
]
>=
257
)
{
if
(
*
scc
->
downlinkConfigCommon
->
frequencyInfoDL
->
frequencyBandList
.
list
.
array
[
0
]
>=
257
)
{
...
...
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