diff options
| author | Nicholas Corgan <nick.corgan@ettus.com> | 2012-11-16 16:04:26 -0800 |
|---|---|---|
| committer | Nicholas Corgan <nick.corgan@ettus.com> | 2012-11-16 16:04:26 -0800 |
| commit | eaadc6e89a6bc99e5c1006c7d2aabc1dd7934178 (patch) | |
| tree | 84afd7a5c5d3c58d90999bad7478ea9e0b02a646 /host/lib/usrp/common | |
| parent | 3d01dec1aba85bb9fe936cbb1ca653a82961e181 (diff) | |
| parent | 011f63d19d6c614666ba7ee145b0685d36a8a0de (diff) | |
| download | uhd-eaadc6e89a6bc99e5c1006c7d2aabc1dd7934178.tar.gz uhd-eaadc6e89a6bc99e5c1006c7d2aabc1dd7934178.tar.bz2 uhd-eaadc6e89a6bc99e5c1006c7d2aabc1dd7934178.zip | |
Merge branch 'maint34' into maint
Conflicts:
host/lib/usrp/b100/b100_impl.cpp
host/lib/usrp/usrp1/usrp1_impl.hpp
Diffstat (limited to 'host/lib/usrp/common')
| -rw-r--r-- | host/lib/usrp/common/fx2_ctrl.cpp | 3 | ||||
| -rw-r--r-- | host/lib/usrp/common/fx2_ctrl.hpp | 19 |
2 files changed, 19 insertions, 3 deletions
diff --git a/host/lib/usrp/common/fx2_ctrl.cpp b/host/lib/usrp/common/fx2_ctrl.cpp index 5cc701eb0..93303542e 100644 --- a/host/lib/usrp/common/fx2_ctrl.cpp +++ b/host/lib/usrp/common/fx2_ctrl.cpp @@ -1,5 +1,5 @@ // -// Copyright 2010-2011 Ettus Research LLC +// Copyright 2010-2012 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -16,7 +16,6 @@ // #include "fx2_ctrl.hpp" -#include "usrp_commands.h" #include <uhd/utils/msg.hpp> #include <uhd/exception.hpp> #include <uhd/transport/usb_control.hpp> diff --git a/host/lib/usrp/common/fx2_ctrl.hpp b/host/lib/usrp/common/fx2_ctrl.hpp index f2e060862..9f8cec296 100644 --- a/host/lib/usrp/common/fx2_ctrl.hpp +++ b/host/lib/usrp/common/fx2_ctrl.hpp @@ -1,5 +1,5 @@ // -// Copyright 2010-2011 Ettus Research LLC +// Copyright 2010-2012 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -23,6 +23,23 @@ #include <boost/shared_ptr.hpp> #include <boost/utility.hpp> +#define FL_BEGIN 0 +#define FL_END 2 +#define FL_XFER 1 +#define USRP_HASH_SLOT_0_ADDR 0xe1e0 +#define USRP_HASH_SLOT_1_ADDR 0xe1f0 +#define VRQ_FPGA_LOAD 0x02 +#define VRQ_FPGA_SET_RESET 0x04 +#define VRQ_FPGA_SET_TX_ENABLE 0x05 +#define VRQ_FPGA_SET_RX_ENABLE 0x06 +#define VRQ_FPGA_SET_TX_RESET 0x0a +#define VRQ_FPGA_SET_RX_RESET 0x0b +#define VRQ_I2C_READ 0x81 +#define VRQ_I2C_WRITE 0x08 +#define VRQ_SET_LED 0x01 +#define VRT_VENDOR_IN 0xC0 +#define VRT_VENDOR_OUT 0x40 + namespace uhd{ namespace usrp{ class fx2_ctrl : boost::noncopyable, public uhd::i2c_iface{ |