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
00925ef8
Commit
00925ef8
authored
Jul 05, 2016
by
Xiwen JIANG
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
resolve conflict when merge develop
parent
e6f91683
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
18 additions
and
37 deletions
+18
-37
openair1/PHY/INIT/lte_init.c
openair1/PHY/INIT/lte_init.c
+3
-3
openair1/PHY/LTE_REFSIG/defs.h
openair1/PHY/LTE_REFSIG/defs.h
+1
-1
openair1/PHY/LTE_REFSIG/lte_dl_ue_spec.c
openair1/PHY/LTE_REFSIG/lte_dl_ue_spec.c
+4
-4
openair1/PHY/LTE_REFSIG/lte_dl_uespec.c
openair1/PHY/LTE_REFSIG/lte_dl_uespec.c
+2
-2
openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
+1
-1
openair1/PHY/LTE_TRANSPORT/pilots_ue_spec.c
openair1/PHY/LTE_TRANSPORT/pilots_ue_spec.c
+2
-2
openair1/PHY/LTE_TRANSPORT/proto.h
openair1/PHY/LTE_TRANSPORT/proto.h
+1
-2
openair1/PHY/MODULATION/ofdm_mod.c
openair1/PHY/MODULATION/ofdm_mod.c
+2
-2
openair1/SIMULATION/LTE_PHY/dlsim.c
openair1/SIMULATION/LTE_PHY/dlsim.c
+2
-20
No files found.
openair1/PHY/INIT/lte_init.c
View file @
00925ef8
...
@@ -1334,7 +1334,7 @@ int phy_init_lte_eNB(PHY_VARS_eNB *phy_vars_eNB,
...
@@ -1334,7 +1334,7 @@ int phy_init_lte_eNB(PHY_VARS_eNB *phy_vars_eNB,
eNB_common_vars
->
txdataF_BF
[
eNB_id
]
=
(
int32_t
**
)
malloc16
(
frame_parms
->
nb_antennas_tx
*
sizeof
(
int32_t
*
));
eNB_common_vars
->
txdataF_BF
[
eNB_id
]
=
(
int32_t
**
)
malloc16
(
frame_parms
->
nb_antennas_tx
*
sizeof
(
int32_t
*
));
for
(
i
=
0
;
i
<
14
;
i
++
)
{
for
(
i
=
0
;
i
<
14
;
i
++
)
{
eNB_common_vars
->
txdataF
[
eNB_id
][
i
]
=
(
mod_sym_t
*
)
malloc16_clear
(
FRAME_LENGTH_COMPLEX_SAMPLES_NO_PREFIX
*
sizeof
(
mod_sym
_t
)
);
eNB_common_vars
->
txdataF
[
eNB_id
][
i
]
=
(
int32_t
*
)
malloc16_clear
(
FRAME_LENGTH_COMPLEX_SAMPLES_NO_PREFIX
*
sizeof
(
int32
_t
)
);
#ifdef DEBUG_PHY
#ifdef DEBUG_PHY
msg
(
"[openair][LTE_PHY][INIT] lte_eNB_common_vars->txdataF[%d][%d] = %p (%d bytes)
\n
"
,
msg
(
"[openair][LTE_PHY][INIT] lte_eNB_common_vars->txdataF[%d][%d] = %p (%d bytes)
\n
"
,
eNB_id
,
i
,
eNB_common_vars
->
txdataF
[
eNB_id
][
i
],
eNB_id
,
i
,
eNB_common_vars
->
txdataF
[
eNB_id
][
i
],
...
@@ -1343,7 +1343,7 @@ int phy_init_lte_eNB(PHY_VARS_eNB *phy_vars_eNB,
...
@@ -1343,7 +1343,7 @@ int phy_init_lte_eNB(PHY_VARS_eNB *phy_vars_eNB,
}
}
for
(
i
=
0
;
i
<
frame_parms
->
nb_antennas_tx
;
i
++
)
{
for
(
i
=
0
;
i
<
frame_parms
->
nb_antennas_tx
;
i
++
)
{
eNB_common_vars
->
txdataF_BF
[
eNB_id
][
i
]
=
(
mod_sym_t
*
)
malloc16_clear
(
OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES
*
sizeof
(
mod_sym
_t
)
);
eNB_common_vars
->
txdataF_BF
[
eNB_id
][
i
]
=
(
int32_t
*
)
malloc16_clear
(
OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES
*
sizeof
(
int32
_t
)
);
#ifdef USER_MODE
#ifdef USER_MODE
eNB_common_vars
->
txdata
[
eNB_id
][
i
]
=
(
int32_t
*
)
malloc16_clear
(
FRAME_LENGTH_COMPLEX_SAMPLES
*
sizeof
(
int32_t
)
);
eNB_common_vars
->
txdata
[
eNB_id
][
i
]
=
(
int32_t
*
)
malloc16_clear
(
FRAME_LENGTH_COMPLEX_SAMPLES
*
sizeof
(
int32_t
)
);
#else // USER_MODE
#else // USER_MODE
...
@@ -1352,7 +1352,7 @@ int phy_init_lte_eNB(PHY_VARS_eNB *phy_vars_eNB,
...
@@ -1352,7 +1352,7 @@ int phy_init_lte_eNB(PHY_VARS_eNB *phy_vars_eNB,
#ifdef DEBUG_PHY
#ifdef DEBUG_PHY
msg
(
"[openair][LTE_PHY][INIT] lte_eNB_common_vars->txdataF_BF[%d][%d][%d] = %p (%d bytes)
\n
"
,
msg
(
"[openair][LTE_PHY][INIT] lte_eNB_common_vars->txdataF_BF[%d][%d][%d] = %p (%d bytes)
\n
"
,
eNB_id
,
i
,
j
,
eNB_common_vars
->
txdataF_BF
[
eNB_id
][
i
][
j
],
eNB_id
,
i
,
j
,
eNB_common_vars
->
txdataF_BF
[
eNB_id
][
i
][
j
],
OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES
*
sizeof
(
mod_sym
_t
));
OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES
*
sizeof
(
int32
_t
));
msg
(
"[openair][LTE_PHY][INIT] lte_eNB_common_vars->txdata[%d][%d] = %p
\n
"
,
eNB_id
,
i
,
eNB_common_vars
->
txdata
[
eNB_id
][
i
]);
msg
(
"[openair][LTE_PHY][INIT] lte_eNB_common_vars->txdata[%d][%d] = %p
\n
"
,
eNB_id
,
i
,
eNB_common_vars
->
txdata
[
eNB_id
][
i
]);
#endif
#endif
}
}
...
...
openair1/PHY/LTE_REFSIG/defs.h
View file @
00925ef8
...
@@ -139,7 +139,7 @@ int lte_dl_cell_spec_rx(PHY_VARS_UE *phy_vars_ue,
...
@@ -139,7 +139,7 @@ int lte_dl_cell_spec_rx(PHY_VARS_UE *phy_vars_ue,
@param nRB_PDSCH number of allocated PDSCH RBs
@param nRB_PDSCH number of allocated PDSCH RBs
*/
*/
int
lte_dl_ue_spec_rx
(
PHY_VARS_UE
*
phy_vars_ue
,
int
lte_dl_ue_spec_rx
(
PHY_VARS_UE
*
phy_vars_ue
,
mod_sym
_t
*
output
,
int32
_t
*
output
,
unsigned
char
Ns
,
unsigned
char
Ns
,
unsigned
char
p
,
unsigned
char
p
,
int
lprime
,
int
lprime
,
...
...
openair1/PHY/LTE_REFSIG/lte_dl_ue_spec.c
View file @
00925ef8
...
@@ -55,7 +55,7 @@ int Wbar_NCP[8][4] = {{1,1,1,1},{1,-1,1,-1},{1,1,1,1},{1,-1,1,-1},{1,1,-1,-1},{-
...
@@ -55,7 +55,7 @@ int Wbar_NCP[8][4] = {{1,1,1,1},{1,-1,1,-1},{1,1,1,1},{1,-1,1,-1},{1,1,-1,-1},{-
/*
/*
int lte_dl_ue_spec(PHY_VARS_eNB *phy_vars_eNB,
int lte_dl_ue_spec(PHY_VARS_eNB *phy_vars_eNB,
uint8_t UE_id,
uint8_t UE_id,
mod_sym
_t *output,
int32
_t *output,
short amp,
short amp,
uint8_t Ns,
uint8_t Ns,
uint8_t lprime,
uint8_t lprime,
...
@@ -63,7 +63,7 @@ int lte_dl_ue_spec(PHY_VARS_eNB *phy_vars_eNB,
...
@@ -63,7 +63,7 @@ int lte_dl_ue_spec(PHY_VARS_eNB *phy_vars_eNB,
int SS_flag)
int SS_flag)
{
{
mod_sym
_t qpsk[4],nqpsk[4];
int32
_t qpsk[4],nqpsk[4];
int16_t k=0,a;
int16_t k=0,a;
int mprime,ind,ind_dword,ind_qpsk_symb;
int mprime,ind,ind_dword,ind_qpsk_symb;
unsigned nushift,kprime;
unsigned nushift,kprime;
...
@@ -133,14 +133,14 @@ int lte_dl_ue_spec(PHY_VARS_eNB *phy_vars_eNB,
...
@@ -133,14 +133,14 @@ int lte_dl_ue_spec(PHY_VARS_eNB *phy_vars_eNB,
int
lte_dl_ue_spec_rx
(
PHY_VARS_UE
*
phy_vars_ue
,
int
lte_dl_ue_spec_rx
(
PHY_VARS_UE
*
phy_vars_ue
,
mod_sym
_t
*
output
,
int32
_t
*
output
,
unsigned
char
Ns
,
unsigned
char
Ns
,
unsigned
char
p
,
unsigned
char
p
,
int
lprime
,
int
lprime
,
int
SS_flag
,
int
SS_flag
,
uint16_t
nRB_PDSCH
)
uint16_t
nRB_PDSCH
)
{
{
mod_sym
_t
qpsk
[
4
],
nqpsk
[
4
],
*
qpsk_p
,
*
output_p
;
int32
_t
qpsk
[
4
],
nqpsk
[
4
],
*
qpsk_p
,
*
output_p
;
int
w
,
mprime
,
ind
,
l
,
ind_dword
,
ind_qpsk_symb
,
nPRB
;
int
w
,
mprime
,
ind
,
l
,
ind_dword
,
ind_qpsk_symb
,
nPRB
;
short
pamp
;
short
pamp
;
...
...
openair1/PHY/LTE_REFSIG/lte_dl_uespec.c
View file @
00925ef8
...
@@ -133,14 +133,14 @@ int lte_dl_ue_spec(PHY_VARS_eNB *phy_vars_eNB,
...
@@ -133,14 +133,14 @@ int lte_dl_ue_spec(PHY_VARS_eNB *phy_vars_eNB,
int
lte_dl_ue_spec_rx
(
PHY_VARS_UE
*
phy_vars_ue
,
int
lte_dl_ue_spec_rx
(
PHY_VARS_UE
*
phy_vars_ue
,
mod_sym
_t
*
output
,
int32
_t
*
output
,
unsigned
char
Ns
,
unsigned
char
Ns
,
unsigned
char
p
,
unsigned
char
p
,
int
lprime
,
int
lprime
,
int
SS_flag
,
int
SS_flag
,
uint16_t
nRB_PDSCH
)
uint16_t
nRB_PDSCH
)
{
{
mod_sym
_t
qpsk
[
4
],
nqpsk
[
4
],
*
qpsk_p
,
*
output_p
;
int32
_t
qpsk
[
4
],
nqpsk
[
4
],
*
qpsk_p
,
*
output_p
;
int
w
,
mprime
,
ind
,
l
,
ind_dword
,
ind_qpsk_symb
,
nPRB
;
int
w
,
mprime
,
ind
,
l
,
ind_dword
,
ind_qpsk_symb
,
nPRB
;
short
pamp
;
short
pamp
;
...
...
openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
View file @
00925ef8
...
@@ -232,7 +232,7 @@ int allocate_REs_in_RB(PHY_VARS_eNB *phy_vars_eNB,
...
@@ -232,7 +232,7 @@ int allocate_REs_in_RB(PHY_VARS_eNB *phy_vars_eNB,
int
s
=
1
;
int
s
=
1
;
int
mprime2
=
mprime
,
ind
,
ind_dword
,
ind_qpsk_symb
;
int
mprime2
=
mprime
,
ind
,
ind_dword
,
ind_qpsk_symb
;
mod_sym
_t
qpsk
[
4
];
int32
_t
qpsk
[
4
];
gain_lin_QPSK
=
(
int16_t
)((
amp
*
ONE_OVER_SQRT2_Q15
)
>>
15
);
gain_lin_QPSK
=
(
int16_t
)((
amp
*
ONE_OVER_SQRT2_Q15
)
>>
15
);
// if (mimo_mode == LARGE_CDD) gain_lin_QPSK>>=1;
// if (mimo_mode == LARGE_CDD) gain_lin_QPSK>>=1;
...
...
openair1/PHY/LTE_TRANSPORT/pilots_ue_spec.c
View file @
00925ef8
...
@@ -42,7 +42,7 @@
...
@@ -42,7 +42,7 @@
void
generate_ue_spec_pilots
(
PHY_VARS_eNB
*
phy_vars_eNB
,
void
generate_ue_spec_pilots
(
PHY_VARS_eNB
*
phy_vars_eNB
,
uint8_t
UE_id
,
uint8_t
UE_id
,
mod_sym
_t
**
txdataF
,
int32
_t
**
txdataF
,
int16_t
amp
,
int16_t
amp
,
uint16_t
Ntti
,
uint16_t
Ntti
,
uint8_t
beamforming_mode
)
uint8_t
beamforming_mode
)
...
@@ -127,7 +127,7 @@ void generate_ue_spec_pilots(PHY_VARS_eNB *phy_vars_eNB,
...
@@ -127,7 +127,7 @@ void generate_ue_spec_pilots(PHY_VARS_eNB *phy_vars_eNB,
}
}
/*int generate_ue_spec_pilots_slot(PHY_VARS_eNB *phy_vars_eNB,
/*int generate_ue_spec_pilots_slot(PHY_VARS_eNB *phy_vars_eNB,
mod_sym
_t **txdataF,
int32
_t **txdataF,
int16_t amp,
int16_t amp,
uint16_t slot,
uint16_t slot,
int first_pilot_only)
int first_pilot_only)
...
...
openair1/PHY/LTE_TRANSPORT/proto.h
View file @
00925ef8
...
@@ -306,10 +306,9 @@ int32_t generate_mbsfn_pilot(PHY_VARS_eNB *phy_vars_eNB,
...
@@ -306,10 +306,9 @@ int32_t generate_mbsfn_pilot(PHY_VARS_eNB *phy_vars_eNB,
int16_t
amp
,
int16_t
amp
,
uint16_t
subframe
);
uint16_t
subframe
);
<<<<<<<
HEAD
void
generate_ue_spec_pilots
(
PHY_VARS_eNB
*
phy_vars_eNB
,
void
generate_ue_spec_pilots
(
PHY_VARS_eNB
*
phy_vars_eNB
,
uint8_t
UE_id
,
uint8_t
UE_id
,
mod_sym
_t
**
txdataF
,
int32
_t
**
txdataF
,
int16_t
amp
,
int16_t
amp
,
uint16_t
Ntti
,
uint16_t
Ntti
,
uint8_t
beamforming_mode
);
uint8_t
beamforming_mode
);
...
...
openair1/PHY/MODULATION/ofdm_mod.c
View file @
00925ef8
...
@@ -296,8 +296,8 @@ void do_OFDM_mod_l(LTE_eNB_COMMON *eNB_common_vars, int eNB_id, uint16_t next_sl
...
@@ -296,8 +296,8 @@ void do_OFDM_mod_l(LTE_eNB_COMMON *eNB_common_vars, int eNB_id, uint16_t next_sl
int
aa
,
l
,
slot_offset
,
slot_offset_F
;
int
aa
,
l
,
slot_offset
,
slot_offset_F
;
int8_t
UE_id
=
0
;
int8_t
UE_id
=
0
;
mod_sym
_t
**
txdataF
=
eNB_common_vars
->
txdataF
[
eNB_id
];
int32
_t
**
txdataF
=
eNB_common_vars
->
txdataF
[
eNB_id
];
mod_sym
_t
**
txdataF_BF
=
eNB_common_vars
->
txdataF_BF
[
eNB_id
];
int32
_t
**
txdataF_BF
=
eNB_common_vars
->
txdataF_BF
[
eNB_id
];
int32_t
**
txdata
=
eNB_common_vars
->
txdata
[
eNB_id
];
int32_t
**
txdata
=
eNB_common_vars
->
txdata
[
eNB_id
];
//slot_offset_F = (next_slot)*(frame_parms->ofdm_symbol_size)*((frame_parms->Ncp==1) ? 6 : 7);
//slot_offset_F = (next_slot)*(frame_parms->ofdm_symbol_size)*((frame_parms->Ncp==1) ? 6 : 7);
...
...
openair1/SIMULATION/LTE_PHY/dlsim.c
View file @
00925ef8
...
@@ -505,11 +505,8 @@ int main(int argc, char **argv)
...
@@ -505,11 +505,8 @@ int main(int argc, char **argv)
exit
(
-
1
);
exit
(
-
1
);
}
}
if
(
transmission_mode
>
1
&&
transmission_mode
<
7
){
if
(
transmission_mode
>
1
&&
transmission_mode
<
7
)
{
n_tx_port
=
2
;
n_tx_port
=
2
;
n_tx_phy
=
n_tx_port
;
}
else
if
(
transmission_mode
==
7
){
n_tx_port
=
1
;
}
}
break
;
break
;
...
@@ -521,14 +518,10 @@ int main(int argc, char **argv)
...
@@ -521,14 +518,10 @@ int main(int argc, char **argv)
if
(
n_tx_phy
==
1
)
{
if
(
n_tx_phy
==
1
)
{
msg
(
"n_tx_phy must be >1 for transmission_mode %d
\n
"
,
transmission_mode
);
msg
(
"n_tx_phy must be >1 for transmission_mode %d
\n
"
,
transmission_mode
);
exit
(
-
1
);
exit
(
-
1
);
}
else
if
(
n_tx_phy
!=
n_tx_port
)
{
// to be changed
}
msg
(
"For transmission mode TM2-TM6, physical antenna number should be the same as antenna port number.
\n
"
);
exit
(
-
1
);
}
}
}
if
(
transmission_mode
==
7
&&
(
n_tx_phy
!=
1
&&
n_tx_phy
!=
2
&&
n_tx_phy
!=
4
&&
n_tx_phy
!=
8
&&
n_tx_phy
!=
16
&&
n_tx_phy
!=
64
&&
n_tx_phy
!=
128
))
{
if
(
transmission_mode
==
7
&&
(
n_tx_phy
!=
1
&&
n_tx_phy
!=
2
&&
n_tx_phy
!=
4
&&
n_tx_phy
!=
8
&&
n_tx_phy
!=
16
&&
n_tx_phy
!=
64
&&
n_tx_phy
!=
128
))
{
// if (transmission_mode==7 && (n_tx_phy!=1 && n_tx_phy!=2 && n_tx_phy!=4 && n_tx_phy!=16 && n_tx_phy!=64)) {
msg
(
"Physical number of antennas not supported for TM7.
\n
"
);
msg
(
"Physical number of antennas not supported for TM7.
\n
"
);
exit
(
-
1
);
exit
(
-
1
);
}
}
...
@@ -616,8 +609,6 @@ int main(int argc, char **argv)
...
@@ -616,8 +609,6 @@ int main(int argc, char **argv)
}
else
}
else
NB_RB
=
4
;
NB_RB
=
4
;
/*if ((transmission_mode > 1) && (n_tx != 2))
printf("n_tx must be >1 for transmission_mode %d\n",transmission_mode);*/
if
(
xforms
==
1
)
{
if
(
xforms
==
1
)
{
fl_initialize
(
&
argc
,
argv
,
NULL
,
0
,
0
);
fl_initialize
(
&
argc
,
argv
,
NULL
,
0
,
0
);
...
@@ -673,15 +664,6 @@ int main(int argc, char **argv)
...
@@ -673,15 +664,6 @@ int main(int argc, char **argv)
snr1
=
snr0
+
snr_int
;
snr1
=
snr0
+
snr_int
;
printf
(
"SNR0 %f, SNR1 %f
\n
"
,
snr0
,
snr1
);
printf
(
"SNR0 %f, SNR1 %f
\n
"
,
snr0
,
snr1
);
/*
txdataF = (int **)malloc16(2*sizeof(int*));
txdataF[0] = (int *)malloc16(FRAME_LENGTH_BYTES);
txdataF[1] = (int *)malloc16(FRAME_LENGTH_BYTES);
txdata = (int **)malloc16(2*sizeof(int*));
txdata[0] = (int *)malloc16(FRAME_LENGTH_BYTES);
txdata[1] = (int *)malloc16(FRAME_LENGTH_BYTES);
*/
s_re
=
malloc
(
n_tx_phy
*
sizeof
(
double
*
));
s_re
=
malloc
(
n_tx_phy
*
sizeof
(
double
*
));
s_im
=
malloc
(
n_tx_phy
*
sizeof
(
double
*
));
s_im
=
malloc
(
n_tx_phy
*
sizeof
(
double
*
));
...
...
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