From: Stefan Reinauer <stefan.reinauer@coreboot.org>
Date: Mon, 14 Mar 2011 09:08:27 +0000 (+0000)
Subject: msrtool: Update to use DirectHW on Mac OS X
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=9018b6ee641407703a0c3967356a07d50f6bb4b5;hp=0238a9caa3c6bc4cbc084b350f5cc016dc24178d;p=coreboot.git

msrtool: Update to use DirectHW on Mac OS X

http://www.coreboot.org/DirectHW

Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Acked-by: Peter Stuge <peter@stuge.se>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6443 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
---

diff --git a/util/msrtool/configure b/util/msrtool/configure
index e52054ba5..35d17183a 100755
--- a/util/msrtool/configure
+++ b/util/msrtool/configure
@@ -155,7 +155,7 @@ CFLAGS=`trycompile "libpci (from pciutils)" "${pc_CFLAGS}" "-I/usr/local/include
 	rm -f .config.c
 	exit 1
 }
-LDFLAGS=`trylink "libpci (from pciutils)" "${pc_LDFLAGS}" "-lpci -lz" "-L/usr/local/lib -lpci -lz" "-framework DirectIO -lpci -lz"` || {
+LDFLAGS=`trylink "libpci (from pciutils)" "${pc_LDFLAGS}" "-lpci -lz" "-L/usr/local/lib -lpci -lz" "-framework DirectHW -lpci -lz"` || {
 	rm -f .config.c .config.o
 	exit 1
 }
diff --git a/util/msrtool/darwin.c b/util/msrtool/darwin.c
index 4d8ad2e04..9f0291c3c 100644
--- a/util/msrtool/darwin.c
+++ b/util/msrtool/darwin.c
@@ -26,8 +26,8 @@
 
 #include "msrtool.h"
 
-/* This Darwin support requires DirectIO, which is available at
- * http://www.coresystems.de/en/directio
+/* This Darwin support requires DirectHW, which is available at
+ * http://www.coreboot.org/DirectHW
  */
 
 int darwin_probe(const struct sysdef *system)
diff --git a/util/msrtool/msrtool.c b/util/msrtool/msrtool.c
index 9cbf358ce..86fc2f971 100644
--- a/util/msrtool/msrtool.c
+++ b/util/msrtool/msrtool.c
@@ -49,7 +49,7 @@ static struct targetdef alltargets[] = {
 
 static struct sysdef allsystems[] = {
 	{ "linux", "Linux with /dev/cpu/*/msr", linux_probe, linux_open, linux_close, linux_rdmsr },
-	{ "darwin", "OS X with DirectIO", darwin_probe, darwin_open, darwin_close, darwin_rdmsr },
+	{ "darwin", "Mac OS X with DirectHW", darwin_probe, darwin_open, darwin_close, darwin_rdmsr },
 	{ "freebsd", "FreeBSD with /dev/cpuctl*", freebsd_probe, freebsd_open, freebsd_close, freebsd_rdmsr },
 	{ SYSTEM_EOT }
 };
diff --git a/util/msrtool/msrtool.h b/util/msrtool/msrtool.h
index cf77b4970..0441e3f1d 100644
--- a/util/msrtool/msrtool.h
+++ b/util/msrtool/msrtool.h
@@ -24,9 +24,9 @@
 #include <stdio.h>
 #include <stdint.h>
 #if (defined(__MACH__) && defined(__APPLE__))
-/* DirectIO is available here: http://www.coresystems.de/en/directio */
+/* DirectHW is available here: http://www.coreboot.org/DirectHW */
 #define __DARWIN__
-#include <DirectIO/darwinio.h>
+#include <DirectHW/DirectHW.h>
 #endif
 #if defined(__FreeBSD__)
 #include <sys/ioctl.h>