libhw_generic: spi: Use libobj instead of vcall.h

1 files changed, 6 insertions, 10 deletions

diff --git a/libhw_generic/include/libhw/generic/spi.h b/libhw_generic/include/libhw/generic/spi.h
index 2207a2c..aeeca37 100644
--- a/libhw_generic/include/libhw/generic/spi.h
+++ b/libhw_generic/include/libhw/generic/spi.h
@@ -1,6 +1,6 @@
 /* libhw/generic/spi.h - Device-independent SPI definitions
  *
- * 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
  */
 
@@ -9,6 +9,8 @@
 
 #include <stddef.h> /* for size_t */
 
+#include <libobj/obj.h>
+
 enum spi_mode {
 	SPI_MODE_0 = 0, /* clk_polarity=0 (idle low), clk_phase=0 (sample on rise) */
 	SPI_MODE_1 = 1, /* clk_polarity=0 (idle low), clk_phase=1 (sample on fall) */
@@ -22,12 +24,6 @@ struct bidi_iovec {
 	size_t   iov_len;
 };
 
-struct spi_vtable;
-
-typedef struct {
-	struct spi_vtable      *vtable;
-} implements_spi;
-
 /* This API assumes that an SPI frame is a multiple of 8-bits.
  *
  * It is my understanding that this is a common constraint of SPI
@@ -40,8 +36,8 @@ typedef struct {
  * octets; so we have no need for an API that allows a
  * non-multiple-of-8 number of bits.
  */
-struct spi_vtable {
-	void (*readwritev)(implements_spi *, const struct bidi_iovec *iov, int iovcnt);
-};
+#define spi_LO_IFACE \
+	LO_FUNC(void, readwritev, const struct bidi_iovec *iov, int iovcnt)
+LO_INTERFACE(spi)
 
 #endif /* _LIBHW_GENERIC_SPI_H_ */