Commit 0340ec53 authored by Rohit Gupta's avatar Rohit Gupta

fixes for EXMIMO as it is not harmonized with dynamic library linking of HW targets

parent b8dde7ba
...@@ -137,6 +137,10 @@ int load_lib(openair0_device *device, openair0_config_t *openair0_cfg, eth_param ...@@ -137,6 +137,10 @@ int load_lib(openair0_device *device, openair0_config_t *openair0_cfg, eth_param
int openair0_device_load(openair0_device *device, openair0_config_t *openair0_cfg) { int openair0_device_load(openair0_device *device, openair0_config_t *openair0_cfg) {
int rc; int rc;
//ToDo: EXMIMO harmonization is not complete. That is the reason for this ifdef
#ifdef EXMIMO
device_init(device, openair0_cfg);
#else
rc=load_lib(device, openair0_cfg, NULL,BBU_LOCAL_RADIO_HEAD ); rc=load_lib(device, openair0_cfg, NULL,BBU_LOCAL_RADIO_HEAD );
if ( rc >= 0) { if ( rc >= 0) {
if ( set_device(device) < 0) { if ( set_device(device) < 0) {
...@@ -144,16 +148,12 @@ int openair0_device_load(openair0_device *device, openair0_config_t *openair0_cf ...@@ -144,16 +148,12 @@ int openair0_device_load(openair0_device *device, openair0_config_t *openair0_cf
return -1; return -1;
} }
} }
#endif
return 0; return 0;
} }
int openair0_transport_load(openair0_device *device, openair0_config_t *openair0_cfg, eth_params_t * eth_params) { int openair0_transport_load(openair0_device *device, openair0_config_t *openair0_cfg, eth_params_t * eth_params) {
int rc; int rc;
//ToDo: EXMIMO library is still not harmonized with rest of HW Targets (USRP, BladeRF).
if (device->type != EXMIMO_DEV)
{
rc=load_lib(device, openair0_cfg, eth_params, BBU_REMOTE_RADIO_HEAD); rc=load_lib(device, openair0_cfg, eth_params, BBU_REMOTE_RADIO_HEAD);
if ( rc >= 0) { if ( rc >= 0) {
if ( set_transport(device) < 0) { if ( set_transport(device) < 0) {
...@@ -161,11 +161,6 @@ int openair0_transport_load(openair0_device *device, openair0_config_t *openair0 ...@@ -161,11 +161,6 @@ int openair0_transport_load(openair0_device *device, openair0_config_t *openair0
return -1; return -1;
} }
} }
}
else
{
device_init(device, openair0_cfg);
}
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment