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
Michael Black
OpenXG-RAN
Commits
3a1874a1
Commit
3a1874a1
authored
Feb 08, 2016
by
Aikaterini
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add openair0_cgf params in device libraries for tx triggering and IQ samples shift
parent
2fbbbdf0
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
13 deletions
+19
-13
targets/ARCH/BLADERF/USERSPACE/LIB/bladerf_lib.c
targets/ARCH/BLADERF/USERSPACE/LIB/bladerf_lib.c
+4
-4
targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
+4
-4
targets/ARCH/EXMIMO/USERSPACE/LIB/openair0_lib.c
targets/ARCH/EXMIMO/USERSPACE/LIB/openair0_lib.c
+7
-1
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
+4
-4
No files found.
targets/ARCH/BLADERF/USERSPACE/LIB/bladerf_lib.c
View file @
3a1874a1
...
@@ -829,10 +829,10 @@ int openair0_dev_init_bladerf(openair0_device *device, openair0_config_t *openai
...
@@ -829,10 +829,10 @@ int openair0_dev_init_bladerf(openair0_device *device, openair0_config_t *openai
brf_state_t
*
brf
=
(
brf_state_t
*
)
malloc
(
sizeof
(
brf_state_t
));
brf_state_t
*
brf
=
(
brf_state_t
*
)
malloc
(
sizeof
(
brf_state_t
));
memset
(
brf
,
0
,
sizeof
(
brf_state_t
));
memset
(
brf
,
0
,
sizeof
(
brf_state_t
));
/* device specific */
/* device specific */
openair0_cfg
->
txlaunch_wait
=
1
;
openair0_cfg
->
txlaunch_wait
=
1
;
//manage when TX processing is triggered
openair0_cfg
->
txlaunch_wait_slotcount
=
1
;
/
* device specific */
openair0_cfg
->
txlaunch_wait_slotcount
=
1
;
/
/manage when TX processing is triggered
openair0_cfg
->
iq_txshift
=
5
;
openair0_cfg
->
iq_txshift
=
0
;
// shift
openair0_cfg
->
iq_rxrescale
=
15
;
openair0_cfg
->
iq_rxrescale
=
15
;
//rescale iqs
// init required params
// init required params
switch
((
int
)
openair0_cfg
->
sample_rate
)
{
switch
((
int
)
openair0_cfg
->
sample_rate
)
{
...
...
targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
View file @
3a1874a1
...
@@ -374,10 +374,10 @@ int transport_init(openair0_device *device, openair0_config_t *openair0_cfg, eth
...
@@ -374,10 +374,10 @@ int transport_init(openair0_device *device, openair0_config_t *openair0_cfg, eth
device
->
priv
=
eth
;
device
->
priv
=
eth
;
/* device specific */
/* device specific */
openair0_cfg
[
0
].
iq_txshift
=
5
;
openair0_cfg
[
0
].
txlaunch_wait
=
0
;
//manage when TX processing is triggered
openair0_cfg
[
0
].
iq_rxrescale
=
15
;
openair0_cfg
[
0
].
txlaunch_wait_slotcount
=
0
;
//manage when TX processing is triggered
openair0_cfg
[
0
].
txlaunch_wait
=
0
;
openair0_cfg
[
0
].
iq_txshift
=
5
;
// shift
openair0_cfg
[
0
].
txlaunch_wait_slotcount
=
0
;
openair0_cfg
[
0
].
iq_rxrescale
=
15
;
//rescale iqs
/* RRH does not have any information to make this configuration atm */
/* RRH does not have any information to make this configuration atm */
if
(
device
->
host_type
==
BBU_HOST
)
{
if
(
device
->
host_type
==
BBU_HOST
)
{
...
...
targets/ARCH/EXMIMO/USERSPACE/LIB/openair0_lib.c
View file @
3a1874a1
...
@@ -247,7 +247,7 @@ int openair0_stop_without_reset(int card)
...
@@ -247,7 +247,7 @@ int openair0_stop_without_reset(int card)
#define MY_RF_MODE (RXEN + TXEN + TXLPFNORM + TXLPFEN + TXLPF25 + RXLPFNORM + RXLPFEN + RXLPF25 + LNA1ON +LNAMax + RFBBNORM + DMAMODE_RX + DMAMODE_TX)
#define MY_RF_MODE (RXEN + TXEN + TXLPFNORM + TXLPFEN + TXLPF25 + RXLPFNORM + RXLPFEN + RXLPF25 + LNA1ON +LNAMax + RFBBNORM + DMAMODE_RX + DMAMODE_TX)
#define RF_MODE_BASE (LNA1ON + RFBBNORM)
#define RF_MODE_BASE (LNA1ON + RFBBNORM)
int
device_init
(
openair0_device
*
device
,
openair0_config_t
*
openair0_cfg
,
char
*
cfgfile
)
{
int
device_init
(
openair0_device
*
device
,
openair0_config_t
*
openair0_cfg
)
{
// Initialize card
// Initialize card
// exmimo_config_t *p_exmimo_config;
// exmimo_config_t *p_exmimo_config;
...
@@ -325,6 +325,12 @@ int openair0_config(openair0_config_t *openair0_cfg, int UE_flag)
...
@@ -325,6 +325,12 @@ int openair0_config(openair0_config_t *openair0_cfg, int UE_flag)
else
else
p_exmimo_config
->
framing
.
multicard_syncmode
=
SYNCMODE_SLAVE
;
p_exmimo_config
->
framing
.
multicard_syncmode
=
SYNCMODE_SLAVE
;
/* device specific */
openair0_cfg
[
card
].
txlaunch_wait
=
1
;
//manage when TX processing is triggered
openair0_cfg
[
card
].
txlaunch_wait_slotcount
=
1
;
//manage when TX processing is triggered
openair0_cfg
[
card
].
iq_txshift
=
4
;
//shift
openair0_cfg
[
card
].
iq_rxrescale
=
15
;
//rescale iqs
if
(
openair0_cfg
[
card
].
sample_rate
==
30.72e6
)
{
if
(
openair0_cfg
[
card
].
sample_rate
==
30.72e6
)
{
resampling_factor
=
0
;
resampling_factor
=
0
;
rx_filter
=
RXLPF10
;
rx_filter
=
RXLPF10
;
...
...
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
View file @
3a1874a1
...
@@ -555,10 +555,10 @@ extern "C" {
...
@@ -555,10 +555,10 @@ extern "C" {
}
}
/* device specific */
/* device specific */
openair0_cfg
[
0
].
iq_txshift
=
5
;
openair0_cfg
[
0
].
txlaunch_wait
=
1
;
//manage when TX processing is triggered
openair0_cfg
[
0
].
iq_rxrescale
=
15
;
openair0_cfg
[
0
].
txlaunch_wait_slotcount
=
1
;
//manage when TX processing is triggered
openair0_cfg
[
0
].
txlaunch_wait
=
1
;
openair0_cfg
[
0
].
iq_txshift
=
4
;
//shift
openair0_cfg
[
0
].
txlaunch_wait_slotcount
=
1
;
openair0_cfg
[
0
].
iq_rxrescale
=
15
;
//rescale iqs
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
)
{
...
...
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