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
wangwenhui
OpenXG-RAN
Commits
c38e542f
Commit
c38e542f
authored
Jul 10, 2020
by
Raphael Defosseux
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/bugfix-T-uplink-ack-nack' into develop_integration_2020_w27
parents
d7ffd70b
d32b45dd
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
0 deletions
+4
-0
openair1/SCHED/phy_procedures_lte_eNb.c
openair1/SCHED/phy_procedures_lte_eNb.c
+4
-0
No files found.
openair1/SCHED/phy_procedures_lte_eNb.c
View file @
c38e542f
...
@@ -1211,6 +1211,8 @@ void postDecode(L1_rxtx_proc_t *proc, notifiedFIFO_elt_t *req) {
...
@@ -1211,6 +1211,8 @@ void postDecode(L1_rxtx_proc_t *proc, notifiedFIFO_elt_t *req) {
}
}
if
(
!
decodeSucess
)
{
if
(
!
decodeSucess
)
{
T
(
T_ENB_PHY_ULSCH_UE_NACK
,
T_INT
(
eNB
->
Mod_id
),
T_INT
(
rdata
->
frame
),
T_INT
(
rdata
->
subframe
),
T_INT
(
ulsch
->
rnti
),
T_INT
(
rdata
->
harq_pid
));
fill_crc_indication
(
eNB
,
i
,
rdata
->
frame
,
rdata
->
subframe
,
1
);
// indicate NAK to MAC
fill_crc_indication
(
eNB
,
i
,
rdata
->
frame
,
rdata
->
subframe
,
1
);
// indicate NAK to MAC
fill_rx_indication
(
eNB
,
i
,
rdata
->
frame
,
rdata
->
subframe
);
// indicate SDU to MAC
fill_rx_indication
(
eNB
,
i
,
rdata
->
frame
,
rdata
->
subframe
);
// indicate SDU to MAC
LOG_D
(
PHY
,
"[eNB %d][PUSCH %d] frame %d subframe %d UE %d Error receiving ULSCH, round %d/%d (ACK %d,%d)
\n
"
,
LOG_D
(
PHY
,
"[eNB %d][PUSCH %d] frame %d subframe %d UE %d Error receiving ULSCH, round %d/%d (ACK %d,%d)
\n
"
,
...
@@ -1239,6 +1241,8 @@ void postDecode(L1_rxtx_proc_t *proc, notifiedFIFO_elt_t *req) {
...
@@ -1239,6 +1241,8 @@ void postDecode(L1_rxtx_proc_t *proc, notifiedFIFO_elt_t *req) {
fill_rx_indication
(
eNB
,
i
,
rdata
->
frame
,
rdata
->
subframe
);
// indicate SDU to MAC
fill_rx_indication
(
eNB
,
i
,
rdata
->
frame
,
rdata
->
subframe
);
// indicate SDU to MAC
ulsch_harq
->
status
=
SCH_IDLE
;
ulsch_harq
->
status
=
SCH_IDLE
;
ulsch
->
harq_mask
&=
~
(
1
<<
rdata
->
harq_pid
);
ulsch
->
harq_mask
&=
~
(
1
<<
rdata
->
harq_pid
);
T
(
T_ENB_PHY_ULSCH_UE_ACK
,
T_INT
(
eNB
->
Mod_id
),
T_INT
(
rdata
->
frame
),
T_INT
(
rdata
->
subframe
),
T_INT
(
ulsch
->
rnti
),
T_INT
(
rdata
->
harq_pid
));
}
// ulsch not in error
}
// ulsch not in error
if
(
ulsch_harq
->
O_ACK
>
0
)
if
(
ulsch_harq
->
O_ACK
>
0
)
...
...
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