Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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
Michael Black
OpenXG UE
Commits
800234c6
Commit
800234c6
authored
Mar 03, 2016
by
lukashov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixing FDD for TM4
parent
bfa106d8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
10 deletions
+11
-10
openair1/PHY/LTE_TRANSPORT/dci_tools.c
openair1/PHY/LTE_TRANSPORT/dci_tools.c
+8
-5
openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
+1
-3
openair1/SIMULATION/LTE_PHY/dlsim.c
openair1/SIMULATION/LTE_PHY/dlsim.c
+2
-2
No files found.
openair1/PHY/LTE_TRANSPORT/dci_tools.c
View file @
800234c6
...
@@ -1586,7 +1586,7 @@ int generate_eNB_dlsch_params_from_dci(int frame,
...
@@ -1586,7 +1586,7 @@ int generate_eNB_dlsch_params_from_dci(int frame,
dlsch0_harq
->
mimo_mode
=
DUALSTREAM_PUSCH_PRECODING
;
dlsch0_harq
->
mimo_mode
=
DUALSTREAM_PUSCH_PRECODING
;
dlsch0_harq
->
pmi_alloc
=
DL_pmi_single
;
dlsch0_harq
->
pmi_alloc
=
DL_pmi_single
;
dlsch1_harq
->
mimo_mode
=
DUALSTREAM_PUSCH_PRECODING
;
dlsch1_harq
->
mimo_mode
=
DUALSTREAM_PUSCH_PRECODING
;
dlsch1_harq
->
pmi_alloc
=
DL_pmi_single
;
//this is actually never used, since the PMI for the second codeword is always the opposote of the first one
dlsch1_harq
->
pmi_alloc
=
DL_pmi_single
;
break
;
break
;
default:
default:
break
;
break
;
...
@@ -3337,7 +3337,8 @@ int dump_dci(LTE_DL_FRAME_PARMS *frame_parms, DCI_ALLOC_t *dci)
...
@@ -3337,7 +3337,8 @@ int dump_dci(LTE_DL_FRAME_PARMS *frame_parms, DCI_ALLOC_t *dci)
break
;
break
;
case
25
:
case
25
:
LOG_D
(
PHY
,
"DCI format2 2 antennas (FDD, 5 MHz), rnti %x (%x): rah %d, rb_alloc %x, mcs %d, harq_pid %d, ndi %d, RV %d, TPC %d
\n
"
,
//LOG_D
printf
(
"DCI format2 2 antennas (FDD, 5 MHz), rnti %x (%x): rah %d, rb_alloc %x, mcs1 %d, mcs2 %d, harq_pid %d, ndi1 %d, ndi2 %d, RV1 %d, RV2 %d, swap %d, TPMI %d, TPC %d
\n
"
,
dci
->
rnti
,
dci
->
rnti
,
((
uint32_t
*
)
&
dci
->
dci_pdu
)[
0
],
((
uint32_t
*
)
&
dci
->
dci_pdu
)[
0
],
((
DCI2_5MHz_2A_FDD_t
*
)
&
dci
->
dci_pdu
[
0
])
->
rah
,
((
DCI2_5MHz_2A_FDD_t
*
)
&
dci
->
dci_pdu
[
0
])
->
rah
,
...
@@ -4772,8 +4773,10 @@ int generate_ue_dlsch_params_from_dci(int frame,
...
@@ -4772,8 +4773,10 @@ int generate_ue_dlsch_params_from_dci(int frame,
return
(
-
1
);
return
(
-
1
);
}
}
if
(
frame_type
==
TDD
)
tbswap
=
((
DCI2_5MHz_2A_TDD_t
*
)
dci_pdu
)
->
tb_swap
;
tbswap
=
((
DCI2_5MHz_2A_TDD_t
*
)
dci_pdu
)
->
tb_swap
;
else
tbswap
=
((
DCI2_5MHz_2A_FDD_t
*
)
dci_pdu
)
->
tb_swap
;
if
(
tbswap
==
0
)
{
if
(
tbswap
==
0
)
{
dlsch0
=
dlsch
[
0
];
dlsch0
=
dlsch
[
0
];
...
@@ -5899,7 +5902,7 @@ uint16_t quantize_subband_pmi(PHY_MEASUREMENTS *meas,uint8_t eNB_id,int nb_rb)
...
@@ -5899,7 +5902,7 @@ uint16_t quantize_subband_pmi(PHY_MEASUREMENTS *meas,uint8_t eNB_id,int nb_rb)
else
else
pmiq
=
PMI_2A_R1_1j
;
pmiq
=
PMI_2A_R1_1j
;
//
printf("subband %d, pmi_re %d, pmi_im %d, pmiq %d \n",i,pmi_re,pmi_im,pmiq);
//
printf("subband %d, pmi_re %d, pmi_im %d, pmiq %d \n",i,pmi_re,pmi_im,pmiq);
// printf("subband %d, pmi%d \n",i,pmiq);
// printf("subband %d, pmi%d \n",i,pmiq);
//According to Section 7.2.4 of 36.213
//According to Section 7.2.4 of 36.213
...
...
openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
View file @
800234c6
...
@@ -776,9 +776,7 @@ int allocate_REs_in_RB(LTE_DL_FRAME_PARMS *frame_parms,
...
@@ -776,9 +776,7 @@ int allocate_REs_in_RB(LTE_DL_FRAME_PARMS *frame_parms,
else
if
((
mimo_mode
>=
DUALSTREAM_UNIFORM_PRECODING1
)
&&
(
mimo_mode
<=
DUALSTREAM_PUSCH_PRECODING
))
{
else
if
((
mimo_mode
>=
DUALSTREAM_UNIFORM_PRECODING1
)
&&
(
mimo_mode
<=
DUALSTREAM_PUSCH_PRECODING
))
{
// this is for transmission mode 4 (1 layer)
// this is for transmission mode 4 (1 layer)
*
re_allocated
=
*
re_allocated
+
1
;
*
re_allocated
=
*
re_allocated
+
1
;
//amp = (int16_t)(((int32_t)tmp_amp*ONE_OVER_SQRT2_Q15)>>15);
amp
=
tmp_amp
/
2
;
gain_lin_QPSK
=
(
int16_t
)((
amp
*
ONE_OVER_SQRT2_Q15
)
>>
15
);
if
(
precoder_index
==
0
)
{
if
(
precoder_index
==
0
)
{
precoder_index0
=
0
;
//[1 1]
precoder_index0
=
0
;
//[1 1]
...
...
openair1/SIMULATION/LTE_PHY/dlsim.c
View file @
800234c6
...
@@ -1785,7 +1785,7 @@ n(tikz_fname,"w");
...
@@ -1785,7 +1785,7 @@ n(tikz_fname,"w");
}
}
printf
(
"TM4 with tpmi =%d
\n
"
,
((
DCI2_5MHz_2A_TDD_t
*
)
&
DLSCH_alloc_pdu_1
[
k
])
->
tpmi
);
printf
(
"TM4 with tpmi =%d
\n
"
,
((
DCI2_5MHz_2A_TDD_t
*
)
&
DLSCH_alloc_pdu_1
[
k
])
->
tpmi
);
if
(((
DCI2_5MHz_2A_TDD_t
*
)
&
DLSCH_alloc_pdu_1
[
k
])
->
tpmi
==
2
)
{
if
(((
(
DCI2_5MHz_2A_TDD_t
*
)
&
DLSCH_alloc_pdu_1
[
k
])
->
tpmi
==
2
)
||
(((
DCI2_5MHz_2A_FDD_t
*
)
&
DLSCH_alloc_pdu_1
[
k
])
->
tpmi
==
2
)
)
{
PHY_vars_eNB
->
eNB_UE_stats
[
0
].
DL_pmi_single
=
(
unsigned
short
)(
taus
()
&
0xffff
);
PHY_vars_eNB
->
eNB_UE_stats
[
0
].
DL_pmi_single
=
(
unsigned
short
)(
taus
()
&
0xffff
);
...
@@ -2771,7 +2771,7 @@ n(tikz_fname,"w");
...
@@ -2771,7 +2771,7 @@ n(tikz_fname,"w");
}
}
if
(
transmission_mode
==
4
&&
(((
DCI2_5MHz_2A_TDD_t
*
)
&
DLSCH_alloc_pdu_1
[
k
])
->
tpmi
==
2
)){
if
(
transmission_mode
==
4
&&
(((
(
DCI2_5MHz_2A_TDD_t
*
)
&
DLSCH_alloc_pdu_1
[
k
])
->
tpmi
==
2
)
||
(((
DCI2_5MHz_2A_FDD_t
*
)
&
DLSCH_alloc_pdu_1
[
k
])
->
tpmi
==
2
)
)){
PHY_vars_eNB
->
dlsch_eNB
[
0
][
0
]
->
harq_processes
[
0
]
->
pmi_alloc
=
quantize_subband_pmi
(
&
PHY_vars_UE
->
PHY_measurements
,
0
,
PHY_vars_eNB
->
lte_frame_parms
.
N_RB_DL
);
PHY_vars_eNB
->
dlsch_eNB
[
0
][
0
]
->
harq_processes
[
0
]
->
pmi_alloc
=
quantize_subband_pmi
(
&
PHY_vars_UE
->
PHY_measurements
,
0
,
PHY_vars_eNB
->
lte_frame_parms
.
N_RB_DL
);
PHY_vars_UE
->
dlsch_ue
[
0
][
0
]
->
pmi_alloc
=
quantize_subband_pmi
(
&
PHY_vars_UE
->
PHY_measurements
,
0
,
PHY_vars_UE
->
lte_frame_parms
.
N_RB_DL
);
PHY_vars_UE
->
dlsch_ue
[
0
][
0
]
->
pmi_alloc
=
quantize_subband_pmi
(
&
PHY_vars_UE
->
PHY_measurements
,
0
,
PHY_vars_UE
->
lte_frame_parms
.
N_RB_DL
);
}
}
...
...
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