diff options
author | Amaury Pouly <amaury.pouly@gmail.com> | 2014-10-22 17:51:41 +0200 |
---|---|---|
committer | Amaury Pouly <amaury.pouly@gmail.com> | 2014-12-15 22:54:05 +0100 |
commit | 04e798eddf43c81685324e83a655e62434f6fcce (patch) | |
tree | ef1ffe2ae33c8b356643c58de8e81745f3c0011b /utils/regtools | |
parent | 6cb861137d40c91782042764c591ceb995f345fa (diff) | |
download | rockbox-04e798eddf43c81685324e83a655e62434f6fcce.tar.gz 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.cpp | 7 | ||||
-rw-r--r-- | utils/regtools/qeditor/qeditor.pro | 2 |
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) | |||
116 | 116 | ||
117 | bool RamIoBackend::ReadRegister(const QString& name, soc_word_t& value) | 117 | bool RamIoBackend::ReadRegister(const QString& name, soc_word_t& value) |
118 | { | 118 | { |
119 | if(m_map.find(name) == m_map.end()) | 119 | QMap<QString, soc_word_t>::const_iterator it = m_map.find(name); |
120 | if(it == m_map.end()) | ||
120 | return false; | 121 | return false; |
121 | value = m_map[name]; | 122 | value = it.value(); |
122 | return true; | 123 | return true; |
123 | } | 124 | } |
124 | 125 | ||
@@ -617,7 +618,7 @@ bool BackendHelper::DumpAllRegisters(IoBackend *backend, bool ignore_errors) | |||
617 | if(!ignore_errors) | 618 | if(!ignore_errors) |
618 | return false; | 619 | return false; |
619 | } | 620 | } |
620 | if(!bh.WriteRegister(devname, regname, val)) | 621 | else if(!bh.WriteRegister(devname, regname, val)) |
621 | { | 622 | { |
622 | ret = false; | 623 | ret = false; |
623 | if(!ignore_errors) | 624 | 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 \ | |||
7 | LIBS += -L../lib/ -lsocdesc -lxml2 | 7 | LIBS += -L../lib/ -lsocdesc -lxml2 |
8 | INCLUDEPATH += ../lib/ ../../hwstub/lib | 8 | INCLUDEPATH += ../lib/ ../../hwstub/lib |
9 | 9 | ||
10 | VERSION = 2.0.1 | 10 | VERSION = 2.0.2 |
11 | 11 | ||
12 | DEFINES += APP_VERSION=\\\"$$VERSION\\\" | 12 | DEFINES += APP_VERSION=\\\"$$VERSION\\\" |
13 | 13 | ||