diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-07-30 12:40:24 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-08-07 10:35:06 -0700 |
| commit | c2827e9a0bcfe9c2dd2e4dd5d68f895384564ec6 (patch) | |
| tree | 2b097f3c838823241d72364a7dc665f9f65f90d8 /host/lib/usrp/x300/x300_impl.hpp | |
| parent | 3a7420fc4ffc246616e53259a3c8d718f9fa7c54 (diff) | |
| download | uhd-c2827e9a0bcfe9c2dd2e4dd5d68f895384564ec6.tar.gz uhd-c2827e9a0bcfe9c2dd2e4dd5d68f895384564ec6.tar.bz2 uhd-c2827e9a0bcfe9c2dd2e4dd5d68f895384564ec6.zip | |
x300, e300: Moved common register names to radio namespace
This preps the code for merging common registers altogether.
Diffstat (limited to 'host/lib/usrp/x300/x300_impl.hpp')
| -rw-r--r-- | host/lib/usrp/x300/x300_impl.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/x300/x300_impl.hpp b/host/lib/usrp/x300/x300_impl.hpp index 20cd4d754..3cec7d5ce 100644 --- a/host/lib/usrp/x300/x300_impl.hpp +++ b/host/lib/usrp/x300/x300_impl.hpp @@ -182,7 +182,7 @@ private: UHD_DEFINE_SOFT_REG_FIELD(ADC_DATA_DLY_VAL, /*width*/ 5, /*shift*/ 4); //[8:4] UHD_DEFINE_SOFT_REG_FIELD(ADC_CHECKER_ENABLED, /*width*/ 1, /*shift*/ 9); //[9] - radio_misc_outs_reg(): uhd::soft_reg32_wo_t(TOREG(SR_MISC_OUTS)) { + radio_misc_outs_reg(): uhd::soft_reg32_wo_t(uhd::usrp::radio::sr_addr(uhd::usrp::radio::MISC_OUTS)) { //Initial values set(DAC_ENABLED, 0); set(DAC_RESET_N, 0); @@ -203,7 +203,7 @@ private: UHD_DEFINE_SOFT_REG_FIELD(ADC_CHECKER1_Q_ERROR, /*width*/ 1, /*shift*/ 6); //[6] UHD_DEFINE_SOFT_REG_FIELD(ADC_CHECKER1_I_ERROR, /*width*/ 1, /*shift*/ 7); //[7] - radio_misc_ins_reg(): uhd::soft_reg32_ro_t(RB32_MISC_INS) { } + radio_misc_ins_reg(): uhd::soft_reg32_ro_t(uhd::usrp::radio::RB32_MISC_INS) { } }; //perifs in the radio core |