Merge branch 'lukeshu/9p-idl-defs'

5 files changed, 63 insertions, 85 deletions

diff --git a/lib9p/9p.generated.c b/lib9p/9p.generated.c
index 8d29a6d..353654c 100644
--- a/lib9p/9p.generated.c
+++ b/lib9p/9p.generated.c
@@ -143,6 +143,7 @@ const char * _lib9p_table_msg_name[LIB9P_VER_NUM][0x100] = {
 		_MSG_NAME(Rauth),
 		_MSG_NAME(Tattach),
 		_MSG_NAME(Rattach),
+		_MSG_NAME(Rerror),
 		_MSG_NAME(Tflush),
 		_MSG_NAME(Rflush),
 		_MSG_NAME(Twalk),
@@ -365,8 +366,6 @@ LM_ALWAYS_INLINE static bool validate_fid(struct _validate_ctx *ctx) {
 	return validate_4(ctx);
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
 LM_ALWAYS_INLINE static bool validate_d(struct _validate_ctx *ctx) {
 	uint32_t base_offset = ctx->net_offset;
 	if (validate_4(ctx))
@@ -375,8 +374,6 @@ LM_ALWAYS_INLINE static bool validate_d(struct _validate_ctx *ctx) {
 	return _validate_size_net(ctx, len) || _validate_size_host(ctx, len);
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
 LM_ALWAYS_INLINE static bool validate_s(struct _validate_ctx *ctx) {
 	uint32_t base_offset = ctx->net_offset;
 	if (validate_2(ctx))
@@ -1044,8 +1041,6 @@ LM_FLATTEN static bool validate_Rversion(struct _validate_ctx *ctx) {
 	    ;
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
 LM_FLATTEN static bool validate_Rerror(struct _validate_ctx *ctx) {
 	uint32_t size;
 	uint8_t typ;
@@ -1065,8 +1060,6 @@ LM_FLATTEN static bool validate_Rerror(struct _validate_ctx *ctx) {
 	    ;
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
 LM_FLATTEN static bool validate_Twalk(struct _validate_ctx *ctx) {
 	uint32_t size;
 	uint8_t typ;
@@ -1865,8 +1858,6 @@ LM_ALWAYS_INLINE static void unmarshal_fid(struct _unmarshal_ctx *ctx, lib9p_fid
 	unmarshal_4(ctx, (uint32_t *)out);
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
 LM_ALWAYS_INLINE static void unmarshal_d(struct _unmarshal_ctx *ctx, struct lib9p_d *out) {
 	memset(out, 0, sizeof(*out));
 	unmarshal_4(ctx, &out->len);
@@ -1876,8 +1867,6 @@ LM_ALWAYS_INLINE static void unmarshal_d(struct _unmarshal_ctx *ctx, struct lib9
 		unmarshal_1(ctx, (uint8_t *)&out->dat[i]);
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
 LM_ALWAYS_INLINE static void unmarshal_s(struct _unmarshal_ctx *ctx, struct lib9p_s *out) {
 	memset(out, 0, sizeof(*out));
 	unmarshal_2(ctx, &out->len);
@@ -2238,8 +2227,6 @@ LM_FLATTEN static void unmarshal_Rversion(struct _unmarshal_ctx *ctx, struct lib
 	unmarshal_s(ctx, &out->version);
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
 LM_FLATTEN static void unmarshal_Rerror(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rerror *out) {
 	memset(out, 0, sizeof(*out));
 	ctx->net_offset += 4;
@@ -2251,8 +2238,6 @@ LM_FLATTEN static void unmarshal_Rerror(struct _unmarshal_ctx *ctx, struct lib9p
 #endif /* CONFIG_9P_ENABLE_9P2000_u */
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
 LM_FLATTEN static void unmarshal_Twalk(struct _unmarshal_ctx *ctx, struct lib9p_msg_Twalk *out) {
 	memset(out, 0, sizeof(*out));
 	ctx->net_offset += 4;
@@ -2767,8 +2752,6 @@ LM_ALWAYS_INLINE static bool marshal_fid(struct _marshal_ctx *ctx, lib9p_fid_t *
 	return marshal_4(ctx, (uint32_t *)val);
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
 LM_ALWAYS_INLINE static bool marshal_d(struct _marshal_ctx *ctx, struct lib9p_d *val) {
 	return false
 	    || marshal_4(ctx, &val->len)
@@ -2779,8 +2762,6 @@ LM_ALWAYS_INLINE static bool marshal_d(struct _marshal_ctx *ctx, struct lib9p_d
 	    ;
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
 LM_ALWAYS_INLINE static bool marshal_s(struct _marshal_ctx *ctx, struct lib9p_s *val) {
 	return false
 	    || marshal_2(ctx, &val->len)
@@ -3314,8 +3295,6 @@ LM_FLATTEN static bool marshal_Rversion(struct _marshal_ctx *ctx, struct lib9p_m
 	    ;
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
 LM_FLATTEN static bool marshal_Rerror(struct _marshal_ctx *ctx, struct lib9p_msg_Rerror *val) {
 	uint32_t _size_offset;
 	uint32_t _typ_offset;
@@ -3332,8 +3311,6 @@ LM_FLATTEN static bool marshal_Rerror(struct _marshal_ctx *ctx, struct lib9p_msg
 	    ;
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
 LM_FLATTEN static bool marshal_Twalk(struct _marshal_ctx *ctx, struct lib9p_msg_Twalk *val) {
 	uint32_t _size_offset;
 	uint32_t _typ_offset;
@@ -4143,6 +4120,7 @@ const struct _lib9p_recv_tentry _lib9p_table_Rmsg_recv[LIB9P_VER_NUM][0x80] = {
 		_MSG_RECV(Rversion),
 		_MSG_RECV(Rauth),
 		_MSG_RECV(Rattach),
+		_MSG_RECV(Rerror),
 		_MSG_RECV(Rflush),
 		_MSG_RECV(Rwalk),
 		_MSG_RECV(Rread),
@@ -4330,6 +4308,7 @@ const struct _lib9p_send_tentry _lib9p_table_Rmsg_send[LIB9P_VER_NUM][0x80] = {
 		_MSG_SEND(Rversion),
 		_MSG_SEND(Rauth),
 		_MSG_SEND(Rattach),
+		_MSG_SEND(Rerror),
 		_MSG_SEND(Rflush),
 		_MSG_SEND(Rwalk),
 		_MSG_SEND(Rread),
diff --git a/lib9p/idl.gen b/lib9p/idl.gen
index 7c79a28..f154cb1 100755
--- a/lib9p/idl.gen
+++ b/lib9p/idl.gen
@@ -183,6 +183,10 @@ def gen_h(versions: set[str], typs: list[idl.Type]) -> str:
 #include <stdint.h> /* for uint{{n}}_t types */
 """
 
+    id2typ: dict[int, idl.Message] = {}
+    for msg in [msg for msg in typs if isinstance(msg, idl.Message)]:
+        id2typ[msg.msgid] = msg
+
     ret += f"""
 /* config *********************************************************************/
 
@@ -216,7 +220,10 @@ enum {idprefix}version {{
 """
     ret += f"enum {idprefix}msg_type {{ /* uint8_t */\n"
     namewidth = max(len(msg.name) for msg in typs if isinstance(msg, idl.Message))
-    for msg in [msg for msg in typs if isinstance(msg, idl.Message)]:
+    for n in range(0x100):
+        if n not in id2typ:
+            continue
+        msg = id2typ[n]
         ret += ifdef_push(1, c_ver_ifdef(msg.in_versions))
         ret += f"\t{idprefix.upper()}TYP_{msg.name.ljust(namewidth)} = {msg.msgid},\n"
     ret += ifdef_pop(0)
diff --git a/lib9p/idl/2010-9P2000.L.9p b/lib9p/idl/2010-9P2000.L.9p
index 972e7d0..3886265 100644
--- a/lib9p/idl/2010-9P2000.L.9p
+++ b/lib9p/idl/2010-9P2000.L.9p
@@ -7,7 +7,9 @@
 # https://github.com/chaos/diod/blob/master/protocol.md
 version "9P2000.L"
 
-from ./2002-9P2000.9p import tag, fid, s, qt, qid, Tversion, Rversion, Tflush, Rflush, Twalk, Rwalk, Tread, Rread, Twrite, Rwrite, Tclunk, RClunk, Tremove, Rremove
+from ./2002-9P2000.9p import tag, fid, s, d, qt, qid
+from ./2002-9P2000.9p import Rerror
+from ./2002-9P2000.9p import Tversion, Rversion, Tflush, Rflush, Twalk, Rwalk, Tread, Rread, Twrite, Rwrite, Tclunk, RClunk, Tremove, Rremove
 from ./2005-9P2000.u.9p import nuid, Tauth, Rauth, Tattach, Rattach
 
 bitfield getattr = 8
diff --git a/lib9p/idl/__init__.py b/lib9p/idl/__init__.py
index 8fd7e25..fec6c41 100644
--- a/lib9p/idl/__init__.py
+++ b/lib9p/idl/__init__.py
@@ -550,6 +550,13 @@ def parse_file(
     for typ in [typ for typ in typs if isinstance(typ, Struct)]:
         valid_syms = ["end", "s32_max", "s64_max", *["&" + m.name for m in typ.members]]
         for member in typ.members:
+            if (
+                not isinstance(member.typ, Primitive)
+                and member.typ.in_versions < member.in_versions
+            ):
+                raise ValueError(
+                    f"{typ.name}.{member.name}: type {member.typ.name} does not exist in {member.in_versions.difference(member.typ.in_versions)}"
+                )
             for tok in [*member.max.tokens, *member.val.tokens]:
                 if isinstance(tok, ExprSym) and tok.name not in valid_syms:
                     raise ValueError(
diff --git a/lib9p/include/lib9p/9p.generated.h b/lib9p/include/lib9p/9p.generated.h
index f41b3ca..abc2686 100644
--- a/lib9p/include/lib9p/9p.generated.h
+++ b/lib9p/include/lib9p/9p.generated.h
@@ -48,49 +48,6 @@ enum lib9p_version {
 /* enum msg_type **************************************************************/
 
 enum lib9p_msg_type { /* uint8_t */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || 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,
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
-	LIB9P_TYP_Rerror       = 107,
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
-	LIB9P_TYP_Tflush       = 108,
-	LIB9P_TYP_Rflush       = 109,
-	LIB9P_TYP_Twalk        = 110,
-	LIB9P_TYP_Rwalk        = 111,
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
-	LIB9P_TYP_Topen        = 112,
-	LIB9P_TYP_Ropen        = 113,
-	LIB9P_TYP_Tcreate      = 114,
-	LIB9P_TYP_Rcreate      = 115,
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
-	LIB9P_TYP_Tread        = 116,
-	LIB9P_TYP_Rread        = 117,
-	LIB9P_TYP_Twrite       = 118,
-	LIB9P_TYP_Rwrite       = 119,
-	LIB9P_TYP_Tclunk       = 120,
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
-	LIB9P_TYP_Rclunk       = 121,
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
-	LIB9P_TYP_Tremove      = 122,
-	LIB9P_TYP_Rremove      = 123,
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
-	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_L
 	LIB9P_TYP_Rlerror      = 7,
 	LIB9P_TYP_Tstatfs      = 8,
@@ -131,6 +88,45 @@ enum lib9p_msg_type { /* uint8_t */
 	LIB9P_TYP_Tunlinkat    = 76,
 	LIB9P_TYP_Runlinkat    = 77,
 #endif /* CONFIG_9P_ENABLE_9P2000_L */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || 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,
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+	LIB9P_TYP_Topen        = 112,
+	LIB9P_TYP_Ropen        = 113,
+	LIB9P_TYP_Tcreate      = 114,
+	LIB9P_TYP_Rcreate      = 115,
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+	LIB9P_TYP_Tread        = 116,
+	LIB9P_TYP_Rread        = 117,
+	LIB9P_TYP_Twrite       = 118,
+	LIB9P_TYP_Rwrite       = 119,
+	LIB9P_TYP_Tclunk       = 120,
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+	LIB9P_TYP_Rclunk       = 121,
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+	LIB9P_TYP_Tremove      = 122,
+	LIB9P_TYP_Rremove      = 123,
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+	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,
@@ -152,16 +148,12 @@ typedef uint16_t lib9p_tag_t;
 typedef uint32_t lib9p_fid_t;
 #define LIB9P_FID_NOFID ((lib9p_fid_t)UINT32_C(~0))
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
 /* min_size = 4 ; max_size = 2,147,483,651 */
 struct lib9p_d {
 	uint32_t                  len;
 	[[gnu::nonstring]] char  *dat;
 };
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
 /* min_size = 2 ; max_size = 65,537 */
 struct lib9p_s {
 	uint16_t                  len;
@@ -622,19 +614,13 @@ struct lib9p_msg_Tfsync {
 
 #endif /* CONFIG_9P_ENABLE_9P2000_L */
 #if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
-/* LIB9P_VER_9P2000  : min_size = 11 ; max_size = 2,147,483,658 */
-/* LIB9P_VER_9P2000_L: size = 7 */
-/* LIB9P_VER_9P2000_e: min_size = 11 ; max_size = 2,147,483,658 */
-/* LIB9P_VER_9P2000_u: min_size = 11 ; max_size = 2,147,483,658 */
+/* min_size = 11 ; max_size = 2,147,483,658 */
 struct lib9p_msg_Rread {
 	lib9p_tag_t      tag;
 	struct lib9p_d   data;
 };
 
-/* LIB9P_VER_9P2000  : min_size = 23 ; max_size = 2,147,483,670 */
-/* LIB9P_VER_9P2000_L: size = 19 */
-/* LIB9P_VER_9P2000_e: min_size = 23 ; max_size = 2,147,483,670 */
-/* LIB9P_VER_9P2000_u: min_size = 23 ; max_size = 2,147,483,670 */
+/* min_size = 23 ; max_size = 2,147,483,670 */
 struct lib9p_msg_Twrite {
 	lib9p_tag_t      tag;
 	lib9p_fid_t      fid;
@@ -656,9 +642,8 @@ struct lib9p_msg_Rversion {
 	struct lib9p_s   version;
 };
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
 /* LIB9P_VER_9P2000  : min_size = 9 ; max_size = 65,544 */
+/* LIB9P_VER_9P2000_L: min_size = 9 ; max_size = 65,544 */
 /* LIB9P_VER_9P2000_e: min_size = 9 ; max_size = 65,544 */
 /* LIB9P_VER_9P2000_u: min_size = 13 ; max_size = 65,548 */
 struct lib9p_msg_Rerror {
@@ -669,8 +654,6 @@ struct lib9p_msg_Rerror {
 #endif /* CONFIG_9P_ENABLE_9P2000_u */
 };
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
 /* min_size = 17 ; max_size = 1,048,609 */
 struct lib9p_msg_Twalk {
 	lib9p_tag_t      tag;