summaryrefslogtreecommitdiff
path: root/lib9p/include
diff options
context:
space:
mode:
Diffstat (limited to 'lib9p/include')
-rw-r--r--lib9p/include/lib9p/9p.generated.h76
-rw-r--r--lib9p/include/lib9p/9p.h12
2 files changed, 48 insertions, 40 deletions
diff --git a/lib9p/include/lib9p/9p.generated.h b/lib9p/include/lib9p/9p.generated.h
index feca8c9..25aacfe 100644
--- a/lib9p/include/lib9p/9p.generated.h
+++ b/lib9p/include/lib9p/9p.generated.h
@@ -6,19 +6,35 @@
#include <stdint.h> /* for uint{n}_t types */
+/* config *********************************************************************/
+
+#include "config.h"
+
+#ifndef CONFIG_9P_ENABLE_9P2000
+ #error config.h must define CONFIG_9P_ENABLE_9P2000
+#endif
+
+#ifndef CONFIG_9P_ENABLE_9P2000_e
+ #error config.h must define CONFIG_9P_ENABLE_9P2000_e
+#endif
+
+#ifndef CONFIG_9P_ENABLE_9P2000_u
+ #error config.h must define CONFIG_9P_ENABLE_9P2000_u
+#endif
+
/* versions *******************************************************************/
enum lib9p_version {
LIB9P_VER_unknown = 0, /* "unknown" */
-#if defined(CONFIG_9P_ENABLE_9P2000)
+#if CONFIG_9P_ENABLE_9P2000
LIB9P_VER_9P2000, /* "9P2000" */
-#endif /* defined(CONFIG_9P_ENABLE_9P2000) */
-#if defined(CONFIG_9P_ENABLE_9P2000_e)
+#endif /* CONFIG_9P_ENABLE_9P2000 */
+#if CONFIG_9P_ENABLE_9P2000_e
LIB9P_VER_9P2000_e, /* "9P2000.e" */
-#endif /* defined(CONFIG_9P_ENABLE_9P2000_e) */
-#if defined(CONFIG_9P_ENABLE_9P2000_u)
+#endif /* CONFIG_9P_ENABLE_9P2000_e */
+#if CONFIG_9P_ENABLE_9P2000_u
LIB9P_VER_9P2000_u, /* "9P2000.u" */
-#endif /* defined(CONFIG_9P_ENABLE_9P2000_u) */
+#endif /* CONFIG_9P_ENABLE_9P2000_u */
LIB9P_VER_NUM,
};
@@ -26,7 +42,7 @@ const char *lib9p_version_str(enum lib9p_version);
/* non-message types **********************************************************/
-#if defined(CONFIG_9P_ENABLE_9P2000) || defined(CONFIG_9P_ENABLE_9P2000_e) || defined(CONFIG_9P_ENABLE_9P2000_u)
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
typedef uint16_t lib9p_tag_t;
typedef uint32_t lib9p_fid_t;
@@ -51,16 +67,16 @@ typedef uint32_t lib9p_dm_t;
#define LIB9P_DM_TMP ((lib9p_dm_t)(1<<26))
/* unused ((lib9p_dm_t)(1<<25)) */
/* unused ((lib9p_dm_t)(1<<24)) */
-#if defined(CONFIG_9P_ENABLE_9P2000_u)
+#if CONFIG_9P_ENABLE_9P2000_u
# define LIB9P_DM_DEVICE ((lib9p_dm_t)(1<<23))
-#endif /* defined(CONFIG_9P_ENABLE_9P2000_u) */
+#endif /* CONFIG_9P_ENABLE_9P2000_u */
/* unused ((lib9p_dm_t)(1<<22)) */
-#if defined(CONFIG_9P_ENABLE_9P2000_u)
+#if CONFIG_9P_ENABLE_9P2000_u
# define LIB9P_DM_NAMEDPIPE ((lib9p_dm_t)(1<<21))
# define LIB9P_DM_SOCKET ((lib9p_dm_t)(1<<20))
# define LIB9P_DM_SETUID ((lib9p_dm_t)(1<<19))
# define LIB9P_DM_SETGID ((lib9p_dm_t)(1<<18))
-#endif /* defined(CONFIG_9P_ENABLE_9P2000_u) */
+#endif /* CONFIG_9P_ENABLE_9P2000_u */
/* unused ((lib9p_dm_t)(1<<17)) */
/* unused ((lib9p_dm_t)(1<<16)) */
/* unused ((lib9p_dm_t)(1<<15)) */
@@ -90,9 +106,9 @@ typedef uint8_t lib9p_qt_t;
#define _LIB9P_QT_PLAN9_MOUNT ((lib9p_qt_t)(1<<4))
#define LIB9P_QT_AUTH ((lib9p_qt_t)(1<<3))
#define LIB9P_QT_TMP ((lib9p_qt_t)(1<<2))
-#if defined(CONFIG_9P_ENABLE_9P2000_u)
+#if CONFIG_9P_ENABLE_9P2000_u
# define LIB9P_QT_SYMLINK ((lib9p_qt_t)(1<<1))
-#endif /* defined(CONFIG_9P_ENABLE_9P2000_u) */
+#endif /* CONFIG_9P_ENABLE_9P2000_u */
/* unused ((lib9p_qt_t)(1<<0)) */
#define LIB9P_QT_FILE ((lib9p_qt_t)(0))
@@ -115,12 +131,12 @@ struct lib9p_stat {
struct lib9p_s file_owner_uid;
struct lib9p_s file_owner_gid;
struct lib9p_s file_last_modified_uid;
-#if defined(CONFIG_9P_ENABLE_9P2000_u)
+#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 /* defined(CONFIG_9P_ENABLE_9P2000_u) */
+#endif /* CONFIG_9P_ENABLE_9P2000_u */
};
typedef uint8_t lib9p_o_t;
@@ -140,12 +156,12 @@ 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 /* defined(CONFIG_9P_ENABLE_9P2000) || defined(CONFIG_9P_ENABLE_9P2000_e) || defined(CONFIG_9P_ENABLE_9P2000_u) */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
/* messages *******************************************************************/
enum lib9p_msg_type { /* uint8_t */
-#if defined(CONFIG_9P_ENABLE_9P2000) || defined(CONFIG_9P_ENABLE_9P2000_e) || defined(CONFIG_9P_ENABLE_9P2000_u)
+#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,
@@ -173,18 +189,18 @@ enum lib9p_msg_type { /* uint8_t */
LIB9P_TYP_Rstat = 125,
LIB9P_TYP_Twstat = 126,
LIB9P_TYP_Rwstat = 127,
-#endif /* defined(CONFIG_9P_ENABLE_9P2000) || defined(CONFIG_9P_ENABLE_9P2000_e) || defined(CONFIG_9P_ENABLE_9P2000_u) */
-#if defined(CONFIG_9P_ENABLE_9P2000_e)
+#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 /* defined(CONFIG_9P_ENABLE_9P2000_e) */
+#endif /* CONFIG_9P_ENABLE_9P2000_e */
};
-#if defined(CONFIG_9P_ENABLE_9P2000) || defined(CONFIG_9P_ENABLE_9P2000_e) || defined(CONFIG_9P_ENABLE_9P2000_u)
+#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;
@@ -202,9 +218,9 @@ struct lib9p_msg_Tauth {
lib9p_fid_t afid;
struct lib9p_s uname;
struct lib9p_s aname;
-#if defined(CONFIG_9P_ENABLE_9P2000_u)
+#if CONFIG_9P_ENABLE_9P2000_u
uint32_t n_uname;
-#endif /* defined(CONFIG_9P_ENABLE_9P2000_u) */
+#endif /* CONFIG_9P_ENABLE_9P2000_u */
};
struct lib9p_msg_Rauth {
@@ -218,9 +234,9 @@ struct lib9p_msg_Tattach {
lib9p_fid_t afid;
struct lib9p_s uname;
struct lib9p_s aname;
-#if defined(CONFIG_9P_ENABLE_9P2000_u)
+#if CONFIG_9P_ENABLE_9P2000_u
uint32_t n_uname;
-#endif /* defined(CONFIG_9P_ENABLE_9P2000_u) */
+#endif /* CONFIG_9P_ENABLE_9P2000_u */
};
struct lib9p_msg_Rattach {
@@ -231,9 +247,9 @@ struct lib9p_msg_Rattach {
struct lib9p_msg_Rerror {
lib9p_tag_t tag;
struct lib9p_s ename;
-#if defined(CONFIG_9P_ENABLE_9P2000_u)
+#if CONFIG_9P_ENABLE_9P2000_u
uint32_t errno;
-#endif /* defined(CONFIG_9P_ENABLE_9P2000_u) */
+#endif /* CONFIG_9P_ENABLE_9P2000_u */
};
struct lib9p_msg_Tflush {
@@ -347,8 +363,8 @@ struct lib9p_msg_Rwstat {
lib9p_tag_t tag;
};
-#endif /* defined(CONFIG_9P_ENABLE_9P2000) || defined(CONFIG_9P_ENABLE_9P2000_e) || defined(CONFIG_9P_ENABLE_9P2000_u) */
-#if defined(CONFIG_9P_ENABLE_9P2000_e)
+#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;
@@ -382,4 +398,4 @@ struct lib9p_msg_Rswrite {
lib9p_tag_t tag;
uint32_t count;
};
-#endif /* defined(CONFIG_9P_ENABLE_9P2000_e) */
+#endif /* CONFIG_9P_ENABLE_9P2000_e */
diff --git a/lib9p/include/lib9p/9p.h b/lib9p/include/lib9p/9p.h
index 9d22354..fb1f97d 100644
--- a/lib9p/include/lib9p/9p.h
+++ b/lib9p/include/lib9p/9p.h
@@ -13,21 +13,13 @@
#include <libmisc/assert.h>
#include <lib9p/linux-errno.h>
-
-/* configuration **************************************************************/
-
-#include "config.h"
+#include <lib9p/9p.generated.h>
#ifndef CONFIG_9P_MAX_ERR_SIZE
#error config.h must define CONFIG_9P_MAX_ERR_SIZE
#endif
-#ifndef CONFIG_9P_ENABLE_9P2000
- #define CONFIG_9P_ENABLE_9P2000
-#endif
-
-/* protocol definitions *******************************************************/
-#include <lib9p/9p.generated.h> /* *after* config.h */
+/******************************************************************************/
#define LIB9P_NOTAG ((uint16_t)~0U)
#define LIB9P_NOFID ((uint32_t)~0U)
generated by cgit v1.2.3-2-g168b (git 2.25.1) at 2025-04-01 04:40:37 +0000