lib9p: Reorganize 9p.generated.h

1 files changed, 44 insertions, 46 deletions

diff --git a/lib9p/include/lib9p/9p.generated.h b/lib9p/include/lib9p/9p.generated.h
index 25aacfe..a6dc13c 100644
--- a/lib9p/include/lib9p/9p.generated.h
+++ b/lib9p/include/lib9p/9p.generated.h
@@ -22,7 +22,7 @@
 	#error config.h must define CONFIG_9P_ENABLE_9P2000_u
 #endif
 
-/* versions *******************************************************************/
+/* enum version ***************************************************************/
 
 enum lib9p_version {
 	LIB9P_VER_unknown = 0, /* "unknown" */
@@ -40,7 +40,49 @@ enum lib9p_version {
 
 const char *lib9p_version_str(enum lib9p_version);
 
-/* non-message types **********************************************************/
+/* enum msg_type **************************************************************/
+
+enum lib9p_msg_type { /* uint8_t */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+	LIB9P_TYP_Tversion = 100,
+	LIB9P_TYP_Rversion = 101,
+	LIB9P_TYP_Tauth    = 102,
+	LIB9P_TYP_Rauth    = 103,
+	LIB9P_TYP_Tattach  = 104,
+	LIB9P_TYP_Rattach  = 105,
+	LIB9P_TYP_Rerror   = 107,
+	LIB9P_TYP_Tflush   = 108,
+	LIB9P_TYP_Rflush   = 109,
+	LIB9P_TYP_Twalk    = 110,
+	LIB9P_TYP_Rwalk    = 111,
+	LIB9P_TYP_Topen    = 112,
+	LIB9P_TYP_Ropen    = 113,
+	LIB9P_TYP_Tcreate  = 114,
+	LIB9P_TYP_Rcreate  = 115,
+	LIB9P_TYP_Tread    = 116,
+	LIB9P_TYP_Rread    = 117,
+	LIB9P_TYP_Twrite   = 118,
+	LIB9P_TYP_Rwrite   = 119,
+	LIB9P_TYP_Tclunk   = 120,
+	LIB9P_TYP_Rclunk   = 121,
+	LIB9P_TYP_Tremove  = 122,
+	LIB9P_TYP_Rremove  = 123,
+	LIB9P_TYP_Tstat    = 124,
+	LIB9P_TYP_Rstat    = 125,
+	LIB9P_TYP_Twstat   = 126,
+	LIB9P_TYP_Rwstat   = 127,
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000_e
+	LIB9P_TYP_Tsession = 150,
+	LIB9P_TYP_Rsession = 151,
+	LIB9P_TYP_Tsread   = 152,
+	LIB9P_TYP_Rsread   = 153,
+	LIB9P_TYP_Tswrite  = 154,
+	LIB9P_TYP_Rswrite  = 155,
+#endif /* CONFIG_9P_ENABLE_9P2000_e */
+};
+
+/* payload types **************************************************************/
 
 #if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
 typedef uint16_t lib9p_tag_t;
@@ -156,51 +198,7 @@ typedef uint8_t lib9p_o_t;
 #define   LIB9P_O_EXEC       ((lib9p_o_t)(3))
 #define   LIB9P_O_MODE_MASK  ((lib9p_o_t)(0b00000011))
 #define   LIB9P_O_FLAG_MASK  ((lib9p_o_t)(0b11111100))
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
 
-/* messages *******************************************************************/
-
-enum lib9p_msg_type { /* uint8_t */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
-	LIB9P_TYP_Tversion = 100,
-	LIB9P_TYP_Rversion = 101,
-	LIB9P_TYP_Tauth    = 102,
-	LIB9P_TYP_Rauth    = 103,
-	LIB9P_TYP_Tattach  = 104,
-	LIB9P_TYP_Rattach  = 105,
-	LIB9P_TYP_Rerror   = 107,
-	LIB9P_TYP_Tflush   = 108,
-	LIB9P_TYP_Rflush   = 109,
-	LIB9P_TYP_Twalk    = 110,
-	LIB9P_TYP_Rwalk    = 111,
-	LIB9P_TYP_Topen    = 112,
-	LIB9P_TYP_Ropen    = 113,
-	LIB9P_TYP_Tcreate  = 114,
-	LIB9P_TYP_Rcreate  = 115,
-	LIB9P_TYP_Tread    = 116,
-	LIB9P_TYP_Rread    = 117,
-	LIB9P_TYP_Twrite   = 118,
-	LIB9P_TYP_Rwrite   = 119,
-	LIB9P_TYP_Tclunk   = 120,
-	LIB9P_TYP_Rclunk   = 121,
-	LIB9P_TYP_Tremove  = 122,
-	LIB9P_TYP_Rremove  = 123,
-	LIB9P_TYP_Tstat    = 124,
-	LIB9P_TYP_Rstat    = 125,
-	LIB9P_TYP_Twstat   = 126,
-	LIB9P_TYP_Rwstat   = 127,
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000_e
-	LIB9P_TYP_Tsession = 150,
-	LIB9P_TYP_Rsession = 151,
-	LIB9P_TYP_Tsread   = 152,
-	LIB9P_TYP_Rsread   = 153,
-	LIB9P_TYP_Tswrite  = 154,
-	LIB9P_TYP_Rswrite  = 155,
-#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;