[commit] r5982 - trunk/util/superiotool

[repository service]

Author: jakllsch
Date: Sun Oct 24 16:10:35 2010
New Revision: 5982
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5982

Log:
Provide for I/O space access on NetBSD.

Signed-off-by: Jonathan Kollasch 
Acked-by: Peter Stuge

Modified:
   trunk/util/superiotool/Makefile
   trunk/util/superiotool/superiotool.h

Modified: trunk/util/superiotool/Makefile
==============================================================================
--- trunk/util/superiotool/Makefile	Sun Oct 24 15:50:13 2010	(r5981)
+++ trunk/util/superiotool/Makefile	Sun Oct 24 16:10:35 2010	(r5982)
@@ -46,6 +46,9 @@
 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

Modified: trunk/util/superiotool/superiotool.h
==============================================================================
--- trunk/util/superiotool/superiotool.h	Sun Oct 24 15:50:13 2010	(r5981)
+++ trunk/util/superiotool/superiotool.h	Sun Oct 24 16:10:35 2010	(r5982)
@@ -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\