libhw_generic: net: Use libobj instead of vcall.h

author: Luke T. Shumaker <lukeshu@lukeshu.com> 2025-02-02 02:01:30 -0700
committer: Luke T. Shumaker <lukeshu@lukeshu.com> 2025-02-09 23:42:11 -0700
commit: 06eed899486daeec8ad2718c74d70f91fa0dbb25 (patch)
tree: f402d1cc1e82f5e297db142f51fdfd4306a74f68 /libhw
parent: cb0c00a240c0d803e7202433f9940a91db849a5c (diff)
5 files changed, 65 insertions, 184 deletions
diff --git a/libhw/host_include/libhw/host_net.h b/libhw/host_include/libhw/host_net.h
index bfef5c9..fced229 100644
--- a/libhw/host_include/libhw/host_net.h
+++ b/libhw/host_include/libhw/host_net.h
@@ -1,6 +1,6 @@
 /* libhw/host_net.h - <libhw/generic/net.h> implementation for hosted glibc
  *
- * 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
  */
 
@@ -14,33 +14,30 @@
 #include <libhw/generic/net.h>
 
 struct _hostnet_tcp_conn {
-	implements_net_stream_conn;
-
 	BEGIN_PRIVATE(LIBHW_HOST_NET_H)
 	int                              fd;
 	uint64_t                         read_deadline_ns;
 	END_PRIVATE(LIBHW_HOST_NET_H)
 };
+LO_IMPLEMENTATION_H(net_stream_conn, struct _hostnet_tcp_conn, hostnet_tcp)
 
 struct hostnet_tcp_listener {
-	implements_net_stream_listener;
-
 	BEGIN_PRIVATE(LIBHW_HOST_NET_H)
 	int                              fd;
 	struct _hostnet_tcp_conn         active_conn;
 	END_PRIVATE(LIBHW_HOST_NET_H)
 };
+LO_IMPLEMENTATION_H(net_stream_listener, struct hostnet_tcp_listener, hostnet_tcplist)
 
 void hostnet_tcp_listener_init(struct hostnet_tcp_listener *self, uint16_t port);
 
 struct hostnet_udp_conn {
-	implements_net_packet_conn;
-
 	BEGIN_PRIVATE(LIBHW_HOST_NET_H)
 	int                              fd;
 	uint64_t                         read_deadline_ns;
 	END_PRIVATE(LIBHW_HOST_NET_H)
 };
+LO_IMPLEMENTATION_H(net_packet_conn, struct hostnet_udp_conn, hostnet_udp)
 
 void hostnet_udp_conn_init(struct hostnet_udp_conn *self, uint16_t port);
 
diff --git a/libhw/host_net.c b/libhw/host_net.c
index 3352b87..505c7dc 100644
--- a/libhw/host_net.c
+++ b/libhw/host_net.c
@@ -21,7 +21,7 @@
 #include <libcr/coroutine.h>
 #include <libmisc/assert.h>
 #include <libmisc/macro.h>
-#include <libmisc/vcall.h>
+#include <libobj/obj.h>
 
 #include <libhw/generic/alarmclock.h>
 
@@ -30,6 +30,10 @@
 
 #include "host_util.h" /* for host_sigrt_alloc(), ns_to_host_us_time() */
 
+LO_IMPLEMENTATION_C(net_stream_conn, struct _hostnet_tcp_conn, hostnet_tcp, static)
+LO_IMPLEMENTATION_C(net_stream_listener, struct hostnet_tcp_listener, hostnet_tcplist, static)
+LO_IMPLEMENTATION_C(net_packet_conn, struct hostnet_udp_conn, hostnet_udp, static)
+
 /* common *********************************************************************/
 
 static int hostnet_sig_io = 0;
@@ -109,25 +113,6 @@ static inline ssize_t hostnet_map_negerrno(ssize_t v, enum hostnet_timeout_op op
 
 /* TCP init() ( AKA socket(3) + listen(3) )************************************/
 
-static implements_net_stream_conn *hostnet_tcplist_accept(implements_net_stream_listener *);
-static int                         hostnet_tcplist_close(implements_net_stream_listener *);
-static void    hostnet_tcp_set_read_deadline(implements_net_stream_conn *conn, uint64_t ts_ns);
-static ssize_t hostnet_tcp_read(implements_net_stream_conn *conn, void *buf, size_t count);
-static ssize_t hostnet_tcp_write(implements_net_stream_conn *conn, void *buf, size_t count);
-static int     hostnet_tcp_close(implements_net_stream_conn *conn, bool rd, bool wr);
-
-static struct net_stream_listener_vtable hostnet_tcp_listener_vtable = {
-	.accept = hostnet_tcplist_accept,
-	.close  = hostnet_tcplist_close,
-};
-
-static struct net_stream_conn_vtable hostnet_tcp_conn_vtable = {
-	.set_read_deadline = hostnet_tcp_set_read_deadline,
-	.read              = hostnet_tcp_read,
-	.write             = hostnet_tcp_write,
-	.close             = hostnet_tcp_close,
-};
-
 void hostnet_tcp_listener_init(struct hostnet_tcp_listener *self, uint16_t port) {
 	int listenerfd;
 	union {
@@ -151,7 +136,6 @@ void hostnet_tcp_listener_init(struct hostnet_tcp_listener *self, uint16_t port)
 	if (listen(listenerfd, 0) < 0)
 		error(1, errno, "listen(fd=%d)", listenerfd);
 
-	self->vtable = &hostnet_tcp_listener_vtable;
 	self->fd = listenerfd;
 }
 
@@ -175,9 +159,7 @@ static void *hostnet_pthread_accept(void *_args) {
 	return NULL;
 }
 
-static implements_net_stream_conn *hostnet_tcplist_accept(implements_net_stream_listener *_listener) {
-	struct hostnet_tcp_listener *listener =
-		VCALL_SELF(struct hostnet_tcp_listener, implements_net_stream_listener, _listener);
+static lo_interface net_stream_conn hostnet_tcplist_accept(struct hostnet_tcp_listener *listener) {
 	assert(listener);
 
 	int ret_connfd;
@@ -188,22 +170,19 @@ static implements_net_stream_conn *hostnet_tcplist_accept(implements_net_stream_
 		.ret_connfd   = &ret_connfd,
 	};
 	if (RUN_PTHREAD(hostnet_pthread_accept, &args))
-		return NULL;
+		return LO_NULL(net_stream_conn);
 
 	if (ret_connfd < 0)
-		return NULL;
+		return LO_NULL(net_stream_conn);
 
-	listener->active_conn.vtable = &hostnet_tcp_conn_vtable;
 	listener->active_conn.fd = ret_connfd;
 	listener->active_conn.read_deadline_ns = 0;
-	return &listener->active_conn;
+	return lo_box_hostnet_tcp_as_net_stream_conn(&listener->active_conn);
 }
 
 /* TCP listener close() *******************************************************/
 
-static int hostnet_tcplist_close(implements_net_stream_listener *_listener) {
-	struct hostnet_tcp_listener *listener =
-		VCALL_SELF(struct hostnet_tcp_listener, implements_net_stream_listener, _listener);
+static int hostnet_tcplist_close(struct hostnet_tcp_listener *listener) {
 	assert(listener);
 
 	return hostnet_map_negerrno(shutdown(listener->fd, SHUT_RDWR) ? -errno : 0, OP_NONE);
@@ -211,9 +190,7 @@ static int hostnet_tcplist_close(implements_net_stream_listener *_listener) {
 
 /* TCP read() *****************************************************************/
 
-static void hostnet_tcp_set_read_deadline(implements_net_stream_conn *_conn, uint64_t ts_ns) {
-	struct _hostnet_tcp_conn *conn =
-		VCALL_SELF(struct _hostnet_tcp_conn, implements_net_stream_conn, _conn);
+static void hostnet_tcp_set_read_deadline(struct _hostnet_tcp_conn *conn, uint64_t ts_ns) {
 	assert(conn);
 
 	conn->read_deadline_ns = ts_ns;
@@ -250,9 +227,7 @@ static void *hostnet_pthread_read(void *_args) {
 	return NULL;
 }
 
-static ssize_t hostnet_tcp_read(implements_net_stream_conn *_conn, void *buf, size_t count) {
-	struct _hostnet_tcp_conn *conn =
-		VCALL_SELF(struct _hostnet_tcp_conn, implements_net_stream_conn, _conn);
+static ssize_t hostnet_tcp_read(struct _hostnet_tcp_conn *conn, void *buf, size_t count) {
 	assert(conn);
 
 	ssize_t ret;
@@ -310,9 +285,7 @@ static void *hostnet_pthread_write(void *_args) {
 	return NULL;
 }
 
-static ssize_t hostnet_tcp_write(implements_net_stream_conn *_conn, void *buf, size_t count) {
-	struct _hostnet_tcp_conn *conn =
-		VCALL_SELF(struct _hostnet_tcp_conn, implements_net_stream_conn, _conn);
+static ssize_t hostnet_tcp_write(struct _hostnet_tcp_conn *conn, void *buf, size_t count) {
 	assert(conn);
 
 	ssize_t ret;
@@ -333,9 +306,7 @@ static ssize_t hostnet_tcp_write(implements_net_stream_conn *_conn, void *buf, s
 
 /* TCP close() ****************************************************************/
 
-static int hostnet_tcp_close(implements_net_stream_conn *_conn, bool rd, bool wr) {
-	struct _hostnet_tcp_conn *conn =
-		VCALL_SELF(struct _hostnet_tcp_conn, implements_net_stream_conn, _conn);
+static int hostnet_tcp_close(struct _hostnet_tcp_conn *conn, bool rd, bool wr) {
 	assert(conn);
 
 	int how;
@@ -352,21 +323,6 @@ static int hostnet_tcp_close(implements_net_stream_conn *_conn, bool rd, bool wr
 
 /* UDP init() *****************************************************************/
 
-static void    hostnet_udp_set_read_deadline(implements_net_packet_conn *self,
-                                             uint64_t ts_ns);
-static ssize_t hostnet_udp_sendto(implements_net_packet_conn *self, void *buf, size_t len,
-                                  struct net_ip4_addr addr, uint16_t port);
-static ssize_t hostnet_udp_recvfrom(implements_net_packet_conn *self, void *buf, size_t len,
-                                    struct net_ip4_addr *ret_addr, uint16_t *ret_port);
-static int     hostnet_udp_close(implements_net_packet_conn *self);
-
-static struct net_packet_conn_vtable hostnet_udp_conn_vtable = {
-	.set_read_deadline = hostnet_udp_set_read_deadline,
-	.sendto            = hostnet_udp_sendto,
-	.recvfrom          = hostnet_udp_recvfrom,
-	.close             = hostnet_udp_close,
-};
-
 void hostnet_udp_conn_init(struct hostnet_udp_conn *self, uint16_t port) {
 	int fd;
 	union {
@@ -385,7 +341,6 @@ void hostnet_udp_conn_init(struct hostnet_udp_conn *self, uint16_t port) {
 	if (bind(fd, &addr.gen, sizeof addr) < 0)
 		error(1, errno, "bind");
 
-	self->vtable = &hostnet_udp_conn_vtable;
 	self->fd = fd;
 	self->read_deadline_ns = 0;
 }
@@ -427,10 +382,8 @@ static void *hostnet_pthread_sendto(void *_args) {
 	return NULL;
 }
 
-static ssize_t hostnet_udp_sendto(implements_net_packet_conn *_conn, void *buf, size_t count,
+static ssize_t hostnet_udp_sendto(struct hostnet_udp_conn *conn, void *buf, size_t count,
                                   struct net_ip4_addr node, uint16_t port) {
-	struct hostnet_udp_conn *conn =
-		VCALL_SELF(struct hostnet_udp_conn, implements_net_packet_conn, _conn);
 	assert(conn);
 
 	ssize_t ret;
@@ -453,10 +406,8 @@ static ssize_t hostnet_udp_sendto(implements_net_packet_conn *_conn, void *buf,
 
 /* UDP recvfrom() *************************************************************/
 
-static void hostnet_udp_set_read_deadline(implements_net_packet_conn *_conn,
+static void hostnet_udp_set_read_deadline(struct hostnet_udp_conn *conn,
                                           uint64_t ts_ns) {
-	struct hostnet_udp_conn *conn =
-		VCALL_SELF(struct hostnet_udp_conn, implements_net_packet_conn, _conn);
 	assert(conn);
 
 	conn->read_deadline_ns = ts_ns;
@@ -514,10 +465,8 @@ static void *hostnet_pthread_recvfrom(void *_args) {
 	return NULL;
 }
 
-static ssize_t hostnet_udp_recvfrom(implements_net_packet_conn *_conn, void *buf, size_t count,
+static ssize_t hostnet_udp_recvfrom(struct hostnet_udp_conn *conn, void *buf, size_t count,
                                     struct net_ip4_addr *ret_node, uint16_t *ret_port) {
-	struct hostnet_udp_conn *conn =
-		VCALL_SELF(struct hostnet_udp_conn, implements_net_packet_conn, _conn);
 	assert(conn);
 
 	ssize_t ret;
@@ -549,9 +498,7 @@ static ssize_t hostnet_udp_recvfrom(implements_net_packet_conn *_conn, void *buf
 
 /* UDP close() ****************************************************************/
 
-static int hostnet_udp_close(implements_net_packet_conn *_conn) {
-	struct hostnet_udp_conn *conn =
-		VCALL_SELF(struct hostnet_udp_conn, implements_net_packet_conn, _conn);
+static int hostnet_udp_close(struct hostnet_udp_conn *conn) {
 	assert(conn);
 
 	return hostnet_map_negerrno(close(conn->fd) ? -errno : 0, OP_NONE);
diff --git a/libhw/rp2040_include/libhw/w5500.h b/libhw/rp2040_include/libhw/w5500.h
index 87d333a..ab9f50e 100644
--- a/libhw/rp2040_include/libhw/w5500.h
+++ b/libhw/rp2040_include/libhw/w5500.h
@@ -20,11 +20,8 @@
 CR_CHAN_DECLARE(_w5500_sockintr_ch, uint8_t)
 
 struct _w5500_socket {
-	/* const-after-init */
-	implements_net_stream_listener   implements_net_stream_listener;
-	implements_net_stream_conn       implements_net_stream_conn;
-	implements_net_packet_conn       implements_net_packet_conn;
 	BEGIN_PRIVATE(LIBHW_W5500_H)
+	/* const-after-init */
 	uint8_t                          socknum;
 
 	/* mutable */
@@ -43,11 +40,13 @@ struct _w5500_socket {
 
 	END_PRIVATE(LIBHW_W5500_H)
 };
+LO_IMPLEMENTATION_H(net_stream_listener, struct _w5500_socket, w5500_tcplist)
+LO_IMPLEMENTATION_H(net_stream_conn, struct _w5500_socket, w5500_tcp)
+LO_IMPLEMENTATION_H(net_packet_conn, struct _w5500_socket, w5500_udp)
 
 struct w5500 {
-	/* const-after-init */
-	implements_net_iface;
 	BEGIN_PRIVATE(LIBHW_W5500_H)
+	/* const-after-init */
 	lo_interface spi                 spidev;
 	uint                             pin_intr;
 	uint                             pin_reset;
@@ -61,6 +60,7 @@ struct w5500 {
 	cr_mutex_t                       mu;
 	END_PRIVATE(LIBHW_W5500_H)
 };
+LO_IMPLEMENTATION_H(net_iface, struct w5500, w5500_if)
 
 /**
  * Initialize a WIZnet W5500 Ethernet-and-TCP/IP-offload chip.
diff --git a/libhw/w5500.c b/libhw/w5500.c
index 2c130f5..dfe169f 100644
--- a/libhw/w5500.c
+++ b/libhw/w5500.c
@@ -74,7 +74,6 @@
 #include <hardware/gpio.h> /* pico-sdk:hardware_gpio */
 
 #include <libcr/coroutine.h> /* for cr_yield() */
-#include <libmisc/vcall.h>   /* for VCALL_SELF() */
 
 #include <libhw/generic/alarmclock.h> /* for sleep_*() */
 
@@ -124,61 +123,12 @@ static const char *w5500_state_str(uint8_t state) {
 	}
 }
 
-/* vtables ********************************************************************/
-
-/* iface */
-static struct net_eth_addr              w5500_if_hwaddr     (implements_net_iface *);
-static void                             w5500_if_up         (implements_net_iface *, struct net_iface_config);
-static void                             w5500_if_down       (implements_net_iface *);
-static implements_net_stream_listener  *w5500_if_tcp_listen (implements_net_iface *, uint16_t local_port);
-static implements_net_stream_conn      *w5500_if_tcp_dial   (implements_net_iface *, struct net_ip4_addr, uint16_t remote_port);
-static implements_net_packet_conn      *w5500_if_udp_conn   (implements_net_iface *, uint16_t local_port);
-
-/* stream_listener */
-static implements_net_stream_conn      *w5500_tcplist_accept(implements_net_stream_listener *);
-static int                              w5500_tcplist_close (implements_net_stream_listener *);
-
-/* stream_conn */
-static void     w5500_tcp_set_read_deadline (implements_net_stream_conn *, uint64_t ns);
-static ssize_t  w5500_tcp_read              (implements_net_stream_conn *, void *, size_t);
-static ssize_t  w5500_tcp_write             (implements_net_stream_conn *, void *, size_t);
-static int      w5500_tcp_close             (implements_net_stream_conn *, bool rd, bool wr);
-
-/* packet_conn */
-static void     w5500_udp_set_read_deadline (implements_net_packet_conn *, uint64_t ns);
-static ssize_t  w5500_udp_recvfrom          (implements_net_packet_conn *, void *, size_t, struct net_ip4_addr *, uint16_t *);
-static ssize_t  w5500_udp_sendto            (implements_net_packet_conn *, void *, size_t, struct net_ip4_addr, uint16_t);
-static int      w5500_udp_close             (implements_net_packet_conn *);
-
-/* tables */
-
-static struct net_iface_vtable w5500_iface_vtable = {
-	.hwaddr            = w5500_if_hwaddr,
-	.ifup              = w5500_if_up,
-	.ifdown            = w5500_if_down,
-	.tcp_listen        = w5500_if_tcp_listen,
-	.tcp_dial          = w5500_if_tcp_dial,
-	.udp_conn          = w5500_if_udp_conn,
-};
-
-static struct net_stream_listener_vtable w5500_tcp_listener_vtable = {
-	.accept            = w5500_tcplist_accept,
-	.close             = w5500_tcplist_close,
-};
-
-static struct net_stream_conn_vtable w5500_tcp_conn_vtable = {
-	.set_read_deadline = w5500_tcp_set_read_deadline,
-	.read              = w5500_tcp_read,
-	.write             = w5500_tcp_write,
-	.close             = w5500_tcp_close,
-};
-
-static struct net_packet_conn_vtable w5500_udp_conn_vtable = {
-	.set_read_deadline = w5500_udp_set_read_deadline,
-	.recvfrom          = w5500_udp_recvfrom,
-	.sendto            = w5500_udp_sendto,
-	.close             = w5500_udp_close,
-};
+/* libobj *********************************************************************/
+
+LO_IMPLEMENTATION_C(net_stream_listener, struct _w5500_socket, w5500_tcplist, static)
+LO_IMPLEMENTATION_C(net_stream_conn, struct _w5500_socket, w5500_tcp, static)
+LO_IMPLEMENTATION_C(net_packet_conn, struct _w5500_socket, w5500_udp, static)
+LO_IMPLEMENTATION_C(net_iface, struct w5500, w5500_if, static)
 
 /* mid-level utilities ********************************************************/
 
@@ -311,9 +261,6 @@ static inline void w5500_socket_close(struct _w5500_socket *socket) {
 }
 
 #define ASSERT_SELF(_iface, _mode)                            \
-	struct _w5500_socket *socket =                        \
-		VCALL_SELF(struct _w5500_socket,              \
-		           implements_net_##_iface, _socket); \
 	assert(socket);                                       \
 	uint8_t socknum = socket->socknum;                    \
 	assert(socknum < 8);                                  \
@@ -341,7 +288,6 @@ void _w5500_init(struct w5500 *chip,
 	/* Initialize the data structures.  */
 	*chip = (struct w5500){
 		/* const-after-init */
-		.implements_net_iface = { .vtable = &w5500_iface_vtable },
 		.spidev          = spi,
 		.pin_intr        = pin_intr,
 		.pin_reset       = pin_reset,
@@ -353,9 +299,6 @@ void _w5500_init(struct w5500 *chip,
 	for (uint8_t i = 0; i < 8; i++) {
 		chip->sockets[i] = (struct _w5500_socket){
 			/* const-after-init */
-			.implements_net_stream_listener = { .vtable = &w5500_tcp_listener_vtable },
-			.implements_net_stream_conn     = { .vtable = &w5500_tcp_conn_vtable },
-			.implements_net_packet_conn     = { .vtable = &w5500_udp_conn_vtable },
 			.socknum = i,
 			/* mutable */
 			.next_free = (i + 1 < 8) ? &chip->sockets[i+1] : NULL,
@@ -449,15 +392,13 @@ void w5500_soft_reset(struct w5500 *chip) {
 	cr_mutex_unlock(&chip->mu);
 }
 
-static struct net_eth_addr w5500_if_hwaddr(implements_net_iface *_chip) {
-	struct w5500 *chip = VCALL_SELF(struct w5500, implements_net_iface, _chip);
+static struct net_eth_addr w5500_if_hwaddr(struct w5500 *chip) {
 	assert(chip);
 
 	return chip->hwaddr;
 }
 
-static void _w5500_if_up(implements_net_iface *_chip, struct net_iface_config cfg) {
-	struct w5500 *chip = VCALL_SELF(struct w5500, implements_net_iface, _chip);
+static void _w5500_if_up(struct w5500 *chip, struct net_iface_config cfg) {
 	assert(chip);
 
 	cr_mutex_lock(&chip->mu);
@@ -469,27 +410,26 @@ static void _w5500_if_up(implements_net_iface *_chip, struct net_iface_config cf
 	cr_mutex_unlock(&chip->mu);
 }
 
-static void w5500_if_up(implements_net_iface *_chip, struct net_iface_config cfg) {
+static void w5500_if_ifup(struct w5500 *chip, struct net_iface_config cfg) {
 	debugf("if_up()");
 	debugf(":: addr         = "PRI_net_ip4_addr, ARG_net_ip4_addr(cfg.addr));
 	debugf(":: gateway_addr = "PRI_net_ip4_addr, ARG_net_ip4_addr(cfg.gateway_addr));
 	debugf(":: subnet_mask  = "PRI_net_ip4_addr, ARG_net_ip4_addr(cfg.subnet_mask));
-	_w5500_if_up(_chip, cfg);
+	_w5500_if_up(chip, cfg);
 }
 
-static void w5500_if_down(implements_net_iface *_chip) {
+static void w5500_if_ifdown(struct w5500 *chip) {
 	debugf("if_down()");
-	_w5500_if_up(_chip, (struct net_iface_config){0});
+	_w5500_if_up(chip, (struct net_iface_config){0});
 }
 
-static implements_net_stream_listener *w5500_if_tcp_listen(implements_net_iface *_chip, uint16_t local_port) {
-	struct w5500 *chip = VCALL_SELF(struct w5500, implements_net_iface, _chip);
+static lo_interface net_stream_listener w5500_if_tcp_listen(struct w5500 *chip, uint16_t local_port) {
 	assert(chip);
 
 	struct _w5500_socket *sock = w5500_alloc_socket(chip);
 	if (!sock) {
 		debugf("tcp_listen() => no sock");
-		return NULL;
+		return LO_NULL(net_stream_listener);
 	}
 	debugf("tcp_listen() => sock[%"PRIu8"]", sock->socknum);
 
@@ -502,12 +442,11 @@ static implements_net_stream_listener *w5500_if_tcp_listen(implements_net_iface
 	sock->read_deadline_ns = 0;
 	sock->list_open = true;
 
-	return &sock->implements_net_stream_listener;
+	return lo_box_w5500_tcplist_as_net_stream_listener(sock);
 }
 
-static implements_net_stream_conn *w5500_if_tcp_dial(implements_net_iface *_chip,
-                                                     struct net_ip4_addr node, uint16_t port) {
-	struct w5500 *chip = VCALL_SELF(struct w5500, implements_net_iface, _chip);
+static lo_interface net_stream_conn w5500_if_tcp_dial(struct w5500 *chip,
+                                                      struct net_ip4_addr node, uint16_t port) {
 	assert(chip);
 	assert(memcmp(node.octets, net_ip4_addr_zero.octets, 4));
 	assert(memcmp(node.octets, net_ip4_addr_broadcast.octets, 4));
@@ -516,7 +455,7 @@ static implements_net_stream_conn *w5500_if_tcp_dial(implements_net_iface *_chip
 	struct _w5500_socket *socket = w5500_alloc_socket(chip);
 	if (!socket) {
 		debugf("tcp_dial() => no sock");
-		return NULL;
+		return LO_NULL(net_stream_conn);
 	}
 	uint8_t socknum = socket->socknum;
 	debugf("tcp_dial() => sock[%"PRIu8"]", socknum);
@@ -553,21 +492,20 @@ static implements_net_stream_conn *w5500_if_tcp_dial(implements_net_iface *_chip
 			cr_yield();
 			break;
 		case STATE_TCP_ESTABLISHED:
-			return &socket->implements_net_stream_conn;
+			return lo_box_w5500_tcp_as_net_stream_conn(socket);
 		default:
 			goto restart;
 		}
 	}
 }
 
-static implements_net_packet_conn *w5500_if_udp_conn(implements_net_iface *_chip, uint16_t local_port) {
-	struct w5500 *chip = VCALL_SELF(struct w5500, implements_net_iface, _chip);
+static lo_interface net_packet_conn w5500_if_udp_conn(struct w5500 *chip, uint16_t local_port) {
 	assert(chip);
 
 	struct _w5500_socket *socket = w5500_alloc_socket(chip);
 	if (!socket) {
 		debugf("udp_conn() => no sock");
-		return NULL;
+		return LO_NULL(net_packet_conn);
 	}
 	uint8_t socknum = socket->socknum;
 	debugf("udp_conn() => sock[%"PRIu8"]", socknum);
@@ -590,18 +528,18 @@ static implements_net_packet_conn *w5500_if_udp_conn(implements_net_iface *_chip
 		cr_yield();
 	cr_mutex_unlock(&chip->mu);
 
-	return &socket->implements_net_packet_conn;
+	return lo_box_w5500_udp_as_net_packet_conn(socket);
 }
 
 /* tcp_listener methods *******************************************************/
 
-static implements_net_stream_conn *w5500_tcplist_accept(implements_net_stream_listener *_socket) {
+static lo_interface net_stream_conn w5500_tcplist_accept(struct _w5500_socket *socket) {
 	ASSERT_SELF(stream_listener, TCP);
 
  restart:
 	if (!socket->list_open) {
 		debugf("tcp_listener.accept() => already closed");
-		return NULL;
+		return LO_NULL(net_stream_conn);
 	}
 
 	cr_mutex_lock(&chip->mu);
@@ -630,14 +568,14 @@ static implements_net_stream_conn *w5500_tcplist_accept(implements_net_stream_li
 			/* fall-through */
 		case STATE_TCP_CLOSE_WAIT:
 			socket->write_open = true;
-			return &socket->implements_net_stream_conn;
+			return lo_box_w5500_tcp_as_net_stream_conn(socket);
 		default:
 			goto restart;
 		}
 	}
 }
 
-static int w5500_tcplist_close(implements_net_stream_listener *_socket) {
+static int w5500_tcplist_close(struct _w5500_socket *socket) {
 	debugf("tcp_listener.close()");
 	ASSERT_SELF(stream_listener, TCP);
 
@@ -648,7 +586,7 @@ static int w5500_tcplist_close(implements_net_stream_listener *_socket) {
 
 /* tcp_conn methods ***********************************************************/
 
-static ssize_t w5500_tcp_write(implements_net_stream_conn *_socket, void *buf, size_t count) {
+static ssize_t w5500_tcp_write(struct _w5500_socket *socket, void *buf, size_t count) {
 	debugf("tcp_conn.write(%zu)", count);
 	ASSERT_SELF(stream_conn, TCP);
 	assert(buf);
@@ -725,7 +663,7 @@ static ssize_t w5500_tcp_write(implements_net_stream_conn *_socket, void *buf, s
 	return done;
 }
 
-static void w5500_tcp_set_read_deadline(implements_net_stream_conn *_socket, uint64_t ns) {
+static void w5500_tcp_set_read_deadline(struct _w5500_socket *socket, uint64_t ns) {
 	debugf("tcp_conn.set_read_deadline(%"PRIu64")", ns);
 	ASSERT_SELF(stream_conn, TCP);
 	socket->read_deadline_ns = ns;
@@ -736,7 +674,7 @@ static void w5500_tcp_alarm_handler(void *_arg) {
 	cr_sema_signal_from_intrhandler(&socket->read_sema);
 }
 
-static ssize_t w5500_tcp_read(implements_net_stream_conn *_socket, void *buf, size_t count) {
+static ssize_t w5500_tcp_read(struct _w5500_socket *socket, void *buf, size_t count) {
 	debugf("tcp_conn.read()");
 	ASSERT_SELF(stream_conn, TCP);
 	assert(buf);
@@ -745,9 +683,9 @@ static ssize_t w5500_tcp_read(implements_net_stream_conn *_socket, void *buf, si
 	struct alarmclock_trigger trigger = {0};
 	if (socket->read_deadline_ns)
 		LO_CALL(bootclock, add_trigger, &trigger,
-		      socket->read_deadline_ns,
-		      w5500_tcp_alarm_handler,
-		      socket);
+		        socket->read_deadline_ns,
+		        w5500_tcp_alarm_handler,
+		        socket);
 
 	/* Wait until there is data to read.  */
 	uint16_t avail = 0;
@@ -806,7 +744,7 @@ static ssize_t w5500_tcp_read(implements_net_stream_conn *_socket, void *buf, si
 	return avail;
 }
 
-static int w5500_tcp_close(implements_net_stream_conn *_socket, bool rd, bool wr) {
+static int w5500_tcp_close(struct _w5500_socket *socket, bool rd, bool wr) {
 	debugf("tcp_conn.close(rd=%s, wr=%s)", rd ? "true" : "false", wr ? "true" : "false");
 	ASSERT_SELF(stream_conn, TCP);
 
@@ -839,7 +777,7 @@ static int w5500_tcp_close(implements_net_stream_conn *_socket, bool rd, bool wr
 
 /* udp_conn methods ***********************************************************/
 
-static ssize_t w5500_udp_sendto(implements_net_packet_conn *_socket, void *buf, size_t count,
+static ssize_t w5500_udp_sendto(struct _w5500_socket *socket, void *buf, size_t count,
                                 struct net_ip4_addr node, uint16_t port) {
 	debugf("udp_conn.sendto()");
 	ASSERT_SELF(packet_conn, UDP);
@@ -896,7 +834,7 @@ static ssize_t w5500_udp_sendto(implements_net_packet_conn *_socket, void *buf,
 	}
 }
 
-static void w5500_udp_set_read_deadline(implements_net_packet_conn *_socket, uint64_t ns) {
+static void w5500_udp_set_read_deadline(struct _w5500_socket *socket, uint64_t ns) {
 	debugf("udp_conn.set_read_deadline(%"PRIu64")", ns);
 	ASSERT_SELF(packet_conn, UDP);
 	socket->read_deadline_ns = ns;
@@ -907,7 +845,7 @@ static void w5500_udp_alarm_handler(void *_arg) {
 	cr_sema_signal_from_intrhandler(&socket->read_sema);
 }
 
-static ssize_t w5500_udp_recvfrom(implements_net_packet_conn *_socket, void *buf, size_t count,
+static ssize_t w5500_udp_recvfrom(struct _w5500_socket *socket, void *buf, size_t count,
                                   struct net_ip4_addr *ret_node, uint16_t *ret_port) {
 	debugf("udp_conn.recvfrom()");
 	ASSERT_SELF(packet_conn, UDP);
@@ -975,7 +913,7 @@ static ssize_t w5500_udp_recvfrom(implements_net_packet_conn *_socket, void *buf
 	return len;
 }
 
-static int w5500_udp_close(implements_net_packet_conn *_socket) {
+static int w5500_udp_close(struct _w5500_socket *socket) {
 	debugf("udp_conn.close()");
 	ASSERT_SELF(packet_conn, UDP);
 
diff --git a/libhw/w5500_ll.h b/libhw/w5500_ll.h
index c05a04f..92d9f14 100644
--- a/libhw/w5500_ll.h
+++ b/libhw/w5500_ll.h
@@ -15,7 +15,6 @@
 
 #include <libmisc/assert.h> /* for assert(), static_assert() */
 #include <libmisc/endian.h> /* for uint16be_t */
-#include <libmisc/vcall.h>  /* for VCALL() */
 
 #include <libhw/generic/net.h> /* for struct net_eth_addr, struct net_ip4_addr */
 #include <libhw/generic/spi.h> /* for lo_interface spi */
author	Luke T. Shumaker <lukeshu@lukeshu.com>	2025-02-02 02:01:30 -0700
committer	Luke T. Shumaker <lukeshu@lukeshu.com>	2025-02-09 23:42:11 -0700
commit	06eed899486daeec8ad2718c74d70f91fa0dbb25 (patch)
tree	f402d1cc1e82f5e297db142f51fdfd4306a74f68 /libhw
parent	cb0c00a240c0d803e7202433f9940a91db849a5c (diff)