7 files changed, 15 insertions, 14 deletions
diff --git a/libhw_cr/host_net.c b/libhw_cr/host_net.c
index 6ed6e46..ba634a6 100644
--- a/libhw_cr/host_net.c
+++ b/libhw_cr/host_net.c
@@ -19,6 +19,7 @@
 #include <signal.h>     /* for siginfo_t, struct sigaction, enum sigval, sigaction(), SA_SIGINFO */
 
 #include <libcr/coroutine.h>
+#include <libmisc/alloc.h>
 #include <libmisc/assert.h>
 #include <libmisc/macro.h>
 #include <libobj/obj.h>
@@ -283,7 +284,7 @@ static void *hostnet_pthread_writev(void *_args) {
 	struct hostnet_pthread_writev_args *args = _args;
 
 	size_t count = 0;
-	struct iovec *iov = alloca(sizeof(struct iovec)*args->iovcnt);
+	struct iovec *iov = stack_alloc(args->iovcnt, struct iovec);
 	for (int i = 0; i < args->iovcnt; i++) {
 		iov[i] = args->iov[i];
 		count += args->iov[i].iov_len;
diff --git a/libhw_cr/host_util.c b/libhw_cr/host_util.c
index 958ed9c..7b3200c 100644
--- a/libhw_cr/host_util.c
+++ b/libhw_cr/host_util.c
@@ -1,6 +1,6 @@
 /* libhw_cr/host_util.c - Utilities for GNU/Linux hosts
  *
- * 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
  */
 
diff --git a/libhw_cr/host_util.h b/libhw_cr/host_util.h
index 8c53fab..02c04dc 100644
--- a/libhw_cr/host_util.h
+++ b/libhw_cr/host_util.h
@@ -1,6 +1,6 @@
 /* libhw_cr/host_util.h - Utilities for GNU/Linux hosts
  *
- * 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
  */
 
diff --git a/libhw_cr/rp2040_hwspi.c b/libhw_cr/rp2040_hwspi.c
index 646d8ba..29a7bac 100644
--- a/libhw_cr/rp2040_hwspi.c
+++ b/libhw_cr/rp2040_hwspi.c
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-#include <alloca.h>
 #include <inttypes.h> /* for PRIu{n} */
 
 #include <hardware/clocks.h> /* for clock_get_hz() and clk_peri */
@@ -12,6 +11,7 @@
 #include <hardware/spi.h>
 
 #include <libcr/coroutine.h>
+#include <libmisc/alloc.h>
 #include <libmisc/assert.h>
 
 #define LOG_NAME RP2040_SPI
@@ -130,7 +130,7 @@ void _rp2040_hwspi_init(struct rp2040_hwspi *self,
 	self->dma_tx_data = dma3;
 	self->dma_rx_data = dma4;
 	self->dead_until_ns = 0;
-	self->sema = (cr_sema_t){0};
+	self->sema = (cr_sema_t){};
 
 	/* Initialize the interrupt handler.  */
 	/* We do this on (just) the rx channel, because the way the
@@ -198,8 +198,8 @@ static void rp2040_hwspi_readwritev(struct rp2040_hwspi *self, const struct dupl
 	 *    happens, so the IRQ machinery doesn't need to be engaged
 	 *    at all.
 	 */
-	struct dma_alias1 *tx_data_blocks = alloca(sizeof(struct dma_alias1)*(pruned_iovcnt+1));
-	struct dma_alias0 *rx_data_blocks = alloca(sizeof(struct dma_alias0)*(pruned_iovcnt+1));
+	struct dma_alias1 *tx_data_blocks = stack_alloc(pruned_iovcnt+1, struct dma_alias1);
+	struct dma_alias0 *rx_data_blocks = stack_alloc(pruned_iovcnt+1, struct dma_alias0);
 	static_assert(!DMA_IS_TRIGGER(typeof(tx_data_blocks[0]), ctrl));
 	static_assert(DMA_IS_TRIGGER(typeof(rx_data_blocks[0]), ctrl));
 
diff --git a/libhw_cr/rp2040_include/libhw/w5500.h b/libhw_cr/rp2040_include/libhw/w5500.h
index 8db6a58..8dda1a1 100644
--- a/libhw_cr/rp2040_include/libhw/w5500.h
+++ b/libhw_cr/rp2040_include/libhw/w5500.h
@@ -17,7 +17,7 @@
 #include <libhw/generic/net.h>
 #include <libhw/generic/spi.h>
 
-CR_CHAN_DECLARE(_w5500_sockintr_ch, uint8_t)
+CR_CHAN_DECLARE(_w5500_sockintr_ch, uint8_t);
 
 struct _w5500_socket {
 	BEGIN_PRIVATE(LIBHW_W5500_H);
diff --git a/libhw_cr/w5500.c b/libhw_cr/w5500.c
index fa427d9..c04e344 100644
--- a/libhw_cr/w5500.c
+++ b/libhw_cr/w5500.c
@@ -217,7 +217,7 @@ static COROUTINE w5500_irq_cr(void *_chip) {
 				}
 				if (send_bits) {
 					debugf("w5500_irq_cr(): signal sock[%"PRIu8"]->write_ch", socknum);
-					_w5500_sockintr_ch_send(&socket->write_ch, send_bits);
+					cr_chan_send(&socket->write_ch, send_bits);
 				}
 				break;
 			}
@@ -666,7 +666,7 @@ static ssize_t w5500_tcp_writev(struct _w5500_socket *socket, const struct iovec
 		w5500_socket_cmd(socket, CMD_SEND);
 
 		cr_mutex_unlock(&chip->mu);
-		switch (_w5500_sockintr_ch_recv(&socket->write_ch)) {
+		switch (cr_chan_recv(&socket->write_ch)) {
 		case SOCKINTR_SEND_OK:
 			debugf(" => sent %zu", freesize);
 			done += freesize;
@@ -853,7 +853,7 @@ static ssize_t w5500_udp_sendto(struct _w5500_socket *socket, void *buf, size_t
 	w5500_socket_cmd(socket, CMD_SEND);
 
 	cr_mutex_unlock(&chip->mu);
-	switch (_w5500_sockintr_ch_recv(&socket->write_ch)) {
+	switch (cr_chan_recv(&socket->write_ch)) {
 	case SOCKINTR_SEND_OK:
 		debugf(" => sent");
 		return count;
diff --git a/libhw_cr/w5500_ll.h b/libhw_cr/w5500_ll.h
index 2506cd2..8b98f9d 100644
--- a/libhw_cr/w5500_ll.h
+++ b/libhw_cr/w5500_ll.h
@@ -10,10 +10,10 @@
 #ifndef _LIBHW_CR_W5500_LL_H_
 #define _LIBHW_CR_W5500_LL_H_
 
-#include <alloca.h> /* for alloca() */
 #include <stdint.h> /* for uint{n}_t */
 #include <string.h> /* for memcmp() */
 
+#include <libmisc/alloc.h>  /* for stack_alloc() */
 #include <libmisc/assert.h> /* for assert(), static_assert() */
 #include <libmisc/endian.h> /* for uint16be_t */
 
@@ -94,7 +94,7 @@ w5500ll_writev(
 		(block & CTL_MASK_BLOCK) | CTL_W | CTL_OM_VDM,
 	};
 	int inner_cnt = 1+io_slice_cnt(iov, iovcnt, skip, max);
-	struct duplex_iovec *inner = alloca(sizeof(struct duplex_iovec)*inner_cnt);
+	struct duplex_iovec *inner = stack_alloc(inner_cnt, struct duplex_iovec);
 	inner[0] = (struct duplex_iovec){
 		.iov_read_to    = IOVEC_DISCARD,
 		.iov_write_from = header,
@@ -131,7 +131,7 @@ w5500ll_readv(
 		(block & CTL_MASK_BLOCK) | CTL_R | CTL_OM_VDM,
 	};
 	int inner_cnt = 1+io_slice_cnt(iov, iovcnt, 0, max);
-	struct duplex_iovec *inner = alloca(sizeof(struct duplex_iovec)*inner_cnt);
+	struct duplex_iovec *inner = stack_alloc(inner_cnt, struct duplex_iovec);
 	inner[0] = (struct duplex_iovec){
 		.iov_read_to    = IOVEC_DISCARD,
 		.iov_write_from = header,