From bc4d1bf0ca341a72a7d7f6b2168aa3d2e936aabf Mon Sep 17 00:00:00 2001
From: Mark Meserve <mark.meserve@ni.com>
Date: Thu, 23 Mar 2017 14:49:42 -0700
Subject: mpm: Rearchitecture of AD9371 code to use ctrl/device paradigm

---
 mpm/include/mpm/spi/adi_ctrl.hpp | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'mpm/include')

diff --git a/mpm/include/mpm/spi/adi_ctrl.hpp b/mpm/include/mpm/spi/adi_ctrl.hpp
index d3269cecc..7cc87b586 100644
--- a/mpm/include/mpm/spi/adi_ctrl.hpp
+++ b/mpm/include/mpm/spi/adi_ctrl.hpp
@@ -17,15 +17,24 @@
 
 #pragma once
 
-#include <mpm/spi_iface.hpp>
+// TODO: fix path of UHD include
+#include <../../host/include/uhd/types/serial.hpp>
 
-struct mpm_spiSettings_t
+#include <chrono>
+
+struct ad9371_spiSettings_t
 {
-    static mpm_spiSettings_t* make(spiSettings_t *sps) {
-        return reinterpret_cast<mpm_spiSettings_t *>(sps);
+    static ad9371_spiSettings_t* make(spiSettings_t *sps) {
+        return reinterpret_cast<ad9371_spiSettings_t *>(sps);
     }
 
+    explicit ad9371_spiSettings_t(uhd::spi_iface::sptr uhd_iface);
+
+    // spiSetting_t MUST be the first data member so that the
+    // reintrepret_cast in make() works
     spiSettings_t spi_settings;
-    mpm::spi_iface *spi_iface;
+    uhd::spi_iface::sptr spi_iface;
+    std::chrono::time_point<std::chrono::steady_clock> timeout_start;
+    std::chrono::microseconds timeout_duration;
 };
 
-- 
cgit v1.2.3