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
b4413872
Commit
b4413872
authored
May 19, 2020
by
Francesco Mani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugfix for 2 acknacks in pucch0
parent
a92fc438
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_primitives.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+7
-6
No files found.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
View file @
b4413872
...
...
@@ -1476,9 +1476,10 @@ void nr_update_pucch_scheduling(int Mod_idP,
if
(
found
==
0
)
i
++
;
}
if
(
found
==
1
)
{
// scheduling this harq-ack in current pucch
sched_pucch
=
curr_pucch
;
sched_pucch
->
dai_c
=
1
+
sched_pucch
->
dai_c
;
sched_pucch
->
timing_indicator
=
pdsch_to_harq_feedback
[
i
];
curr_pucch
->
dai_c
=
1
+
curr_pucch
->
dai_c
;
memcpy
(
sched_pucch
,
curr_pucch
,
sizeof
(
NR_sched_pucch
));
sched_pucch
->
timing_indicator
=
i
;
return
;
}
}
if
(
curr_pucch
->
dai_c
==
MAX_ACK_BITS
||
found
==
0
)
{
// if current pucch is full or no timing indicator allowed
...
...
@@ -1498,7 +1499,7 @@ void nr_update_pucch_scheduling(int Mod_idP,
sched_pucch
->
next_sched_pucch
=
curr_pucch
;
sched_pucch
->
dai_c
=
1
;
sched_pucch
->
resource_indicator
=
0
;
// in phytest with only 1 UE we are using just the 1st resource
sched_pucch
->
timing_indicator
=
pdsch_to_harq_feedback
[
i
]
;
sched_pucch
->
timing_indicator
=
i
;
UE_list
->
UE_sched_ctrl
[
UE_id
].
sched_pucch
=
sched_pucch
;
}
else
{
...
...
@@ -1508,7 +1509,7 @@ void nr_update_pucch_scheduling(int Mod_idP,
sched_pucch
->
frame
=
frameP
;
sched_pucch
->
next_sched_pucch
=
NULL
;
sched_pucch
->
dai_c
=
1
;
sched_pucch
->
timing_indicator
=
pdsch_to_harq_feedback
[
i
]
;
sched_pucch
->
timing_indicator
=
i
;
sched_pucch
->
resource_indicator
=
0
;
// in phytest with only 1 UE we are using just the 1st resource
sched_pucch
->
ul_slot
=
k
+
(
slotP
-
(
slotP
%
slots_per_tdd
));
curr_pucch
->
next_sched_pucch
=
(
NR_sched_pucch
*
)
malloc
(
sizeof
(
NR_sched_pucch
));
...
...
@@ -1520,7 +1521,7 @@ void nr_update_pucch_scheduling(int Mod_idP,
else
{
// scheduling this harq-ack in current pucch
sched_pucch
=
curr_pucch
;
sched_pucch
->
dai_c
=
1
+
sched_pucch
->
dai_c
;
sched_pucch
->
timing_indicator
=
pdsch_to_harq_feedback
[
i
]
;
sched_pucch
->
timing_indicator
=
i
;
}
}
}
...
...
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