Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
openairinterface5G
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Merge Requests
19
Merge Requests
19
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
oai
openairinterface5G
Commits
852775ac
Commit
852775ac
authored
Apr 25, 2016
by
Rohit Gupta
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cherry pick commits from bugfix-48-L1L2signalling to develop
parent
0ddf4208
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
36 additions
and
17 deletions
+36
-17
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+2
-2
cmake_targets/autotests/test_case_list.xml
cmake_targets/autotests/test_case_list.xml
+6
-6
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
+28
-9
No files found.
cmake_targets/CMakeLists.txt
View file @
852775ac
...
...
@@ -171,13 +171,13 @@ set(CMAKE_CXX_FLAGS
#########################
set
(
CMAKE_EXE_LINKER_FLAGS
"
${
CMAKE_EXE_LINKER_FLAGS
}
-Wl,-rpath -Wl,
${
OPENAIR_TARGETS
}
/bin
"
)
set
(
CMAKE_EXE_LINKER_FLAGS
"
${
CMAKE_EXE_LINKER_FLAGS
}
-Wl,-rpath -Wl,
${
CMAKE_CURRENT_BINARY_DIR
}
"
)
#########################
# set a flag for changes in the source code
# these changes are related to hardcoded path to include .h files
add_definitions
(
-DCMAKER
)
set
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS
}
-g -DMALLOC_CHECK_=3"
)
set
(
CMAKE_C_FLAGS_RELWITHDEBINFO
"
${
CMAKE_C_FLAGS
}
-g -DMALLOC_CHECK_=3 -O
2
"
)
set
(
CMAKE_C_FLAGS_RELWITHDEBINFO
"
${
CMAKE_C_FLAGS
}
-g -DMALLOC_CHECK_=3 -O
3
"
)
set
(
GIT_BRANCH
"UNKNOWN"
)
...
...
cmake_targets/autotests/test_case_list.xml
View file @
852775ac
...
...
@@ -4638,7 +4638,7 @@
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf ENB_PORT_FOR_S1U 2152
</eNB_config_file>
<eNB_compile_prog>
$OPENAIR_DIR/cmake_targets/build_oai
</eNB_compile_prog>
<eNB_compile_prog_args>
--eNB -w BLADERF -x -c
</eNB_compile_prog_args>
<eNB_pre_exec>
$OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash
; sudo -E $OPENAIR_DIR/cmake_targets/tools/start_bladerf.py
</eNB_pre_exec>
<eNB_pre_exec>
$OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash
</eNB_pre_exec>
<eNB_pre_exec_args></eNB_pre_exec_args>
<eNB_main_exec>
sudo -E chrt -f 99 $OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem
</eNB_main_exec>
<eNB_main_exec_args>
-O $OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf -W
</eNB_main_exec_args>
...
...
@@ -4714,7 +4714,7 @@
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf ENB_PORT_FOR_S1U 2152
</eNB_config_file>
<eNB_compile_prog>
$OPENAIR_DIR/cmake_targets/build_oai
</eNB_compile_prog>
<eNB_compile_prog_args>
--eNB -w BLADERF -x -c
</eNB_compile_prog_args>
<eNB_pre_exec>
$OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash
; sudo -E $OPENAIR_DIR/cmake_targets/tools/start_bladerf.py
</eNB_pre_exec>
<eNB_pre_exec>
$OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash
</eNB_pre_exec>
<eNB_pre_exec_args></eNB_pre_exec_args>
<eNB_main_exec>
sudo -E chrt -f 99 $OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem
</eNB_main_exec>
<eNB_main_exec_args>
-O $OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf -W
</eNB_main_exec_args>
...
...
@@ -4789,7 +4789,7 @@
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf ENB_PORT_FOR_S1U 2152
</eNB_config_file>
<eNB_compile_prog>
$OPENAIR_DIR/cmake_targets/build_oai
</eNB_compile_prog>
<eNB_compile_prog_args>
--eNB -w BLADERF -x -c
</eNB_compile_prog_args>
<eNB_pre_exec>
$OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash
; sudo -E $OPENAIR_DIR/cmake_targets/tools/start_bladerf.py
</eNB_pre_exec>
<eNB_pre_exec>
$OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash
</eNB_pre_exec>
<eNB_pre_exec_args></eNB_pre_exec_args>
<eNB_main_exec>
sudo -E chrt -f 99 $OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem
</eNB_main_exec>
<eNB_main_exec_args>
-O $OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf -W
</eNB_main_exec_args>
...
...
@@ -4864,7 +4864,7 @@
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf ENB_PORT_FOR_S1U 2152
</eNB_config_file>
<eNB_compile_prog>
$OPENAIR_DIR/cmake_targets/build_oai
</eNB_compile_prog>
<eNB_compile_prog_args>
--eNB -w BLADERF -x -c
</eNB_compile_prog_args>
<eNB_pre_exec>
$OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash
; sudo -E $OPENAIR_DIR/cmake_targets/tools/start_bladerf.py
</eNB_pre_exec>
<eNB_pre_exec>
$OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash
</eNB_pre_exec>
<eNB_pre_exec_args></eNB_pre_exec_args>
<eNB_main_exec>
sudo -E chrt -f 99 $OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem
</eNB_main_exec>
<eNB_main_exec_args>
-O $OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf -W
</eNB_main_exec_args>
...
...
@@ -4938,7 +4938,7 @@
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf ENB_PORT_FOR_S1U 2152
</eNB_config_file>
<eNB_compile_prog>
$OPENAIR_DIR/cmake_targets/build_oai
</eNB_compile_prog>
<eNB_compile_prog_args>
--eNB -w BLADERF -x -c
</eNB_compile_prog_args>
<eNB_pre_exec>
$OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash
; sudo -E $OPENAIR_DIR/cmake_targets/tools/start_bladerf.py
</eNB_pre_exec>
<eNB_pre_exec>
$OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash
</eNB_pre_exec>
<eNB_pre_exec_args></eNB_pre_exec_args>
<eNB_main_exec>
sudo -E chrt -f 99 $OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem
</eNB_main_exec>
<eNB_main_exec_args>
-O $OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf -W
</eNB_main_exec_args>
...
...
@@ -5012,7 +5012,7 @@
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf ENB_PORT_FOR_S1U 2152
</eNB_config_file>
<eNB_compile_prog>
$OPENAIR_DIR/cmake_targets/build_oai
</eNB_compile_prog>
<eNB_compile_prog_args>
--eNB -w BLADERF -x -c
</eNB_compile_prog_args>
<eNB_pre_exec>
$OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash
; sudo -E $OPENAIR_DIR/cmake_targets/tools/start_bladerf.py
</eNB_pre_exec>
<eNB_pre_exec>
$OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash
</eNB_pre_exec>
<eNB_pre_exec_args></eNB_pre_exec_args>
<eNB_main_exec>
sudo -E chrt -f 99 $OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem
</eNB_main_exec>
<eNB_main_exec_args>
-O $OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf -W
</eNB_main_exec_args>
...
...
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
View file @
852775ac
...
...
@@ -597,11 +597,10 @@ extern "C" {
openair0_cfg
[
0
].
rx_gain_calib_table
=
calib_table_b210_38
;
bw_gain_adjust
=
1
;
}
s
->
usrp
->
set_master_clock_rate
(
30.72e6
);
switch
((
int
)
openair0_cfg
[
0
].
sample_rate
)
{
case
30720000
:
// from usrp_time_offset
s
->
usrp
->
set_master_clock_rate
(
30.72e6
);
openair0_cfg
[
0
].
samples_per_packet
=
4096
;
openair0_cfg
[
0
].
tx_sample_advance
=
115
;
openair0_cfg
[
0
].
tx_bw
=
20e6
;
...
...
@@ -609,6 +608,7 @@ extern "C" {
openair0_cfg
[
0
].
tx_scheduling_advance
=
11
*
openair0_cfg
[
0
].
samples_per_packet
;
break
;
case
23040000
:
s
->
usrp
->
set_master_clock_rate
(
23.04e6
);
//to be checked
openair0_cfg
[
0
].
samples_per_packet
=
2048
;
openair0_cfg
[
0
].
tx_sample_advance
=
113
;
openair0_cfg
[
0
].
tx_bw
=
20e6
;
...
...
@@ -616,20 +616,23 @@ extern "C" {
openair0_cfg
[
0
].
tx_scheduling_advance
=
8
*
openair0_cfg
[
0
].
samples_per_packet
;
break
;
case
15360000
:
s
->
usrp
->
set_master_clock_rate
(
30.72e06
);
openair0_cfg
[
0
].
samples_per_packet
=
2048
;
openair0_cfg
[
0
].
tx_sample_advance
=
1
13
;
openair0_cfg
[
0
].
tx_sample_advance
=
1
03
;
openair0_cfg
[
0
].
tx_bw
=
20e6
;
openair0_cfg
[
0
].
rx_bw
=
20e6
;
openair0_cfg
[
0
].
tx_scheduling_advance
=
5
*
openair0_cfg
[
0
].
samples_per_packet
;
openair0_cfg
[
0
].
tx_scheduling_advance
=
10240
;
break
;
case
7680000
:
s
->
usrp
->
set_master_clock_rate
(
30.72e6
);
openair0_cfg
[
0
].
samples_per_packet
=
1024
;
openair0_cfg
[
0
].
tx_sample_advance
=
70
;
//103
;
openair0_cfg
[
0
].
tx_sample_advance
=
80
;
openair0_cfg
[
0
].
tx_bw
=
20e6
;
openair0_cfg
[
0
].
rx_bw
=
20e6
;
openair0_cfg
[
0
].
tx_scheduling_advance
=
5
*
openair0_cfg
[
0
].
samples_per_packet
;
break
;
case
1920000
:
s
->
usrp
->
set_master_clock_rate
(
7.68e6
);
openair0_cfg
[
0
].
samples_per_packet
=
256
;
openair0_cfg
[
0
].
tx_sample_advance
=
40
;
openair0_cfg
[
0
].
tx_bw
=
20e6
;
...
...
@@ -652,8 +655,8 @@ extern "C" {
for
(
i
=
0
;
i
<
s
->
usrp
->
get_rx_num_channels
();
i
++
)
{
if
(
i
<
openair0_cfg
[
0
].
rx_num_channels
)
{
s
->
usrp
->
set_rx_rate
(
openair0_cfg
[
0
].
sample_rate
,
i
);
s
->
usrp
->
set_rx_bandwidth
(
openair0_cfg
[
0
].
rx_bw
,
i
);
printf
(
"Setting rx freq/gain on channel %lu/%lu : BW %f (readback %f)
\n
"
,
i
,
s
->
usrp
->
get_rx_num_channels
(),
openair0_cfg
[
0
].
rx_bw
/
1e6
,
s
->
usrp
->
get_rx_bandwidth
(
i
)
/
1e6
);
//
s->usrp->set_rx_bandwidth(openair0_cfg[0].rx_bw,i);
//
printf("Setting rx freq/gain on channel %lu/%lu : BW %f (readback %f)\n",i,s->usrp->get_rx_num_channels(),openair0_cfg[0].rx_bw/1e6,s->usrp->get_rx_bandwidth(i)/1e6);
s
->
usrp
->
set_rx_freq
(
openair0_cfg
[
0
].
rx_freq
[
i
],
i
);
set_rx_gain_offset
(
&
openair0_cfg
[
0
],
i
,
bw_gain_adjust
);
...
...
@@ -673,8 +676,8 @@ extern "C" {
for
(
i
=
0
;
i
<
s
->
usrp
->
get_tx_num_channels
();
i
++
)
{
if
(
i
<
openair0_cfg
[
0
].
tx_num_channels
)
{
s
->
usrp
->
set_tx_rate
(
openair0_cfg
[
0
].
sample_rate
,
i
);
s
->
usrp
->
set_tx_bandwidth
(
openair0_cfg
[
0
].
tx_bw
,
i
);
printf
(
"Setting tx freq/gain on channel %lu/%lu: BW %f (readback %f)
\n
"
,
i
,
s
->
usrp
->
get_tx_num_channels
(),
openair0_cfg
[
0
].
tx_bw
/
1e6
,
s
->
usrp
->
get_tx_bandwidth
(
i
)
/
1e6
);
//
s->usrp->set_tx_bandwidth(openair0_cfg[0].tx_bw,i);
//
printf("Setting tx freq/gain on channel %lu/%lu: BW %f (readback %f)\n",i,s->usrp->get_tx_num_channels(),openair0_cfg[0].tx_bw/1e6,s->usrp->get_tx_bandwidth(i)/1e6);
s
->
usrp
->
set_tx_freq
(
openair0_cfg
[
0
].
tx_freq
[
i
],
i
);
s
->
usrp
->
set_tx_gain
(
openair0_cfg
[
0
].
tx_gain
[
i
],
i
);
}
...
...
@@ -683,6 +686,8 @@ extern "C" {
// display USRP settings
std
::
cout
<<
boost
::
format
(
"Actual master clock: %fMHz..."
)
%
(
s
->
usrp
->
get_master_clock_rate
()
/
1e6
)
<<
std
::
endl
;
sleep
(
1
);
// create tx & rx streamer
uhd
::
stream_args_t
stream_args_rx
(
"sc16"
,
"sc16"
);
...
...
@@ -701,6 +706,20 @@ extern "C" {
std
::
cout
<<
boost
::
format
(
"tx_max_num_samps %u"
)
%
(
s
->
tx_stream
->
get_max_num_samps
())
<<
std
::
endl
;
/* Setting TX/RX BW after streamers are created due to USRP calibration issue */
for
(
i
=
0
;
i
<
s
->
usrp
->
get_tx_num_channels
();
i
++
)
{
if
(
i
<
openair0_cfg
[
0
].
tx_num_channels
)
{
s
->
usrp
->
set_tx_bandwidth
(
openair0_cfg
[
0
].
tx_bw
,
i
);
printf
(
"Setting tx freq/gain on channel %lu/%lu: BW %f (readback %f)
\n
"
,
i
,
s
->
usrp
->
get_tx_num_channels
(),
openair0_cfg
[
0
].
tx_bw
/
1e6
,
s
->
usrp
->
get_tx_bandwidth
(
i
)
/
1e6
);
}
}
for
(
i
=
0
;
i
<
s
->
usrp
->
get_rx_num_channels
();
i
++
)
{
if
(
i
<
openair0_cfg
[
0
].
rx_num_channels
)
{
s
->
usrp
->
set_rx_bandwidth
(
openair0_cfg
[
0
].
rx_bw
,
i
);
printf
(
"Setting rx freq/gain on channel %lu/%lu : BW %f (readback %f)
\n
"
,
i
,
s
->
usrp
->
get_rx_num_channels
(),
openair0_cfg
[
0
].
rx_bw
/
1e6
,
s
->
usrp
->
get_rx_bandwidth
(
i
)
/
1e6
);
}
}
s
->
usrp
->
set_time_now
(
uhd
::
time_spec_t
(
0.0
));
...
...
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