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
lizhongxiao
OpenXG-RAN
Commits
39c7e629
Commit
39c7e629
authored
Feb 20, 2017
by
Florian Kaltenberger
Committed by
Calisson
Mar 10, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugfix: bundling flag was initialized after its use
parent
c135dd61
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
openair1/PHY/LTE_TRANSPORT/dci_tools.c
openair1/PHY/LTE_TRANSPORT/dci_tools.c
+3
-2
No files found.
openair1/PHY/LTE_TRANSPORT/dci_tools.c
View file @
39c7e629
...
...
@@ -7943,6 +7943,7 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu,
print_CQI
(
ulsch
->
o
,
ulsch
->
uci_format
,
eNB_id
,
ue
->
frame_parms
.
N_RB_DL
);
ulsch
->
bundling
=
1
-
AckNackFBMode
;
if
(
frame_parms
->
frame_type
==
FDD
)
{
int
dl_subframe
=
(
subframe
<
4
)
?
(
subframe
+
6
)
:
(
subframe
-
4
);
...
...
@@ -7974,7 +7975,6 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu,
ulsch
->
Nsymb_pusch
=
12
-
(
frame_parms
->
Ncp
<<
1
)
-
(
use_srs
==
0
?
0
:
1
);
ulsch
->
srs_active
=
use_srs
;
ulsch
->
bundling
=
1
-
AckNackFBMode
;
if
((
rnti
>=
cba_rnti
)
&&
(
rnti
<
p_rnti
))
ulsch
->
harq_processes
[
harq_pid
]
->
status
=
CBA_ACTIVE
;
...
...
@@ -8577,6 +8577,8 @@ int generate_eNB_ulsch_params_from_dci(PHY_VARS_eNB *eNB,
ulsch
->
harq_processes
[
harq_pid
]
->
uci_format
=
HLC_subband_cqi_nopmi
;
}
ulsch
->
bundling
=
1
-
AckNackFBMode
;
if
(
frame_parms
->
frame_type
==
FDD
)
{
int
dl_subframe
=
(
subframe
<
4
)
?
(
subframe
+
6
)
:
(
subframe
-
4
);
...
...
@@ -8600,7 +8602,6 @@ int generate_eNB_ulsch_params_from_dci(PHY_VARS_eNB *eNB,
ulsch
->
harq_processes
[
harq_pid
]
->
Nsymb_pusch
=
12
-
(
frame_parms
->
Ncp
<<
1
)
-
(
use_srs
==
0
?
0
:
1
);
ulsch
->
harq_processes
[
harq_pid
]
->
srs_active
=
use_srs
;
ulsch
->
bundling
=
1
-
AckNackFBMode
;
//Mapping of cyclic shift field in DCI format0 to n_DMRS2 (3GPP 36.211, Table 5.5.2.1.1-1)
if
(
cshift
==
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