diff options
| author | Ashish Chaudhari <ashish@ettus.com> | 2015-09-13 00:42:51 -0700 |
|---|---|---|
| committer | Ashish Chaudhari <ashish@ettus.com> | 2015-09-16 17:21:52 -0700 |
| commit | 07de40c04b6c2ab3fb6470eaea539a6dbea8884f (patch) | |
| tree | 12cd86a5d80036fa49d470df510e81888be8e739 /host/lib/usrp/b200 | |
| parent | 28fa5a1283649c526305a899ee83a88b8ba9a4bd (diff) | |
| download | uhd-07de40c04b6c2ab3fb6470eaea539a6dbea8884f.tar.gz uhd-07de40c04b6c2ab3fb6470eaea539a6dbea8884f.tar.bz2 uhd-07de40c04b6c2ab3fb6470eaea539a6dbea8884f.zip | |
usrp3: Added support for pre-FIFO TX flowcontrol
- tx_vita_core_3000 can now monitor for flow-control immediately
before the radio or immediately before the radio external FIFO
- B200 does not have an external FIFO so it will use the default config
Diffstat (limited to 'host/lib/usrp/b200')
| -rw-r--r-- | host/lib/usrp/b200/b200_impl.cpp | 3 | ||||
| -rw-r--r-- | host/lib/usrp/b200/b200_io_impl.cpp | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/host/lib/usrp/b200/b200_impl.cpp b/host/lib/usrp/b200/b200_impl.cpp index ffce08567..f8baf240a 100644 --- a/host/lib/usrp/b200/b200_impl.cpp +++ b/host/lib/usrp/b200/b200_impl.cpp @@ -760,7 +760,7 @@ void b200_impl::setup_radio(const size_t dspno) perif.ddc->set_link_rate(10e9/8); //whatever perif.ddc->set_mux("IQ", false, dspno == 1 ? true : false, dspno == 1 ? true : false); perif.ddc->set_freq(rx_dsp_core_3000::DEFAULT_CORDIC_FREQ); - perif.deframer = tx_vita_core_3000::make(perif.ctrl, TOREG(SR_TX_CTRL)); + perif.deframer = tx_vita_core_3000::make_no_radio_buff(perif.ctrl, TOREG(SR_TX_CTRL)); perif.duc = tx_dsp_core_3000::make(perif.ctrl, TOREG(SR_TX_DSP)); perif.duc->set_link_rate(10e9/8); //whatever perif.duc->set_freq(tx_dsp_core_3000::DEFAULT_CORDIC_FREQ); @@ -792,7 +792,6 @@ void b200_impl::setup_radio(const size_t dspno) // create tx dsp control objects //////////////////////////////////////////////////////////////////// _tree->access<double>(mb_path / "tick_rate") - .subscribe(boost::bind(&tx_vita_core_3000::set_tick_rate, perif.deframer, _1)) .subscribe(boost::bind(&tx_dsp_core_3000::set_tick_rate, perif.duc, _1)); const fs_path tx_dsp_path = mb_path / "tx_dsps" / dspno; perif.duc->populate_subtree(_tree->subtree(tx_dsp_path)); diff --git a/host/lib/usrp/b200/b200_io_impl.cpp b/host/lib/usrp/b200/b200_io_impl.cpp index 7fcd04823..41b4b8a74 100644 --- a/host/lib/usrp/b200/b200_io_impl.cpp +++ b/host/lib/usrp/b200/b200_io_impl.cpp @@ -159,7 +159,6 @@ void b200_impl::update_tick_rate(const double new_tick_rate) boost::shared_ptr<sph::send_packet_streamer> my_streamer = boost::dynamic_pointer_cast<sph::send_packet_streamer>(perif.tx_streamer.lock()); if (my_streamer) my_streamer->set_tick_rate(new_tick_rate); - perif.deframer->set_tick_rate(new_tick_rate); } } |