[commit] r6338 - in trunk/util/nvramtool: . accessors

[repository service]

Author: jakllsch
Date: Tue Feb  8 17:07:49 2011
New Revision: 6338
URL: https://tracker.coreboot.org/trac/coreboot/changeset/6338

Log:
Add NetBSD support to nvramtool.

Signed-off-by: 
Acked-by: Patrick Georgi 
Acked-by: Peter Stuge

Modified:
   trunk/util/nvramtool/Makefile
   trunk/util/nvramtool/accessors/cmos-hw-unix.c

Modified: trunk/util/nvramtool/Makefile
==============================================================================
--- trunk/util/nvramtool/Makefile	Tue Feb  8 09:37:47 2011	(r6337)
+++ trunk/util/nvramtool/Makefile	Tue Feb  8 17:07:49 2011	(r6338)
@@ -39,6 +39,9 @@
 ifeq ($(OS_ARCH), Darwin)
 LDFLAGS = -framework DirectIO
 endif
+ifeq ($(OS_ARCH), NetBSD)
+LDFLAGS = -l$(shell uname -p)
+endif

all: dep $(PROGRAM)

Modified: trunk/util/nvramtool/accessors/cmos-hw-unix.c
==============================================================================
--- trunk/util/nvramtool/accessors/cmos-hw-unix.c	Tue Feb  8 09:37:47 2011	(r6337)
+++ trunk/util/nvramtool/accessors/cmos-hw-unix.c	Tue Feb  8 17:07:49 2011	(r6338)
@@ -17,6 +17,53 @@
 #if (defined(__MACH__) && defined(__APPLE__))
 #include <DirectIO/darwinio.h>
 #endif
+#if defined(__NetBSD__)
+#if defined(__i386__) || defined(__x86_64__) 
+#include <machine/sysarch.h>
+
+static inline void outb(uint8_t value, uint16_t port)
+{
+	asm volatile ("outb %b0,%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 void outw(uint16_t value, uint16_t port)
+{
+	asm volatile ("outw %w0,%w1": :"a" (value), "Nd" (port));
+}
+
+static inline uint16_t inw(uint16_t port)
+{
+	uint16_t value;
+	asm volatile ("inw %w1,%0":"=a" (value):"Nd" (port));
+	return value;
+}
+
+static inline void outl(uint32_t value, uint16_t port)
+{
+	asm volatile ("outl %0,%w1": :"a" (value), "Nd" (port));
+}
+
+static inline uint32_t inl(uint16_t port)
+{
+	uint32_t value;
+	asm volatile ("inl %1,%0":"=a" (value):"Nd" (port));
+	return value;
+}
+#endif
+#ifdef __x86_64__
+#define iopl x86_64_iopl
+#endif
+#ifdef __i386__
+#define iopl i386_iopl
+#endif
+#endif
 #define OUTB outb
 #define OUTW outw
 #define OUTL outl