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
spbro
OpenXG-RAN
Commits
cebe8b79
Commit
cebe8b79
authored
Aug 20, 2021
by
francescomani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
do not process rar in case of nack
parent
1d09adc7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
41 additions
and
35 deletions
+41
-35
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+41
-35
No files found.
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
View file @
cebe8b79
...
...
@@ -3560,6 +3560,12 @@ int nr_ue_process_rar(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_t
module_id_t
mod_id
=
dl_info
->
module_id
;
frame_t
frame
=
dl_info
->
frame
;
int
slot
=
dl_info
->
slot
;
if
(
dl_info
->
rx_ind
->
rx_indication_body
[
pdu_id
].
pdsch_pdu
.
ack_nack
==
0
)
{
LOG_W
(
NR_MAC
,
"[UE %d][RAPROC][%d.%d] CRC check failed on RAR (NAK)
\n
"
,
mod_id
,
frame
,
slot
);
return
0
;
}
int
cc_id
=
dl_info
->
cc_id
;
uint8_t
gNB_id
=
dl_info
->
gNB_index
;
NR_UE_MAC_INST_t
*
mac
=
get_mac_inst
(
mod_id
);
...
...
@@ -3622,46 +3628,46 @@ int nr_ue_process_rar(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_t
unsigned
char
csi_req
;
#endif
// TC-RNTI
ra
->
t_crnti
=
rar
->
TCRNTI_2
+
(
rar
->
TCRNTI_1
<<
8
);
// TC-RNTI
ra
->
t_crnti
=
rar
->
TCRNTI_2
+
(
rar
->
TCRNTI_1
<<
8
);
// TA command
ul_time_alignment
->
apply_ta
=
1
;
ul_time_alignment
->
ta_command
=
31
+
rar
->
TA2
+
(
rar
->
TA1
<<
5
);
// TA command
ul_time_alignment
->
apply_ta
=
1
;
ul_time_alignment
->
ta_command
=
31
+
rar
->
TA2
+
(
rar
->
TA1
<<
5
);
#ifdef DEBUG_RAR
// CSI
csi_req
=
(
unsigned
char
)
(
rar
->
UL_GRANT_4
&
0x01
);
// CSI
csi_req
=
(
unsigned
char
)
(
rar
->
UL_GRANT_4
&
0x01
);
#endif
// TPC
tpc_command
=
(
unsigned
char
)
((
rar
->
UL_GRANT_4
>>
1
)
&
0x07
);
switch
(
tpc_command
){
case
0
:
ra
->
Msg3_TPC
=
-
6
;
break
;
case
1
:
ra
->
Msg3_TPC
=
-
4
;
break
;
case
2
:
ra
->
Msg3_TPC
=
-
2
;
break
;
case
3
:
ra
->
Msg3_TPC
=
0
;
break
;
case
4
:
ra
->
Msg3_TPC
=
2
;
break
;
case
5
:
ra
->
Msg3_TPC
=
4
;
break
;
case
6
:
ra
->
Msg3_TPC
=
6
;
break
;
case
7
:
ra
->
Msg3_TPC
=
8
;
break
;
}
// TPC
tpc_command
=
(
unsigned
char
)
((
rar
->
UL_GRANT_4
>>
1
)
&
0x07
);
switch
(
tpc_command
){
case
0
:
ra
->
Msg3_TPC
=
-
6
;
break
;
case
1
:
ra
->
Msg3_TPC
=
-
4
;
break
;
case
2
:
ra
->
Msg3_TPC
=
-
2
;
break
;
case
3
:
ra
->
Msg3_TPC
=
0
;
break
;
case
4
:
ra
->
Msg3_TPC
=
2
;
break
;
case
5
:
ra
->
Msg3_TPC
=
4
;
break
;
case
6
:
ra
->
Msg3_TPC
=
6
;
break
;
case
7
:
ra
->
Msg3_TPC
=
8
;
break
;
}
// MCS
rar_grant
.
mcs
=
(
unsigned
char
)
(
rar
->
UL_GRANT_4
>>
4
);
// time alloc
...
...
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