Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
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
lizhongxiao
OpenXG-RAN
Commits
3d03e522
Commit
3d03e522
authored
Jan 12, 2023
by
Florian Kaltenberger
Committed by
Robert Schmidt
Jan 19, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
patch from Robert to fix segfault
parent
9948d972
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
radio/USRP/USERSPACE/LIB/usrp_lib.cpp
radio/USRP/USERSPACE/LIB/usrp_lib.cpp
+4
-4
No files found.
radio/USRP/USERSPACE/LIB/usrp_lib.cpp
View file @
3d03e522
...
@@ -88,7 +88,7 @@ typedef struct {
...
@@ -88,7 +88,7 @@ typedef struct {
int
tx_forward_nsamps
;
//166 for 20Mhz
int
tx_forward_nsamps
;
//166 for 20Mhz
//! gpio bank to use
//! gpio bank to use
std
::
string
gpio_bank
;
char
*
gpio_bank
;
// --------------------------------
// --------------------------------
// Debug and output control
// Debug and output control
...
@@ -271,13 +271,13 @@ static int sync_to_gps(openair0_device *device) {
...
@@ -271,13 +271,13 @@ static int sync_to_gps(openair0_device *device) {
static
int
trx_usrp_start
(
openair0_device
*
device
)
{
static
int
trx_usrp_start
(
openair0_device
*
device
)
{
usrp_state_t
*
s
=
(
usrp_state_t
*
)
device
->
priv
;
usrp_state_t
*
s
=
(
usrp_state_t
*
)
device
->
priv
;
s
->
gpio_bank
=
"FP0"
;
//good for B210, X310 and N310
s
->
gpio_bank
=
(
char
*
)
"FP0"
;
//good for B210, X310 and N310
#if UHD_VERSION>4000000
#if UHD_VERSION>4000000
if
(
device
->
type
==
USRP_X400_DEV
)
{
if
(
device
->
type
==
USRP_X400_DEV
)
{
// Set every pin on GPIO0 to be controlled by DB0_RF0
// Set every pin on GPIO0 to be controlled by DB0_RF0
std
::
vector
<
std
::
string
>
sxx
{
12
,
"DB0_RF0"
};
std
::
vector
<
std
::
string
>
sxx
{
12
,
"DB0_RF0"
};
s
->
gpio_bank
=
"GPIO0"
;
s
->
gpio_bank
=
(
char
*
)
"GPIO0"
;
s
->
usrp
->
set_gpio_src
(
s
->
gpio_bank
,
sxx
);
s
->
usrp
->
set_gpio_src
(
s
->
gpio_bank
,
sxx
);
}
}
#endif
#endif
...
@@ -1001,7 +1001,7 @@ extern "C" {
...
@@ -1001,7 +1001,7 @@ extern "C" {
int
choffset
=
0
;
int
choffset
=
0
;
if
(
device
->
priv
==
NULL
)
{
if
(
device
->
priv
==
NULL
)
{
s
=
(
usrp_state_t
*
)
calloc
(
sizeof
(
usrp_state_t
),
1
);
s
=
(
usrp_state_t
*
)
calloc
(
1
,
sizeof
(
usrp_state_t
)
);
device
->
priv
=
s
;
device
->
priv
=
s
;
AssertFatal
(
s
!=
NULL
,
"USRP device: memory allocation failure
\n
"
);
AssertFatal
(
s
!=
NULL
,
"USRP device: memory allocation failure
\n
"
);
}
else
{
}
else
{
...
...
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