diff options
| author | Josh Blum <josh@joshknows.com> | 2011-01-17 15:21:11 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-01-17 15:21:11 -0800 |
| commit | 7e1d02710090c2c1aac971e41a2abb6f68c37d12 (patch) | |
| tree | 9c3261ac3eebde988030a80f976e68d49516ac65 /host/lib/usrp/usrp1/usrp1_impl.cpp | |
| parent | caa911aa270ee4aef7244f3159b9fd402a454069 (diff) | |
| parent | d71344091b324266975b58ec075d896fcb79aeb9 (diff) | |
| download | uhd-7e1d02710090c2c1aac971e41a2abb6f68c37d12.tar.gz uhd-7e1d02710090c2c1aac971e41a2abb6f68c37d12.tar.bz2 uhd-7e1d02710090c2c1aac971e41a2abb6f68c37d12.zip | |
Merge branch 'usrp1' into next
Diffstat (limited to 'host/lib/usrp/usrp1/usrp1_impl.cpp')
| -rw-r--r-- | host/lib/usrp/usrp1/usrp1_impl.cpp | 8 |
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()); |