Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
oai
openairinterface5G
Commits
ab32cefb
Commit
ab32cefb
authored
May 24, 2018
by
Haruki Naoi
Browse files
Revert "fix DLSCH no retransmission"
This reverts commit
24c669f3
.
parent
843e7c8f
Changes
1
Hide whitespace changes
Inline
Side-by-side
openair1/SCHED/phy_procedures_lte_eNb.c
View file @
ab32cefb
...
...
@@ -1069,14 +1069,6 @@ 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
...
...
@@ -1344,14 +1336,6 @@ 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
}
...
...
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