diff options
| author | Nicholas Corgan <nick.corgan@ettus.com> | 2012-11-14 14:11:39 -0800 |
|---|---|---|
| committer | Nicholas Corgan <nick.corgan@ettus.com> | 2012-11-16 15:54:09 -0800 |
| commit | 011f63d19d6c614666ba7ee145b0685d36a8a0de (patch) | |
| tree | 4efe7d70216ebbed3bb263246d208679d3ddff06 /host/lib/usrp/b100 | |
| parent | 80933a5602e5d40e138807124df50a4289fe580f (diff) | |
| download | uhd-011f63d19d6c614666ba7ee145b0685d36a8a0de.tar.gz uhd-011f63d19d6c614666ba7ee145b0685d36a8a0de.tar.bz2 uhd-011f63d19d6c614666ba7ee145b0685d36a8a0de.zip | |
lib/cmake: CPack source work
* Removed all host code dependencies on firmware headers
* Put in CMake settings for CPack source
Diffstat (limited to 'host/lib/usrp/b100')
| -rw-r--r-- | host/lib/usrp/b100/b100_impl.cpp | 3 | ||||
| -rw-r--r-- | host/lib/usrp/b100/b100_impl.hpp | 10 | ||||
| -rw-r--r-- | host/lib/usrp/b100/io_impl.cpp | 1 |
3 files changed, 10 insertions, 4 deletions
diff --git a/host/lib/usrp/b100/b100_impl.cpp b/host/lib/usrp/b100/b100_impl.cpp index 991e6efd3..b1d9a577a 100644 --- a/host/lib/usrp/b100/b100_impl.cpp +++ b/host/lib/usrp/b100/b100_impl.cpp @@ -18,9 +18,6 @@ #include "apply_corrections.hpp" #include "b100_impl.hpp" #include "b100_ctrl.hpp" -#include "fpga_regs_standard.h" -#include "usrp_i2c_addr.h" -#include "usrp_commands.h" #include <uhd/transport/usb_control.hpp> #include "ctrl_packet.hpp" #include <uhd/utils/msg.hpp> diff --git a/host/lib/usrp/b100/b100_impl.hpp b/host/lib/usrp/b100/b100_impl.hpp index eab9c750b..82d5a5f53 100644 --- a/host/lib/usrp/b100/b100_impl.hpp +++ b/host/lib/usrp/b100/b100_impl.hpp @@ -54,6 +54,16 @@ static const boost::uint32_t B100_TX_ASYNC_SID = 1; static const double B100_DEFAULT_TICK_RATE = 64e6; static const size_t B100_MAX_PKT_BYTE_LIMIT = 2048; +#define I2C_ADDR_TX_A (I2C_DEV_EEPROM | 0x4) +#define I2C_ADDR_RX_A (I2C_DEV_EEPROM | 0x5) +#define I2C_ADDR_TX_B (I2C_DEV_EEPROM | 0x6) +#define I2C_ADDR_RX_B (I2C_DEV_EEPROM | 0x7) +#define I2C_DEV_EEPROM 0x50 + +#define VRQ_FW_COMPAT 0x83 +#define VRQ_ENABLE_GPIF 0x0d +#define VRQ_CLEAR_FPGA_FIFO 0x0e + //! Make a b100 dboard interface uhd::usrp::dboard_iface::sptr make_b100_dboard_iface( wb_iface::sptr wb_iface, diff --git a/host/lib/usrp/b100/io_impl.cpp b/host/lib/usrp/b100/io_impl.cpp index 674380cca..05d701313 100644 --- a/host/lib/usrp/b100/io_impl.cpp +++ b/host/lib/usrp/b100/io_impl.cpp @@ -20,7 +20,6 @@ #include "async_packet_handler.hpp" #include "../../transport/super_recv_packet_handler.hpp" #include "../../transport/super_send_packet_handler.hpp" -#include "usrp_commands.h" #include "b100_impl.hpp" #include "b100_regs.hpp" #include <uhd/utils/thread_priority.hpp> |