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
wangjie
OpenXG-RAN
Commits
b70b2ac4
Commit
b70b2ac4
authored
8 years ago
by
Sandeep Kumar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add openair0 device to eNB struct and per CC_id changes
parent
981655cc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
49 additions
and
28 deletions
+49
-28
openair1/PHY/defs.h
openair1/PHY/defs.h
+7
-0
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-softmodem.c
+42
-28
No files found.
openair1/PHY/defs.h
View file @
b70b2ac4
...
...
@@ -139,6 +139,8 @@ static inline void* malloc16_clear( size_t size )
#include "PHY/LTE_TRANSPORT/defs.h"
#include <pthread.h>
#include "targets/ARCH/COMMON/common_lib.h"
#define NUM_DCI_MAX 32
#define NUMBER_OF_eNB_SECTORS_MAX 3
...
...
@@ -456,6 +458,11 @@ typedef struct PHY_VARS_eNB_s {
SLIST_HEAD
(
ral_thresholds_gen_poll_enb_s
,
ral_threshold_phy_t
)
ral_thresholds_gen_polled
[
RAL_LINK_PARAM_GEN_MAX
];
SLIST_HEAD
(
ral_thresholds_lte_poll_enb_s
,
ral_threshold_phy_t
)
ral_thresholds_lte_polled
[
RAL_LINK_PARAM_LTE_MAX
];
#endif
/// RF and Interface devices per CC
openair0_device
rfdevice
;
openair0_device
ifdevice
;
// *** Handle spatially distributed MIMO antenna ports
}
PHY_VARS_eNB
;
...
...
This diff is collapsed.
Click to expand it.
targets/RT/USER/lte-softmodem.c
View file @
b70b2ac4
...
...
@@ -152,8 +152,6 @@ int sync_var=-1; //!< protected by mutex \ref sync_mutex.
static
pthread_t
forms_thread
;
//xforms
#endif
openair0_device
openair0
;
uint16_t
runtime_phy_rx
[
29
][
6
];
// SISO [MCS 0-28][RBs 0-5 : 6, 15, 25, 50, 75, 100]
uint16_t
runtime_phy_tx
[
29
][
6
];
// SISO [MCS 0-28][RBs 0-5 : 6, 15, 25, 50, 75, 100]
...
...
@@ -1580,14 +1578,26 @@ int main( int argc, char **argv )
}
LOG_I
(
HW
,
"CPU Affinity of main() function is... %s
\n
"
,
cpu_affinity
);
#endif
openair0_cfg
[
0
].
log_level
=
glog_level
;
for
(
CC_id
=
0
;
CC_id
<
MAX_NUM_CCs
;
CC_id
++
)
{
PHY_vars_eNB_g
[
0
][
CC_id
]
->
rfdevice
.
host_type
=
BBU_HOST
;
PHY_vars_eNB_g
[
0
][
CC_id
]
->
rfdevice
.
type
=
NONE_DEV
;
PHY_vars_eNB_g
[
0
][
CC_id
]
->
rfdevice
.
transp_type
=
NONE_TP
;
PHY_vars_eNB_g
[
0
][
CC_id
]
->
ifdevice
.
host_type
=
BBU_HOST
;
PHY_vars_eNB_g
[
0
][
CC_id
]
->
ifdevice
.
type
=
NONE_DEV
;
PHY_vars_eNB_g
[
0
][
CC_id
]
->
ifdevice
.
transp_type
=
NONE_TP
;
}
/* device host type is set*/
openair0
.
host_type
=
BBU_HOST
;
//
openair0.host_type = BBU_HOST;
/* device type is initialized NONE_DEV (no RF device) when the RF device will be initiated device type will be set */
openair0
.
type
=
NONE_DEV
;
//
openair0.type = NONE_DEV;
/* transport type is initialized NONE_TP (no transport protocol) when the transport protocol will be initiated transport protocol type will be set */
openair0
.
transp_type
=
NONE_TP
;
openair0_cfg
[
0
].
log_level
=
glog_level
;
//
openair0.transp_type = NONE_TP;
//
openair0_cfg[0].log_level = glog_level;
// Legacy BBU - RRH init
//int returns=-1;
...
...
@@ -1619,36 +1629,40 @@ int main( int argc, char **argv )
//printf("Done\n");
int
returns
=-
1
;
// Handle spatially distributed MIMO antenna ports
// Load RF device and initialize
if
(
node_function
==
eNodeB_3GPP
||
node_function
==
NGFI_RRU_IF4
)
{
if
(
mode
!=
loop_through_memory
)
{
returns
=
openair0_device_load
(
&
openair0
,
&
openair0_cfg
[
0
]);
printf
(
"openair0_device_init returns %d
\n
"
,
returns
);
if
(
returns
<
0
)
{
printf
(
"Exiting, cannot initialize device
\n
"
);
exit
(
-
1
);
for
(
CC_id
=
0
;
CC_id
<
MAX_NUM_CCs
;
CC_id
++
)
{
if
(
mode
!=
loop_through_memory
)
{
returns
=
openair0_device_load
(
&
(
PHY_vars_eNB_g
[
0
][
CC_id
]
->
rfdevice
),
&
openair0_cfg
[
0
]);
printf
(
"openair0_device_init returns %d for CC_id %d
\n
"
,
returns
,
CC_id
);
if
(
returns
<
0
)
{
printf
(
"Exiting, cannot initialize device
\n
"
);
exit
(
-
1
);
}
}
}
else
if
(
mode
==
loop_through_memory
)
{
else
if
(
mode
==
loop_through_memory
)
{
}
}
}
// Load transport protocol and initialize
if
(
node_function
==
NGFI_RCC_IF4
||
node_function
==
NGFI_RRU_IF4
){
if
(
mode
!=
loop_through_memory
)
{
returns
=
openair0_transport_load
(
&
openair0
,
&
openair0_cfg
[
0
],
eth_params
);
printf
(
"openair0_transport_init returns %d
\n
"
,
returns
);
if
(
returns
<
0
)
{
printf
(
"Exiting, cannot initialize transport protocol
\n
"
);
exit
(
-
1
);
for
(
CC_id
=
0
;
CC_id
<
MAX_NUM_CCs
;
CC_id
++
)
{
if
(
mode
!=
loop_through_memory
)
{
returns
=
openair0_transport_load
(
&
(
PHY_vars_eNB_g
[
0
][
CC_id
]
->
ifdevice
),
&
openair0_cfg
[
0
],
(
eth_params
+
CC_id
));
printf
(
"openair0_transport_init returns %d for CC_id %d
\n
"
,
returns
,
CC_id
);
if
(
returns
<
0
)
{
printf
(
"Exiting, cannot initialize transport protocol
\n
"
);
exit
(
-
1
);
}
}
else
if
(
mode
==
loop_through_memory
)
{
}
}
else
if
(
mode
==
loop_through_memory
)
{
}
}
printf
(
"Done
\n
"
);
printf
(
"Done
initializing RF and IF devices
\n
"
);
mac_xface
=
malloc
(
sizeof
(
MAC_xface
));
...
...
@@ -1819,7 +1833,7 @@ int main( int argc, char **argv )
// *** Handle per CC_id openair0
#ifndef USRP_DEBUG
if
((
UE_flag
==
1
)
&&
(
mode
!=
loop_through_memory
))
if
(
openair0
.
trx_start_func
(
&
openair0
)
!=
0
)
...
...
@@ -1889,7 +1903,7 @@ int main( int argc, char **argv )
pthread_cond_destroy
(
&
sync_cond
);
pthread_mutex_destroy
(
&
sync_mutex
);
// *** Handle per CC_id openair0
openair0
.
trx_end_func
(
&
openair0
);
if
(
ouput_vcd
)
...
...
This diff is collapsed.
Click to expand it.
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