diff options
| -rw-r--r-- | util/inteltool/Makefile | 2 | ||||
| -rw-r--r-- | util/inteltool/inteltool.c | 2 | ||||
| -rw-r--r-- | util/inteltool/inteltool.h | 4 | ||||
| -rw-r--r-- | util/nvramtool/Makefile | 2 | ||||
| -rw-r--r-- | util/nvramtool/accessors/cmos-hw-unix.c | 2 | ||||
| -rw-r--r-- | util/superiotool/Makefile | 2 | ||||
| -rw-r--r-- | util/superiotool/superiotool.h | 4 |
7 files changed, 9 insertions, 9 deletions
diff --git a/util/inteltool/Makefile b/util/inteltool/Makefile index c6894c0afd..db7fca0b23 100644 --- a/util/inteltool/Makefile +++ b/util/inteltool/Makefile @@ -31,7 +31,7 @@ OBJS = inteltool.o cpu.o gpio.o rootcmplx.o powermgt.o memory.o pcie.o OS_ARCH = $(shell uname) ifeq ($(OS_ARCH), Darwin) -LDFLAGS = -framework DirectIO -lpci -lz +LDFLAGS = -framework DirectHW -lpci -lz endif ifeq ($(OS_ARCH), FreeBSD) CFLAGS += -I/usr/local/include diff --git a/util/inteltool/inteltool.c b/util/inteltool/inteltool.c index f32ec73cbc..a4161063f1 100644 --- a/util/inteltool/inteltool.c +++ b/util/inteltool/inteltool.c @@ -85,7 +85,7 @@ static const struct { #ifndef __DARWIN__ static int fd_mem; -void *map_physical(unsigned long phys_addr, size_t len) +void *map_physical(uint64_t phys_addr, size_t len) { void *virt_addr; diff --git a/util/inteltool/inteltool.h b/util/inteltool/inteltool.h index 65792e4a90..cac1c272ab 100644 --- a/util/inteltool/inteltool.h +++ b/util/inteltool/inteltool.h @@ -26,7 +26,7 @@ #if (defined(__MACH__) && defined(__APPLE__)) /* DirectHW is available here: http://www.coresystems.de/en/directhw */ #define __DARWIN__ -#include <DirectIO/darwinio.h> +#include <DirectHW/DirectHW.h> #endif #include <pci/pci.h> @@ -111,7 +111,7 @@ int freebsd_wrmsr(int addr, msr_t msr); #endif typedef struct { uint16_t addr; int size; char *name; } io_register_t; -void *map_physical(unsigned long phys_addr, size_t len); +void *map_physical(uint64_t phys_addr, size_t len); void unmap_physical(void *virt_addr, size_t len); unsigned int cpuid(unsigned int op); diff --git a/util/nvramtool/Makefile b/util/nvramtool/Makefile index e0054cde34..a75c70da5c 100644 --- a/util/nvramtool/Makefile +++ b/util/nvramtool/Makefile @@ -37,7 +37,7 @@ OBJS += $(CLI_OBJS) OS_ARCH = $(shell uname) ifeq ($(OS_ARCH), Darwin) -LDFLAGS = -framework DirectIO +LDFLAGS = -framework DirectHW endif ifeq ($(OS_ARCH), NetBSD) LDFLAGS = -l$(shell uname -p) diff --git a/util/nvramtool/accessors/cmos-hw-unix.c b/util/nvramtool/accessors/cmos-hw-unix.c index 24cc42d2dd..6d42cb57ee 100644 --- a/util/nvramtool/accessors/cmos-hw-unix.c +++ b/util/nvramtool/accessors/cmos-hw-unix.c @@ -15,7 +15,7 @@ #include <sys/io.h> #endif #if (defined(__MACH__) && defined(__APPLE__)) -#include <DirectIO/darwinio.h> +#include <DirectHW/DirectHW.h> #endif #if defined(__NetBSD__) #if defined(__i386__) || defined(__x86_64__) diff --git a/util/superiotool/Makefile b/util/superiotool/Makefile index bcdb107d71..00a1cc0d7b 100644 --- a/util/superiotool/Makefile +++ b/util/superiotool/Makefile @@ -37,7 +37,7 @@ OBJS = superiotool.o ali.o fintek.o ite.o nsc.o nuvoton.o smsc.o winbond.o OS_ARCH = $(shell uname) ifeq ($(OS_ARCH), Darwin) -LIBS = -framework IOKit -framework DirectIO -lpci -lz +LIBS = -framework IOKit -framework DirectHW -lpci -lz endif ifeq ($(OS_ARCH), FreeBSD) CFLAGS = -O2 -Wall -Werror -Wstrict-prototypes -Wundef -Wstrict-aliasing \ diff --git a/util/superiotool/superiotool.h b/util/superiotool/superiotool.h index 63dfebdcf7..8a7d2aa479 100644 --- a/util/superiotool/superiotool.h +++ b/util/superiotool/superiotool.h @@ -33,8 +33,8 @@ #include <sys/io.h> #endif #if (defined(__MACH__) && defined(__APPLE__)) -/* DirectIO is available here: http://www.coresystems.de/en/directio */ -#include <DirectIO/darwinio.h> +/* DirectHW is available here: http://www.coreboot.org/DirectHW */ +#include <DirectHW/DirectHW.h> #endif #ifdef PCI_SUPPORT |