No more (static inline) function bodies in headers

7 files changed, 167 insertions, 115 deletions

diff --git a/libhw_cr/CMakeLists.txt b/libhw_cr/CMakeLists.txt
index ba20b26..9dd6a27 100644
--- a/libhw_cr/CMakeLists.txt
+++ b/libhw_cr/CMakeLists.txt
@@ -24,6 +24,7 @@ if (PICO_PLATFORM STREQUAL "rp2040")
 		rp2040_hwspi.c
 		rp2040_hwtimer.c
 		w5500.c
+		w5500_ll.c
 	)
 	target_link_libraries(libhw_cr INTERFACE
 		hardware_gpio
diff --git a/libhw_cr/host_util.c b/libhw_cr/host_util.c
index 7b3200c..8cacd57 100644
--- a/libhw_cr/host_util.c
+++ b/libhw_cr/host_util.c
@@ -7,6 +7,8 @@
 #include <error.h>  /* for error(3gnu) */
 #include <signal.h> /* for SIGRTMIN, SIGRTMAX */
 
+#include <libhw/generic/alarmclock.h> /* for {X}S_PER_S */
+
 #include "host_util.h"
 
 int host_sigrt_alloc(void) {
@@ -19,3 +21,30 @@ int host_sigrt_alloc(void) {
 		error(1, 0, "SIGRTMAX exceeded");
 	return ret;
 }
+
+host_us_time_t ns_to_host_us_time(uint64_t time_ns) {
+	host_us_time_t ret;
+	ret.tv_sec = time_ns
+		/NS_PER_S;
+	ret.tv_usec = (time_ns - ((uint64_t)ret.tv_sec)*NS_PER_S)
+		/(NS_PER_S/US_PER_S);
+	return ret;
+}
+
+host_ns_time_t ns_to_host_ns_time(uint64_t time_ns) {
+	host_ns_time_t ret;
+	ret.tv_sec = time_ns
+		/NS_PER_S;
+	ret.tv_nsec = time_ns - ((uint64_t)ret.tv_sec)*NS_PER_S;
+	return ret;
+}
+
+uint64_t ns_from_host_us_time(host_us_time_t host_time) {
+	return (((uint64_t)host_time.tv_sec) * NS_PER_S) +
+		((uint64_t)host_time.tv_usec * (NS_PER_S/US_PER_S));
+}
+
+uint64_t ns_from_host_ns_time(host_ns_time_t host_time) {
+	return (((uint64_t)host_time.tv_sec) * NS_PER_S) +
+		((uint64_t)host_time.tv_nsec);
+}
diff --git a/libhw_cr/host_util.h b/libhw_cr/host_util.h
index 3f0a671..4adb94e 100644
--- a/libhw_cr/host_util.h
+++ b/libhw_cr/host_util.h
@@ -7,41 +7,18 @@
 #ifndef _LIBHW_CR_HOST_UTIL_H_
 #define _LIBHW_CR_HOST_UTIL_H_
 
+#include <stdint.h>   /* for uint{n}_t */
 #include <sys/time.h> /* for struct timeval */
 #include <time.h>     /* for struct timespec */
 
-#include <libhw/generic/alarmclock.h> /* for {X}S_PER_S */
-
 int host_sigrt_alloc(void);
 
 typedef struct timeval  host_us_time_t;
 typedef struct timespec host_ns_time_t;
 
-static inline host_us_time_t ns_to_host_us_time(uint64_t time_ns) {
-	host_us_time_t ret;
-	ret.tv_sec = time_ns
-		/NS_PER_S;
-	ret.tv_usec = (time_ns - ((uint64_t)ret.tv_sec)*NS_PER_S)
-		/(NS_PER_S/US_PER_S);
-	return ret;
-}
-
-static inline host_ns_time_t ns_to_host_ns_time(uint64_t time_ns) {
-	host_ns_time_t ret;
-	ret.tv_sec = time_ns
-		/NS_PER_S;
-	ret.tv_nsec = time_ns - ((uint64_t)ret.tv_sec)*NS_PER_S;
-	return ret;
-}
-
-static inline uint64_t ns_from_host_us_time(host_us_time_t host_time) {
-	return (((uint64_t)host_time.tv_sec) * NS_PER_S) +
-		((uint64_t)host_time.tv_usec * (NS_PER_S/US_PER_S));
-}
-
-static inline uint64_t ns_from_host_ns_time(host_ns_time_t host_time) {
-	return (((uint64_t)host_time.tv_sec) * NS_PER_S) +
-		((uint64_t)host_time.tv_nsec);
-}
+host_us_time_t ns_to_host_us_time(uint64_t time_ns);
+host_ns_time_t ns_to_host_ns_time(uint64_t time_ns);
+uint64_t ns_from_host_us_time(host_us_time_t host_time);
+uint64_t ns_from_host_ns_time(host_ns_time_t host_time);
 
 #endif /* _LIBHW_CR_HOST_UTIL_H_ */
diff --git a/libhw_cr/rp2040_dma.c b/libhw_cr/rp2040_dma.c
index e117c19..8901f06 100644
--- a/libhw_cr/rp2040_dma.c
+++ b/libhw_cr/rp2040_dma.c
@@ -1,5 +1,8 @@
 /* libhw_cr/rp2040_dma.c - Utilities for sharing the DMA IRQs
  *
+ * Copyright (c) 2020 Raspberry Pi (Trading) Ltd.
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (C) 2025  Luke T. Shumaker <lukeshu@lukeshu.com>
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
@@ -8,6 +11,21 @@
 
 #include "rp2040_dma.h"
 
+/* Borrowed from <hardware/dma.h> *********************************************/
+
+dma_channel_hw_t *dma_channel_hw_addr(uint channel) {
+	assert(channel < NUM_DMA_CHANNELS);
+	return &dma_hw->ch[channel];
+}
+
+enum dma_channel_transfer_size {
+	DMA_SIZE_8  = 0, ///< Byte transfer (8 bits)
+	DMA_SIZE_16 = 1, ///< Half word transfer (16 bits)
+	DMA_SIZE_32 = 2  ///< Word transfer (32 bits)
+};
+
+/* Our own code ***************************************************************/
+
 struct dmairq_handler_entry {
 	dmairq_handler_t         fn;
 	void                    *arg;
diff --git a/libhw_cr/rp2040_dma.h b/libhw_cr/rp2040_dma.h
index e8bceec..5c1c7bb 100644
--- a/libhw_cr/rp2040_dma.h
+++ b/libhw_cr/rp2040_dma.h
@@ -21,10 +21,7 @@
 
 /* Borrowed from <hardware/dma.h> *********************************************/
 
-static inline dma_channel_hw_t *dma_channel_hw_addr(uint channel) {
-	assert(channel < NUM_DMA_CHANNELS);
-	return &dma_hw->ch[channel];
-}
+dma_channel_hw_t *dma_channel_hw_addr(uint channel);
 
 enum dma_channel_transfer_size {
 	DMA_SIZE_8  = 0, ///< Byte transfer (8 bits)
diff --git a/libhw_cr/w5500_ll.c b/libhw_cr/w5500_ll.c
new file mode 100644
index 0000000..d9f4fc5
--- /dev/null
+++ b/libhw_cr/w5500_ll.c
@@ -0,0 +1,105 @@
+/* libhw_cr/w5500_ll.c - Low-level library for the WIZnet W5500 chip
+ *
+ * Based entirely on the W5500 datasheet, v1.1.0.
+ * https://docs.wiznet.io/img/products/w5500/W5500_ds_v110e.pdf
+ *
+ * Copyright (C) 2024-2025  Luke T. Shumaker <lukeshu@lukeshu.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+#include <libmisc/alloc.h>  /* for stack_alloc() */
+#include <libmisc/fmt.h>
+
+#include "w5500_ll.h"
+
+#if CONFIG_W5500_LL_DEBUG
+static void fmt_print_ctl_block(lo_interface fmt_dest, uint8_t b) {
+	static char *strs[] = {
+		"RES",
+		"REG",
+		"TX",
+		"RX",
+	};
+	fmt_print("CTL_BLOCK_SOCK(", (base10, (((b)>>5) & 0b111)), ", ", strs[((b)>>3)&0b11], ")");
+}
+#endif
+
+void
+#if CONFIG_W5500_LL_DEBUG
+_w5500ll_writev(const char *func,
+#else
+w5500ll_writev(
+#endif
+               lo_interface spi spidev, uint16_t addr, uint8_t block,
+               const struct iovec *iov, int iovcnt,
+               size_t skip, size_t max)
+{
+	assert(!LO_IS_NULL(spidev));
+	assert((block & ~CTL_MASK_BLOCK) == 0);
+	assert(iov);
+	assert(iovcnt > 0);
+#if CONFIG_W5500_LL_DEBUG
+	log_n_debugln(W5500_LL,
+	              func, "(): w5500ll_write(spidev",
+	              ", addr=", (base16_u16_, addr),
+	              ", block=", (ctl_block, block),
+	              ", iov",
+	              ", iovcnt=", iovcnt,
+	              ")");
+#endif
+
+	uint8_t header[] = {
+		(uint8_t)((addr >> 8) & 0xFF),
+		(uint8_t)(addr & 0xFF),
+		(block & CTL_MASK_BLOCK) | CTL_W | CTL_OM_VDM,
+	};
+	int inner_cnt = 1+io_slice_cnt(iov, iovcnt, skip, max);
+	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,
+		.iov_len        = sizeof(header),
+	};
+	io_slice_wr_to_duplex(&inner[1], iov, iovcnt, skip, max);
+	LO_CALL(spidev, readwritev, inner, inner_cnt);
+}
+
+void
+#if CONFIG_W5500_LL_DEBUG
+_w5500ll_readv(const char *func,
+#else
+w5500ll_readv(
+#endif
+              lo_interface spi spidev, uint16_t addr, uint8_t block,
+              const struct iovec *iov, int iovcnt,
+              size_t max)
+{
+	assert(!LO_IS_NULL(spidev));
+	assert((block & ~CTL_MASK_BLOCK) == 0);
+	assert(iov);
+	assert(iovcnt > 0);
+#if CONFIG_W5500_LL_DEBUG
+	log_n_debugln(W5500_LL,
+	              func, "(): w5500ll_read(spidev",
+	              ", addr=", (base16_u16_, addr),
+	              ", block=", (ctl_block, block),
+	              ", iov",
+	              ", iovcnt=", iovcnt,
+	              ")");
+#endif
+
+	uint8_t header[] = {
+		(uint8_t)((addr >> 8) & 0xFF),
+		(uint8_t)(addr & 0xFF),
+		(block & CTL_MASK_BLOCK) | CTL_R | CTL_OM_VDM,
+	};
+	int inner_cnt = 1+io_slice_cnt(iov, iovcnt, 0, max);
+	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,
+		.iov_len        = sizeof(header),
+	};
+	io_slice_rd_to_duplex(&inner[1], iov, iovcnt, 0, max);
+	LO_CALL(spidev, readwritev, inner, inner_cnt);
+}
diff --git a/libhw_cr/w5500_ll.h b/libhw_cr/w5500_ll.h
index aa41e7a..eeb2fb7 100644
--- a/libhw_cr/w5500_ll.h
+++ b/libhw_cr/w5500_ll.h
@@ -1,4 +1,4 @@
-/* libhw_cr/w5500_ll.h - Low-level header library for the WIZnet W5500 chip
+/* libhw_cr/w5500_ll.h - Low-level library for the WIZnet W5500 chip
  *
  * Based entirely on the W5500 datasheet, v1.1.0.
  * https://docs.wiznet.io/img/products/w5500/W5500_ds_v110e.pdf
@@ -13,8 +13,7 @@
 #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/assert.h> /* for static_assert() */
 #include <libmisc/endian.h> /* for uint16be_t */
 
 #include <libhw/generic/net.h> /* for struct net_eth_addr, struct net_ip4_addr */
@@ -53,102 +52,28 @@
 #define CTL_OM_FDM2 0b10 /* fixed-length data mode: 2 byte data length */
 #define CTL_OM_FDM4 0b11 /* fixed-length data mode: 4 byte data length */
 
-#if CONFIG_W5500_LL_DEBUG
-static void fmt_print_ctl_block(lo_interface fmt_dest, uint8_t b) {
-	static char *strs[] = {
-		"RES",
-		"REG",
-		"TX",
-		"RX",
-	};
-	fmt_print("CTL_BLOCK_SOCK(", (base10, (((b)>>5) & 0b111)), ", ", strs[((b)>>3)&0b11], ")");
-}
-#endif
-
 /* Even though SPI is a full-duplex protocol, the W5500's spiframe on top of it is only half-duplex.
  * Lame.  */
 
-static inline void
 #if CONFIG_W5500_LL_DEBUG
 #define w5500ll_writev(...) _w5500ll_writev(__func__, __VA_ARGS__)
-_w5500ll_writev(const char *func,
+void _w5500ll_writev(const char *func,
 #else
-w5500ll_writev(
+void w5500ll_writev(
 #endif
                lo_interface spi spidev, uint16_t addr, uint8_t block,
                const struct iovec *iov, int iovcnt,
-               size_t skip, size_t max)
-{
-	assert(!LO_IS_NULL(spidev));
-	assert((block & ~CTL_MASK_BLOCK) == 0);
-	assert(iov);
-	assert(iovcnt > 0);
-#if CONFIG_W5500_LL_DEBUG
-	log_n_debugln(W5500_LL,
-	              func, "(): w5500ll_write(spidev",
-	              ", addr=", (base16_u16_, addr),
-	              ", block=", (ctl_block, block),
-	              ", iov",
-	              ", iovcnt=", iovcnt,
-	              ")");
-#endif
+               size_t skip, size_t max);
 
-	uint8_t header[] = {
-		(uint8_t)((addr >> 8) & 0xFF),
-		(uint8_t)(addr & 0xFF),
-		(block & CTL_MASK_BLOCK) | CTL_W | CTL_OM_VDM,
-	};
-	int inner_cnt = 1+io_slice_cnt(iov, iovcnt, skip, max);
-	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,
-		.iov_len        = sizeof(header),
-	};
-	io_slice_wr_to_duplex(&inner[1], iov, iovcnt, skip, max);
-	LO_CALL(spidev, readwritev, inner, inner_cnt);
-}
-
-static inline void
 #if CONFIG_W5500_LL_DEBUG
 #define w5500ll_readv(...) _w5500ll_read(__func__, __VA_ARGS__)
-_w5500ll_readv(const char *func,
+void _w5500ll_readv(const char *func,
 #else
-w5500ll_readv(
+void w5500ll_readv(
 #endif
               lo_interface spi spidev, uint16_t addr, uint8_t block,
               const struct iovec *iov, int iovcnt,
-              size_t max)
-{
-	assert(!LO_IS_NULL(spidev));
-	assert((block & ~CTL_MASK_BLOCK) == 0);
-	assert(iov);
-	assert(iovcnt > 0);
-#if CONFIG_W5500_LL_DEBUG
-	log_n_debugln(W5500_LL,
-	              func, "(): w5500ll_read(spidev",
-	              ", addr=", (base16_u16_, addr),
-	              ", block=", (ctl_block, block),
-	              ", iov",
-	              ", iovcnt=", iovcnt,
-	              ")");
-#endif
-
-	uint8_t header[] = {
-		(uint8_t)((addr >> 8) & 0xFF),
-		(uint8_t)(addr & 0xFF),
-		(block & CTL_MASK_BLOCK) | CTL_R | CTL_OM_VDM,
-	};
-	int inner_cnt = 1+io_slice_cnt(iov, iovcnt, 0, max);
-	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,
-		.iov_len        = sizeof(header),
-	};
-	io_slice_rd_to_duplex(&inner[1], iov, iovcnt, 0, max);
-	LO_CALL(spidev, readwritev, inner, inner_cnt);
-}
+              size_t max);
 
 /* Common chip-wide registers.  ***********************************************/