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
alex037yang
OpenXG-RAN
Commits
86802258
Commit
86802258
authored
Jun 14, 2018
by
Haruki NAOI
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'mu_with_tdd1' of
https://gitlab.eurecom.fr/oai/openairinterface5g
into mu_with_tdd1
parents
e84fd27e
6cd76158
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
openair1/SCHED/phy_procedures_lte_eNb.c
openair1/SCHED/phy_procedures_lte_eNb.c
+2
-2
No files found.
openair1/SCHED/phy_procedures_lte_eNb.c
View file @
86802258
...
@@ -1772,10 +1772,10 @@ void fill_ulsch_harq_indication(PHY_VARS_eNB *eNB,LTE_UL_eNB_HARQ_t *ulsch_harq,
...
@@ -1772,10 +1772,10 @@ void fill_ulsch_harq_indication(PHY_VARS_eNB *eNB,LTE_UL_eNB_HARQ_t *ulsch_harq,
int
frame_tx
=
subframe_tx
>=
6
?
(
frame
+
1023
)
%
1024
:
frame
;
int
frame_tx
=
subframe_tx
>=
6
?
(
frame
+
1023
)
%
1024
:
frame
;
if
(
ulsch_harq
->
o_ACK
[
i
]
!=
1
)
if
(
ulsch_harq
->
o_ACK
[
i
]
!=
1
)
T
(
T_ENB_PHY_DLSCH_UE_NACK
,
T_INT
(
0
),
T_INT
(
frame
),
T_INT
(
subframe
),
T
(
T_ENB_PHY_DLSCH_UE_NACK
,
T_INT
(
0
),
T_INT
(
frame
),
T_INT
(
subframe
),
T_INT
(
rnti
),
T_INT
(
eNB
->
dlsch
[
UE_id
][
0
]
->
harq_ids
[
frame_tx
][
subframe_tx
]));
T_INT
(
rnti
),
T_INT
(
eNB
->
dlsch
[
UE_id
][
0
]
->
harq_ids
[
frame_tx
%
2
][
subframe_tx
]));
else
else
T
(
T_ENB_PHY_DLSCH_UE_ACK
,
T_INT
(
0
),
T_INT
(
frame
),
T_INT
(
subframe
),
T
(
T_ENB_PHY_DLSCH_UE_ACK
,
T_INT
(
0
),
T_INT
(
frame
),
T_INT
(
subframe
),
T_INT
(
rnti
),
T_INT
(
eNB
->
dlsch
[
UE_id
][
0
]
->
harq_ids
[
frame_tx
][
subframe_tx
]));
T_INT
(
rnti
),
T_INT
(
eNB
->
dlsch
[
UE_id
][
0
]
->
harq_ids
[
frame_tx
%
2
][
subframe_tx
]));
}
}
#endif
#endif
}
}
...
...
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