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
3bfbb132
Commit
3bfbb132
authored
Jan 05, 2017
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
changes for RRU (merge with develop). single-thread-disable flag is functional for RRU.
parent
f55e95d1
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
32 additions
and
34 deletions
+32
-34
openair1/PHY/INIT/lte_init.c
openair1/PHY/INIT/lte_init.c
+8
-17
openair1/PHY/MODULATION/ofdm_mod.c
openair1/PHY/MODULATION/ofdm_mod.c
+10
-10
openair1/SIMULATION/LTE_PHY/dlsim.c
openair1/SIMULATION/LTE_PHY/dlsim.c
+9
-2
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-enb.c
+1
-1
targets/RT/USER/rru_if4p5_usrp.gtkw
targets/RT/USER/rru_if4p5_usrp.gtkw
+4
-4
No files found.
openair1/PHY/INIT/lte_init.c
View file @
3bfbb132
...
@@ -1304,35 +1304,26 @@ int phy_init_lte_eNB(PHY_VARS_eNB *eNB,
...
@@ -1304,35 +1304,26 @@ int phy_init_lte_eNB(PHY_VARS_eNB *eNB,
common_vars
->
txdataF
[
eNB_id
]
=
(
int32_t
**
)
malloc16
(
NB_ANTENNA_PORTS_ENB
*
sizeof
(
int32_t
*
));
common_vars
->
txdataF
[
eNB_id
]
=
(
int32_t
**
)
malloc16
(
NB_ANTENNA_PORTS_ENB
*
sizeof
(
int32_t
*
));
common_vars
->
txdataF_BF
[
eNB_id
]
=
(
int32_t
**
)
malloc16
(
fp
->
nb_antennas_tx
*
sizeof
(
int32_t
*
));
common_vars
->
txdataF_BF
[
eNB_id
]
=
(
int32_t
**
)
malloc16
(
fp
->
nb_antennas_tx
*
sizeof
(
int32_t
*
));
for
(
i
=
0
;
i
<
14
;
i
++
)
{
if
(
eNB
->
node_function
!=
NGFI_RRU_IF5
)
{
common_vars
->
txdataF
[
eNB_id
][
i
]
=
(
int32_t
*
)
malloc16_clear
(
fp
->
ofdm_symbol_size
*
fp
->
symbols_per_tti
*
10
*
sizeof
(
int32_t
)
);
for
(
i
=
0
;
i
<
((
eNB
->
do_precoding
==
0
)
?
fp
->
nb_antennas_tx
:
14
);
i
++
)
{
common_vars
->
txdataF
[
eNB_id
][
i
]
=
(
int32_t
*
)
malloc16_clear
(
fp
->
ofdm_symbol_size
*
fp
->
symbols_per_tti
*
10
*
sizeof
(
int32_t
)
);
#ifdef DEBUG_PHY
#ifdef DEBUG_PHY
msg
(
"[openair][LTE_PHY][INIT] lte_common_vars->txdataF[%d][%d] = %p (%d
bytes)
\n
"
,
printf
(
"[openair][LTE_PHY][INIT] common_vars->txdataF[%d][%d] = %p (%lu
bytes)
\n
"
,
eNB_id
,
i
,
common_vars
->
txdataF
[
eNB_id
][
i
],
eNB_id
,
i
,
common_vars
->
txdataF
[
eNB_id
][
i
],
fp
->
ofdm_symbol_size
*
fp
->
symbols_per_tti
*
10
*
sizeof
(
int32_t
));
fp
->
ofdm_symbol_size
*
fp
->
symbols_per_tti
*
10
*
sizeof
(
int32_t
));
#endif
#endif
}
}
}
for
(
i
=
0
;
i
<
fp
->
nb_antennas_tx
;
i
++
)
{
for
(
i
=
0
;
i
<
fp
->
nb_antennas_tx
;
i
++
)
{
common_vars
->
txdataF_BF
[
eNB_id
][
i
]
=
(
int32_t
*
)
malloc16_clear
(
fp
->
ofdm_symbol_size
*
sizeof
(
int32_t
)
);
common_vars
->
txdataF_BF
[
eNB_id
][
i
]
=
(
int32_t
*
)
malloc16_clear
(
fp
->
ofdm_symbol_size
*
sizeof
(
int32_t
)
);
if
(
eNB
->
node_function
!=
NGFI_RCC_IF4p5
)
if
(
eNB
->
node_function
!=
NGFI_RCC_IF4p5
)
// Allocate 10 subframes of I/Q TX signal data (time) if not
// Allocate 10 subframes of I/Q TX signal data (time) if not
common_vars
->
txdata
[
eNB_id
][
i
]
=
(
int32_t
*
)
malloc16_clear
(
fp
->
samples_per_tti
*
10
*
sizeof
(
int32_t
)
);
common_vars
->
txdata
[
eNB_id
][
i
]
=
(
int32_t
*
)
malloc16_clear
(
fp
->
samples_per_tti
*
10
*
sizeof
(
int32_t
)
);
if
(
eNB
->
node_function
==
NGFI_RRU_IF4p5
)
// Allocate 2 subframes of I/Q signal data (frequency)
common_vars
->
txdataF
[
eNB_id
][
i
]
=
(
int32_t
*
)
malloc16_clear
(
fp
->
ofdm_symbol_size
*
fp
->
symbols_per_tti
*
2
*
sizeof
(
int32_t
)
);
else
if
(
eNB
->
node_function
!=
NGFI_RRU_IF5
)
// Allocate 10 subframes of I/Q signal data (frequency)
common_vars
->
txdataF
[
eNB_id
][
i
]
=
(
int32_t
*
)
malloc16_clear
(
fp
->
ofdm_symbol_size
*
fp
->
symbols_per_tti
*
10
*
sizeof
(
int32_t
)
);
#ifdef DEBUG_PHY
#ifdef DEBUG_PHY
printf
(
"[openair][LTE_PHY][INIT] common_vars->txdata[%d][%d] = %p (%lu bytes)
\n
"
,
eNB_id
,
i
,
common_vars
->
txdata
[
eNB_id
][
i
],
printf
(
"[openair][LTE_PHY][INIT] common_vars->txdata[%d][%d] = %p (%lu bytes)
\n
"
,
eNB_id
,
i
,
common_vars
->
txdata
[
eNB_id
][
i
],
fp
->
samples_per_tti
*
10
*
sizeof
(
int32_t
));
fp
->
samples_per_tti
*
10
*
sizeof
(
int32_t
));
if
(
eNB
->
node_function
!=
NGFI_RRU_IF5
)
printf
(
"[openair][LTE_PHY][INIT] common_vars->txdataF[%d][%d] = %p (%lu bytes)
\n
"
,
eNB_id
,
i
,
common_vars
->
txdataF
[
eNB_id
][
i
],
fp
->
ofdm_symbol_size
*
fp
->
symbols_per_tti
*
(
eNB
->
node_function
==
NGFI_RRU_IF4p5
?
2
:
10
)
*
sizeof
(
int32_t
));
#endif
#endif
}
}
...
@@ -1379,7 +1370,7 @@ int phy_init_lte_eNB(PHY_VARS_eNB *eNB,
...
@@ -1379,7 +1370,7 @@ int phy_init_lte_eNB(PHY_VARS_eNB *eNB,
// allocate 2 subframes of I/Q signal data (frequency)
// allocate 2 subframes of I/Q signal data (frequency)
common_vars
->
rxdataF
[
eNB_id
][
i
]
=
(
int32_t
*
)
malloc16_clear
(
sizeof
(
int32_t
)
*
(
2
*
fp
->
ofdm_symbol_size
*
fp
->
symbols_per_tti
)
);
common_vars
->
rxdataF
[
eNB_id
][
i
]
=
(
int32_t
*
)
malloc16_clear
(
sizeof
(
int32_t
)
*
(
2
*
fp
->
ofdm_symbol_size
*
fp
->
symbols_per_tti
)
);
#ifdef DEBUG_PHY
#ifdef DEBUG_PHY
printf
(
"[openair][LTE_PHY][INIT] common_vars->rxdata[%d][%d] = %p (%lu bytes)
\n
"
,
eNB_id
,
i
,
common_vars
->
rxdata
[
eNB_id
][
i
],
fp
->
samples_per_tti
*
2
*
sizeof
(
int32_t
));
printf
(
"[openair][LTE_PHY][INIT] common_vars->rxdata[%d][%d] = %p (%lu bytes)
\n
"
,
eNB_id
,
i
,
common_vars
->
rxdata
[
eNB_id
][
i
],
fp
->
samples_per_tti
*
10
*
sizeof
(
int32_t
));
if
(
eNB
->
node_function
!=
NGFI_RRU_IF5
)
if
(
eNB
->
node_function
!=
NGFI_RRU_IF5
)
printf
(
"[openair][LTE_PHY][INIT] common_vars->rxdata_7_5kHz[%d][%d] = %p (%lu bytes)
\n
"
,
eNB_id
,
i
,
common_vars
->
rxdata_7_5kHz
[
eNB_id
][
i
],
fp
->
samples_per_tti
*
2
*
sizeof
(
int32_t
));
printf
(
"[openair][LTE_PHY][INIT] common_vars->rxdata_7_5kHz[%d][%d] = %p (%lu bytes)
\n
"
,
eNB_id
,
i
,
common_vars
->
rxdata_7_5kHz
[
eNB_id
][
i
],
fp
->
samples_per_tti
*
2
*
sizeof
(
int32_t
));
#endif
#endif
...
...
openair1/PHY/MODULATION/ofdm_mod.c
View file @
3bfbb132
...
@@ -288,13 +288,13 @@ void do_OFDM_mod(int32_t **txdataF, int32_t **txdata, uint32_t frame,uint16_t ne
...
@@ -288,13 +288,13 @@ void do_OFDM_mod(int32_t **txdataF, int32_t **txdata, uint32_t frame,uint16_t ne
void
do_OFDM_mod_symbol
(
LTE_eNB_COMMON
*
eNB_common_vars
,
int
eNB_id
,
uint16_t
next_slot
,
LTE_DL_FRAME_PARMS
*
frame_parms
,
int
do_precoding
)
void
do_OFDM_mod_symbol
(
LTE_eNB_COMMON
*
eNB_common_vars
,
int
eNB_id
,
uint16_t
next_slot
,
LTE_DL_FRAME_PARMS
*
frame_parms
,
int
do_precoding
)
{
{
int
aa
,
l
,
slot_offset
;
int
aa
,
l
,
slot_offset
,
slot_offsetF
;
int32_t
**
txdataF
=
eNB_common_vars
->
txdataF
[
eNB_id
];
int32_t
**
txdataF
=
eNB_common_vars
->
txdataF
[
eNB_id
];
int32_t
**
txdataF_BF
=
(
do_precoding
==
1
)
?
eNB_common_vars
->
txdataF_BF
[
eNB_id
]
:
txdataF
;
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
=
(
next_slot
)
*
(
frame_parms
->
samples_per_tti
>>
1
);
slot_offset
=
(
next_slot
)
*
(
frame_parms
->
samples_per_tti
>>
1
);
slot_offsetF
=
(
next_slot
)
*
(
frame_parms
->
ofdm_symbol_size
)
*
((
frame_parms
->
Ncp
==
EXTENDED
)
?
6
:
7
);
//printf("Thread %d starting ... aa %d (%llu)\n",omp_get_thread_num(),aa,rdtsc());
//printf("Thread %d starting ... aa %d (%llu)\n",omp_get_thread_num(),aa,rdtsc());
for
(
l
=
0
;
l
<
frame_parms
->
symbols_per_tti
>>
1
;
l
++
)
{
for
(
l
=
0
;
l
<
frame_parms
->
symbols_per_tti
>>
1
;
l
++
)
{
...
@@ -307,8 +307,8 @@ void do_OFDM_mod_symbol(LTE_eNB_COMMON *eNB_common_vars, int eNB_id, uint16_t ne
...
@@ -307,8 +307,8 @@ void do_OFDM_mod_symbol(LTE_eNB_COMMON *eNB_common_vars, int eNB_id, uint16_t ne
//PMCH case not implemented...
//PMCH case not implemented...
if
(
frame_parms
->
Ncp
==
1
)
if
(
frame_parms
->
Ncp
==
EXTENDED
)
PHY_ofdm_mod
(
txdataF_BF
[
aa
],
// input
PHY_ofdm_mod
(
(
do_precoding
==
1
)
?
txdataF_BF
[
aa
]
:&
txdataF
[
aa
][
slot_offsetF
+
l
*
frame_parms
->
ofdm_symbol_size
],
// input
&
txdata
[
aa
][
slot_offset
+
l
*
OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES
],
// output
&
txdata
[
aa
][
slot_offset
+
l
*
OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES
],
// output
frame_parms
->
ofdm_symbol_size
,
frame_parms
->
ofdm_symbol_size
,
1
,
// number of symbols
1
,
// number of symbols
...
@@ -316,7 +316,7 @@ void do_OFDM_mod_symbol(LTE_eNB_COMMON *eNB_common_vars, int eNB_id, uint16_t ne
...
@@ -316,7 +316,7 @@ void do_OFDM_mod_symbol(LTE_eNB_COMMON *eNB_common_vars, int eNB_id, uint16_t ne
CYCLIC_PREFIX
);
CYCLIC_PREFIX
);
else
{
else
{
if
(
l
==
0
)
{
if
(
l
==
0
)
{
PHY_ofdm_mod
(
txdataF_BF
[
aa
],
// input
PHY_ofdm_mod
(
(
do_precoding
==
1
)
?
txdataF_BF
[
aa
]
:&
txdataF
[
aa
][
slot_offsetF
+
l
*
frame_parms
->
ofdm_symbol_size
],
// input
&
txdata
[
aa
][
slot_offset
],
// output
&
txdata
[
aa
][
slot_offset
],
// output
frame_parms
->
ofdm_symbol_size
,
frame_parms
->
ofdm_symbol_size
,
1
,
// number of symbols
1
,
// number of symbols
...
@@ -324,7 +324,7 @@ void do_OFDM_mod_symbol(LTE_eNB_COMMON *eNB_common_vars, int eNB_id, uint16_t ne
...
@@ -324,7 +324,7 @@ void do_OFDM_mod_symbol(LTE_eNB_COMMON *eNB_common_vars, int eNB_id, uint16_t ne
CYCLIC_PREFIX
);
CYCLIC_PREFIX
);
}
else
{
}
else
{
PHY_ofdm_mod
(
txdataF_BF
[
aa
],
// input
PHY_ofdm_mod
((
do_precoding
==
1
)
?
txdataF_BF
[
aa
]
:&
txdataF
[
aa
][
slot_offsetF
+
l
*
frame_parms
->
ofdm_symbol_size
],
// input
&
txdata
[
aa
][
slot_offset
+
OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES0
+
(
l
-
1
)
*
OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES
],
// output
&
txdata
[
aa
][
slot_offset
+
OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES0
+
(
l
-
1
)
*
OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES
],
// output
frame_parms
->
ofdm_symbol_size
,
frame_parms
->
ofdm_symbol_size
,
1
,
// number of symbols
1
,
// number of symbols
...
...
openair1/SIMULATION/LTE_PHY/dlsim.c
View file @
3bfbb132
...
@@ -1812,6 +1812,11 @@ int main(int argc, char **argv)
...
@@ -1812,6 +1812,11 @@ int main(int argc, char **argv)
eNB
->
common_vars
.
beam_weights
[
0
][
0
][
aa
][
re
]
=
0x00007fff
/
eNB
->
frame_parms
.
nb_antennas_tx
;
eNB
->
common_vars
.
beam_weights
[
0
][
0
][
aa
][
re
]
=
0x00007fff
/
eNB
->
frame_parms
.
nb_antennas_tx
;
}
}
if
(
transmission_mode
<
7
)
eNB
->
do_precoding
=
0
;
else
eNB
->
do_precoding
=
1
;
eNB
->
mac_enabled
=
1
;
eNB
->
mac_enabled
=
1
;
if
(
two_thread_flag
==
0
)
{
if
(
two_thread_flag
==
0
)
{
eNB
->
te
=
dlsch_encoding
;
eNB
->
te
=
dlsch_encoding
;
...
@@ -2409,12 +2414,14 @@ int main(int argc, char **argv)
...
@@ -2409,12 +2414,14 @@ int main(int argc, char **argv)
do_OFDM_mod_symbol
(
&
eNB
->
common_vars
,
do_OFDM_mod_symbol
(
&
eNB
->
common_vars
,
eNB_id
,
eNB_id
,
(
subframe
*
2
),
(
subframe
*
2
),
&
eNB
->
frame_parms
);
&
eNB
->
frame_parms
,
eNB
->
do_precoding
);
do_OFDM_mod_symbol
(
&
eNB
->
common_vars
,
do_OFDM_mod_symbol
(
&
eNB
->
common_vars
,
eNB_id
,
eNB_id
,
(
subframe
*
2
)
+
1
,
(
subframe
*
2
)
+
1
,
&
eNB
->
frame_parms
);
&
eNB
->
frame_parms
,
eNB
->
do_precoding
);
stop_meas
(
&
eNB
->
ofdm_mod_stats
);
stop_meas
(
&
eNB
->
ofdm_mod_stats
);
...
...
targets/RT/USER/lte-enb.c
View file @
3bfbb132
...
@@ -867,7 +867,7 @@ void rx_rf(PHY_VARS_eNB *eNB,int *frame,int *subframe) {
...
@@ -867,7 +867,7 @@ void rx_rf(PHY_VARS_eNB *eNB,int *frame,int *subframe) {
void
*
rxp
[
fp
->
nb_antennas_rx
],
*
txp
[
fp
->
nb_antennas_tx
];
void
*
rxp
[
fp
->
nb_antennas_rx
],
*
txp
[
fp
->
nb_antennas_tx
];
unsigned
int
rxs
,
txs
;
unsigned
int
rxs
,
txs
;
int
i
;
int
i
;
int
tx_sfoffset
=
3
;
//(eNB->single_thread_flag == 1) ? 3 : 3
;
int
tx_sfoffset
=
(
eNB
->
single_thread_flag
==
1
)
?
3
:
2
;
openair0_timestamp
ts
,
old_ts
;
openair0_timestamp
ts
,
old_ts
;
if
(
proc
->
first_rx
==
0
)
{
if
(
proc
->
first_rx
==
0
)
{
...
...
targets/RT/USER/rru_if4p5_usrp.gtkw
View file @
3bfbb132
[*]
[*]
[*] GTKWave Analyzer v3.3.58 (w)1999-2014 BSI
[*] GTKWave Analyzer v3.3.58 (w)1999-2014 BSI
[*] T
ue Jan 3 00:00:25
2017
[*] T
hu Jan 5 06:19:58
2017
[*]
[*]
[dumpfile] "/tmp/openair_dump_eNB.vcd"
[dumpfile] "/tmp/openair_dump_eNB.vcd"
[dumpfile_mtime] "
Mon Jan 2 23:59:11
2017"
[dumpfile_mtime] "
Thu Jan 5 06:09:13
2017"
[dumpfile_size]
93728
[dumpfile_size]
24570356
[savefile] "/home/uprru1/oai/openairinterface5g/targets/RT/USER/rru_if4p5_usrp.gtkw"
[savefile] "/home/uprru1/oai/openairinterface5g/targets/RT/USER/rru_if4p5_usrp.gtkw"
[timestart] 23491157000
[timestart] 23491157000
[size] 1301 716
[size] 1301 716
...
@@ -39,7 +39,7 @@ variables.subframe_number_RX1_eNB[63:0]
...
@@ -39,7 +39,7 @@ variables.subframe_number_RX1_eNB[63:0]
variables.frame_number_TX1_eNB[63:0]
variables.frame_number_TX1_eNB[63:0]
variables.subframe_number_TX1_eNB[63:0]
variables.subframe_number_TX1_eNB[63:0]
@28
@28
functions.phy_e
nb_sfgen
functions.phy_e
NB_ofdm_mod_l
functions.phy_eNB_slot_fep
functions.phy_eNB_slot_fep
functions.phy_enb_prach_rx
functions.phy_enb_prach_rx
[pattern_trace] 1
[pattern_trace] 1
...
...
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