Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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
Michael Black
OpenXG UE
Commits
8057458d
Commit
8057458d
authored
Aug 15, 2021
by
francescomani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msg3 retransmission rounds at gnb
parent
e84adbb4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
3 deletions
+15
-3
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+5
-2
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+9
-1
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
+1
-0
No files found.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
View file @
8057458d
...
...
@@ -773,6 +773,7 @@ void nr_generate_Msg3_retransmission(module_id_t module_idP, int CC_id, frame_t
memset
(
pusch_pdu
,
0
,
sizeof
(
nfapi_nr_pusch_pdu_t
));
fill_msg3_pusch_pdu
(
pusch_pdu
,
scc
,
ra
->
msg3_round
,
startSymbolAndLength
,
ra
->
rnti
,
scs
,
bwpSize
,
bwpStart
,
...
...
@@ -956,6 +957,7 @@ void nr_get_Msg3alloc(module_id_t module_id,
void
fill_msg3_pusch_pdu
(
nfapi_nr_pusch_pdu_t
*
pusch_pdu
,
NR_ServingCellConfigCommon_t
*
scc
,
int
round
,
int
startSymbolAndLength
,
rnti_t
rnti
,
int
scs
,
int
bwp_size
,
int
bwp_start
,
...
...
@@ -1006,9 +1008,9 @@ void fill_msg3_pusch_pdu(nfapi_nr_pusch_pdu_t *pusch_pdu,
pusch_pdu
->
start_symbol_index
=
start_symbol_index
;
pusch_pdu
->
nr_of_symbols
=
nr_of_symbols
;
//Optional Data only included if indicated in pduBitmap
pusch_pdu
->
pusch_data
.
rv_index
=
0
;
// 8.3 in 38.213
pusch_pdu
->
pusch_data
.
rv_index
=
nr_rv_round_map
[
round
];
pusch_pdu
->
pusch_data
.
harq_process_id
=
0
;
pusch_pdu
->
pusch_data
.
new_data_indicator
=
1
;
// new data
pusch_pdu
->
pusch_data
.
new_data_indicator
=
1
;
pusch_pdu
->
pusch_data
.
num_cb
=
0
;
pusch_pdu
->
pusch_data
.
tb_size
=
nr_compute_tbs
(
pusch_pdu
->
qam_mod_order
,
pusch_pdu
->
target_code_rate
,
...
...
@@ -1097,6 +1099,7 @@ void nr_add_msg3(module_id_t module_idP, int CC_id, frame_t frameP, sub_frame_t
bwp_start
=
ibwp_start
;
fill_msg3_pusch_pdu
(
pusch_pdu
,
scc
,
ra
->
msg3_round
,
startSymbolAndLength
,
ra
->
rnti
,
scs
,
ibwp_size
,
bwp_start
,
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
View file @
8057458d
...
...
@@ -795,7 +795,15 @@ void nr_rx_sdu(const module_id_t gnb_mod_idP,
if
(
(
frameP
!=
ra
->
Msg3_frame
)
||
(
slotP
!=
ra
->
Msg3_slot
))
continue
;
LOG_W
(
NR_MAC
,
"Random Access %i failed at state %i (CRC did not pass)
\n
"
,
i
,
ra
->
state
);
if
(
ra
->
msg3_round
>=
MAX_HARQ_ROUNDS
-
1
)
{
LOG_W
(
NR_MAC
,
"Random Access %i failed at state %i (Reached msg3 max harq rounds)
\n
"
,
i
,
ra
->
state
);
nr_mac_remove_ra_rnti
(
gnb_mod_idP
,
ra
->
rnti
);
nr_clear_ra_proc
(
gnb_mod_idP
,
CC_idP
,
frameP
,
ra
);
return
;
}
LOG_W
(
NR_MAC
,
"Random Access %i Msg3 CRC did not pass)
\n
"
,
i
);
ra
->
msg3_round
++
;
ra
->
state
=
Msg3_retransmission
;
}
}
...
...
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
View file @
8057458d
...
...
@@ -138,6 +138,7 @@ void nr_fill_rar(uint8_t Mod_idP,
void
fill_msg3_pusch_pdu
(
nfapi_nr_pusch_pdu_t
*
pusch_pdu
,
NR_ServingCellConfigCommon_t
*
scc
,
int
round
,
int
startSymbolAndLength
,
rnti_t
rnti
,
int
scs
,
int
bwp_size
,
int
bwp_start
,
...
...
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