aboutsummaryrefslogtreecommitdiffstats
path: root/vppapigen
diff options
context:
space:
mode:
Diffstat (limited to 'vppapigen')
-rw-r--r--vppapigen/node.c60
-rwxr-xr-xvppapigen/pyvppapigen.py2
2 files changed, 42 insertions, 20 deletions
diff --git a/vppapigen/node.c b/vppapigen/node.c
index 420a128c00e..fa7146ae497 100644
--- a/vppapigen/node.c
+++ b/vppapigen/node.c
@@ -1324,26 +1324,48 @@ void add_msg_ids(YYSTYPE a1)
}
}
-void generate_python (YYSTYPE a1, FILE *fp)
-{
- node_t *np = (node_t *)a1;
- node_vft_t *vftp;
- fprintf (fp, "vppapidef = [\n");
- /* Walk the top-level node-list */
- while (np) {
- if (np->type == NODE_DEFINE && !(np->flags & NODE_FLAG_TYPEONLY)) {
- /* Yeah, this is pedantic */
- vftp = the_vft[np->type];
- vftp->generate(np, PYTHON_PASS, fp);
+void generate_python_msg_definitions(YYSTYPE a1, FILE *fp)
+{
+ node_t *np = (node_t *)a1;
+ node_vft_t *vftp;
+ fprintf (fp, "messages = [\n");
+ /* Walk the top-level node-list */
+ while (np) {
+ if (np->type == NODE_DEFINE && !(np->flags & NODE_FLAG_TYPEONLY)) {
+ /* Yeah, this is pedantic */
+ vftp = the_vft[np->type];
+ vftp->generate(np, PYTHON_PASS, fp);
+ }
+ np = np->peer;
}
- np = np->peer;
- }
- fprintf (fp, "\n]\n");
-
- /*
- * API CRC signature
- */
- fprintf (fp, "vl_api_version = 0x%08x\n\n", (unsigned int)input_crc);
+ fprintf (fp, "\n]\n");
+}
+
+void generate_python_typeonly_definitions(YYSTYPE a1, FILE *fp)
+{
+ node_t *np = (node_t *)a1;
+ node_vft_t *vftp;
+ fprintf (fp, "types = [\n");
+ /* Walk the top-level node-list */
+ while (np) {
+ if (np->type == NODE_DEFINE && (np->flags & NODE_FLAG_TYPEONLY)) {
+ vftp = the_vft[np->type];
+ vftp->generate(np, PYTHON_PASS, fp);
+ }
+ np = np->peer;
+ }
+ fprintf (fp, "\n]\n");
+}
+
+void generate_python(YYSTYPE a1, FILE *fp)
+{
+ generate_python_typeonly_definitions(a1, fp);
+ generate_python_msg_definitions(a1, fp);
+
+ /*
+ * API CRC signature
+ */
+ fprintf (fp, "vl_api_version = 0x%08x\n\n", (unsigned int)input_crc);
}
void generate(YYSTYPE a1)
diff --git a/vppapigen/pyvppapigen.py b/vppapigen/pyvppapigen.py
index 7fde21c5ce9..901510e0531 100755
--- a/vppapigen/pyvppapigen.py
+++ b/vppapigen/pyvppapigen.py
@@ -267,7 +267,7 @@ api_func_table = []
api_name_to_id = {}
''')
- for i, a in enumerate(vppapidef):
+ for i, a in enumerate(messages):
name = a[0]
encode_print(name, str(i), a[1:])
decode_print(name, a[1:])