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
cf7179f6
Commit
cf7179f6
authored
Jun 15, 2016
by
lukashov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixing merge with develop
parent
43814938
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
70 additions
and
71 deletions
+70
-71
openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
+31
-31
openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
+8
-9
openair1/PHY/LTE_TRANSPORT/proto.h
openair1/PHY/LTE_TRANSPORT/proto.h
+26
-26
openair1/SIMULATION/LTE_PHY/dlsim.c
openair1/SIMULATION/LTE_PHY/dlsim.c
+5
-5
No files found.
openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
View file @
cf7179f6
...
...
@@ -687,7 +687,7 @@ 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
**
sic_buffer
,
//Q15
int32_t
**
rho_i
,
short
*
dlsch_llr
,
uint8_t
num_pdcch_symbols
,
...
...
@@ -929,7 +929,7 @@ 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
**
sic_buffer
,
//Q15
int32_t
**
rho_i
,
int16_t
*
dlsch_llr
,
uint8_t
num_pdcch_symbols
,
...
...
@@ -1184,7 +1184,7 @@ 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
**
sic_buffer
,
//Q15
int32_t
**
rho_i
,
int16_t
*
dlsch_llr
,
uint8_t
num_pdcch_symbols
,
...
...
openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
View file @
cf7179f6
...
...
@@ -1611,9 +1611,8 @@ int dlsch_modulation(int32_t **txdataF,
return
(
re_allocated
);
}
<<<<<<<
HEAD
int
dlsch_modulation_SIC
(
mod_sym
_t
**
sic_buffer
,
int
dlsch_modulation_SIC
(
int32
_t
**
sic_buffer
,
int16_t
amp
,
uint32_t
subframe_offset
,
LTE_DL_FRAME_PARMS
*
frame_parms
,
...
...
openair1/PHY/LTE_TRANSPORT/proto.h
View file @
cf7179f6
...
...
@@ -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,7 +721,7 @@ 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
,
int32
_t
**
sic_buffer
,
int
**
rho_i
,
short
*
dlsch_llr
,
uint8_t
num_pdcch_symbols
,
...
...
@@ -753,7 +753,7 @@ 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
**
sic_buffer
,
//Q15
int32_t
**
rho_i
,
int16_t
*
dlsch_llr
,
uint8_t
num_pdcch_symbols
,
...
...
@@ -765,7 +765,7 @@ void dlsch_16qam_llr_SIC (LTE_DL_FRAME_PARMS *frame_parms,
void
dlsch_64qam_llr_SIC
(
LTE_DL_FRAME_PARMS
*
frame_parms
,
int32_t
**
rxdataF_comp
,
mod_sym
_t
**
sic_buffer
,
//Q15
int32
_t
**
sic_buffer
,
//Q15
int32_t
**
rho_i
,
int16_t
*
dlsch_llr
,
uint8_t
num_pdcch_symbols
,
...
...
openair1/SIMULATION/LTE_PHY/dlsim.c
View file @
cf7179f6
...
...
@@ -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