commit d0c587167f509a8c1667f52f31a4ca1fe499dd17
author Rich Lane <rlane@bigswitch.com> Wed Dec 18 10:02:47 2013 -0800
committer Rich Lane <rlane@bigswitch.com> Wed Dec 18 10:02:47 2013 -0800
tree d0a5e925ffa9cea393a6bdb7ad3fb1885a84e41a
parent 661bc02f5a565baad7decd5cf3ea84da3586022a
parent c3c2b787fc0102392b05f5a33c8f2977f00c6e3d

Merge remote-tracking branch 'origin/master' into loci-split

Conflicts:
	c_gen/codegen.py

c_gen/codegen.py

diff --git a/c_gen/codegen.py b/c_gen/codegen.py
index 2bc62ca..3249747 100644
--- a/c_gen/codegen.py
+++ b/c_gen/codegen.py
@@ -62,7 +62,7 @@
                     # Special case for version
                     pwtms.append(PushWireTypesMember(m.name, m.offset, m.length, "obj->version"))
                 else:
-                    pwtms.append(PushWireTypesMember(m.name, m.offset, m.length, m.value))
+                    pwtms.append(PushWireTypesMember(m.name, m.offset, m.length, hex(m.value)))
         type_members_by_version[version] = pwtms
 
     # Merge versions with identical type members

c_gen/templates/loci_show.h

diff --git a/c_gen/templates/loci_show.h b/c_gen/templates/loci_show.h
index 3d55da8..a66c321 100644
--- a/c_gen/templates/loci_show.h
+++ b/c_gen/templates/loci_show.h
@@ -371,5 +371,7 @@
 #define LOCI_SHOW_u16_partner_port_num(writer, cookie, val) LOCI_SHOW_u16(writer, cookie, val)
 #define LOCI_SHOW_u16_partner_key(writer, cookie, val) LOCI_SHOW_u16(writer, cookie, val)
 #define LOCI_SHOW_u64_time_ms(writer, cookie, val) LOCI_SHOW_u64(writer, cookie, val)
+#define LOCI_SHOW_desc_str_uri(writer, cookie, val) LOCI_SHOW_desc_str(writer, cookie, val)
+#define LOCI_SHOW_u8_state(writer, cookie, val) LOCI_SHOW_u8(writer, cookie, val)
 
 #endif /* _LOCI_SHOW_H_ */