Skip to content

O
OpenXG-RAN
Commit 21c6624f authored by frtabu's avatar frtabu
Browse files
Options

cleanup in CMakelist.txt and build_oai

parent 2d74da01
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
targets/ARCH/USRP/USERSPACE/LIB/usrp_liblte.cpp
View file @ 21c6624f
...@@ -293,8 +293,6 @@ static int sync_to_gps(openair0_device *device) { ...@@ -293,8 +293,6 @@ static int sync_to_gps(openair0_device *device) {
char config_hlp_sf_rdelay[] = CONFIG_HLP_SF_RDELAY; char config_hlp_sf_rdelay[] = CONFIG_HLP_SF_RDELAY;
char config_opt_sf_wdelay[] = CONFIG_OPT_SF_WDELAY; char config_opt_sf_wdelay[] = CONFIG_OPT_SF_WDELAY;
char config_hlp_sf_wdelay[] = CONFIG_HLP_SF_WDELAY; char config_hlp_sf_wdelay[] = CONFIG_HLP_SF_WDELAY;
#endif #endif
/*! \brief Called to start the USRP transceiver. Return 0 if OK, < 0 if error /*! \brief Called to start the USRP transceiver. Return 0 if OK, < 0 if error
...@@ -441,7 +439,6 @@ static int trx_usrp_write(openair0_device *device, openair0_timestamp timestamp, ...@@ -441,7 +439,6 @@ static int trx_usrp_write(openair0_device *device, openair0_timestamp timestamp,
#endif #endif
usrp_state_t *s = (usrp_state_t *)device->priv; usrp_state_t *s = (usrp_state_t *)device->priv;
int nsamps2; // aligned to upper 32 or 16 byte boundary int nsamps2; // aligned to upper 32 or 16 byte boundary
#if defined(__x86_64) || defined(__i386__) #if defined(__x86_64) || defined(__i386__)
#ifdef __AVX2__ #ifdef __AVX2__
nsamps2 = (nsamps+7)>>3; nsamps2 = (nsamps+7)>>3;
...@@ -1062,6 +1059,7 @@ extern "C" { ...@@ -1062,6 +1059,7 @@ extern "C" {
LOG_I(PHY,"Checking for USRPs : UHD %s (%d.%d.%d)\n", LOG_I(PHY,"Checking for USRPs : UHD %s (%d.%d.%d)\n",
uhd::get_version_string().c_str(),vers,subvers,subsubvers); uhd::get_version_string().c_str(),vers,subvers,subsubvers);
std::string args; std::string args;
if (openair0_cfg[0].sdr_addrs == NULL) { if (openair0_cfg[0].sdr_addrs == NULL) {
args = "type=b200"; args = "type=b200";
} else { } else {
...@@ -1090,6 +1088,7 @@ extern "C" { ...@@ -1090,6 +1088,7 @@ extern "C" {
args += boost::str(boost::format(",master_clock_rate=%f") % usrp_master_clock); args += boost::str(boost::format(",master_clock_rate=%f") % usrp_master_clock);
args += ",num_send_frames=256,num_recv_frames=256, send_frame_size=7680, recv_frame_size=7680" ; args += ",num_send_frames=256,num_recv_frames=256, send_frame_size=7680, recv_frame_size=7680" ;
} }
if (device_adds[0].get("type") == "n3xx") { if (device_adds[0].get("type") == "n3xx") {
printf("Found USRP n300\n"); printf("Found USRP n300\n");
device->type=USRP_X300_DEV; //treat it as X300 for now device->type=USRP_X300_DEV; //treat it as X300 for now
...@@ -1114,6 +1113,7 @@ extern "C" { ...@@ -1114,6 +1113,7 @@ extern "C" {
s->usrp->set_clock_source("external"); s->usrp->set_clock_source("external");
printf("Setting clock source to external\n"); printf("Setting clock source to external\n");
} }
if (device->type==USRP_X300_DEV) { if (device->type==USRP_X300_DEV) {
openair0_cfg[0].rx_gain_calib_table = calib_table_x310; openair0_cfg[0].rx_gain_calib_table = calib_table_x310;
#if defined(USRP_REC_PLAY) #if defined(USRP_REC_PLAY)
......
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