Merge branch 'lukeshu/better-cpp'HEADmain

5 files changed, 10 insertions, 12 deletions

diff --git a/cmd/sbc_harness/fs_harness_flash_bin.c b/cmd/sbc_harness/fs_harness_flash_bin.c
index 5e6f49c..8bd144e 100644
--- a/cmd/sbc_harness/fs_harness_flash_bin.c
+++ b/cmd/sbc_harness/fs_harness_flash_bin.c
@@ -201,7 +201,7 @@ static lo_interface lib9p_srv_fio flash_file_fopen(struct flash_file *self, stru
 		self->wbuf.ok = false;
 	}
 
-	return lo_box_flash_file_as_lib9p_srv_fio(self);
+	return LO_BOX(lib9p_srv_fio, self);
 }
 
 /* srv_fio ********************************************************************/
diff --git a/cmd/sbc_harness/fs_harness_flash_bin.h b/cmd/sbc_harness/fs_harness_flash_bin.h
index 36382be..148a446 100644
--- a/cmd/sbc_harness/fs_harness_flash_bin.h
+++ b/cmd/sbc_harness/fs_harness_flash_bin.h
@@ -25,6 +25,5 @@ struct flash_file {
 	END_PRIVATE(FS_HARNESS_FLASH_BIN);
 };
 LO_IMPLEMENTATION_H(lib9p_srv_file, struct flash_file, flash_file);
-#define lo_box_flash_file_as_lib9p_srv_file(obj) util9p_box(flash_file, obj)
 
 #endif /* _SBC_HARNESS_FS_HARNESS_FLASH_BIN_H_ */
diff --git a/cmd/sbc_harness/fs_harness_uptime_txt.c b/cmd/sbc_harness/fs_harness_uptime_txt.c
index 339b410..23ac9d4 100644
--- a/cmd/sbc_harness/fs_harness_uptime_txt.c
+++ b/cmd/sbc_harness/fs_harness_uptime_txt.c
@@ -89,7 +89,7 @@ static lo_interface lib9p_srv_fio uptime_file_fopen(struct uptime_file *self, st
 	ret->parent = self;
 	ret->buf_len = 0;
 
-	return lo_box_uptime_fio_as_lib9p_srv_fio(ret);
+	return LO_BOX(lib9p_srv_fio, ret);
 }
 
 /* srv_fio ********************************************************************/
diff --git a/cmd/sbc_harness/fs_harness_uptime_txt.h b/cmd/sbc_harness/fs_harness_uptime_txt.h
index 7bf2945..c575580 100644
--- a/cmd/sbc_harness/fs_harness_uptime_txt.h
+++ b/cmd/sbc_harness/fs_harness_uptime_txt.h
@@ -14,6 +14,5 @@ struct uptime_file {
 	uint64_t         pathnum;
 };
 LO_IMPLEMENTATION_H(lib9p_srv_file, struct uptime_file, uptime_file);
-#define lo_box_uptime_file_as_lib9p_srv_file(obj) util9p_box(uptime_file, obj)
 
 #endif /* _SBC_HARNESS_FS_HARNESS_UPTIME_TXT_H_ */
diff --git a/cmd/sbc_harness/main.c b/cmd/sbc_harness/main.c
index 71c39b2..d32b775 100644
--- a/cmd/sbc_harness/main.c
+++ b/cmd/sbc_harness/main.c
@@ -54,11 +54,11 @@ enum { PATH_BASE = __COUNTER__ };
 #define STATIC_FILE(STRNAME, ...) UTIL9P_STATIC_FILE(PATH_COUNTER, STRNAME, __VA_ARGS__)
 #define STATIC_DIR(STRNAME, ...)  UTIL9P_STATIC_DIR(PATH_COUNTER, STRNAME, __VA_ARGS__)
 
-#define API_FILE(STRNAME, SYMNAME, ...)                                      \
-	lo_box_##SYMNAME##_file_as_lib9p_srv_file(&((struct SYMNAME##_file){ \
-		.name = STRNAME,                                             \
-		.pathnum = PATH_COUNTER                                      \
-		__VA_OPT__(,) __VA_ARGS__                                    \
+#define API_FILE(STRNAME, SYMNAME, ...)                   \
+	LO_BOX(lib9p_srv_file, &((struct SYMNAME##_file){ \
+		.name = STRNAME,                          \
+		.pathnum = PATH_COUNTER                   \
+		__VA_OPT__(,) __VA_ARGS__                 \
 	}))
 
 static struct lib9p_srv_file root =
@@ -149,7 +149,7 @@ struct {
 static COROUTINE dhcp_cr(void *) {
 	cr_begin();
 
-	dhcp_client_main(lo_box_w5500_if_as_net_iface(&globals.dev_w5500), "harness");
+	dhcp_client_main(LO_BOX(net_iface, &globals.dev_w5500), "harness");
 
 	cr_end();
 }
@@ -157,7 +157,7 @@ static COROUTINE dhcp_cr(void *) {
 static COROUTINE read9p_cr(void *) {
 	cr_begin();
 
-	lo_interface net_iface iface = lo_box_w5500_if_as_net_iface(&globals.dev_w5500);
+	lo_interface net_iface iface = LO_BOX(net_iface, &globals.dev_w5500);
 	lo_interface net_stream_listener listener = LO_CALL(iface, tcp_listen, LIB9P_DEFAULT_PORT_9FS);
 
 	lib9p_srv_accept_and_read_loop(&globals.srv, listener);
@@ -204,7 +204,7 @@ COROUTINE init_cr(void *) {
 	                  17, /* PIN_CS */
 	                  0, 1, 2, 3); /* DMA channels */
 	w5500_init(&globals.dev_w5500, "W5500",
-	           lo_box_rp2040_hwspi_as_spi(&globals.dev_spi),
+	           LO_BOX(spi, &globals.dev_spi),
 	           21, /* PIN_INTR */
 	           20, /* PIN_RESET */
 	           ((struct net_eth_addr){{