summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmd/sbc_harness/config/config.h16
-rw-r--r--cmd/sbc_harness/main.c6
-rw-r--r--lib9p/internal.h6
-rw-r--r--lib9p/srv.c12
-rw-r--r--lib9p/tests/test_server/config/config.h13
5 files changed, 28 insertions, 25 deletions
diff --git a/cmd/sbc_harness/config/config.h b/cmd/sbc_harness/config/config.h
index 309fac1..3a777f5 100644
--- a/cmd/sbc_harness/config/config.h
+++ b/cmd/sbc_harness/config/config.h
@@ -56,9 +56,9 @@
* struct padding, (2) nul-terminator byes for strings.
*/
#define CONFIG_9P_MAX_HOSTMSG_SIZE CONFIG_9P_MAX_MSG_SIZE+16
-#define CONFIG_9P_MAX_FIDS 16
-#define CONFIG_9P_MAX_REQS 2
#define CONFIG_9P_MAX_ERR_SIZE 128 /* 128 is what Plan 9 4e uses */
+#define CONFIG_9P_SRV_MAX_FIDS 16
+#define CONFIG_9P_SRV_MAX_REQS 2
#define CONFIG_9P_ENABLE_9P2000 1 /* bool */
#define CONFIG_9P_ENABLE_9P2000_u 1 /* bool */
#define CONFIG_9P_ENABLE_9P2000_e 0 /* bool */
@@ -94,11 +94,11 @@
#define CONFIG_COROUTINE_GDB 1 /* bool */
#define _CONFIG_9P_NUM_SOCKS 7
-#define CONFIG_COROUTINE_NUM ( \
- 1 /* usb_common */ + \
- 1 /* usb_keyboard */ + \
- CONFIG_W5500_NUM /* irq handler */ + \
- _CONFIG_9P_NUM_SOCKS /* 9P accept()+read() */ + \
- (CONFIG_9P_MAX_REQS*_CONFIG_9P_NUM_SOCKS) /* 9P work+write() */ )
+#define CONFIG_COROUTINE_NUM ( \
+ 1 /* usb_common */ + \
+ 1 /* usb_keyboard */ + \
+ CONFIG_W5500_NUM /* irq handler */ + \
+ _CONFIG_9P_NUM_SOCKS /* 9P accept()+read() */ + \
+ (CONFIG_9P_SRV_MAX_REQS*_CONFIG_9P_NUM_SOCKS) /* 9P work+write() */ )
#endif /* _CONFIG_H_ */
diff --git a/cmd/sbc_harness/main.c b/cmd/sbc_harness/main.c
index 00f1c4a..b17725d 100644
--- a/cmd/sbc_harness/main.c
+++ b/cmd/sbc_harness/main.c
@@ -1,6 +1,6 @@
/* sbc_harness/main.c - Main entry point and event loop for sbc-harness
*
- * Copyright (C) 2024 Luke T. Shumaker <lukeshu@lukeshu.com>
+ * Copyright (C) 2024-2025 Luke T. Shumaker <lukeshu@lukeshu.com>
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
@@ -68,7 +68,7 @@ static COROUTINE read9p_cr(void *) {
}
const char *hexdig = "0123456789ABCDEF";
-static_assert(CONFIG_9P_MAX_REQS*_CONFIG_9P_NUM_SOCKS <= 16);
+static_assert(CONFIG_9P_SRV_MAX_REQS*_CONFIG_9P_NUM_SOCKS <= 16);
COROUTINE init_cr(void *) {
cr_begin();
@@ -122,7 +122,7 @@ COROUTINE init_cr(void *) {
char name[] = {'r', 'e', 'a', 'd', '-', hexdig[i], '\0'};
coroutine_add(name, read9p_cr, NULL);
}
- for (int i = 0; i < CONFIG_9P_MAX_REQS*_CONFIG_9P_NUM_SOCKS; i++) {
+ for (int i = 0; i < CONFIG_9P_SRV_MAX_REQS*_CONFIG_9P_NUM_SOCKS; i++) {
char name[] = {'w', 'r', 'i', 't', 'e', '-', hexdig[i], '\0'};
coroutine_add(name, lib9p_srv_write_cr, &globals.srv);
}
diff --git a/lib9p/internal.h b/lib9p/internal.h
index eb67992..d939d46 100644
--- a/lib9p/internal.h
+++ b/lib9p/internal.h
@@ -28,12 +28,6 @@
#ifndef CONFIG_9P_MAX_HOSTMSG_SIZE
#error config.h must define CONFIG_9P_MAX_HOSTMSG_SIZE
#endif
-#ifndef CONFIG_9P_MAX_FIDS
- #error config.h must define CONFIG_9P_MAX_FIDS
-#endif
-#ifndef CONFIG_9P_MAX_REQS
- #error config.h must define CONFIG_9P_MAX_REQS
-#endif
#ifndef CONFIG_9P_MAX_ERR_SIZE
#error config.h must define CONFIG_9P_MAX_ERR_SIZE
#endif
diff --git a/lib9p/srv.c b/lib9p/srv.c
index 10a8a96..06117b8 100644
--- a/lib9p/srv.c
+++ b/lib9p/srv.c
@@ -20,8 +20,16 @@
#define IMPLEMENTATION_FOR_LIB9P_SRV_H YES
#include <lib9p/srv.h>
+
#include "internal.h"
+#ifndef CONFIG_9P_SRV_MAX_FIDS
+ #error config.h must define CONFIG_9P_SRV_MAX_FIDS
+#endif
+#ifndef CONFIG_9P_SRV_MAX_REQS
+ #error config.h must define CONFIG_9P_SRV_MAX_REQS
+#endif
+
/* context ********************************************************************/
bool lib9p_srv_flush_requested(struct lib9p_srv_ctx *ctx) {
@@ -55,13 +63,13 @@ struct _srv_fidinfo {
#define NAME fidmap
#define KEY_T lib9p_fid_t
#define VAL_T struct _srv_fidinfo
-#define CAP CONFIG_9P_MAX_FIDS
+#define CAP CONFIG_9P_SRV_MAX_FIDS
#include "map.h"
#define NAME reqmap
#define KEY_T lib9p_tag_t
#define VAL_T struct _lib9p_srv_req *
-#define CAP CONFIG_9P_MAX_REQS
+#define CAP CONFIG_9P_SRV_MAX_REQS
#include "map.h"
/* The hierarchy of concepts is:
diff --git a/lib9p/tests/test_server/config/config.h b/lib9p/tests/test_server/config/config.h
index e4036d6..ffd549b 100644
--- a/lib9p/tests/test_server/config/config.h
+++ b/lib9p/tests/test_server/config/config.h
@@ -36,9 +36,9 @@
* struct padding, (2) array pointers.
*/
#define CONFIG_9P_MAX_HOSTMSG_SIZE CONFIG_9P_MAX_MSG_SIZE+16
-#define CONFIG_9P_MAX_FIDS 16
-#define CONFIG_9P_MAX_REQS 2
#define CONFIG_9P_MAX_ERR_SIZE 128 /* 128 is what Plan 9 4e uses */
+#define CONFIG_9P_SRV_MAX_FIDS 16
+#define CONFIG_9P_SRV_MAX_REQS 2
#define CONFIG_9P_ENABLE_9P2000 1 /* bool */
#define CONFIG_9P_ENABLE_9P2000_u 1 /* bool */
#define CONFIG_9P_ENABLE_9P2000_e 0 /* bool */
@@ -54,9 +54,10 @@
#define CONFIG_COROUTINE_DEBUG 0 /* bool */
#define CONFIG_COROUTINE_VALGRIND 1 /* bool */
#define CONFIG_COROUTINE_GDB 1 /* bool */
-#define CONFIG_COROUTINE_NUM (1 /* usb_common */ +\
- 1 /* usb_keyboard */ +\
- CONFIG_SRV9P_NUM_CONNS /* accept+read */ +\
- (CONFIG_9P_MAX_REQS*CONFIG_SRV9P_NUM_CONNS) /* work+write */ )
+#define CONFIG_COROUTINE_NUM ( \
+ 1 /* usb_common */ + \
+ 1 /* usb_keyboard */ + \
+ CONFIG_SRV9P_NUM_CONNS /* accept+read */ + \
+ (CONFIG_9P_SRV_MAX_REQS*CONFIG_SRV9P_NUM_CONNS) /* work+write */ )
#endif /* _CONFIG_H_ */