[flashrom] [commit] r1282 - trunk

[repository service]

Author: stepan
Date: Fri Mar 18 23:00:15 2011
New Revision: 1282
URL: http://flashrom.org/trac/flashrom/changeset/1282

Log:
Update port of flashrom package to Mac OS X using DirectHW:
http://www.coreboot.org/DirectHW

Signed-off-by: Stefan Reinauer <stefan.reinauer at coreboot.org>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>
Acked-by: Paul Menzel <paulepanter at users.sourceforge.net>

Modified:
   trunk/Makefile
   trunk/hwaccess.h
   trunk/physmap.c

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Thu Mar 17 01:10:25 2011	(r1281)
+++ trunk/Makefile	Fri Mar 18 23:00:15 2011	(r1282)
@@ -44,8 +44,8 @@
 endif
 ifeq ($(OS_ARCH), Darwin)
 CPPFLAGS += -I/opt/local/include -I/usr/local/include
-# DirectIO framework can be found in the DirectHW library.
-LDFLAGS += -framework IOKit -framework DirectIO -L/opt/local/lib -L/usr/local/lib
+# DirectHW framework can be found in the DirectHW library.
+LDFLAGS += -framework IOKit -framework DirectHW -L/opt/local/lib -L/usr/local/lib
 endif
 ifeq ($(OS_ARCH), FreeBSD)
 CPPFLAGS += -I/usr/local/include

Modified: trunk/hwaccess.h
==============================================================================
--- trunk/hwaccess.h	Thu Mar 17 01:10:25 2011	(r1281)
+++ trunk/hwaccess.h	Fri Mar 18 23:00:15 2011	(r1282)
@@ -194,7 +194,7 @@
 #else
 #if defined(__DARWIN__)
     /* Header is part of the DirectHW library. */
-    #include <DirectIO/darwinio.h>
+    #include <DirectHW/DirectHW.h>
     #define off64_t off_t
     #define lseek64 lseek
 #endif

Modified: trunk/physmap.c
==============================================================================
--- trunk/physmap.c	Thu Mar 17 01:10:25 2011	(r1281)
+++ trunk/physmap.c	Fri Mar 18 23:00:15 2011	(r1282)
@@ -134,7 +134,7 @@
 }
 #elif defined(__DARWIN__)
 
-#define MEM_DEV "DirectIO"
+#define MEM_DEV "DirectHW"
 
 static void *sys_physmap(unsigned long phys_addr, size_t len)
 {