summaryrefslogtreecommitdiff
path: root/utils/regtools/lib/soc_desc.cpp
diff options
context:
space:
mode:
authorAmaury Pouly <amaury.pouly@gmail.com>2014-04-04 15:33:39 +0200
committerAmaury Pouly <amaury.pouly@gmail.com>2014-05-01 19:32:01 +0200
commit3754624edc48539c5cc5acbf426ce909477e87d8 (patch)
tree5b74dd28aa33186dcba9557c1ab516fc6e39d0db /utils/regtools/lib/soc_desc.cpp
parent0cd03c2d201b5b17d9465470cedccab3d4c5edd0 (diff)
downloadrockbox-3754624edc48539c5cc5acbf426ce909477e87d8.tar.gz
rockbox-3754624edc48539c5cc5acbf426ce909477e87d8.zip
regtools: update soc desc parser/header to include desc fields
Change-Id: I32374784d17f4352905f15e404df23b01338235b
Diffstat (limited to 'utils/regtools/lib/soc_desc.cpp')
-rw-r--r--utils/regtools/lib/soc_desc.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/utils/regtools/lib/soc_desc.cpp b/utils/regtools/lib/soc_desc.cpp
index 21c2f8acac..6a6d47648f 100644
--- a/utils/regtools/lib/soc_desc.cpp
+++ b/utils/regtools/lib/soc_desc.cpp
@@ -147,6 +147,7 @@ bool parse_field_elem(xmlNode *node, soc_reg_field_t& field)
147 BEGIN_ATTR_MATCH(node->properties) 147 BEGIN_ATTR_MATCH(node->properties)
148 MATCH_TEXT_ATTR("name", field.name) 148 MATCH_TEXT_ATTR("name", field.name)
149 MATCH_BITRANGE_ATTR("bitrange", field.first_bit, field.last_bit) 149 MATCH_BITRANGE_ATTR("bitrange", field.first_bit, field.last_bit)
150 MATCH_TEXT_ATTR("desc", field.desc)
150 END_ATTR_MATCH() 151 END_ATTR_MATCH()
151 152
152 BEGIN_NODE_MATCH(node->children) 153 BEGIN_NODE_MATCH(node->children)
@@ -194,6 +195,7 @@ bool parse_reg_elem(xmlNode *node, soc_reg_t& reg)
194 MATCH_TEXT_ATTR("name", reg.name) 195 MATCH_TEXT_ATTR("name", reg.name)
195 SOFT_MATCH_SCT_ATTR("sct", reg.flags) 196 SOFT_MATCH_SCT_ATTR("sct", reg.flags)
196 SOFT_MATCH_X_ATTR("addr", parse_add_trivial_addr, reg) 197 SOFT_MATCH_X_ATTR("addr", parse_add_trivial_addr, reg)
198 MATCH_TEXT_ATTR("desc", reg.desc)
197 END_ATTR_MATCH() 199 END_ATTR_MATCH()
198 200
199 BEGIN_NODE_MATCH(node->children) 201 BEGIN_NODE_MATCH(node->children)
@@ -227,6 +229,8 @@ bool parse_dev_elem(xmlNode *node, soc_dev_t& dev)
227{ 229{
228 BEGIN_ATTR_MATCH(node->properties) 230 BEGIN_ATTR_MATCH(node->properties)
229 MATCH_TEXT_ATTR("name", dev.name) 231 MATCH_TEXT_ATTR("name", dev.name)
232 MATCH_TEXT_ATTR("long_name", dev.long_name)
233 MATCH_TEXT_ATTR("desc", dev.desc)
230 MATCH_TEXT_ATTR("version", dev.version) 234 MATCH_TEXT_ATTR("version", dev.version)
231 END_ATTR_MATCH() 235 END_ATTR_MATCH()
232 236