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
OpenXG
OpenXG UE
Commits
d1b83e68
Commit
d1b83e68
authored
Jan 24, 2020
by
Raphael Defosseux
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/uhd_priority_set_cleanup' into develop_integration_2020_w04
parents
e1b3f62d
f5d26ed4
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
0 additions
and
28 deletions
+0
-28
executables/nr-ru.c
executables/nr-ru.c
+0
-7
targets/ARCH/BLADERF/USERSPACE/LIB/bladerf_lib.c
targets/ARCH/BLADERF/USERSPACE/LIB/bladerf_lib.c
+0
-1
targets/ARCH/COMMON/common_lib.h
targets/ARCH/COMMON/common_lib.h
+0
-4
targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
+0
-1
targets/ARCH/LMSSDR/USERSPACE/LIB/lms_lib.cpp
targets/ARCH/LMSSDR/USERSPACE/LIB/lms_lib.cpp
+0
-1
targets/ARCH/LMSSDR/USERSPACE/LIB/sodera_lib.cpp
targets/ARCH/LMSSDR/USERSPACE/LIB/sodera_lib.cpp
+0
-1
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
+0
-11
targets/ARCH/tcp_bridge/tcp_bridge.c
targets/ARCH/tcp_bridge/tcp_bridge.c
+0
-1
targets/ARCH/tcp_bridge/tcp_bridge_oai.c
targets/ARCH/tcp_bridge/tcp_bridge_oai.c
+0
-1
No files found.
executables/nr-ru.c
View file @
d1b83e68
...
@@ -1250,13 +1250,6 @@ static void *ru_thread_tx( void *param ) {
...
@@ -1250,13 +1250,6 @@ static void *ru_thread_tx( void *param ) {
wait_on_condition
(
&
proc
->
mutex_FH1
,
&
proc
->
cond_FH1
,
&
proc
->
instance_cnt_FH1
,
"ru_thread_tx"
);
wait_on_condition
(
&
proc
->
mutex_FH1
,
&
proc
->
cond_FH1
,
&
proc
->
instance_cnt_FH1
,
"ru_thread_tx"
);
printf
(
"ru_thread_tx ready
\n
"
);
printf
(
"ru_thread_tx ready
\n
"
);
if
(
ru
->
rfdevice
.
uhd_set_thread_priority
!=
NULL
)
{
LOG_I
(
PHY
,
"set ru_thread_tx uhd priority
\n
"
);
ru
->
rfdevice
.
uhd_set_thread_priority
();
}
while
(
!
oai_exit
)
{
while
(
!
oai_exit
)
{
LOG_D
(
PHY
,
"ru_thread_tx: Waiting for TX processing
\n
"
);
LOG_D
(
PHY
,
"ru_thread_tx: Waiting for TX processing
\n
"
);
...
...
targets/ARCH/BLADERF/USERSPACE/LIB/bladerf_lib.c
View file @
d1b83e68
...
@@ -1147,7 +1147,6 @@ int device_init(openair0_device *device,
...
@@ -1147,7 +1147,6 @@ int device_init(openair0_device *device,
device
->
trx_set_gains_func
=
trx_brf_set_gains
;
device
->
trx_set_gains_func
=
trx_brf_set_gains
;
device
->
openair0_cfg
=
openair0_cfg
;
device
->
openair0_cfg
=
openair0_cfg
;
device
->
priv
=
(
void
*
)
brf
;
device
->
priv
=
(
void
*
)
brf
;
device
->
uhd_set_thread_priority
=
NULL
;
calibrate_rf
(
device
);
calibrate_rf
(
device
);
...
...
targets/ARCH/COMMON/common_lib.h
View file @
d1b83e68
...
@@ -400,10 +400,6 @@ struct openair0_device_t {
...
@@ -400,10 +400,6 @@ struct openair0_device_t {
* \param arg pointer to capabilities or configuration
* \param arg pointer to capabilities or configuration
*/
*/
void
(
*
configure_rru
)(
int
idx
,
void
*
arg
);
void
(
*
configure_rru
)(
int
idx
,
void
*
arg
);
/*! \brief set UHD thread priority
*/
void
(
*
uhd_set_thread_priority
)(
void
);
};
};
/* type of device init function, implemented in shared lib */
/* type of device init function, implemented in shared lib */
...
...
targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
View file @
d1b83e68
...
@@ -417,7 +417,6 @@ int transport_init(openair0_device *device,
...
@@ -417,7 +417,6 @@ int transport_init(openair0_device *device,
device
->
trx_stop_func
=
trx_eth_stop
;
device
->
trx_stop_func
=
trx_eth_stop
;
device
->
trx_set_freq_func
=
trx_eth_set_freq
;
device
->
trx_set_freq_func
=
trx_eth_set_freq
;
device
->
trx_set_gains_func
=
trx_eth_set_gains
;
device
->
trx_set_gains_func
=
trx_eth_set_gains
;
device
->
uhd_set_thread_priority
=
NULL
;
if
(
eth
->
flags
==
ETH_RAW_MODE
)
{
if
(
eth
->
flags
==
ETH_RAW_MODE
)
{
device
->
trx_write_func
=
trx_eth_write_raw
;
device
->
trx_write_func
=
trx_eth_write_raw
;
...
...
targets/ARCH/LMSSDR/USERSPACE/LIB/lms_lib.cpp
View file @
d1b83e68
...
@@ -405,7 +405,6 @@ int device_init(openair0_device *device, openair0_config_t *openair0_cfg){
...
@@ -405,7 +405,6 @@ int device_init(openair0_device *device, openair0_config_t *openair0_cfg){
device
->
trx_stop_func
=
trx_lms_stop
;
device
->
trx_stop_func
=
trx_lms_stop
;
device
->
trx_set_freq_func
=
trx_lms_set_freq
;
device
->
trx_set_freq_func
=
trx_lms_set_freq
;
device
->
trx_set_gains_func
=
trx_lms_set_gains
;
device
->
trx_set_gains_func
=
trx_lms_set_gains
;
device
->
uhd_set_thread_priority
=
NULL
;
device
->
openair0_cfg
=
openair0_cfg
;
device
->
openair0_cfg
=
openair0_cfg
;
...
...
targets/ARCH/LMSSDR/USERSPACE/LIB/sodera_lib.cpp
View file @
d1b83e68
...
@@ -706,7 +706,6 @@ int openair0_dev_init_sodera(openair0_device* device, openair0_config_t *openair
...
@@ -706,7 +706,6 @@ int openair0_dev_init_sodera(openair0_device* device, openair0_config_t *openair
device
->
trx_stop_func
=
trx_sodera_stop
;
device
->
trx_stop_func
=
trx_sodera_stop
;
device
->
trx_set_freq_func
=
trx_sodera_set_freq
;
device
->
trx_set_freq_func
=
trx_sodera_set_freq
;
device
->
trx_set_gains_func
=
trx_sodera_set_gains
;
device
->
trx_set_gains_func
=
trx_sodera_set_gains
;
device
->
uhd_set_thread_priority
=
NULL
;
s
->
sample_rate
=
openair0_cfg
[
0
].
sample_rate
;
s
->
sample_rate
=
openair0_cfg
[
0
].
sample_rate
;
s
->
channelscount
=
openair0_cfg
[
0
].
rx_num_channels
;
s
->
channelscount
=
openair0_cfg
[
0
].
rx_num_channels
;
...
...
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
View file @
d1b83e68
...
@@ -893,15 +893,6 @@ int trx_usrp_reset_stats(openair0_device *device) {
...
@@ -893,15 +893,6 @@ int trx_usrp_reset_stats(openair0_device *device) {
return
(
0
);
return
(
0
);
}
}
/*! \brief Set uhd priority
*/
static
void
uhd_set_thread_priority
(
void
)
{
uhd
::
set_thread_priority_safe
(
1.0
);
}
void
noop_func
(
void
)
{
return
;
}
extern
"C"
{
extern
"C"
{
int
device_init
(
openair0_device
*
device
,
openair0_config_t
*
openair0_cfg
)
{
int
device_init
(
openair0_device
*
device
,
openair0_config_t
*
openair0_cfg
)
{
LOG_D
(
HW
,
"openair0_cfg[0].sdr_addrs == '%s'
\n
"
,
openair0_cfg
[
0
].
sdr_addrs
);
LOG_D
(
HW
,
"openair0_cfg[0].sdr_addrs == '%s'
\n
"
,
openair0_cfg
[
0
].
sdr_addrs
);
...
@@ -941,7 +932,6 @@ extern "C" {
...
@@ -941,7 +932,6 @@ extern "C" {
set_rx_gain_offset
(
&
openair0_cfg
[
0
],
0
,
bw_gain_adjust
);
set_rx_gain_offset
(
&
openair0_cfg
[
0
],
0
,
bw_gain_adjust
);
device
->
trx_write_func
=
trx_usrp_write_recplay
;
device
->
trx_write_func
=
trx_usrp_write_recplay
;
device
->
trx_read_func
=
trx_usrp_read_recplay
;
device
->
trx_read_func
=
trx_usrp_read_recplay
;
device
->
uhd_set_thread_priority
=
noop_func
;
std
::
cerr
<<
"USRP device initialized in subframes replay mode for "
<<
s
->
recplay_state
->
u_sf_loops
<<
" loops. Use mmap="
std
::
cerr
<<
"USRP device initialized in subframes replay mode for "
<<
s
->
recplay_state
->
u_sf_loops
<<
" loops. Use mmap="
<<
s
->
recplay_state
->
use_mmap
<<
std
::
endl
;
<<
s
->
recplay_state
->
use_mmap
<<
std
::
endl
;
}
else
{
}
else
{
...
@@ -1294,7 +1284,6 @@ extern "C" {
...
@@ -1294,7 +1284,6 @@ extern "C" {
LOG_I
(
HW
,
"Device timestamp: %f...
\n
"
,
s
->
usrp
->
get_time_now
().
get_real_secs
());
LOG_I
(
HW
,
"Device timestamp: %f...
\n
"
,
s
->
usrp
->
get_time_now
().
get_real_secs
());
device
->
trx_write_func
=
trx_usrp_write
;
device
->
trx_write_func
=
trx_usrp_write
;
device
->
trx_read_func
=
trx_usrp_read
;
device
->
trx_read_func
=
trx_usrp_read
;
device
->
uhd_set_thread_priority
=
uhd_set_thread_priority
;
s
->
sample_rate
=
openair0_cfg
[
0
].
sample_rate
;
s
->
sample_rate
=
openair0_cfg
[
0
].
sample_rate
;
// TODO:
// TODO:
...
...
targets/ARCH/tcp_bridge/tcp_bridge.c
View file @
d1b83e68
...
@@ -267,7 +267,6 @@ int device_init(openair0_device* device, openair0_config_t *openair0_cfg)
...
@@ -267,7 +267,6 @@ int device_init(openair0_device* device, openair0_config_t *openair0_cfg)
device
->
trx_set_gains_func
=
tcp_bridge_set_gains
;
device
->
trx_set_gains_func
=
tcp_bridge_set_gains
;
device
->
trx_write_func
=
tcp_bridge_write
;
device
->
trx_write_func
=
tcp_bridge_write
;
device
->
trx_read_func
=
tcp_bridge_read
;
device
->
trx_read_func
=
tcp_bridge_read
;
device
->
uhd_set_thread_priority
=
NULL
;
device
->
priv
=
tcp_bridge
;
device
->
priv
=
tcp_bridge
;
...
...
targets/ARCH/tcp_bridge/tcp_bridge_oai.c
View file @
d1b83e68
...
@@ -413,7 +413,6 @@ int device_init(openair0_device *device, openair0_config_t *openair0_cfg) {
...
@@ -413,7 +413,6 @@ int device_init(openair0_device *device, openair0_config_t *openair0_cfg) {
device
->
trx_set_freq_func
=
tcp_bridge_set_freq
;
device
->
trx_set_freq_func
=
tcp_bridge_set_freq
;
device
->
trx_set_gains_func
=
tcp_bridge_set_gains
;
device
->
trx_set_gains_func
=
tcp_bridge_set_gains
;
device
->
trx_write_func
=
tcp_bridge_write
;
device
->
trx_write_func
=
tcp_bridge_write
;
device
->
uhd_set_thread_priority
=
NULL
;
if
(
tcp_bridge
->
is_enb
)
{
if
(
tcp_bridge
->
is_enb
)
{
device
->
trx_read_func
=
tcp_bridge_read
;
device
->
trx_read_func
=
tcp_bridge_read
;
...
...
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