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 e52054ba5e9eabaa3c7d85a91f86fc9096653918..35d17183a20d616062c4cb12659b0b141a4e1556 100755 (executable)
--- 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 4d8ad2e04f065ef4a10bc40b70f9996eba7fa1b6..9f0291c3ceee857362107a0475ba1c6bbb8c58a6 100644 (file)
--- 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 9cbf358ce4897a7f80e59e3431190e6ca45682e4..86fc2f971a812801dafb76830c86295f05fe39d4 100644 (file)
--- 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 cf77b49707333bb98cb8a6b86dad3f309b7df6d4..0441e3f1d48966649df139313889b4ea6ada408d 100644 (file)
--- 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>