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
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
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
OpenXG
OpenXG-RAN
Commits
7ecedfce
Commit
7ecedfce
authored
Feb 26, 2025
by
francescomani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
UE fix when completing RA with C-RNTI in MSG3
parent
39920eb3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
13 deletions
+7
-13
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
+4
-12
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
+3
-1
No files found.
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
View file @
7ecedfce
...
...
@@ -1173,24 +1173,16 @@ void nr_ra_succeeded(NR_UE_MAC_INST_t *mac, const uint8_t gNB_index, const frame
if
(
ra
->
cfra
)
{
LOG_I
(
MAC
,
"[UE %d][%d.%d][RAPROC] RA procedure succeeded. CFRA: RAR successfully received.
\n
"
,
mac
->
ue_id
,
frame
,
slot
);
}
else
if
(
ra
->
ra_type
==
RA_2_STEP
)
{
LOG_A
(
MAC
,
"[UE %d][%d.%d][RAPROC] 2-Step RA procedure succeeded. CBRA: Contention Resolution is successful.
\n
"
,
mac
->
ue_id
,
frame
,
slot
);
mac
->
crnti
=
ra
->
t_crnti
;
ra
->
t_crnti
=
0
;
LOG_D
(
MAC
,
"[UE %d][%d.%d] CBRA: cleared response window timer...
\n
"
,
mac
->
ue_id
,
frame
,
slot
);
}
else
{
LOG_A
(
MAC
,
"[UE %d][%d.%d][RAPROC]
4
-Step RA procedure succeeded. CBRA: Contention Resolution is successful.
\n
"
,
"[UE %d][%d.%d][RAPROC]
%d
-Step RA procedure succeeded. CBRA: Contention Resolution is successful.
\n
"
,
mac
->
ue_id
,
frame
,
slot
);
slot
,
ra
->
ra_type
==
RA_2_STEP
?
2
:
4
);
mac
->
crnti
=
ra
->
t_crnti
;
ra
->
t_crnti
=
0
;
LOG_D
(
MAC
,
"[UE %d][%d.%d] CBRA: cleared contention resolution timer...
\n
"
,
mac
->
ue_id
,
frame
,
slot
);
nr_timer_stop
(
&
ra
->
contention_resolution_timer
);
}
ra
->
RA_active
=
false
;
...
...
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
View file @
7ecedfce
...
...
@@ -1233,7 +1233,9 @@ static void nr_update_sr(NR_UE_MAC_INST_t *mac, bool BSRsent)
NR_UE_UL_BWP_t
*
current_UL_BWP
=
mac
->
current_UL_BWP
;
NR_PUCCH_Config_t
*
pucch_Config
=
current_UL_BWP
?
current_UL_BWP
->
pucch_Config
:
NULL
;
if
(
!
pucch_Config
||
!
pucch_Config
->
schedulingRequestResourceToAddModList
)
if
(
!
pucch_Config
||
!
pucch_Config
->
schedulingRequestResourceToAddModList
||
pucch_Config
->
schedulingRequestResourceToAddModList
->
list
.
count
==
0
)
return
;
// cannot schedule SR if there is no schedulingRequestResource configured
if
(
lc_info
->
sr_id
<
0
||
lc_info
->
sr_id
>=
NR_MAX_SR_ID
)
...
...
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