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.hpp | |
| 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.hpp')
| -rw-r--r-- | host/lib/usrp/usrp2/usrp2_regs.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_regs.hpp b/host/lib/usrp/usrp2/usrp2_regs.hpp index bb15ed496..0d68c65c2 100644 --- a/host/lib/usrp/usrp2/usrp2_regs.hpp +++ b/host/lib/usrp/usrp2/usrp2_regs.hpp @@ -18,7 +18,7 @@ #ifndef INCLUDED_USRP2_REGS_HPP #define INCLUDED_USRP2_REGS_HPP -#include <uhd/usrp/mboard_rev.hpp> +#include "mboard_rev.hpp" #define USRP2_MISC_OUTPUT_BASE 0xD400 #define USRP2_GPIO_BASE 0xC800 @@ -30,7 +30,7 @@ #define USRP2P_ATR_BASE 0x3800 #define USRP2P_BP_STATUS_BASE 0x3300 -const uhd::usrp::mboard_rev_t USRP2P_FIRST_HW_REV(0x0A00); +const mboard_rev_t USRP2P_FIRST_HW_REV(0x0A00); typedef struct { int sr_misc; @@ -103,7 +103,7 @@ typedef struct { extern const usrp2_regs_t usrp2_regs; //the register definitions, set in usrp2_regs.cpp and usrp2p_regs.cpp -usrp2_regs_t usrp2_get_regs(uhd::usrp::mboard_rev_t hw_rev); +usrp2_regs_t usrp2_get_regs(mboard_rev_t hw_rev); //////////////////////////////////////////////////// // Settings Bus, Slave #7, Not Byte Addressable! |