Skip to content
GitLab
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
26f06f35
Commit
26f06f35
authored
Mar 28, 2017
by
Cédric Roux
Browse files
Merge remote-tracking branch 'origin/bugfix-226' into develop_integration_w13
parents
0a33a1d3
f65150aa
Changes
1
Hide whitespace changes
Inline
Side-by-side
openair1/SCHED/phy_procedures_lte_ue.c
View file @
26f06f35
...
...
@@ -735,7 +735,7 @@ uint16_t get_n1_pucch(PHY_VARS_UE *ue,
}
else
if
(
subframe
==
8
)
{
// ACK subframes 4
candidate_dl
[
0
]
=
4
;
}
else
{
LOG_E
(
PHY
,
"[UE%d] : Frame %d phy_procedures_lte.c: get_n1pucch, illegal subframe %d for tdd_config %d
\n
"
,
LOG_E
(
PHY
,
"[UE%d] : Frame %d phy_procedures_lte.c: get_n1pucch, illegal
tx-
subframe %d for tdd_config %d
\n
"
,
ue
->
Mod_id
,
proc
->
frame_tx
,
subframe
,
frame_parms
->
tdd_config
);
return
(
0
);
}
...
...
@@ -749,8 +749,8 @@ uint16_t get_n1_pucch(PHY_VARS_UE *ue,
}
}
if
(
last_dl
>=
10
)
{
LOG_E
(
PHY
,
"[UE%d] : Frame %d phy_procedures_lte.c: get_n1pucch, illegal subframe %d for tdd_config %d
\n
"
,
ue
->
Mod_id
,
proc
->
frame_tx
,
last_dl
,
frame_parms
->
tdd_config
);
LOG_E
(
PHY
,
"[UE%d] : Frame %d phy_procedures_lte.c: get_n1pucch, illegal
rx-
subframe %d
(tx-subframe %d)
for tdd_config %d
\n
"
,
ue
->
Mod_id
,
proc
->
frame_tx
,
last_dl
,
subframe
,
frame_parms
->
tdd_config
);
return
(
0
);
}
...
...
@@ -1781,13 +1781,13 @@ void ue_pucch_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin
}
}
ack_status_cw0
=
res
et_ack
(
&
ue
->
frame_parms
,
ack_status_cw0
=
g
et_ack
(
&
ue
->
frame_parms
,
ue
->
dlsch
[
proc
->
subframe_rx
&
0x1
][
eNB_id
][
0
]
->
harq_ack
,
subframe_tx
,
pucch_ack_payload
,
0
);
ack_status_cw1
=
res
et_ack
(
&
ue
->
frame_parms
,
ack_status_cw1
=
g
et_ack
(
&
ue
->
frame_parms
,
ue
->
dlsch
[
proc
->
subframe_rx
&
0x1
][
eNB_id
][
1
]
->
harq_ack
,
subframe_tx
,
pucch_ack_payload
,
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment