lib9p: idl.gen: Do topological sorting on types

1 files changed, 145 insertions, 135 deletions

diff --git a/lib9p/include/lib9p/9p.generated.h b/lib9p/include/lib9p/9p.generated.h
index a6dc13c..2d613c9 100644
--- a/lib9p/include/lib9p/9p.generated.h
+++ b/lib9p/include/lib9p/9p.generated.h
@@ -155,32 +155,6 @@ typedef uint8_t lib9p_qt_t;
 
 #define   LIB9P_QT_FILE          ((lib9p_qt_t)(0))
 
-struct lib9p_qid {
-	lib9p_qt_t   type;
-	uint32_t     vers;
-	uint64_t     path;
-};
-
-struct lib9p_stat {
-	uint16_t           kern_type;
-	uint32_t           kern_dev;
-	struct lib9p_qid   file_qid;
-	lib9p_dm_t         file_mode;
-	uint32_t           file_atime;
-	uint32_t           file_mtime;
-	uint64_t           file_size;
-	struct lib9p_s     file_name;
-	struct lib9p_s     file_owner_uid;
-	struct lib9p_s     file_owner_gid;
-	struct lib9p_s     file_last_modified_uid;
-#if CONFIG_9P_ENABLE_9P2000_u
-	struct lib9p_s     file_extension;
-	uint32_t           file_owner_n_uid;
-	uint32_t           file_owner_n_gid;
-	uint32_t           file_last_modified_n_uid;
-#endif /* CONFIG_9P_ENABLE_9P2000_u */
-};
-
 typedef uint8_t lib9p_o_t;
 
 /* unused                    ((lib9p_o_t)(1<<7)) */
@@ -199,6 +173,93 @@ typedef uint8_t lib9p_o_t;
 #define   LIB9P_O_MODE_MASK  ((lib9p_o_t)(0b00000011))
 #define   LIB9P_O_FLAG_MASK  ((lib9p_o_t)(0b11111100))
 
+struct lib9p_msg_Tflush {
+	lib9p_tag_t   tag;
+	uint16_t      oldtag;
+};
+
+struct lib9p_msg_Rflush {
+	lib9p_tag_t   tag;
+};
+
+struct lib9p_msg_Rwrite {
+	lib9p_tag_t   tag;
+	uint32_t      count;
+};
+
+struct lib9p_msg_Rclunk {
+	lib9p_tag_t   tag;
+};
+
+struct lib9p_msg_Rremove {
+	lib9p_tag_t   tag;
+};
+
+struct lib9p_msg_Rwstat {
+	lib9p_tag_t   tag;
+};
+
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000_e
+struct lib9p_msg_Tsession {
+	lib9p_tag_t   tag;
+	uint64_t      key;
+};
+
+struct lib9p_msg_Rsession {
+	lib9p_tag_t   tag;
+};
+
+struct lib9p_msg_Rswrite {
+	lib9p_tag_t   tag;
+	uint32_t      count;
+};
+
+#endif /* CONFIG_9P_ENABLE_9P2000_e */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+struct lib9p_msg_Tread {
+	lib9p_tag_t   tag;
+	lib9p_fid_t   fid;
+	uint64_t      offset;
+	uint32_t      count;
+};
+
+struct lib9p_msg_Tclunk {
+	lib9p_tag_t   tag;
+	lib9p_fid_t   fid;
+};
+
+struct lib9p_msg_Tremove {
+	lib9p_tag_t   tag;
+	lib9p_fid_t   fid;
+};
+
+struct lib9p_msg_Tstat {
+	lib9p_tag_t   tag;
+	lib9p_fid_t   fid;
+};
+
+struct lib9p_msg_Rread {
+	lib9p_tag_t      tag;
+	struct lib9p_d   data;
+};
+
+struct lib9p_msg_Twrite {
+	lib9p_tag_t      tag;
+	lib9p_fid_t      fid;
+	uint64_t         offset;
+	struct lib9p_d   data;
+};
+
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000_e
+struct lib9p_msg_Rsread {
+	lib9p_tag_t      tag;
+	struct lib9p_d   data;
+};
+
+#endif /* CONFIG_9P_ENABLE_9P2000_e */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
 struct lib9p_msg_Tversion {
 	lib9p_tag_t      tag;
 	uint32_t         max_msg_size;
@@ -221,11 +282,6 @@ struct lib9p_msg_Tauth {
 #endif /* CONFIG_9P_ENABLE_9P2000_u */
 };
 
-struct lib9p_msg_Rauth {
-	lib9p_tag_t        tag;
-	struct lib9p_qid   aqid;
-};
-
 struct lib9p_msg_Tattach {
 	lib9p_tag_t      tag;
 	lib9p_fid_t      fid;
@@ -237,11 +293,6 @@ struct lib9p_msg_Tattach {
 #endif /* CONFIG_9P_ENABLE_9P2000_u */
 };
 
-struct lib9p_msg_Rattach {
-	lib9p_tag_t        tag;
-	struct lib9p_qid   qid;
-};
-
 struct lib9p_msg_Rerror {
 	lib9p_tag_t      tag;
 	struct lib9p_s   ename;
@@ -250,27 +301,37 @@ struct lib9p_msg_Rerror {
 #endif /* CONFIG_9P_ENABLE_9P2000_u */
 };
 
-struct lib9p_msg_Tflush {
-	lib9p_tag_t   tag;
-	uint16_t      oldtag;
+struct lib9p_msg_Twalk {
+	lib9p_tag_t      tag;
+	lib9p_fid_t      fid;
+	lib9p_fid_t      newfid;
+	uint16_t         nwname;
+	struct lib9p_s  *wname;
 };
 
-struct lib9p_msg_Rflush {
-	lib9p_tag_t   tag;
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000_e
+struct lib9p_msg_Tsread {
+	lib9p_tag_t      tag;
+	uint32_t         fid;
+	uint16_t         nwname;
+	struct lib9p_s  *wname;
 };
 
-struct lib9p_msg_Twalk {
+struct lib9p_msg_Tswrite {
 	lib9p_tag_t      tag;
-	lib9p_fid_t      fid;
-	lib9p_fid_t      newfid;
+	uint32_t         fid;
 	uint16_t         nwname;
 	struct lib9p_s  *wname;
+	struct lib9p_d   data;
 };
 
-struct lib9p_msg_Rwalk {
-	lib9p_tag_t        tag;
-	uint16_t           nwqid;
-	struct lib9p_qid  *wqid;
+#endif /* CONFIG_9P_ENABLE_9P2000_e */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+struct lib9p_qid {
+	lib9p_qt_t   type;
+	uint32_t     vers;
+	uint64_t     path;
 };
 
 struct lib9p_msg_Topen {
@@ -279,12 +340,6 @@ struct lib9p_msg_Topen {
 	lib9p_o_t     mode;
 };
 
-struct lib9p_msg_Ropen {
-	lib9p_tag_t        tag;
-	struct lib9p_qid   qid;
-	uint32_t           iounit;
-};
-
 struct lib9p_msg_Tcreate {
 	lib9p_tag_t      tag;
 	lib9p_fid_t      fid;
@@ -293,57 +348,52 @@ struct lib9p_msg_Tcreate {
 	lib9p_o_t        mode;
 };
 
-struct lib9p_msg_Rcreate {
-	lib9p_tag_t        tag;
-	struct lib9p_qid   qid;
-	uint32_t           iounit;
-};
-
-struct lib9p_msg_Tread {
-	lib9p_tag_t   tag;
-	lib9p_fid_t   fid;
-	uint64_t      offset;
-	uint32_t      count;
-};
-
-struct lib9p_msg_Rread {
-	lib9p_tag_t      tag;
-	struct lib9p_d   data;
-};
-
-struct lib9p_msg_Twrite {
-	lib9p_tag_t      tag;
-	lib9p_fid_t      fid;
-	uint64_t         offset;
-	struct lib9p_d   data;
-};
-
-struct lib9p_msg_Rwrite {
-	lib9p_tag_t   tag;
-	uint32_t      count;
+struct lib9p_stat {
+	uint16_t           kern_type;
+	uint32_t           kern_dev;
+	struct lib9p_qid   file_qid;
+	lib9p_dm_t         file_mode;
+	uint32_t           file_atime;
+	uint32_t           file_mtime;
+	uint64_t           file_size;
+	struct lib9p_s     file_name;
+	struct lib9p_s     file_owner_uid;
+	struct lib9p_s     file_owner_gid;
+	struct lib9p_s     file_last_modified_uid;
+#if CONFIG_9P_ENABLE_9P2000_u
+	struct lib9p_s     file_extension;
+	uint32_t           file_owner_n_uid;
+	uint32_t           file_owner_n_gid;
+	uint32_t           file_last_modified_n_uid;
+#endif /* CONFIG_9P_ENABLE_9P2000_u */
 };
 
-struct lib9p_msg_Tclunk {
-	lib9p_tag_t   tag;
-	lib9p_fid_t   fid;
+struct lib9p_msg_Rauth {
+	lib9p_tag_t        tag;
+	struct lib9p_qid   aqid;
 };
 
-struct lib9p_msg_Rclunk {
-	lib9p_tag_t   tag;
+struct lib9p_msg_Rattach {
+	lib9p_tag_t        tag;
+	struct lib9p_qid   qid;
 };
 
-struct lib9p_msg_Tremove {
-	lib9p_tag_t   tag;
-	lib9p_fid_t   fid;
+struct lib9p_msg_Rwalk {
+	lib9p_tag_t        tag;
+	uint16_t           nwqid;
+	struct lib9p_qid  *wqid;
 };
 
-struct lib9p_msg_Rremove {
-	lib9p_tag_t   tag;
+struct lib9p_msg_Ropen {
+	lib9p_tag_t        tag;
+	struct lib9p_qid   qid;
+	uint32_t           iounit;
 };
 
-struct lib9p_msg_Tstat {
-	lib9p_tag_t   tag;
-	lib9p_fid_t   fid;
+struct lib9p_msg_Rcreate {
+	lib9p_tag_t        tag;
+	struct lib9p_qid   qid;
+	uint32_t           iounit;
 };
 
 struct lib9p_msg_Rstat {
@@ -356,44 +406,4 @@ struct lib9p_msg_Twstat {
 	lib9p_fid_t         fid;
 	struct lib9p_stat   stat;
 };
-
-struct lib9p_msg_Rwstat {
-	lib9p_tag_t   tag;
-};
-
 #endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000_e
-struct lib9p_msg_Tsession {
-	lib9p_tag_t   tag;
-	uint64_t      key;
-};
-
-struct lib9p_msg_Rsession {
-	lib9p_tag_t   tag;
-};
-
-struct lib9p_msg_Tsread {
-	lib9p_tag_t      tag;
-	uint32_t         fid;
-	uint16_t         nwname;
-	struct lib9p_s  *wname;
-};
-
-struct lib9p_msg_Rsread {
-	lib9p_tag_t      tag;
-	struct lib9p_d   data;
-};
-
-struct lib9p_msg_Tswrite {
-	lib9p_tag_t      tag;
-	uint32_t         fid;
-	uint16_t         nwname;
-	struct lib9p_s  *wname;
-	struct lib9p_d   data;
-};
-
-struct lib9p_msg_Rswrite {
-	lib9p_tag_t   tag;
-	uint32_t      count;
-};
-#endif /* CONFIG_9P_ENABLE_9P2000_e */