[commit] r6443 - trunk/util/msrtool

[repository service]

Author: stuge
Date: Mon Mar 14 10:08:27 2011
New Revision: 6443
URL: https://tracker.coreboot.org/trac/coreboot/changeset/6443

Log:
msrtool: Update to use DirectHW on Mac OS X

http://www.coreboot.org/DirectHW

Signed-off-by: Stefan Reinauer 
Acked-by: Peter Stuge

Modified:
   trunk/util/msrtool/configure
   trunk/util/msrtool/darwin.c
   trunk/util/msrtool/msrtool.c
   trunk/util/msrtool/msrtool.h

Modified: trunk/util/msrtool/configure
==============================================================================
--- trunk/util/msrtool/configure	Mon Mar 14 09:18:27 2011	(r6442)
+++ trunk/util/msrtool/configure	Mon Mar 14 10:08:27 2011	(r6443)
@@ -155,7 +155,7 @@
    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
 }

Modified: trunk/util/msrtool/darwin.c
==============================================================================
--- trunk/util/msrtool/darwin.c	Mon Mar 14 09:18:27 2011	(r6442)
+++ trunk/util/msrtool/darwin.c	Mon Mar 14 10:08:27 2011	(r6443)
@@ -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)

Modified: trunk/util/msrtool/msrtool.c
==============================================================================
--- trunk/util/msrtool/msrtool.c	Mon Mar 14 09:18:27 2011	(r6442)
+++ trunk/util/msrtool/msrtool.c	Mon Mar 14 10:08:27 2011	(r6443)
@@ -49,7 +49,7 @@

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 }
 };

Modified: trunk/util/msrtool/msrtool.h
==============================================================================
--- trunk/util/msrtool/msrtool.h	Mon Mar 14 09:18:27 2011	(r6442)
+++ trunk/util/msrtool/msrtool.h	Mon Mar 14 10:08:27 2011	(r6443)
@@ -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>