lib9p: idl: 9P2000.L: Also import Rerror

For some of the imported methods, it doesn't specify to use Rlerror
instead of Rerror.

3 files changed, 7 insertions, 21 deletions

diff --git a/lib9p/9p.generated.c b/lib9p/9p.generated.c
index 8d29a6d..63fd340 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),
@@ -1044,8 +1045,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 +1064,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;
@@ -2238,8 +2235,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 +2246,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;
@@ -3314,8 +3307,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 +3323,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 +4132,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 +4320,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/2010-9P2000.L.9p b/lib9p/idl/2010-9P2000.L.9p
index 972e7d0..bc36f01 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, 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/include/lib9p/9p.generated.h b/lib9p/include/lib9p/9p.generated.h
index f41b3ca..fa70897 100644
--- a/lib9p/include/lib9p/9p.generated.h
+++ b/lib9p/include/lib9p/9p.generated.h
@@ -55,11 +55,7 @@ enum lib9p_msg_type { /* uint8_t */
 	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,
@@ -656,9 +652,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 +664,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;