diff options
| author | Josh Blum <josh@joshknows.com> | 2011-06-14 15:32:11 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-06-14 15:32:11 -0700 |
| commit | be74968870fcf7288c0ccab9dc27231140cfa665 (patch) | |
| tree | dcc2fd0f61ca74a5417697d0ab4c4a798f3b03ed /host/lib/usrp/usrp1/usrp1_impl.cpp | |
| parent | 9abe8aed3170390c8ab7b855d1d4d322129a7b34 (diff) | |
| download | uhd-be74968870fcf7288c0ccab9dc27231140cfa665.tar.gz uhd-be74968870fcf7288c0ccab9dc27231140cfa665.tar.bz2 uhd-be74968870fcf7288c0ccab9dc27231140cfa665.zip | |
usrp1: moved fx2 control into its own directory
Diffstat (limited to 'host/lib/usrp/usrp1/usrp1_impl.cpp')
| -rw-r--r-- | host/lib/usrp/usrp1/usrp1_impl.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/host/lib/usrp/usrp1/usrp1_impl.cpp b/host/lib/usrp/usrp1/usrp1_impl.cpp index 83ff8ebe2..37955d628 100644 --- a/host/lib/usrp/usrp1/usrp1_impl.cpp +++ b/host/lib/usrp/usrp1/usrp1_impl.cpp @@ -16,7 +16,6 @@ // #include "usrp1_impl.hpp" -#include "usrp1_ctrl.hpp" #include "fpga_regs_standard.h" #include "usrp_spi_defs.h" #include <uhd/utils/log.hpp> @@ -90,7 +89,7 @@ static device_addrs_t usrp1_find(const device_addr_t &hint) try{control = usb_control::make(handle);} catch(const uhd::exception &){continue;} //ignore claimed - usrp_ctrl::make(control)->usrp_load_firmware(usrp1_fw_image); + fx2_ctrl::make(control)->usrp_load_firmware(usrp1_fw_image); } //get descriptors again with serial number, but using the initialized VID/PID now since we have firmware @@ -102,7 +101,7 @@ static device_addrs_t usrp1_find(const device_addr_t &hint) try{control = usb_control::make(handle);} catch(const uhd::exception &){continue;} //ignore claimed - usrp1_iface::sptr iface = usrp1_iface::make(usrp_ctrl::make(control)); + usrp1_iface::sptr iface = usrp1_iface::make(fx2_ctrl::make(control)); device_addr_t new_addr; new_addr["type"] = "usrp1"; new_addr["name"] = iface->mb_eeprom["name"]; @@ -147,7 +146,7 @@ static device::sptr usrp1_make(const device_addr_t &device_addr){ //create control objects and a data transport usb_control::sptr ctrl_transport = usb_control::make(handle); - usrp_ctrl::sptr usrp_ctrl = usrp_ctrl::make(ctrl_transport); + fx2_ctrl::sptr usrp_ctrl = fx2_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( @@ -169,7 +168,7 @@ UHD_STATIC_BLOCK(register_usrp1_device){ * Structors **********************************************************************/ usrp1_impl::usrp1_impl(uhd::transport::usb_zero_copy::sptr data_transport, - usrp_ctrl::sptr ctrl_transport) + uhd::usrp::fx2_ctrl::sptr ctrl_transport) : _data_transport(data_transport), _ctrl_transport(ctrl_transport) { _iface = usrp1_iface::make(ctrl_transport); |