Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
oai
openairinterface5G
Commits
abe0d39d
Commit
abe0d39d
authored
Apr 20, 2016
by
Rohit Gupta
Browse files
fix conflicts after merge from develop
parents
23efd459
b4d650e4
Changes
1
Hide whitespace changes
Inline
Side-by-side
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
View file @
abe0d39d
...
...
@@ -598,10 +598,10 @@ extern "C" {
openair0_cfg
[
0
].
rx_gain_calib_table
=
calib_table_b210_38
;
bw_gain_adjust
=
1
;
}
switch
((
int
)
openair0_cfg
[
0
].
sample_rate
)
{
case
30720000
:
s
->
usrp
->
set_master_clock_rate
(
30.72e6
);
// from usrp_time_offset
openair0_cfg
[
0
].
samples_per_packet
=
4096
;
openair0_cfg
[
0
].
tx_sample_advance
=
115
;
openair0_cfg
[
0
].
tx_bw
=
20e6
;
...
...
@@ -625,7 +625,6 @@ extern "C" {
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
=
80
;
openair0_cfg
[
0
].
tx_bw
=
20e6
;
...
...
@@ -636,8 +635,8 @@ extern "C" {
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
=
1.25
e6
;
openair0_cfg
[
0
].
rx_bw
=
1.25
e6
;
openair0_cfg
[
0
].
tx_bw
=
20
e6
;
openair0_cfg
[
0
].
rx_bw
=
20
e6
;
openair0_cfg
[
0
].
tx_scheduling_advance
=
8
*
openair0_cfg
[
0
].
samples_per_packet
;
break
;
default:
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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