Merge branch 'lukeshu/lib9p-idl-cleanup'

1 files changed, 49 insertions, 42 deletions

diff --git a/lib9p/9p.generated.c b/lib9p/9p.generated.c
index d3dc36a..c260647 100644
--- a/lib9p/9p.generated.c
+++ b/lib9p/9p.generated.c
@@ -34,6 +34,46 @@ const char *lib9p_version_str(enum lib9p_version ver) {
     return version_strs[ver];
 }
 
+/* bitmasks *******************************************************************/
+
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+static const lib9p_dm_t dm_masks[LIB9P_VER_NUM] = {
+#if CONFIG_9P_ENABLE_9P2000
+	[LIB9P_VER_9P2000]   = 0b11101100000000000000000111111111,
+#endif /* CONFIG_9P_ENABLE_9P2000 */
+#if CONFIG_9P_ENABLE_9P2000_e
+	[LIB9P_VER_9P2000_e] = 0b11101100000000000000000111111111,
+#endif /* CONFIG_9P_ENABLE_9P2000_e */
+#if CONFIG_9P_ENABLE_9P2000_u
+	[LIB9P_VER_9P2000_u] = 0b11101100101111000000000111111111,
+#endif /* CONFIG_9P_ENABLE_9P2000_u */
+};
+
+static const lib9p_qt_t qt_masks[LIB9P_VER_NUM] = {
+#if CONFIG_9P_ENABLE_9P2000
+	[LIB9P_VER_9P2000]   = 0b11101100,
+#endif /* CONFIG_9P_ENABLE_9P2000 */
+#if CONFIG_9P_ENABLE_9P2000_e
+	[LIB9P_VER_9P2000_e] = 0b11101100,
+#endif /* CONFIG_9P_ENABLE_9P2000_e */
+#if CONFIG_9P_ENABLE_9P2000_u
+	[LIB9P_VER_9P2000_u] = 0b11101110,
+#endif /* CONFIG_9P_ENABLE_9P2000_u */
+};
+
+static const lib9p_o_t o_masks[LIB9P_VER_NUM] = {
+#if CONFIG_9P_ENABLE_9P2000
+	[LIB9P_VER_9P2000]   = 0b01010011,
+#endif /* CONFIG_9P_ENABLE_9P2000 */
+#if CONFIG_9P_ENABLE_9P2000_e
+	[LIB9P_VER_9P2000_e] = 0b01010011,
+#endif /* CONFIG_9P_ENABLE_9P2000_e */
+#if CONFIG_9P_ENABLE_9P2000_u
+	[LIB9P_VER_9P2000_u] = 0b01010011,
+#endif /* CONFIG_9P_ENABLE_9P2000_u */
+};
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+
 /* validate_* *****************************************************************/
 
 LM_ALWAYS_INLINE static bool _validate_size_net(struct _validate_ctx *ctx, uint32_t n) {
@@ -99,17 +139,6 @@ LM_ALWAYS_INLINE static bool validate_s(struct _validate_ctx *ctx) {
 	return false;
 }
 
-static const lib9p_dm_t dm_masks[LIB9P_VER_NUM] = {
-#if CONFIG_9P_ENABLE_9P2000
-	[LIB9P_VER_9P2000]   = 0b11101100000000000000000111111111,
-#endif /* CONFIG_9P_ENABLE_9P2000 */
-#if CONFIG_9P_ENABLE_9P2000_e
-	[LIB9P_VER_9P2000_e] = 0b11101100000000000000000111111111,
-#endif /* CONFIG_9P_ENABLE_9P2000_e */
-#if CONFIG_9P_ENABLE_9P2000_u
-	[LIB9P_VER_9P2000_u] = 0b11101100101111000000000111111111,
-#endif /* CONFIG_9P_ENABLE_9P2000_u */
-};
 LM_ALWAYS_INLINE static bool validate_dm(struct _validate_ctx *ctx) {
 	 if (validate_4(ctx))
 		return true;
@@ -120,17 +149,6 @@ LM_ALWAYS_INLINE static bool validate_dm(struct _validate_ctx *ctx) {
 	return false;
 }
 
-static const lib9p_qt_t qt_masks[LIB9P_VER_NUM] = {
-#if CONFIG_9P_ENABLE_9P2000
-	[LIB9P_VER_9P2000]   = 0b11101100,
-#endif /* CONFIG_9P_ENABLE_9P2000 */
-#if CONFIG_9P_ENABLE_9P2000_e
-	[LIB9P_VER_9P2000_e] = 0b11101100,
-#endif /* CONFIG_9P_ENABLE_9P2000_e */
-#if CONFIG_9P_ENABLE_9P2000_u
-	[LIB9P_VER_9P2000_u] = 0b11101110,
-#endif /* CONFIG_9P_ENABLE_9P2000_u */
-};
 LM_ALWAYS_INLINE static bool validate_qt(struct _validate_ctx *ctx) {
 	 if (validate_1(ctx))
 		return true;
@@ -176,17 +194,6 @@ LM_ALWAYS_INLINE static bool validate_stat(struct _validate_ctx *ctx) {
 	    ;
 }
 
-static const lib9p_o_t o_masks[LIB9P_VER_NUM] = {
-#if CONFIG_9P_ENABLE_9P2000
-	[LIB9P_VER_9P2000]   = 0b01010011,
-#endif /* CONFIG_9P_ENABLE_9P2000 */
-#if CONFIG_9P_ENABLE_9P2000_e
-	[LIB9P_VER_9P2000_e] = 0b01010011,
-#endif /* CONFIG_9P_ENABLE_9P2000_e */
-#if CONFIG_9P_ENABLE_9P2000_u
-	[LIB9P_VER_9P2000_u] = 0b01010011,
-#endif /* CONFIG_9P_ENABLE_9P2000_u */
-};
 LM_ALWAYS_INLINE static bool validate_o(struct _validate_ctx *ctx) {
 	 if (validate_1(ctx))
 		return true;
@@ -1784,15 +1791,15 @@ LM_FLATTEN static bool marshal_Rswrite(struct _marshal_ctx *ctx, struct lib9p_ms
 
 /* tables / exports ***********************************************************/
 
-#define _MSG(typ) [LIB9P_TYP_##typ] = {                          \
-		.name      = #typ,                               \
-		.basesize  = sizeof(struct lib9p_msg_##typ),     \
-		.validate  = validate_##typ,                     \
-		.unmarshal = (_unmarshal_fn_t)unmarshal_##typ,   \
-		.marshal   = (_marshal_fn_t)marshal_##typ,       \
+#define _MSG(typ) [LIB9P_TYP_##typ] = {                         \
+		.name      = #typ,                              \
+		.basesize  = sizeof(struct lib9p_msg_##typ),    \
+		.validate  = validate_##typ,                    \
+		.unmarshal = (_unmarshal_fn_t)unmarshal_##typ,  \
+		.marshal   = (_marshal_fn_t)marshal_##typ,      \
 	}
-#define _NONMSG(num) [num] = {                                   \
-		.name      = #num,                               \
+#define _NONMSG(num) [num] = {      \
+		.name      = #num,  \
 	}
 
 struct _table_version _lib9p_versions[LIB9P_VER_NUM] = {
@@ -2843,5 +2850,5 @@ LM_FLATTEN void _lib9p_unmarshal_stat(struct _unmarshal_ctx *ctx, struct lib9p_s
 	unmarshal_stat(ctx, out);
 }
 LM_FLATTEN bool _lib9p_marshal_stat(struct _marshal_ctx *ctx, struct lib9p_stat *val) {
-    return marshal_stat(ctx, val);
+	return marshal_stat(ctx, val);
 }