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
Index: flashrom-directio_directhw_rename/hwaccess.h =================================================================== --- flashrom-directio_directhw_rename/hwaccess.h (Revision 1194) +++ flashrom-directio_directhw_rename/hwaccess.h (Arbeitskopie) @@ -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 Index: flashrom-directio_directhw_rename/Makefile =================================================================== --- flashrom-directio_directhw_rename/Makefile (Revision 1194) +++ flashrom-directio_directhw_rename/Makefile (Arbeitskopie) @@ -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) Index: flashrom-directio_directhw_rename/cbtable.c =================================================================== --- flashrom-directio_directhw_rename/cbtable.c (Revision 1194) +++ flashrom-directio_directhw_rename/cbtable.c (Arbeitskopie) @@ -204,7 +204,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; Index: flashrom-directio_directhw_rename/physmap.c =================================================================== --- flashrom-directio_directhw_rename/physmap.c (Revision 1194) +++ flashrom-directio_directhw_rename/physmap.c (Arbeitskopie) @@ -131,6 +131,7 @@ } #elif defined(__DARWIN__)
+/* Header is part of the DirectHW library. */ #include <DirectIO/darwinio.h>
#define MEM_DEV "DirectIO" Index: flashrom-directio_directhw_rename/README =================================================================== --- flashrom-directio_directhw_rename/README (Revision 1194) +++ flashrom-directio_directhw_rename/README (Arbeitskopie) @@ -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:
2010/10/6 Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net
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
Stefan: the old URL doesn't redirect.
Acked-by: Idwer Vollering vidwer@gmail.com
Index: flashrom-directio_directhw_rename/hwaccess.h
--- flashrom-directio_directhw_rename/hwaccess.h (Revision 1194) +++ flashrom-directio_directhw_rename/hwaccess.h (Arbeitskopie) @@ -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
Index: flashrom-directio_directhw_rename/Makefile
--- flashrom-directio_directhw_rename/Makefile (Revision 1194) +++ flashrom-directio_directhw_rename/Makefile (Arbeitskopie) @@ -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) Index: flashrom-directio_directhw_rename/cbtable.c =================================================================== --- flashrom-directio_directhw_rename/cbtable.c (Revision 1194) +++ flashrom-directio_directhw_rename/cbtable.c (Arbeitskopie) @@ -204,7 +204,7 @@ struct lb_record *rec, *last;
#ifdef __DARWIN__
/* This is a hack. DirectIO fails to map physical address0x00000000.
/* This is a hack. DirectHW fails to map physical address0x00000000. * Why? */ start = 0x400; Index: flashrom-directio_directhw_rename/physmap.c =================================================================== --- flashrom-directio_directhw_rename/physmap.c (Revision 1194) +++ flashrom-directio_directhw_rename/physmap.c (Arbeitskopie) @@ -131,6 +131,7 @@ } #elif defined(__DARWIN__)
+/* Header is part of the DirectHW library. */ #include <DirectIO/darwinio.h>
#define MEM_DEV "DirectIO" Index: flashrom-directio_directhw_rename/README =================================================================== --- flashrom-directio_directhw_rename/README (Revision 1194) +++ flashrom-directio_directhw_rename/README (Arbeitskopie) @@ -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:
flashrom mailing list flashrom@flashrom.org http://www.flashrom.org/mailman/listinfo/flashrom
On 07.10.2010 00:53, Idwer Vollering wrote:
2010/10/6 Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net
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
Stefan: the old URL doesn't redirect.
Acked-by: Idwer Vollering vidwer@gmail.com
Thanks, committed in r1198.
Regards, Carl-Daniel
-
Carl-Daniel Hailfinger -
Idwer Vollering