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
c0096f36
Commit
c0096f36
authored
Dec 01, 2015
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed compilation issues with UHD
parent
8c048ee9
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
22 deletions
+21
-22
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
+19
-19
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-softmodem.c
+0
-1
targets/RT/USER/lte-ue.c
targets/RT/USER/lte-ue.c
+2
-2
No files found.
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
View file @
c0096f36
...
...
@@ -405,27 +405,27 @@ int openair0_dev_init_usrp(openair0_device* device, openair0_config_t *openair0_
openair0_cfg
[
0
].
rx_gain_calib_table
=
calib_table_x310
;
switch
(
openair0_cfg
[
0
].
sample_rate
)
{
case
30
.72e6
:
switch
(
(
int
)
openair0_cfg
[
0
].
sample_rate
)
{
case
30
720000
:
// from usrp_time_offset
openair0_cfg
[
0
].
samples_per_packet
=
2048
;
openair0_cfg
[
0
].
tx_sample_advance
=
15
;
openair0_cfg
[
0
].
tx_scheduling_advance
=
8
*
openair0_cfg
[
card
].
samples_per_packet
;
openair0_cfg
[
0
].
tx_scheduling_advance
=
8
*
openair0_cfg
[
0
].
samples_per_packet
;
break
;
case
15
.36e6
:
case
15
360000
:
openair0_cfg
[
0
].
samples_per_packet
=
2048
;
openair0_cfg
[
0
].
tx_sample_advance
=
45
;
openair0_cfg
[
0
].
tx_scheduling_advance
=
5
*
openair0_cfg
[
card
].
samples_per_packet
;
openair0_cfg
[
0
].
tx_scheduling_advance
=
5
*
openair0_cfg
[
0
].
samples_per_packet
;
break
;
case
7
.6e6
:
case
7
680000
:
openair0_cfg
[
0
].
samples_per_packet
=
1024
;
openair0_cfg
[
0
].
tx_sample_advance
=
50
;
openair0_cfg
[
0
].
tx_scheduling_advance
=
5
*
openair0_cfg
[
card
].
samples_per_packet
;
openair0_cfg
[
0
].
tx_scheduling_advance
=
5
*
openair0_cfg
[
0
].
samples_per_packet
;
break
;
case
1
.92e6
:
case
1
920000
:
openair0_cfg
[
0
].
samples_per_packet
=
256
;
openair0_cfg
[
0
].
tx_sample_advance
=
50
;
openair0_cfg
[
0
].
tx_scheduling_advance
=
8
*
openair0_cfg
[
card
].
samples_per_packet
;
openair0_cfg
[
0
].
tx_scheduling_advance
=
8
*
openair0_cfg
[
0
].
samples_per_packet
;
break
;
default:
printf
(
"Error: unknown sampling rate %f
\n
"
,
openair0_cfg
[
0
].
sample_rate
);
...
...
@@ -445,32 +445,32 @@ int openair0_dev_init_usrp(openair0_device* device, openair0_config_t *openair0_
// s->usrp->set_clock_source("internal");
// set master clock rate and sample rate for tx & rx for streaming
device
->
type
=
USRP_B200_IF
device
->
type
=
USRP_B200_IF
;
s
->
usrp
->
set_master_clock_rate
(
30.72e6
);
openair0_cfg
[
0
].
rx_gain_calib_table
=
calib_table_b210
;
switch
(
openair0_cfg
[
0
].
sample_rate
)
{
case
30
.72e6
:
switch
(
(
int
)
openair0_cfg
[
0
].
sample_rate
)
{
case
30
720000
:
// from usrp_time_offset
openair0_cfg
[
0
].
samples_per_packet
=
2048
;
openair0_cfg
[
0
].
tx_sample_advance
=
175
;
openair0_cfg
[
0
].
tx_scheduling_advance
=
8
*
openair0_cfg
[
card
].
samples_per_packet
;
openair0_cfg
[
0
].
tx_scheduling_advance
=
8
*
openair0_cfg
[
0
].
samples_per_packet
;
break
;
case
15
.36e6
:
case
15
360000
:
openair0_cfg
[
0
].
samples_per_packet
=
2048
;
openair0_cfg
[
0
].
tx_sample_advance
=
95
;
openair0_cfg
[
0
].
tx_scheduling_advance
=
5
*
openair0_cfg
[
card
].
samples_per_packet
;
openair0_cfg
[
0
].
tx_scheduling_advance
=
5
*
openair0_cfg
[
0
].
samples_per_packet
;
break
;
case
7
.6e6
:
case
7
680000
:
openair0_cfg
[
0
].
samples_per_packet
=
1024
;
openair0_cfg
[
0
].
tx_sample_advance
=
70
;
openair0_cfg
[
0
].
tx_scheduling_advance
=
5
*
openair0_cfg
[
card
].
samples_per_packet
;
openair0_cfg
[
0
].
tx_scheduling_advance
=
5
*
openair0_cfg
[
0
].
samples_per_packet
;
break
;
case
1
.92e6
:
case
1
920000
:
openair0_cfg
[
0
].
samples_per_packet
=
256
;
openair0_cfg
[
0
].
tx_sample_advance
=
40
;
openair0_cfg
[
0
].
tx_scheduling_advance
=
8
*
openair0_cfg
[
card
].
samples_per_packet
;
openair0_cfg
[
0
].
tx_scheduling_advance
=
8
*
openair0_cfg
[
0
].
samples_per_packet
;
break
;
default:
printf
(
"Error: unknown sampling rate %f
\n
"
,
openair0_cfg
[
0
].
sample_rate
);
...
...
targets/RT/USER/lte-softmodem.c
View file @
c0096f36
...
...
@@ -1632,7 +1632,6 @@ static void* eNB_thread( void* arg )
#ifndef EXMIMO
spp
=
openair0_cfg
[
0
].
samples_per_packet
;
tx_pos
=
openair0_cfg
[
0
].
tx_scheduling_advance
;
tx_advance
=
openair0_cfg
[
0
].
tx_sample_advance
;
#endif
while
(
!
oai_exit
)
{
...
...
targets/RT/USER/lte-ue.c
View file @
c0096f36
...
...
@@ -1003,7 +1003,7 @@ void *UE_thread(void *arg)
static
int
UE_thread_retval
;
PHY_VARS_UE
*
UE
=
PHY_vars_UE_g
[
0
][
0
];
int
spp
=
openair0_cfg
[
0
].
samples_per_packet
;
int
slot
=
1
,
frame
=
0
,
hw_subframe
=
0
,
rxpos
=
0
,
txpos
=
spp
*
openair0_cfg
[
0
].
tx_
delay
;
int
slot
=
1
,
frame
=
0
,
hw_subframe
=
0
,
rxpos
=
0
,
txpos
=
spp
*
openair0_cfg
[
0
].
tx_
scheduling_advance
;
#ifdef __AVX2__
int
dummy
[
2
][
spp
]
__attribute__
((
aligned
(
32
)));
#else
...
...
@@ -1128,7 +1128,7 @@ void *UE_thread(void *arg)
txp
[
i
]
=
(
void
*
)
&
txdata
[
i
][
txpos
];
openair0
.
trx_write_func
(
&
openair0
,
(
timestamp
+
spp
*
openair0_cfg
[
0
].
tx_
delay
-
openair0_cfg
[
0
].
tx_forward_nsamps
),
(
timestamp
+
spp
*
openair0_cfg
[
0
].
tx_
scheduling_advance
-
openair0_cfg
[
0
].
tx_sample_advance
),
txp
,
spp
-
((
first_rx
==
1
)
?
rx_off_diff
:
0
),
UE
->
lte_frame_parms
.
nb_antennas_tx
,
...
...
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