diff options
Diffstat (limited to 'host/include')
| -rw-r--r-- | host/include/uhd/types/clock_config.hpp | 1 | ||||
| -rw-r--r-- | host/include/uhd/usrp/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | host/include/uhd/usrp/usrp_e.hpp (renamed from host/include/uhd/usrp/usrp1e.hpp) | 26 |
3 files changed, 18 insertions, 11 deletions
diff --git a/host/include/uhd/types/clock_config.hpp b/host/include/uhd/types/clock_config.hpp index 42d74ad90..9342fbb7b 100644 --- a/host/include/uhd/types/clock_config.hpp +++ b/host/include/uhd/types/clock_config.hpp @@ -29,6 +29,7 @@ namespace uhd{ */ struct UHD_API clock_config_t{ enum ref_source_t { + REF_AUTO = 'a', //automatic (device specific) REF_INT = 'i', //internal reference REF_SMA = 's', //external sma port REF_MIMO = 'm' //mimo cable (usrp2 only) diff --git a/host/include/uhd/usrp/CMakeLists.txt b/host/include/uhd/usrp/CMakeLists.txt index 7815a4fb9..c00daaaf0 100644 --- a/host/include/uhd/usrp/CMakeLists.txt +++ b/host/include/uhd/usrp/CMakeLists.txt @@ -31,7 +31,7 @@ INSTALL(FILES dboard_manager.hpp ### usrp headers ### - usrp1e.hpp + usrp_e.hpp usrp2.hpp ### utilities ### diff --git a/host/include/uhd/usrp/usrp1e.hpp b/host/include/uhd/usrp/usrp_e.hpp index cee9dc3d5..557058261 100644 --- a/host/include/uhd/usrp/usrp1e.hpp +++ b/host/include/uhd/usrp/usrp_e.hpp @@ -15,8 +15,8 @@ // along with this program. If not, see <http://www.gnu.org/licenses/>. // -#ifndef INCLUDED_UHD_USRP_USRP1E_HPP -#define INCLUDED_UHD_USRP_USRP1E_HPP +#ifndef INCLUDED_UHD_USRP_USRP_E_HPP +#define INCLUDED_UHD_USRP_USRP_E_HPP #include <uhd/config.hpp> #include <uhd/device.hpp> @@ -24,25 +24,31 @@ namespace uhd{ namespace usrp{ /*! - * The usrp1e device class. + * The USRP-Embedded device class. */ -class UHD_API usrp1e : public device{ +class UHD_API usrp_e : public device{ public: /*! - * Find usrp1e devices on the system via the device node. - * \param hint a device addr with the usrp1e address filled in - * \return a vector of device addresses for all usrp1es found + * Find usrp_e devices on the system via the device node. + * \param hint a device addr with the usrp_e address filled in + * \return a vector of device addresses for all usrp-e's found */ static device_addrs_t find(const device_addr_t &hint); /*! - * Make a usrp1e from a device address. + * Make a usrp_e from a device address. * \param addr the device address - * \return a device sptr to a new usrp1e + * \return a device sptr to a new usrp_e */ static device::sptr make(const device_addr_t &addr); + + /*! + * Load the FPGA with an image file. + * \param bin_file the name of the fpga image file + */ + static void load_fpga(const std::string &bin_file); }; }} //namespace -#endif /* INCLUDED_UHD_USRP_USRP1E_HPP */ +#endif /* INCLUDED_UHD_USRP_USRP_E_HPP */ |