From 9065043544dd129e16d7bb30ae8cb8d5562c3326 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Tue, 17 May 2011 15:12:02 -0700 Subject: usrp2: moved register map into #defines, entries for new dsp frontend also fixes irq rb --- host/lib/usrp/usrp2/usrp2_iface.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'host/lib/usrp/usrp2/usrp2_iface.cpp') diff --git a/host/lib/usrp/usrp2/usrp2_iface.cpp b/host/lib/usrp/usrp2/usrp2_iface.cpp index 2d80f145a..5e197d1f9 100644 --- a/host/lib/usrp/usrp2/usrp2_iface.cpp +++ b/host/lib/usrp/usrp2/usrp2_iface.cpp @@ -97,7 +97,6 @@ public: _protocol_compat = ntohl(ctrl_data.proto_ver); mb_eeprom = mboard_eeprom_t(*this, mboard_eeprom_t::MAP_N100); - regs = usrp2_get_regs(); //reg map identical across all boards } ~usrp2_iface_impl(void){ @@ -123,7 +122,7 @@ public: bool is_device_locked(void){ boost::uint32_t lock_secs = this->get_reg(U2_FW_REG_LOCK_TIME); boost::uint32_t lock_gpid = this->get_reg(U2_FW_REG_LOCK_GPID); - boost::uint32_t curr_secs = this->peek32(this->regs.time64_secs_rb_imm); + boost::uint32_t curr_secs = this->peek32(U2_REG_TIME64_SECS_RB_IMM); //if the difference is larger, assume not locked anymore if (curr_secs - lock_secs >= 3) return false; @@ -139,7 +138,7 @@ public: this->get_reg(U2_FW_REG_LOCK_GPID, boost::uint32_t(get_gpid())); while(true){ //re-lock in loop - boost::uint32_t curr_secs = this->peek32(this->regs.time64_secs_rb_imm); + boost::uint32_t curr_secs = this->peek32(U2_REG_TIME64_SECS_RB_IMM); this->get_reg(U2_FW_REG_LOCK_TIME, curr_secs); //sleep for a bit boost::this_thread::sleep(boost::posix_time::milliseconds(1500)); -- cgit v1.2.3