Merge pull request #3536

c77d2bfa Add the possibility to export private view key for fast scan. (cslashm)
100b7bc1 Change mutex lock model to avoid dead lock and ensure locks are always released. (cslashm)
641dfc99 Automatic height setup when creating/restoring hw device. (cslashm)

1 files changed, 27 insertions, 9 deletions

diff --git a/src/device/device.hpp b/src/device/device.hpp
index b47460472..db489ff0c 100644
--- a/src/device/device.hpp
+++ b/src/device/device.hpp
@@ -80,6 +80,9 @@ namespace hw {
 
 
     class device {
+    protected:
+        std::string  name;
+
     public:
 
         device()  {}
@@ -87,12 +90,12 @@ namespace hw {
         virtual ~device()   {}
 
         explicit virtual operator bool() const = 0;
-
-        static const int SIGNATURE_REAL = 0;
-        static const int SIGNATURE_FAKE = 1;
-
-
-        std::string  name;
+        enum device_mode {
+            NONE,
+            TRANSACTION_CREATE_REAL,
+            TRANSACTION_CREATE_FAKE,
+            TRANSACTION_PARSE
+        };
 
         /* ======================================================================= */
         /*                              SETUP/TEARDOWN                             */
@@ -104,7 +107,18 @@ namespace hw {
         virtual bool release() = 0;
 
         virtual bool connect(void) = 0;
-        virtual bool disconnect() = 0;
+        virtual bool disconnect(void) = 0;
+
+        virtual bool  set_mode(device_mode mode) = 0;
+
+
+        /* ======================================================================= */
+        /*  LOCKER                                                                 */
+        /* ======================================================================= */ 
+        virtual void lock(void) = 0;
+        virtual void unlock(void) = 0;
+        virtual bool try_lock(void) = 0;
+
 
         /* ======================================================================= */
         /*                             WALLET & ADDRESS                            */
@@ -158,8 +172,6 @@ namespace hw {
 
         virtual bool  open_tx(crypto::secret_key &tx_key) = 0;
 
-        virtual bool  set_signature_mode(unsigned int sig_mode) = 0;
-
         virtual bool  encrypt_payment_id(crypto::hash8 &payment_id, const crypto::public_key &public_key, const crypto::secret_key &secret_key) = 0;
         bool  decrypt_payment_id(crypto::hash8 &payment_id, const crypto::public_key &public_key, const crypto::secret_key &secret_key)
         {
@@ -183,6 +195,12 @@ namespace hw {
         virtual bool  close_tx(void) = 0;
     } ;
 
+    struct reset_mode {
+        device& hwref;
+        reset_mode(hw::device& dev) : hwref(dev) { }
+        ~reset_mode() { hwref.set_mode(hw::device::NONE);}
+    };
+
     device& get_device(const std::string device_descriptor) ;
 }