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
208706d0
Commit
208706d0
authored
Mar 14, 2024
by
francescomani
Committed by
sagar arora
May 22, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
improving the handling of sr_TransMax
parent
eab52618
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
6 deletions
+7
-6
openair2/LAYER2/NR_MAC_UE/config_ue.c
openair2/LAYER2/NR_MAC_UE/config_ue.c
+3
-1
openair2/LAYER2/NR_MAC_UE/mac_defs.h
openair2/LAYER2/NR_MAC_UE/mac_defs.h
+1
-1
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+3
-4
No files found.
openair2/LAYER2/NR_MAC_UE/config_ue.c
View file @
208706d0
...
@@ -1714,7 +1714,9 @@ static void configure_maccellgroup(NR_UE_MAC_INST_t *mac, const NR_MAC_CellGroup
...
@@ -1714,7 +1714,9 @@ static void configure_maccellgroup(NR_UE_MAC_INST_t *mac, const NR_MAC_CellGroup
si
->
sr_id
==
sr
->
schedulingRequestId
,
si
->
sr_id
==
sr
->
schedulingRequestId
,
"Current implementation cannot handle more than 1 SR configuration
\n
"
);
"Current implementation cannot handle more than 1 SR configuration
\n
"
);
si
->
sr_id
=
sr
->
schedulingRequestId
;
si
->
sr_id
=
sr
->
schedulingRequestId
;
si
->
sr_TransMax
=
sr
->
sr_TransMax
;
// NR_SchedulingRequestToAddMod__sr_TransMax_n4 = 0 and so on
// to obtain the value to configure we need to right shift 4 by the RRC parameter
si
->
sr_MaxTransmissions
=
4
<<
sr
->
sr_TransMax
;
int
target_ms
=
0
;
int
target_ms
=
0
;
if
(
sr
->
sr_ProhibitTimer
)
if
(
sr
->
sr_ProhibitTimer
)
target_ms
=
1
<<
*
sr
->
sr_ProhibitTimer
;
target_ms
=
1
<<
*
sr
->
sr_ProhibitTimer
;
...
...
openair2/LAYER2/NR_MAC_UE/mac_defs.h
View file @
208706d0
...
@@ -225,7 +225,7 @@ typedef struct {
...
@@ -225,7 +225,7 @@ typedef struct {
/// sr ProhibitTimer
/// sr ProhibitTimer
NR_timer_t
sr_ProhibitTimer
;
NR_timer_t
sr_ProhibitTimer
;
// Maximum number of SR transmissions
// Maximum number of SR transmissions
uint32_t
sr_
TransMax
;
uint32_t
sr_
MaxTransmissions
;
int
sr_id
;
int
sr_id
;
///timer before triggering a periodic PHR
///timer before triggering a periodic PHR
uint16_t
periodicPHR_Timer
;
uint16_t
periodicPHR_Timer
;
...
...
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
View file @
208706d0
...
@@ -2466,23 +2466,22 @@ int8_t nr_ue_get_SR(NR_UE_MAC_INST_t *mac, frame_t frameP, slot_t slot)
...
@@ -2466,23 +2466,22 @@ int8_t nr_ue_get_SR(NR_UE_MAC_INST_t *mac, frame_t frameP, slot_t slot)
{
{
// no UL-SCH resources available for this tti && UE has a valid PUCCH resources for SR configuration for this tti
// no UL-SCH resources available for this tti && UE has a valid PUCCH resources for SR configuration for this tti
NR_UE_SCHEDULING_INFO
*
si
=
&
mac
->
scheduling_info
;
NR_UE_SCHEDULING_INFO
*
si
=
&
mac
->
scheduling_info
;
int
max_sr_transmissions
=
(
1
<<
(
2
+
si
->
sr_TransMax
));
LOG_D
(
NR_MAC
,
"[UE %d] Frame %d slot %d send SR indication (SR_COUNTER/sr_TransMax %d/%d), SR_pending %d
\n
"
,
LOG_D
(
NR_MAC
,
"[UE %d] Frame %d slot %d send SR indication (SR_COUNTER/sr_TransMax %d/%d), SR_pending %d
\n
"
,
mac
->
ue_id
,
mac
->
ue_id
,
frameP
,
frameP
,
slot
,
slot
,
si
->
SR_COUNTER
,
si
->
SR_COUNTER
,
max_sr_t
ransmissions
,
si
->
sr_MaxT
ransmissions
,
si
->
SR_pending
);
// todo
si
->
SR_pending
);
// todo
if
((
si
->
SR_pending
==
1
)
&&
if
((
si
->
SR_pending
==
1
)
&&
(
si
->
SR_COUNTER
<
max_sr_t
ransmissions
))
{
(
si
->
SR_COUNTER
<
si
->
sr_MaxT
ransmissions
))
{
LOG_D
(
NR_MAC
,
"[UE %d] Frame %d slot %d PHY asks for SR (SR_COUNTER/sr_TransMax %d/%d), SR_pending %d, increment SR_COUNTER
\n
"
,
LOG_D
(
NR_MAC
,
"[UE %d] Frame %d slot %d PHY asks for SR (SR_COUNTER/sr_TransMax %d/%d), SR_pending %d, increment SR_COUNTER
\n
"
,
mac
->
ue_id
,
mac
->
ue_id
,
frameP
,
frameP
,
slot
,
slot
,
si
->
SR_COUNTER
,
si
->
SR_COUNTER
,
max_sr_t
ransmissions
,
si
->
sr_MaxT
ransmissions
,
si
->
SR_pending
);
// todo
si
->
SR_pending
);
// todo
si
->
SR_COUNTER
++
;
si
->
SR_COUNTER
++
;
...
...
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