From 6b9610fb908b27d1e0383c8d9bde3a88f35ed30c Mon Sep 17 00:00:00 2001
From: Amaury Pouly <amaury.pouly@gmail.com>
Date: Sat, 6 Feb 2016 15:08:43 +0000
Subject: regtoosl/qeditor: port to the new description format

This big commit port qeditor from v1 to v2 register file format. Although
the display code was much simplified, the edit code had to be rewritten.
The new code also brings many improvement to the register display widget.

The new code also compiles with both Qt4 and Qt5, although it is recommended
to use Qt5 to get some improvements, especially in the layout of editor.

Change-Id: I24633ac37a144f25d9e705b565654269ec9cfbd3
---
 utils/regtools/qeditor/std_analysers.h | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

(limited to 'utils/regtools/qeditor/std_analysers.h')

diff --git a/utils/regtools/qeditor/std_analysers.h b/utils/regtools/qeditor/std_analysers.h
index 54e7b83862..030e010f58 100644
--- a/utils/regtools/qeditor/std_analysers.h
+++ b/utils/regtools/qeditor/std_analysers.h
@@ -35,14 +35,28 @@
 #include <QLineEdit>
 #include "analyser.h"
 
+class AnalyserEx : public Analyser
+{
+public:
+    AnalyserEx(const soc_desc::soc_ref_t& soc, IoBackend *backend);
+protected:
+    bool ReadRegister(const QString& path, soc_word_t& val);
+    bool ReadRegisterOld(const QString& dev, const QString& reg, soc_word_t& val);
+    bool ReadField(const QString& path, const QString& field, soc_word_t& val);
+    bool ReadFieldOld(const QString& dev, const QString& reg, const QString& field,
+        soc_word_t& val);
+
+    BackendHelper m_helper;
+};
+
 /**
  * Clock analyser
  */
 
-class ClockAnalyser : public Analyser
+class ClockAnalyser : public AnalyserEx
 {
 public:
-    ClockAnalyser(const SocRef& soc, IoBackend *backend);
+    ClockAnalyser(const soc_desc::soc_ref_t& soc, IoBackend *backend);
     virtual ~ClockAnalyser();
     virtual QWidget *GetWidget();
     static bool SupportSoc(const QString& soc_name);
@@ -72,11 +86,11 @@ private:
 /**
  * EMI analyser
  */
-class EmiAnalyser : public QObject, public Analyser
+class EmiAnalyser : public QObject, public AnalyserEx
 {
     Q_OBJECT
 public:
-    EmiAnalyser(const SocRef& soc, IoBackend *backend);
+    EmiAnalyser(const soc_desc::soc_ref_t& soc, IoBackend *backend);
     virtual ~EmiAnalyser();
     virtual QWidget *GetWidget();
 
@@ -116,10 +130,10 @@ private:
 /**
  * PINCTRL analyzer
  */
-class PinAnalyser : public Analyser
+class PinAnalyser : public AnalyserEx
 {
 public:
-    PinAnalyser(const SocRef& soc, IoBackend *backend);
+    PinAnalyser(const soc_desc::soc_ref_t& soc, IoBackend *backend);
     virtual ~PinAnalyser();
     virtual QWidget *GetWidget();
 
-- 
cgit v1.2.3