Merge branch 'usrp_e_mmap_b2' of ettus.sourcerepo.com:ettus/uhdpriv into usrp_e

1 files changed, 17 insertions, 8 deletions

diff --git a/host/lib/usrp/usrp1/usrp1_impl.hpp b/host/lib/usrp/usrp1/usrp1_impl.hpp
index c2f693eeb..ff4d40762 100644
--- a/host/lib/usrp/usrp1/usrp1_impl.hpp
+++ b/host/lib/usrp/usrp1/usrp1_impl.hpp
@@ -83,17 +83,18 @@ public:
                 size_t,
                 const uhd::tx_metadata_t &,
                 const uhd::io_type_t &,
-                send_mode_t);
+                send_mode_t, double);
 
     size_t recv(const std::vector<void *> &,
                 size_t, uhd::rx_metadata_t &,
                 const uhd::io_type_t &,
-                recv_mode_t,
-                size_t timeout);
+                recv_mode_t, double);
 
-    size_t get_max_send_samps_per_packet(void) const { return 0; }
-    size_t get_max_recv_samps_per_packet(void) const { return 0; }
-    bool recv_async_msg(uhd::async_metadata_t &, size_t);
+    size_t get_max_send_samps_per_packet(void) const;
+
+    size_t get_max_recv_samps_per_packet(void) const;
+
+    bool recv_async_msg(uhd::async_metadata_t &, double);
 
 private:
     /*!
@@ -179,19 +180,27 @@ private:
     void rx_dsp_init(void);
     void rx_dsp_get(const wax::obj &, wax::obj &);
     void rx_dsp_set(const wax::obj &, const wax::obj &);
-    double _rx_dsp_freq; size_t _rx_dsp_decim;
+    uhd::dict<std::string, double> _rx_dsp_freqs;
+    size_t _rx_dsp_decim;
     wax_obj_proxy::sptr _rx_dsp_proxy;
 
     //tx dsp functions and settings
     void tx_dsp_init(void);
     void tx_dsp_get(const wax::obj &, wax::obj &);
     void tx_dsp_set(const wax::obj &, const wax::obj &);
-    double _tx_dsp_freq; size_t _tx_dsp_interp;
+    uhd::dict<std::string, double> _tx_dsp_freqs;
+    size_t _tx_dsp_interp;
     wax_obj_proxy::sptr _tx_dsp_proxy;
 
     //transports
     uhd::transport::usb_zero_copy::sptr _data_transport;
     usrp_ctrl::sptr _ctrl_transport;
+
+    //capabilities
+    size_t get_num_ducs(void);
+    size_t get_num_ddcs(void);
+    bool has_rx_halfband(void);
+    bool has_tx_halfband(void);
 };
 
 #endif /* INCLUDED_USRP1_IMPL_HPP */