aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/usrp1/usrp1_impl.cpp
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2011-01-17 15:18:46 -0800
committerJosh Blum <josh@joshknows.com>2011-01-17 15:18:46 -0800
commitd71344091b324266975b58ec075d896fcb79aeb9 (patch)
tree33f2204ece9261f63ebe3a68c1d1d0f0faf2a307 /host/lib/usrp/usrp1/usrp1_impl.cpp
parent81dc70a6217f3d35dcf477a44c0151a6bc56e5a9 (diff)
downloaduhd-d71344091b324266975b58ec075d896fcb79aeb9.tar.gz
uhd-d71344091b324266975b58ec075d896fcb79aeb9.tar.bz2
uhd-d71344091b324266975b58ec075d896fcb79aeb9.zip
usrp1: work on usrp1 hardware compat with the api
today we added shutoff the DAC when not transmitting using EOB as an indicator added various other features and cleaned up code for soft time control
Diffstat (limited to 'host/lib/usrp/usrp1/usrp1_impl.cpp')
-rw-r--r--host/lib/usrp/usrp1/usrp1_impl.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/host/lib/usrp/usrp1/usrp1_impl.cpp b/host/lib/usrp/usrp1/usrp1_impl.cpp
index 04a199928..c395db0b9 100644
--- a/host/lib/usrp/usrp1/usrp1_impl.cpp
+++ b/host/lib/usrp/usrp1/usrp1_impl.cpp
@@ -139,6 +139,7 @@ static device::sptr usrp1_make(const device_addr_t &device_addr){
usb_control::sptr ctrl_transport = usb_control::make(handle);
usrp_ctrl::sptr usrp_ctrl = usrp_ctrl::make(ctrl_transport);
usrp_ctrl->usrp_load_fpga(usrp1_fpga_image);
+ usrp_ctrl->usrp_init();
usb_zero_copy::sptr data_transport = usb_zero_copy::make(
handle, // identifier
6, // IN endpoint
@@ -161,10 +162,6 @@ usrp1_impl::usrp1_impl(uhd::transport::usb_zero_copy::sptr data_transport,
usrp_ctrl::sptr ctrl_transport)
: _data_transport(data_transport), _ctrl_transport(ctrl_transport)
{
- _soft_time_ctrl = soft_time_ctrl::make(
- boost::bind(&usrp1_impl::stream_on_off, this, _1)
- );
-
_iface = usrp1_iface::make(ctrl_transport);
//create clock interface
@@ -196,9 +193,6 @@ usrp1_impl::usrp1_impl(uhd::transport::usb_zero_copy::sptr data_transport,
//initialize the send/recv
io_init();
- //turn on the transmitter
- _ctrl_transport->usrp_tx_enable(true);
-
//init the subdev specs
this->mboard_set(MBOARD_PROP_RX_SUBDEV_SPEC, subdev_spec_t());
this->mboard_set(MBOARD_PROP_TX_SUBDEV_SPEC, subdev_spec_t());