summaryrefslogtreecommitdiffstats
path: root/utils/regtools
diff options
context:
space:
mode:
authorAmaury Pouly <amaury.pouly@gmail.com>2014-10-22 17:51:41 +0200
committerAmaury Pouly <amaury.pouly@gmail.com>2014-12-15 22:54:05 +0100
commit04e798eddf43c81685324e83a655e62434f6fcce (patch)
treeef1ffe2ae33c8b356643c58de8e81745f3c0011b /utils/regtools
parent6cb861137d40c91782042764c591ceb995f345fa (diff)
downloadrockbox-04e798eddf43c81685324e83a655e62434f6fcce.tar.gz
rockbox-04e798eddf43c81685324e83a655e62434f6fcce.tar.bz2
rockbox-04e798eddf43c81685324e83a655e62434f6fcce.zip
regtools/qeditor: fix backend dump bug, be more correct on read
Change-Id: I581c033435f553f092b61144c4b68b05ab931dd8 Reviewed-on: http://gerrit.rockbox.org/1019 Reviewed-by: Amaury Pouly <amaury.pouly@gmail.com>
Diffstat (limited to 'utils/regtools')
-rw-r--r--utils/regtools/qeditor/backend.cpp7
-rw-r--r--utils/regtools/qeditor/qeditor.pro2
2 files changed, 5 insertions, 4 deletions
diff --git a/utils/regtools/qeditor/backend.cpp b/utils/regtools/qeditor/backend.cpp
index e9d7941ab1..7091a0c77f 100644
--- a/utils/regtools/qeditor/backend.cpp
+++ b/utils/regtools/qeditor/backend.cpp
@@ -116,9 +116,10 @@ RamIoBackend::RamIoBackend(const QString& soc_name)
bool RamIoBackend::ReadRegister(const QString& name, soc_word_t& value)
{
- if(m_map.find(name) == m_map.end())
+ QMap<QString, soc_word_t>::const_iterator it = m_map.find(name);
+ if(it == m_map.end())
return false;
- value = m_map[name];
+ value = it.value();
return true;
}
@@ -617,7 +618,7 @@ bool BackendHelper::DumpAllRegisters(IoBackend *backend, bool ignore_errors)
if(!ignore_errors)
return false;
}
- if(!bh.WriteRegister(devname, regname, val))
+ else if(!bh.WriteRegister(devname, regname, val))
{
ret = false;
if(!ignore_errors)
diff --git a/utils/regtools/qeditor/qeditor.pro b/utils/regtools/qeditor/qeditor.pro
index 3cf0148971..78a984bbce 100644
--- a/utils/regtools/qeditor/qeditor.pro
+++ b/utils/regtools/qeditor/qeditor.pro
@@ -7,7 +7,7 @@ SOURCES += main.cpp mainwindow.cpp regtab.cpp backend.cpp analyser.cpp \
LIBS += -L../lib/ -lsocdesc -lxml2
INCLUDEPATH += ../lib/ ../../hwstub/lib
-VERSION = 2.0.1
+VERSION = 2.0.2
DEFINES += APP_VERSION=\\\"$$VERSION\\\"