summaryrefslogtreecommitdiff
path: root/utils/regtools
diff options
context:
space:
mode:
Diffstat (limited to 'utils/regtools')
-rw-r--r--utils/regtools/lib/soc_desc.cpp4
-rw-r--r--utils/regtools/lib/soc_desc.hpp2
-rw-r--r--utils/regtools/qeditor/backend.cpp5
3 files changed, 7 insertions, 4 deletions
diff --git a/utils/regtools/lib/soc_desc.cpp b/utils/regtools/lib/soc_desc.cpp
index 223a6d8f53..21c2f8acac 100644
--- a/utils/regtools/lib/soc_desc.cpp
+++ b/utils/regtools/lib/soc_desc.cpp
@@ -252,7 +252,7 @@ bool parse_soc_elem(xmlNode *node, soc_t& soc)
252 return true; 252 return true;
253} 253}
254 254
255bool parse_root_elem(xmlNode *node, std::list< soc_t >& soc) 255bool parse_root_elem(xmlNode *node, std::vector< soc_t >& soc)
256{ 256{
257 BEGIN_NODE_MATCH(node) 257 BEGIN_NODE_MATCH(node)
258 MATCH_ELEM_NODE("soc", soc, parse_soc_elem) 258 MATCH_ELEM_NODE("soc", soc, parse_soc_elem)
@@ -260,7 +260,7 @@ bool parse_root_elem(xmlNode *node, std::list< soc_t >& soc)
260 return true; 260 return true;
261} 261}
262 262
263bool soc_desc_parse_xml(const std::string& filename, std::list< soc_t >& socs) 263bool soc_desc_parse_xml(const std::string& filename, std::vector< soc_t >& socs)
264{ 264{
265 LIBXML_TEST_VERSION 265 LIBXML_TEST_VERSION
266 266
diff --git a/utils/regtools/lib/soc_desc.hpp b/utils/regtools/lib/soc_desc.hpp
index d1a1f0cb50..0324a90fad 100644
--- a/utils/regtools/lib/soc_desc.hpp
+++ b/utils/regtools/lib/soc_desc.hpp
@@ -143,6 +143,6 @@ struct soc_t
143 143
144/** Parse a SoC description from a XML file, append it to <soc>. A file 144/** Parse a SoC description from a XML file, append it to <soc>. A file
145 * can contain multiple SoC descriptions */ 145 * can contain multiple SoC descriptions */
146bool soc_desc_parse_xml(const std::string& filename, std::list< soc_t >& soc); 146bool soc_desc_parse_xml(const std::string& filename, std::vector< soc_t >& soc);
147 147
148#endif /* __SOC_DESC__ */ \ No newline at end of file 148#endif /* __SOC_DESC__ */ \ No newline at end of file
diff --git a/utils/regtools/qeditor/backend.cpp b/utils/regtools/qeditor/backend.cpp
index 44430c25da..15867821e3 100644
--- a/utils/regtools/qeditor/backend.cpp
+++ b/utils/regtools/qeditor/backend.cpp
@@ -33,7 +33,10 @@ bool Backend::GetSocByName(const QString& name, SocRef& s)
33 33
34bool Backend::LoadSocDesc(const QString& filename) 34bool Backend::LoadSocDesc(const QString& filename)
35{ 35{
36 bool ret = soc_desc_parse_xml(filename.toStdString(), m_socs); 36 std::vector< soc_t > new_socs;
37 bool ret = soc_desc_parse_xml(filename.toStdString(), new_socs);
38 for(size_t i = 0; i < new_socs.size(); i++)
39 m_socs.push_back(new_socs[i]);
37 emit OnSocListChanged(); 40 emit OnSocListChanged();
38 return ret; 41 return ret;
39} 42}