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
e238d557
Commit
e238d557
authored
Nov 19, 2015
by
aikaterini.trilyraki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor update in library name
parent
c5d70ce0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
64 additions
and
80 deletions
+64
-80
targets/ARCH/COMMON/common_lib.c
targets/ARCH/COMMON/common_lib.c
+1
-11
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
+63
-69
No files found.
targets/ARCH/COMMON/common_lib.c
View file @
e238d557
...
@@ -101,18 +101,8 @@ int set_transport(openair0_device *device) {
...
@@ -101,18 +101,8 @@ int set_transport(openair0_device *device) {
int
load_lib
(
openair0_device
*
device
,
openair0_config_t
*
openair0_cfg
,
char
*
cfgfile
,
uint8_t
flag
)
{
int
load_lib
(
openair0_device
*
device
,
openair0_config_t
*
openair0_cfg
,
char
*
cfgfile
,
uint8_t
flag
)
{
void
*
lib_handle
;
void
*
lib_handle
;
char
*
OAI_RF_LIBNAME
;
char
*
OAI_TP_LIBNAME
;
oai_device_initfunc_t
fp
;
oai_device_initfunc_t
fp
;
if
(
device
->
host_type
==
BBU_HOST
)
{
OAI_RF_LIBNAME
=
"/home/guepe/openairinterface5g/cmake_targets/lte_noS1_build_oai/build/liboai_device.so"
;
OAI_TP_LIBNAME
=
"/home/guepe/openairinterface5g/cmake_targets/lte_noS1_build_oai/build/liboai_transpro.so"
;
}
else
{
OAI_RF_LIBNAME
=
"liboai_device.so"
;
OAI_TP_LIBNAME
=
"liboai_transpro.so"
;
}
if
(
flag
==
RF_DEVICE
)
{
if
(
flag
==
RF_DEVICE
)
{
lib_handle
=
dlopen
(
OAI_RF_LIBNAME
,
RTLD_LAZY
);
lib_handle
=
dlopen
(
OAI_RF_LIBNAME
,
RTLD_LAZY
);
if
(
!
lib_handle
)
{
if
(
!
lib_handle
)
{
...
...
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
View file @
e238d557
...
@@ -383,15 +383,14 @@ extern "C" {
...
@@ -383,15 +383,14 @@ extern "C" {
// s->usrp->set_rx_subdev_spec(rx_subdev);
// s->usrp->set_rx_subdev_spec(rx_subdev);
// s->usrp->set_tx_subdev_spec(tx_subdev);
// s->usrp->set_tx_subdev_spec(tx_subdev);
// do not explicitly set the clock to "internal", because this will disable the gpsdo
// do not explicitly set the clock to "internal", because this will disable the gpsdo
// // lock mboard clocks
// // lock mboard clocks
// s->usrp->set_clock_source("internal");
// s->usrp->set_clock_source("internal");
// set master clock rate and sample rate for tx & rx for streaming
// set master clock rate and sample rate for tx & rx for streaming
s
->
usrp
->
set_master_clock_rate
(
30.72e6
);
s
->
usrp
->
set_master_clock_rate
(
30.72e6
);
}
}
for
(
i
=
0
;
i
<
s
->
usrp
->
get_rx_num_channels
();
i
++
)
{
for
(
i
=
0
;
i
<
s
->
usrp
->
get_rx_num_channels
();
i
++
)
{
if
(
i
<
openair0_cfg
[
0
].
rx_num_channels
)
{
if
(
i
<
openair0_cfg
[
0
].
rx_num_channels
)
{
s
->
usrp
->
set_rx_rate
(
openair0_cfg
[
0
].
sample_rate
,
i
);
s
->
usrp
->
set_rx_rate
(
openair0_cfg
[
0
].
sample_rate
,
i
);
...
@@ -446,10 +445,6 @@ extern "C" {
...
@@ -446,10 +445,6 @@ extern "C" {
s
->
usrp
->
set_time_now
(
uhd
::
time_spec_t
(
0.0
));
s
->
usrp
->
set_time_now
(
uhd
::
time_spec_t
(
0.0
));
for
(
i
=
0
;
i
<
openair0_cfg
[
0
].
rx_num_channels
;
i
++
)
{
for
(
i
=
0
;
i
<
openair0_cfg
[
0
].
rx_num_channels
;
i
++
)
{
if
(
i
<
openair0_cfg
[
0
].
rx_num_channels
)
{
if
(
i
<
openair0_cfg
[
0
].
rx_num_channels
)
{
printf
(
"RX Channel %lu
\n
"
,
i
);
printf
(
"RX Channel %lu
\n
"
,
i
);
...
@@ -462,7 +457,6 @@ extern "C" {
...
@@ -462,7 +457,6 @@ extern "C" {
}
}
for
(
i
=
0
;
i
<
openair0_cfg
[
0
].
tx_num_channels
;
i
++
)
{
for
(
i
=
0
;
i
<
openair0_cfg
[
0
].
tx_num_channels
;
i
++
)
{
if
(
i
<
openair0_cfg
[
0
].
tx_num_channels
)
{
if
(
i
<
openair0_cfg
[
0
].
tx_num_channels
)
{
printf
(
"TX Channel %lu
\n
"
,
i
);
printf
(
"TX Channel %lu
\n
"
,
i
);
std
::
cout
<<
std
::
endl
<<
boost
::
format
(
"Actual TX sample rate: %fMSps..."
)
%
(
s
->
usrp
->
get_tx_rate
(
i
)
/
1e6
)
<<
std
::
endl
;
std
::
cout
<<
std
::
endl
<<
boost
::
format
(
"Actual TX sample rate: %fMSps..."
)
%
(
s
->
usrp
->
get_tx_rate
(
i
)
/
1e6
)
<<
std
::
endl
;
...
@@ -496,7 +490,7 @@ extern "C" {
...
@@ -496,7 +490,7 @@ extern "C" {
s->tx_forward_nsamps = 90;
s->tx_forward_nsamps = 90;
if(is_equal(s->sample_rate, (double)7.68e6))
if(is_equal(s->sample_rate, (double)7.68e6))
s->tx_forward_nsamps = 50;*/
s->tx_forward_nsamps = 50;*/
/* move device specific parameters from lte-softmodem.c here */
/* move device specific parameters from lte-softmodem.c here */
if
(
is_equal
(
s
->
sample_rate
,
(
double
)
30.72e6
))
{
if
(
is_equal
(
s
->
sample_rate
,
(
double
)
30.72e6
))
{
openair0_cfg
->
tx_delay
=
8
;
openair0_cfg
->
tx_delay
=
8
;
s
->
tx_forward_nsamps
=
175
;
s
->
tx_forward_nsamps
=
175
;
...
@@ -522,5 +516,5 @@ extern "C" {
...
@@ -522,5 +516,5 @@ extern "C" {
printf
(
"check params %d:%d"
,
openair0_cfg
->
tx_forward_nsamps
,
openair0_cfg
->
tx_delay
);
printf
(
"check params %d:%d"
,
openair0_cfg
->
tx_forward_nsamps
,
openair0_cfg
->
tx_delay
);
return
0
;
return
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