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
canghaiwuhen
OpenXG-RAN
Commits
0a2e0332
Commit
0a2e0332
authored
Feb 13, 2020
by
Francesco Mani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
max ack bits in mac_proto.h
parent
57a612c5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+3
-3
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
+2
-0
No files found.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
View file @
0a2e0332
...
@@ -1350,7 +1350,7 @@ void nr_update_pucch_scheduling(int Mod_idP,
...
@@ -1350,7 +1350,7 @@ void nr_update_pucch_scheduling(int Mod_idP,
}
}
else
{
// to be tested
else
{
// to be tested
curr_pucch
=
UE_list
->
UE_sched_ctrl
[
UE_id
].
sched_pucch
;
curr_pucch
=
UE_list
->
UE_sched_ctrl
[
UE_id
].
sched_pucch
;
if
(
curr_pucch
->
dai_c
<
11
)
{
// we are scheduling at most 11
harq-ack in the same pucch
if
(
curr_pucch
->
dai_c
<
MAX_ACK_BITS
)
{
// we are scheduling at most MAX_UCI_BITS
harq-ack in the same pucch
while
(
i
<
8
&&
found
==
0
)
{
// look if timing indicator is among allowed values for current pucch
while
(
i
<
8
&&
found
==
0
)
{
// look if timing indicator is among allowed values for current pucch
if
(
pdsch_to_harq_feedback
[
i
]
==
(
curr_pucch
->
ul_slot
%
slots_per_tdd
)
-
(
slotP
%
slots_per_tdd
))
if
(
pdsch_to_harq_feedback
[
i
]
==
(
curr_pucch
->
ul_slot
%
slots_per_tdd
)
-
(
slotP
%
slots_per_tdd
))
found
=
1
;
found
=
1
;
...
@@ -1362,7 +1362,7 @@ void nr_update_pucch_scheduling(int Mod_idP,
...
@@ -1362,7 +1362,7 @@ void nr_update_pucch_scheduling(int Mod_idP,
sched_pucch
->
timing_indicator
=
pdsch_to_harq_feedback
[
i
];
sched_pucch
->
timing_indicator
=
pdsch_to_harq_feedback
[
i
];
}
}
}
}
if
(
curr_pucch
->
dai_c
==
11
||
found
==
0
)
{
// if current pucch is full or no timing indicator allowed
if
(
curr_pucch
->
dai_c
==
MAX_ACK_BITS
||
found
==
0
)
{
// if current pucch is full or no timing indicator allowed
// look for pucch occasions in other UL of mixed slots
// look for pucch occasions in other UL of mixed slots
for
(
k
=
scc
->
tdd_UL_DL_ConfigurationCommon
->
pattern1
.
nrofDownlinkSlots
;
k
<
slots_per_tdd
;
k
++
)
{
// for each possible UL or mixed slot
for
(
k
=
scc
->
tdd_UL_DL_ConfigurationCommon
->
pattern1
.
nrofDownlinkSlots
;
k
<
slots_per_tdd
;
k
++
)
{
// for each possible UL or mixed slot
if
(
k
!=
(
curr_pucch
->
ul_slot
%
slots_per_tdd
))
{
// skip current scheduled slot (already checked)
if
(
k
!=
(
curr_pucch
->
ul_slot
%
slots_per_tdd
))
{
// skip current scheduled slot (already checked)
...
@@ -1396,7 +1396,7 @@ void nr_update_pucch_scheduling(int Mod_idP,
...
@@ -1396,7 +1396,7 @@ void nr_update_pucch_scheduling(int Mod_idP,
curr_pucch
->
next_sched_pucch
=
sched_pucch
;
curr_pucch
->
next_sched_pucch
=
sched_pucch
;
}
}
else
{
else
{
if
(
curr_pucch
->
dai_c
==
11
)
if
(
curr_pucch
->
dai_c
==
MAX_ACK_BITS
)
found
=
0
;
// if pucch at index k is already full we have to find a new one in a following occasion
found
=
0
;
// if pucch at index k is already full we have to find a new one in a following occasion
else
{
// scheduling this harq-ack in current pucch
else
{
// scheduling this harq-ack in current pucch
sched_pucch
=
curr_pucch
;
sched_pucch
=
curr_pucch
;
...
...
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
View file @
0a2e0332
...
@@ -34,6 +34,8 @@
...
@@ -34,6 +34,8 @@
#include "nr_mac_gNB.h"
#include "nr_mac_gNB.h"
#include "PHY/defs_gNB.h"
#include "PHY/defs_gNB.h"
#define MAX_ACK_BITS 2 //only format 0 is available for now
void
set_cset_offset
(
uint16_t
);
void
set_cset_offset
(
uint16_t
);
void
mac_top_init_gNB
(
void
);
void
mac_top_init_gNB
(
void
);
...
...
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