From 2a54fa56e135c84eade7fb75e5c3459b11c64704 Mon Sep 17 00:00:00 2001 From: Raymond Knopp Date: Sun, 22 Feb 2015 17:51:20 +0000 Subject: [PATCH] git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6597 818b1a75-f10b-46b9-bf7c-635c3b92a50f --- targets/ARCH/COMMON/common_lib.h | 2 +- targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp | 39 +++++++++++-------- .../CONF/enb.band39.tm1.usrpb210.conf | 10 ++--- targets/RT/USER/Makefile | 6 ++- targets/RT/USER/lte-softmodem.c | 2 +- targets/RT/USER/lte-ue.c | 19 +++++---- 6 files changed, 46 insertions(+), 32 deletions(-) diff --git a/targets/ARCH/COMMON/common_lib.h b/targets/ARCH/COMMON/common_lib.h index ccd1ce6a9c..c6ab458dc8 100644 --- a/targets/ARCH/COMMON/common_lib.h +++ b/targets/ARCH/COMMON/common_lib.h @@ -44,7 +44,7 @@ typedef struct openair0_device_t openair0_device; #define MAX_CARDS 1 #endif -#define USRP_GAIN_OFFSET (82.0) // 82 calibrated for USRP B210 @ 2.6 GHz +#define USRP_GAIN_OFFSET (65.0) // 82 calibrated for USRP B210 @ 2.6 GHz typedef enum { max_gain=0,med_gain,byp_gain diff --git a/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp b/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp index 42ab4b8dab..d81e83164b 100644 --- a/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp +++ b/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp @@ -93,11 +93,11 @@ static int trx_usrp_start(openair0_device *device) // init recv and send streaming uhd::stream_cmd_t cmd(uhd::stream_cmd_t::STREAM_MODE_START_CONTINUOUS); - cmd.time_spec = s->usrp->get_time_now() + uhd::time_spec_t(0.01); + cmd.time_spec = s->usrp->get_time_now() + uhd::time_spec_t(0.05); cmd.stream_now = false; // start at constant delay s->rx_stream->issue_stream_cmd(cmd); - s->tx_md.time_spec = s->usrp->get_time_now() + uhd::time_spec_t(1-(double)s->tx_forward_nsamps/s->sample_rate); + s->tx_md.time_spec = cmd.time_spec + uhd::time_spec_t(1-(double)s->tx_forward_nsamps/s->sample_rate); s->tx_md.has_time_spec = true; s->tx_md.start_of_burst = true; s->tx_md.end_of_burst = false; @@ -144,7 +144,7 @@ static int trx_usrp_read(openair0_device *device, openair0_timestamp *ptimestamp usrp_state_t *s = (usrp_state_t*)device->priv; - int samples_received,i; + int samples_received=0,i; if (cc>1) { std::vector buff_ptrs; @@ -154,6 +154,10 @@ static int trx_usrp_read(openair0_device *device, openair0_timestamp *ptimestamp else samples_received = s->rx_stream->recv(buff[0], nsamps, s->rx_md); + if (samples_received < nsamps) { + printf("[recv] received %d samples out of %d\n",samples_received,nsamps); + + } //handle the error code switch(s->rx_md.error_code){ case uhd::rx_metadata_t::ERROR_CODE_NONE: @@ -232,12 +236,9 @@ int openair0_device_init(openair0_device* device, openair0_config_t *openair0_cf memset(s, 0, sizeof(usrp_state_t)); // Initialize USRP device -/* thomas 26.01.205*/ -// std::string args = "type=b200"; + std::string args = "type=b200"; - /* std::string rx_subdev = "A:A A:B"; - std::string tx_subdev = "A:A A:B";*/ uhd::device_addrs_t device_adds = uhd::device::find(args); size_t i; @@ -309,25 +310,31 @@ int openair0_device_init(openair0_device* device, openair0_config_t *openair0_cf } + // display USRP settings + std::cout << boost::format("Actual master clock: %fMHz...") % (s->usrp->get_master_clock_rate()/1e6) << std::endl; // create tx & rx streamer uhd::stream_args_t stream_args_rx("sc16", "sc16"); - //stream_args_rx.args["spp"] = str(boost::format("%d") % (openair0_cfg[0].samples_per_packet)); - - uhd::stream_args_t stream_args_tx("sc16", "sc16"); - //stream_args_tx.args["spp"] = str(boost::format("%d") % (openair0_cfg[0].samples_per_packet)); + //stream_args_rx.args["spp"] = str(boost::format("%d") % 2048);//(openair0_cfg[0].rx_num_channels*openair0_cfg[0].samples_per_packet)); for (i = 0; irx_stream = s->usrp->get_rx_stream(stream_args_rx); + std::cout << boost::format("rx_max_num_samps %u") % (s->rx_stream->get_max_num_samps()) << std::endl; + //openair0_cfg[0].samples_per_packet = s->rx_stream->get_max_num_samps(); + + uhd::stream_args_t stream_args_tx("sc16", "sc16"); + //stream_args_tx.args["spp"] = str(boost::format("%d") % 2048);//(openair0_cfg[0].tx_num_channels*openair0_cfg[0].samples_per_packet)); for (i = 0; itx_stream = s->usrp->get_tx_stream(stream_args_tx); - s->rx_stream = s->usrp->get_rx_stream(stream_args_rx); + std::cout << boost::format("tx_max_num_samps %u") % (s->tx_stream->get_max_num_samps()) << std::endl; + s->usrp->set_time_now(uhd::time_spec_t(0.0)); - // display USRP settings - std::cout << boost::format("Actual master clock: %fMHz...") % (s->usrp->get_master_clock_rate()/1e6) << std::endl << std::endl; + + + for (i=0;i= downlink_frequency[0][0])) { for (card=0;cardmacphy_exit("No cell synchronization found, abandoning"); } else { - LOG_I(PHY,"[initial_sync] trying carrier off %d Hz, rxgain %d\n",openair_daq_vars.freq_offset, - UE->rx_total_gain_dB); + LOG_I(PHY,"[initial_sync] trying carrier off %d Hz, rxgain %d (DL %u, UL %u)\n",openair_daq_vars.freq_offset, + UE->rx_total_gain_dB, + downlink_frequency[0][0]+openair_daq_vars.freq_offset, + downlink_frequency[0][0]+uplink_frequency_offset[0][0]+openair_daq_vars.freq_offset); for (card=0;cardlte_frame_parms.nb_antennas_rx;i++) rxp[i] = (dummy_dump==0) ? (void*)&rxdata[i][rxpos] : (void*)dummy[i]; - // printf("rxpos %d, hw_subframe %d, dummy_dump %d (asking %d)\n",rxpos,hw_subframe,dummy_dump,spp - ((first_rx==1) ? rx_off_diff : 0)); rxs = openair0.trx_read_func(&openair0, ×tamp, rxp, @@ -945,8 +947,9 @@ void *UE_thread(void *arg) { #endif UE->rx_offset=0; } - else if ((UE->rx_offset < RX_OFF_MIN)&&(start_rx_stream==1)) { - // rx_off_diff = -UE->rx_offset + RX_OFF_MIN; + else if ((UE->rx_offset < RX_OFF_MIN)&&(start_rx_stream==1) && (rx_correction_timer == 0)) { + rx_off_diff = -UE->rx_offset + RX_OFF_MIN; + rx_correction_timer = 5; } else if ((UE->rx_offset > (FRAME_LENGTH_COMPLEX_SAMPLES-RX_OFF_MAX)) &&(start_rx_stream==1) && (rx_correction_timer == 0)) { rx_off_diff = FRAME_LENGTH_COMPLEX_SAMPLES-UE->rx_offset; @@ -954,7 +957,7 @@ void *UE_thread(void *arg) { } if (rx_correction_timer>0) rx_correction_timer--; - // LOG_D(PHY,"HW RESYNC: hw_frame %d: Correction: rx_off_diff %d (timer %d)\n",frame,rx_off_diff,rx_correction_timer); + // LOG_D(PHY,"HW RESYNC: hw_frame %d: (rx_offset %d) Correction: rx_off_diff %d (timer %d)\n",frame,UE->rx_offset,rx_off_diff,rx_correction_timer); } dummy_dump=0; }