diff options
| author | Nick Foster <nick@nerdnetworks.org> | 2010-11-10 12:02:28 -0800 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2010-11-10 12:02:28 -0800 |
| commit | 8fe1e7b29aacce7f75ae36e81706bbde02749b97 (patch) | |
| tree | a3f99967174c5a8b4ec6cb38118d1adc5671d7d7 /host/lib/usrp/usrp2/usrp2_regs.cpp | |
| parent | 53412938fe7c851591026ef4c25233806f4f27a3 (diff) | |
| download | uhd-8fe1e7b29aacce7f75ae36e81706bbde02749b97.tar.gz uhd-8fe1e7b29aacce7f75ae36e81706bbde02749b97.tar.bz2 uhd-8fe1e7b29aacce7f75ae36e81706bbde02749b97.zip | |
2+: moved mboard_rev to usrp2/ in preparation for merging upstream
Diffstat (limited to 'host/lib/usrp/usrp2/usrp2_regs.cpp')
| -rw-r--r-- | host/lib/usrp/usrp2/usrp2_regs.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_regs.cpp b/host/lib/usrp/usrp2/usrp2_regs.cpp index f9b54b76e..0f0360c95 100644 --- a/host/lib/usrp/usrp2/usrp2_regs.cpp +++ b/host/lib/usrp/usrp2/usrp2_regs.cpp @@ -15,14 +15,14 @@ // along with this program. If not, see <http://www.gnu.org/licenses/>. // -#include <uhd/usrp/mboard_rev.hpp> +#include "mboard_rev.hpp" #include "usrp2_regs.hpp" int sr_addr(int misc_output_base, int sr) { return misc_output_base + 4 * sr; } -usrp2_regs_t usrp2_get_regs(uhd::usrp::mboard_rev_t hw_rev) { +usrp2_regs_t usrp2_get_regs(mboard_rev_t hw_rev) { //how about you just make this dependent on hw_rev instead of doing the init before main, and give up the const globals, since the application won't ever need both. const int misc_output_base = (hw_rev.is_usrp2p()) ? USRP2P_MISC_OUTPUT_BASE : USRP2_MISC_OUTPUT_BASE, |