Provide for I/O space access on NetBSD.

Signed-off-by: Jonathan Kollasch <jakllsch@kollasch.net>
Acked-by: Peter Stuge <peter@stuge.se>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5982 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/util/superiotool/Makefile b/util/superiotool/Makefile
index 566388ba317eb0e810fa7a8e2879bb3b27d05e88..bcdb107d719e570237b9c56c3707cc37ef37b127 100644 (file)
--- a/util/superiotool/Makefile
+++ b/util/superiotool/Makefile
@@ -46,6 +46,9 @@ CFLAGS = -O2 -Wall -Werror -Wstrict-prototypes -Wundef -Wstrict-aliasing \
 LDFLAGS += -L/usr/local/lib
 LIBS = -lz
 endif
+ifeq ($(OS_ARCH), NetBSD)
+LDFLAGS = -l$(shell uname -p)
+endif
 
 # Support for PCI-attached "Super I/Os" (e.g. in VIA VT82686A/B).
 CONFIG_PCI = yes

diff --git a/util/superiotool/superiotool.h b/util/superiotool/superiotool.h
index fcef02df1f59ede0f1a97448fbd01d84386bc5ff..ba513455609004a4f2fa9463e38df583a80bcad4 100644 (file)
--- a/util/superiotool/superiotool.h
+++ b/util/superiotool/superiotool.h
@@ -59,6 +59,55 @@
 #define INL  inl
 #endif
 
+#if defined(__NetBSD__) && defined(__i386__) || defined(__x86_64__)
+#include <sys/types.h>
+#include <machine/sysarch.h>
+#if defined(__i386__)
+#define iopl i386_iopl
+#elif defined(__x86_64__)
+#define iopl x86_64_iopl
+#endif
+
+static __inline__ void
+outb(uint8_t value, uint16_t port)
+{
+       __asm__ __volatile__ ("outb %b0,%w1": :"a" (value), "Nd" (port));
+}
+
+static __inline__ void
+outw(uint16_t value, uint16_t port)
+{
+       __asm__ __volatile__ ("outw %w0,%w1": :"a" (value), "Nd" (port));
+}
+
+static __inline__ void
+outl(uint32_t value, uint16_t port)
+{
+       __asm__ __volatile__ ("outl %0,%w1": :"a" (value), "Nd" (port));
+}
+
+static __inline__ uint8_t inb(uint16_t port)
+{
+       uint8_t value;
+       __asm__ __volatile__ ("inb %w1,%0":"=a" (value):"Nd" (port));
+       return value;
+}
+
+static __inline__ uint16_t inw(uint16_t port)
+{
+       uint16_t value;
+       __asm__ __volatile__ ("inw %w1,%0":"=a" (value):"Nd" (port));
+       return value;
+}
+
+static __inline__ uint32_t inl(uint16_t port)
+{
+       uint32_t value;
+       __asm__ __volatile__ ("inl %1,%0":"=a" (value):"Nd" (port));
+       return value;
+}
+#endif
+
 #define USAGE "Usage: superiotool [-d] [-e] [-l] [-V] [-v] [-h]\n\n\
   -d | --dump            Dump Super I/O register contents\n\
   -e | --extra-dump      Dump secondary registers too (e.g. EC registers)\n\