Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
openairinterface5G
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Patricio Latini
openairinterface5G
Commits
24c669f3
Commit
24c669f3
authored
May 15, 2018
by
Wu Jing
Browse files
Options
Downloads
Patches
Plain Diff
fix DLSCH no retransmission
parent
38363b10
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
openair1/SCHED/phy_procedures_lte_eNb.c
+16
-0
16 additions, 0 deletions
openair1/SCHED/phy_procedures_lte_eNb.c
with
16 additions
and
0 deletions
openair1/SCHED/phy_procedures_lte_eNb.c
+
16
−
0
View file @
24c669f3
...
...
@@ -1043,6 +1043,14 @@ void uci_procedures(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc)
harq_ack
[
0
]
=
0
;
}
uci
->
stat
=
metric
[
0
];
if
(
harq_ack
[
0
]
!=
1
){
LOG_E
(
PHY
,
"PUCCH ACK/NACK(SR): frame %d subframe %d rnti %x n_pucch_1_0_sr[0] %d pucch_fmt %d harq_ack[0]:%d -> 1
\n
"
,
frame
,
subframe
,
uci
->
rnti
,
uci
->
n_pucch_1_0_sr
[
0
],
uci
->
pucch_fmt
,
harq_ack
[
0
]);
harq_ack
[
0
]
=
1
;
}
else
{
LOG_E
(
PHY
,
"PUCCH ACK/NACK(SR): frame %d subframe %d rnti %x n_pucch_1_0_sr[0] %d pucch_fmt %d
\n
"
,
frame
,
subframe
,
uci
->
rnti
,
uci
->
n_pucch_1_0_sr
[
0
],
uci
->
pucch_fmt
);
}
fill_uci_harq_indication
(
eNB
,
uci
,
frame
,
subframe
,
harq_ack
,
2
,
0xffff
);
// special_bundling mode
}
else
if
((
uci
->
tdd_bundling
==
0
)
&&
(
uci
->
num_pucch_resources
==
2
)){
// multiplexing + no SR, implement Table 10.1.3-5 (Rel14) for multiplexing with M=2
...
...
@@ -1310,6 +1318,14 @@ void uci_procedures(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc)
harq_ack
[
0
]
=
pucch_b0b1
[
0
][
0
];
harq_ack
[
1
]
=
pucch_b0b1
[
0
][
1
];
uci
->
stat
=
metric
[
0
];
if
(
harq_ack
[
0
]
!=
1
){
LOG_E
(
PHY
,
"PUCCH ACK/NACK(no SR): frame %d subframe %d rnti %x n_pucch_1[0][0] %d pucch_fmt %d harq_ack[0]:%d -> 1
\n
"
,
frame
,
subframe
,
uci
->
rnti
,
uci
->
n_pucch_1
[
0
][
0
],
uci
->
pucch_fmt
,
harq_ack
[
0
]);
harq_ack
[
0
]
=
1
;
}
else
{
LOG_E
(
PHY
,
"PUCCH ACK/NACK(no SR): frame %d subframe %d rnti %x n_pucch_1[0][0] %d pucch_fmt %d
\n
"
,
frame
,
subframe
,
uci
->
rnti
,
uci
->
n_pucch_1
[
0
][
0
],
uci
->
pucch_fmt
);
}
fill_uci_harq_indication
(
eNB
,
uci
,
frame
,
subframe
,
harq_ack
,
0
,
0xffff
);
// special_bundling mode
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment