From ba088e27b054ddec8e5ec05f53da113f92c2be07 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Wed, 29 Jun 2011 21:16:28 -0700
Subject: b100: got b100 into the properties tree like usrp2

---
 host/lib/usrp/cores/time64_core_200.cpp | 6 +++---
 host/lib/usrp/cores/time64_core_200.hpp | 2 +-
 host/lib/usrp/cores/wb_iface.hpp        | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'host/lib/usrp/cores')

diff --git a/host/lib/usrp/cores/time64_core_200.cpp b/host/lib/usrp/cores/time64_core_200.cpp
index 772a2a2bb..1edfef8a1 100644
--- a/host/lib/usrp/cores/time64_core_200.cpp
+++ b/host/lib/usrp/cores/time64_core_200.cpp
@@ -64,9 +64,9 @@ public:
 
     uhd::time_spec_t get_time_now(void){
         for (size_t i = 0; i < 3; i++){ //special algorithm because we cant read 64 bits synchronously
-            const boost::uint32_t secs = _iface->peek32(_readback_bases.rb_secs_imm);
-            const boost::uint32_t ticks = _iface->peek32(_readback_bases.rb_ticks_imm);
-            if (secs != _iface->peek32(_readback_bases.rb_secs_imm)) continue;
+            const boost::uint32_t secs = _iface->peek32(_readback_bases.rb_secs_now);
+            const boost::uint32_t ticks = _iface->peek32(_readback_bases.rb_ticks_now);
+            if (secs != _iface->peek32(_readback_bases.rb_secs_now)) continue;
             return time_spec_t(secs, ticks, _tick_rate);
         }
         throw uhd::runtime_error("time64_core_200: get time now timeout");
diff --git a/host/lib/usrp/cores/time64_core_200.hpp b/host/lib/usrp/cores/time64_core_200.hpp
index 4145d1f93..ebd51a02f 100644
--- a/host/lib/usrp/cores/time64_core_200.hpp
+++ b/host/lib/usrp/cores/time64_core_200.hpp
@@ -31,7 +31,7 @@ public:
     typedef boost::shared_ptr<time64_core_200> sptr;
 
     struct readback_bases_type{
-        size_t rb_secs_imm, rb_ticks_imm;
+        size_t rb_secs_now, rb_ticks_now;
         size_t rb_secs_pps, rb_ticks_pps;
     };
 
diff --git a/host/lib/usrp/cores/wb_iface.hpp b/host/lib/usrp/cores/wb_iface.hpp
index 8a873e5dc..982594b21 100644
--- a/host/lib/usrp/cores/wb_iface.hpp
+++ b/host/lib/usrp/cores/wb_iface.hpp
@@ -20,10 +20,9 @@
 
 #include <uhd/config.hpp>
 #include <boost/cstdint.hpp>
-#include <boost/utility.hpp>
 #include <boost/shared_ptr.hpp>
 
-class wb_iface : boost::noncopyable{
+class wb_iface{
 public:
     typedef boost::shared_ptr<wb_iface> sptr;
     typedef boost::uint32_t wb_addr_type;
-- 
cgit v1.2.3