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
2853ab64
Commit
2853ab64
authored
Jul 26, 2016
by
Sandeep Kumar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
testing if5-rrh_gw tx working
parent
70e88555
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
35 additions
and
36 deletions
+35
-36
openair1/PHY/LTE_TRANSPORT/if5_tools.c
openair1/PHY/LTE_TRANSPORT/if5_tools.c
+30
-27
targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
+0
-3
targets/RT/USER/eNB_transport_IQ.c
targets/RT/USER/eNB_transport_IQ.c
+1
-2
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-enb.c
+4
-4
No files found.
openair1/PHY/LTE_TRANSPORT/if5_tools.c
View file @
2853ab64
...
...
@@ -51,16 +51,15 @@ void send_IF5(PHY_VARS_eNB *eNB, openair0_timestamp proc_timestamp, int subframe
uint16_t
packet_id
=
0
,
i
=
0
;
uint32_t
spp_eth
=
(
uint32_t
)
eNB
->
ifdevice
.
openair0_cfg
->
samples_per_packet
;
uint32_t
spsf
=
(
uint32_t
)
eNB
->
ifdevice
.
openair0_cfg
->
samples_per_frame
/
10
;
if
(
packet_type
==
IF5_RRH_GW_DL
)
{
unsigned
int
spp_eth
=
eNB
->
ifdevice
.
openair0_cfg
->
samples_per_packet
;
unsigned
int
spsf
=
eNB
->
ifdevice
.
openair0_cfg
->
samples_per_frame
/
10
;
for
(
i
=
0
;
i
<
fp
->
nb_antennas_tx
;
i
++
)
txp
[
i
]
=
(
void
*
)
&
eNB
->
common_vars
.
txdata
[
0
][
i
][
subframe
*
fp
->
samples_per_tti
];
for
(
packet_id
=
0
;
packet_id
<
spsf
/
spp_eth
;
packet_id
++
)
{
for
(
i
=
0
;
i
<
fp
->
nb_antennas_tx
;
i
++
)
txp
[
i
]
+=
packet_id
*
spp_eth
;
eNB
->
ifdevice
.
trx_write_func
(
&
eNB
->
ifdevice
,
(
proc_timestamp
+
packet_id
*
spp_eth
),
...
...
@@ -68,18 +67,18 @@ void send_IF5(PHY_VARS_eNB *eNB, openair0_timestamp proc_timestamp, int subframe
spp_eth
,
fp
->
nb_antennas_tx
,
0
);
for
(
i
=
0
;
i
<
fp
->
nb_antennas_tx
;
i
++
)
txp
[
i
]
+=
spp_eth
;
}
}
else
if
(
packet_type
==
IF5_RRH_GW_UL
)
{
unsigned
int
spp_eth
=
eNB
->
ifdevice
.
openair0_cfg
->
samples_per_packet
;
unsigned
int
spsf
=
eNB
->
ifdevice
.
openair0_cfg
->
samples_per_frame
/
10
;
for
(
i
=
0
;
i
<
fp
->
nb_antennas_rx
;
i
++
)
rxp
[
i
]
=
(
void
*
)
&
eNB
->
common_vars
.
rxdata
[
0
][
i
][
subframe
*
fp
->
samples_per_tti
];
for
(
packet_id
=
0
;
packet_id
<
spsf
/
spp_eth
;
packet_id
++
)
{
for
(
i
=
0
;
i
<
fp
->
nb_antennas_rx
;
i
++
)
rxp
[
i
]
+=
packet_id
*
spp_eth
;
eNB
->
ifdevice
.
trx_write_func
(
&
eNB
->
ifdevice
,
(
proc_timestamp
+
packet_id
*
spp_eth
),
...
...
@@ -87,6 +86,10 @@ void send_IF5(PHY_VARS_eNB *eNB, openair0_timestamp proc_timestamp, int subframe
spp_eth
,
fp
->
nb_antennas_rx
,
0
);
for
(
i
=
0
;
i
<
fp
->
nb_antennas_rx
;
i
++
)
rxp
[
i
]
+=
spp_eth
;
}
}
else
if
(
packet_type
==
IF5_MOBIPASS
)
{
...
...
@@ -149,49 +152,49 @@ void recv_IF5(PHY_VARS_eNB *eNB, openair0_timestamp *proc_timestamp, int subfram
LTE_DL_FRAME_PARMS
*
fp
=&
eNB
->
frame_parms
;
int32_t
*
txp
[
fp
->
nb_antennas_tx
],
*
rxp
[
fp
->
nb_antennas_rx
];
uint16_t
packet_id
=
0
,
i
=
0
;
if
(
packet_type
==
IF5_RRH_GW_DL
)
{
unsigned
int
spp_eth
=
eNB
->
ifdevice
.
openair0_cfg
->
samples_per_packet
;
unsigned
int
spsf
=
eNB
->
ifdevice
.
openair0_cfg
->
samples_per_frame
/
10
;
int32_t
spp_eth
=
(
int32_t
)
eNB
->
ifdevice
.
openair0_cfg
->
samples_per_packet
;
int32_t
spsf
=
(
int32_t
)
eNB
->
ifdevice
.
openair0_cfg
->
samples_per_frame
/
10
;
openair0_timestamp
timestamp
[
spsf
/
spp_eth
];
if
(
packet_type
==
IF5_RRH_GW_DL
)
{
for
(
i
=
0
;
i
<
fp
->
nb_antennas_tx
;
i
++
)
txp
[
i
]
=
(
void
*
)
&
eNB
->
common_vars
.
txdata
[
0
][
i
][
subframe
*
fp
->
samples_per_tti
];
for
(
packet_id
=
0
;
packet_id
<
spsf
/
spp_eth
;
packet_id
++
)
{
for
(
i
=
0
;
i
<
fp
->
nb_antennas_tx
;
i
++
)
txp
[
i
]
+=
packet_id
*
spp_eth
;
eNB
->
ifdevice
.
trx_read_func
(
&
eNB
->
ifdevice
,
&
timestamp
[
packet_id
],
txp
,
spp_eth
,
fp
->
nb_antennas_tx
);
for
(
i
=
0
;
i
<
fp
->
nb_antennas_tx
;
i
++
)
txp
[
i
]
+=
spp_eth
;
}
*
proc_timestamp
=
timestamp
[
0
];
}
else
if
(
packet_type
==
IF5_RRH_GW_UL
)
{
unsigned
int
spp_eth
=
eNB
->
ifdevice
.
openair0_cfg
->
samples_per_packet
;
unsigned
int
spsf
=
eNB
->
ifdevice
.
openair0_cfg
->
samples_per_frame
/
10
;
openair0_timestamp
timestamp
[
spsf
/
spp_eth
];
for
(
i
=
0
;
i
<
fp
->
nb_antennas_rx
;
i
++
)
rxp
[
i
]
=
(
void
*
)
&
eNB
->
common_vars
.
rxdata
[
0
][
i
][
subframe
*
fp
->
samples_per_tti
];
for
(
packet_id
=
0
;
packet_id
<
spsf
/
spp_eth
;
packet_id
++
)
{
for
(
i
=
0
;
i
<
fp
->
nb_antennas_tx
;
i
++
)
rxp
[
i
]
+=
packet_id
*
spp_eth
;
eNB
->
ifdevice
.
trx_read_func
(
&
eNB
->
ifdevice
,
&
timestamp
[
packet_id
],
rxp
,
spp_eth
,
fp
->
nb_antennas_rx
);
for
(
i
=
0
;
i
<
fp
->
nb_antennas_rx
;
i
++
)
rxp
[
i
]
+=
spp_eth
;
}
*
proc_timestamp
=
timestamp
[
0
];
...
...
targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
View file @
2853ab64
...
...
@@ -411,7 +411,6 @@ int transport_init(openair0_device *device, openair0_config_t *openair0_cfg, eth
exit
(
-
1
);
break
;
}
openair0_cfg
[
0
].
tx_scheduling_advance
=
eth_params
->
tx_scheduling_advance
*
openair0_cfg
[
0
].
samples_per_packet
;
}
device
->
openair0_cfg
=&
openair0_cfg
[
0
];
...
...
@@ -454,8 +453,6 @@ void dump_dev(openair0_device *device) {
printf
(
" Log level is %i :
\n
"
,
device
->
openair0_cfg
->
log_level
);
printf
(
" RB number: %i, sample rate: %lf
\n
"
,
device
->
openair0_cfg
->
num_rb_dl
,
device
->
openair0_cfg
->
sample_rate
);
printf
(
" Scheduling_advance: %i, Sample_advance: %u
\n
"
,
device
->
openair0_cfg
->
tx_scheduling_advance
,
device
->
openair0_cfg
->
tx_sample_advance
);
printf
(
" BBU configured for %i tx/%i rx channels)
\n
"
,
device
->
openair0_cfg
->
tx_num_channels
,
device
->
openair0_cfg
->
rx_num_channels
);
printf
(
" Running flags: %s %s %s
\n
"
,
...
...
targets/RT/USER/eNB_transport_IQ.c
View file @
2853ab64
...
...
@@ -710,14 +710,13 @@ static void check_dev_config( rrh_module_t *mod_enb) {
printf
(
"
\n
---------------------RF device configuration parameters---------------------
\n
"
);
printf
(
"
\t
Mod_id=%d
\n
\t
log level=%d
\n
\t
DL_RB=%d
\n
\t
samples_per_frame=%d
\n
\t
sample_rate=%f
\n
\t
samples_per_packet=%d
\n
\t
tx_s
cheduling_advance=%d
\n
\t
tx_s
ample_advance=%d
\n
\t
rx_num_channels=%d
\n
\t
tx_num_channels=%d
\n
\t
rx_freq_0=%f
\n
\t
tx_freq_0=%f
\n
\t
rx_freq_1=%f
\n
\t
tx_freq_1=%f
\n
\t
rx_freq_2=%f
\n
\t
tx_freq_2=%f
\n
\t
rx_freq_3=%f
\n
\t
tx_freq_3=%f
\n
\t
rxg_mode=%d
\n
\t
rx_gain_0=%f
\n
\t
tx_gain_0=%f
\n
\t
rx_gain_1=%f
\n
\t
tx_gain_1=%f
\n
\t
rx_gain_2=%f
\n
\t
tx_gain_2=%f
\n
\t
rx_gain_3=%f
\n
\t
tx_gain_3=%f
\n
\t
rx_gain_offset_2=%f
\n
\t
tx_gain_offset_3=%f
\n
\t
rx_bw=%f
\n
\t
tx_bw=%f
\n
\t
autocal=%d
\n
"
,
printf
(
"
\t
Mod_id=%d
\n
\t
log level=%d
\n
\t
DL_RB=%d
\n
\t
samples_per_frame=%d
\n
\t
sample_rate=%f
\n
\t
samples_per_packet=%d
\n
\t
tx_sample_advance=%d
\n
\t
rx_num_channels=%d
\n
\t
tx_num_channels=%d
\n
\t
rx_freq_0=%f
\n
\t
tx_freq_0=%f
\n
\t
rx_freq_1=%f
\n
\t
tx_freq_1=%f
\n
\t
rx_freq_2=%f
\n
\t
tx_freq_2=%f
\n
\t
rx_freq_3=%f
\n
\t
tx_freq_3=%f
\n
\t
rxg_mode=%d
\n
\t
rx_gain_0=%f
\n
\t
tx_gain_0=%f
\n
\t
rx_gain_1=%f
\n
\t
tx_gain_1=%f
\n
\t
rx_gain_2=%f
\n
\t
tx_gain_2=%f
\n
\t
rx_gain_3=%f
\n
\t
tx_gain_3=%f
\n
\t
rx_gain_offset_2=%f
\n
\t
tx_gain_offset_3=%f
\n
\t
rx_bw=%f
\n
\t
tx_bw=%f
\n
\t
autocal=%d
\n
"
,
mod_enb
->
devs
->
openair0_cfg
->
Mod_id
,
mod_enb
->
devs
->
openair0_cfg
->
log_level
,
mod_enb
->
devs
->
openair0_cfg
->
num_rb_dl
,
mod_enb
->
devs
->
openair0_cfg
->
samples_per_frame
,
mod_enb
->
devs
->
openair0_cfg
->
sample_rate
,
mod_enb
->
devs
->
openair0_cfg
->
samples_per_packet
,
mod_enb
->
devs
->
openair0_cfg
->
tx_scheduling_advance
,
mod_enb
->
devs
->
openair0_cfg
->
tx_sample_advance
,
mod_enb
->
devs
->
openair0_cfg
->
rx_num_channels
,
mod_enb
->
devs
->
openair0_cfg
->
tx_num_channels
,
...
...
targets/RT/USER/lte-enb.c
View file @
2853ab64
...
...
@@ -1061,8 +1061,6 @@ static void* eNB_thread_FH( void* param ) {
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ
,
1
);
rxs
=
eNB
->
rfdevice
.
trx_read_func
(
&
eNB
->
rfdevice
,
&
proc
->
timestamp_rx
,
rxp
,
...
...
@@ -1102,7 +1100,7 @@ static void* eNB_thread_FH( void* param ) {
(
eNB
->
node_function
==
eNodeB_3GPP_BBU
))
{
// acquisition from IF
/// **** recv_IF5 of rxdata from RRH **** ///
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_RECV_IF5
,
1
);
recv_IF5
(
eNB
,
&
proc
->
timestamp_rx
,
proc
->
subframe_rx
,
IF5_RRH_GW_UL
);
recv_IF5
(
eNB
,
&
proc
->
timestamp_rx
,
subframe
,
IF5_RRH_GW_UL
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_RECV_IF5
,
0
);
proc
->
frame_rx
=
(
proc
->
timestamp_rx
/
(
fp
->
samples_per_tti
*
10
))
&
1023
;
...
...
@@ -1120,6 +1118,8 @@ static void* eNB_thread_FH( void* param ) {
}
}
else
{
proc
->
first_rx
=
0
;
frame
=
proc
->
frame_rx
;
subframe
=
proc
->
subframe_rx
;
}
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME
(
VCD_SIGNAL_DUMPER_VARIABLES_TRX_TS
,
proc
->
timestamp_rx
&
0xffffffff
);
...
...
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