Author: hailfinger Date: Thu Oct 7 01:16:10 2010 New Revision: 1198 URL: http://flashrom.org/trac/flashrom/changeset/1198
Log: The Direct I/O library for Mac OS X is now called DirectHW to make sure people can find it via an internet search. DirectIO was a generic name for a concept and thus not a good distinguisher for a library.
Signed-off-by: Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net Acked-by: Idwer Vollering vidwer@gmail.com
Modified: trunk/Makefile trunk/README trunk/cbtable.c trunk/hwaccess.h
Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Thu Oct 7 01:03:21 2010 (r1197) +++ trunk/Makefile Thu Oct 7 01:16:10 2010 (r1198) @@ -42,6 +42,7 @@ 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 endif ifeq ($(OS_ARCH), FreeBSD)
Modified: trunk/README ============================================================================== --- trunk/README Thu Oct 7 01:03:21 2010 (r1197) +++ trunk/README Thu Oct 7 01:16:10 2010 (r1198) @@ -87,8 +87,8 @@
To compile and run on Darwin/Mac OS X:
- Install DirectIO from coresystems GmbH. - DirectIO is available at http://www.coresystems.de/en/directio. + Install DirectHW from coresystems GmbH. + DirectHW is available at http://www.coresystems.de/en/directhw .
To cross-compile on Linux for DOS:
Modified: trunk/cbtable.c ============================================================================== --- trunk/cbtable.c Thu Oct 7 01:03:21 2010 (r1197) +++ trunk/cbtable.c Thu Oct 7 01:16:10 2010 (r1198) @@ -203,7 +203,7 @@ struct lb_record *rec, *last;
#ifdef __DARWIN__ - /* This is a hack. DirectIO fails to map physical address 0x00000000. + /* This is a hack. DirectHW fails to map physical address 0x00000000. * Why? */ start = 0x400;
Modified: trunk/hwaccess.h ============================================================================== --- trunk/hwaccess.h Thu Oct 7 01:03:21 2010 (r1197) +++ trunk/hwaccess.h Thu Oct 7 01:16:10 2010 (r1198) @@ -193,6 +193,7 @@ #define INL(x) __extension__ ({ u_int inl_tmp = (x); inl(inl_tmp); }) #else #if defined(__DARWIN__) + /* Header is part of the DirectHW library. */ #include <DirectIO/darwinio.h> #define off64_t off_t #define lseek64 lseek