Skip to content
GitLab
Menu
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
c63abc08
Commit
c63abc08
authored
Jun 15, 2016
by
Elena Lukashova
Browse files
Fixing merge with develop
parent
199434b9
Changes
4
Hide whitespace changes
Inline
Side-by-side
openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
View file @
c63abc08
...
...
@@ -686,15 +686,15 @@ int dlsch_qpsk_llr(LTE_DL_FRAME_PARMS *frame_parms,
}
int32_t dlsch_qpsk_llr_SIC(LTE_DL_FRAME_PARMS *frame_parms,
int32_t
**
rxdataF_comp
,
mod_sym
_t
**
sic_buffer
,
//Q15
int32_t
**
rho_i
,
short
*
dlsch_llr
,
uint8_t
num_pdcch_symbols
,
uint16_t
nb_rb
,
uint8_t
subframe
,
uint32_t
rb_alloc
,
LTE_UE_DLSCH_t
*
dlsch0
)
int32_t **rxdataF_comp,
int32
_t **sic_buffer, //Q15
int32_t **rho_i,
short *dlsch_llr,
uint8_t num_pdcch_symbols,
uint16_t nb_rb,
uint8_t subframe,
uint32_t rb_alloc,
LTE_UE_DLSCH_t *dlsch0)
{
int16_t rho_amp_x0[2*frame_parms->N_RB_DL*12];
...
...
@@ -929,16 +929,16 @@ void dlsch_16qam_llr(LTE_DL_FRAME_PARMS *frame_parms,
void dlsch_16qam_llr_SIC (LTE_DL_FRAME_PARMS *frame_parms,
int32_t **rxdataF_comp,
mod_sym
_t
**
sic_buffer
,
//Q15
int32_t
**
rho_i
,
int16_t
*
dlsch_llr
,
uint8_t
num_pdcch_symbols
,
int32_t
**
dl_ch_mag
,
uint16_t
nb_rb
,
uint8_t
subframe
,
uint32_t
rb_alloc
,
LTE_UE_DLSCH_t
*
dlsch0
)
int32
_t **sic_buffer, //Q15
int32_t **rho_i,
int16_t *dlsch_llr,
uint8_t num_pdcch_symbols,
int32_t **dl_ch_mag,
uint16_t nb_rb,
uint8_t subframe,
uint32_t rb_alloc,
LTE_UE_DLSCH_t *dlsch0
)
{
int16_t rho_amp_x0[2*frame_parms->N_RB_DL*12];
int16_t rho_rho_amp_x0[2*frame_parms->N_RB_DL*12];
...
...
@@ -1183,18 +1183,18 @@ void dlsch_64qam_llr(LTE_DL_FRAME_PARMS *frame_parms,
//#if 0
void dlsch_64qam_llr_SIC(LTE_DL_FRAME_PARMS *frame_parms,
int32_t
**
rxdataF_comp
,
mod_sym
_t
**
sic_buffer
,
//Q15
int32_t
**
rho_i
,
int16_t
*
dlsch_llr
,
uint8_t
num_pdcch_symbols
,
int32_t
**
dl_ch_mag
,
int32_t
**
dl_ch_magb
,
uint16_t
nb_rb
,
uint8_t
subframe
,
uint32_t
rb_alloc
,
LTE_UE_DLSCH_t
*
dlsch0
)
int32_t **rxdataF_comp,
int32
_t **sic_buffer, //Q15
int32_t **rho_i,
int16_t *dlsch_llr,
uint8_t num_pdcch_symbols,
int32_t **dl_ch_mag,
int32_t **dl_ch_magb,
uint16_t nb_rb,
uint8_t subframe,
uint32_t rb_alloc,
LTE_UE_DLSCH_t *dlsch0
)
{
int16_t rho_amp_x0[2*frame_parms->N_RB_DL*12];
int16_t rho_rho_amp_x0[2*frame_parms->N_RB_DL*12];
...
...
openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
View file @
c63abc08
...
...
@@ -1611,16 +1611,15 @@ int dlsch_modulation(int32_t **txdataF,
return
(
re_allocated
);
}
<<<<<<<
HEAD
int
dlsch_modulation_SIC
(
mod_sym
_t
**
sic_buffer
,
int16_t
amp
,
uint32_t
subframe_offset
,
LTE_DL_FRAME_PARMS
*
frame_parms
,
uint8_t
num_pdcch_symbols
,
LTE_eNB_DLSCH_t
*
dlsch0
,
LTE_eNB_DLSCH_t
*
dlsch1
,
int
G
)
int
dlsch_modulation_SIC
(
int32
_t
**
sic_buffer
,
int16_t
amp
,
uint32_t
subframe_offset
,
LTE_DL_FRAME_PARMS
*
frame_parms
,
uint8_t
num_pdcch_symbols
,
LTE_eNB_DLSCH_t
*
dlsch0
,
LTE_eNB_DLSCH_t
*
dlsch1
,
int
G
)
{
uint8_t
nsymb
;
...
...
openair1/PHY/LTE_TRANSPORT/proto.h
View file @
c63abc08
...
...
@@ -211,7 +211,7 @@ int32_t dlsch_modulation(int32_t **txdataF,
LTE_eNB_DLSCH_t
*
dlsch0
,
LTE_eNB_DLSCH_t
*
dlsch1
);
int32_t
dlsch_modulation_SIC
(
mod_sym
_t
**
sic_buffer
,
int32_t
dlsch_modulation_SIC
(
int32
_t
**
sic_buffer
,
int16_t
amp
,
uint32_t
sub_frame_offset
,
LTE_DL_FRAME_PARMS
*
frame_parms
,
...
...
@@ -721,14 +721,14 @@ int32_t dlsch_qpsk_llr(LTE_DL_FRAME_PARMS *frame_parms,
int32_t
dlsch_qpsk_llr_SIC
(
LTE_DL_FRAME_PARMS
*
frame_parms
,
int
**
rxdataF_comp
,
mod_sym
_t
**
sic_buffer
,
int
**
rho_i
,
int32
_t
**
sic_buffer
,
int
**
rho_i
,
short
*
dlsch_llr
,
uint8_t
num_pdcch_symbols
,
uint8_t
num_pdcch_symbols
,
uint16_t
nb_rb
,
uint8_t
subframe
,
uint32_t
rb_alloc
,
LTE_UE_DLSCH_t
*
dlsch0
);
uint32_t
rb_alloc
,
LTE_UE_DLSCH_t
*
dlsch0
);
void
dlsch_16qam_llr
(
LTE_DL_FRAME_PARMS
*
frame_parms
,
int32_t
**
rxdataF_comp
,
...
...
@@ -753,28 +753,28 @@ void dlsch_16qam_llr(LTE_DL_FRAME_PARMS *frame_parms,
*/
void
dlsch_16qam_llr_SIC
(
LTE_DL_FRAME_PARMS
*
frame_parms
,
int32_t
**
rxdataF_comp
,
mod_sym
_t
**
sic_buffer
,
//Q15
int32_t
**
rho_i
,
int16_t
*
dlsch_llr
,
uint8_t
num_pdcch_symbols
,
int32_t
**
dl_ch_mag
,
uint16_t
nb_rb
,
uint8_t
subframe
,
uint32_t
rb_alloc
,
LTE_UE_DLSCH_t
*
dlsch0
);
int32
_t
**
sic_buffer
,
//Q15
int32_t
**
rho_i
,
int16_t
*
dlsch_llr
,
uint8_t
num_pdcch_symbols
,
int32_t
**
dl_ch_mag
,
uint16_t
nb_rb
,
uint8_t
subframe
,
uint32_t
rb_alloc
,
LTE_UE_DLSCH_t
*
dlsch0
);
void
dlsch_64qam_llr_SIC
(
LTE_DL_FRAME_PARMS
*
frame_parms
,
int32_t
**
rxdataF_comp
,
mod_sym
_t
**
sic_buffer
,
//Q15
int32_t
**
rho_i
,
int16_t
*
dlsch_llr
,
uint8_t
num_pdcch_symbols
,
int32_t
**
dl_ch_mag
,
int32_t
**
dl_ch_magb
,
uint16_t
nb_rb
,
uint8_t
subframe
,
uint32_t
rb_alloc
,
LTE_UE_DLSCH_t
*
dlsch0
);
int32_t
**
rxdataF_comp
,
int32
_t
**
sic_buffer
,
//Q15
int32_t
**
rho_i
,
int16_t
*
dlsch_llr
,
uint8_t
num_pdcch_symbols
,
int32_t
**
dl_ch_mag
,
int32_t
**
dl_ch_magb
,
uint16_t
nb_rb
,
uint8_t
subframe
,
uint32_t
rb_alloc
,
LTE_UE_DLSCH_t
*
dlsch0
);
void
dlsch_64qam_llr
(
LTE_DL_FRAME_PARMS
*
frame_parms
,
...
...
openair1/SIMULATION/LTE_PHY/dlsim.c
View file @
c63abc08
...
...
@@ -256,7 +256,7 @@ int main(int argc, char **argv)
LTE_DL_eNB_HARQ_t
*
dlsch0_eNB_harq
;
uint8_t
Kmimo
;
mod_sym
_t
**
sic_buffer
;
int32
_t
**
sic_buffer
;
int8_t
cw_to_decode_interf
;
int8_t
cw_to_decode_interf_free
;
int8_t
cw_non_sic
;
...
...
@@ -1029,9 +1029,9 @@ n(tikz_fname,"w");
}
sic_buffer
=
(
mod_sym
_t
**
)
malloc16
(
frame_parms
->
nb_antennas_tx
*
sizeof
(
mod_sym
_t
*
)
);
sic_buffer
=
(
int32
_t
**
)
malloc16
(
frame_parms
->
nb_antennas_tx
*
sizeof
(
int32
_t
*
)
);
for
(
i
=
0
;
i
<
frame_parms
->
nb_antennas_tx
;
i
++
)
{
sic_buffer
[
i
]
=
malloc16_clear
(
FRAME_LENGTH_COMPLEX_SAMPLES_NO_PREFIX
*
sizeof
(
mod_sym
_t
));
sic_buffer
[
i
]
=
malloc16_clear
(
FRAME_LENGTH_COMPLEX_SAMPLES_NO_PREFIX
*
sizeof
(
int32
_t
));
}
if
(
input_fd
==
NULL
)
{
...
...
@@ -2119,7 +2119,7 @@ n(tikz_fname,"w");
fflush
(
stdout
);
round
=
0
;
for
(
i
=
0
;
i
<
frame_parms
->
nb_antennas_tx
;
i
++
)
{
memset
(
sic_buffer
[
i
],
0
,
FRAME_LENGTH_COMPLEX_SAMPLES_NO_PREFIX
*
sizeof
(
mod_sym
_t
));
memset
(
sic_buffer
[
i
],
0
,
FRAME_LENGTH_COMPLEX_SAMPLES_NO_PREFIX
*
sizeof
(
int32
_t
));
}
//if (trials%100==0)
eNB2UE
[
0
]
->
first_run
=
1
;
...
...
@@ -2148,7 +2148,7 @@ n(tikz_fname,"w");
// printf("Trial %d : Round %d, pmi_feedback %d \n",trials,round,pmi_feedback);
for
(
aa
=
0
;
aa
<
PHY_vars_eNB
->
lte_frame_parms
.
nb_antennas_tx
;
aa
++
)
{
memset
(
&
PHY_vars_eNB
->
lte_eNB_common_vars
.
txdataF
[
eNB_id
][
aa
][
0
],
0
,
FRAME_LENGTH_COMPLEX_SAMPLES_NO_PREFIX
*
sizeof
(
mod_sym
_t
));
memset
(
&
PHY_vars_eNB
->
lte_eNB_common_vars
.
txdataF
[
eNB_id
][
aa
][
0
],
0
,
FRAME_LENGTH_COMPLEX_SAMPLES_NO_PREFIX
*
sizeof
(
int32
_t
));
}
if
(
input_fd
==
NULL
)
{
...
...
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