diff options
| author | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2012-08-09 23:34:41 +0000 |
|---|---|---|
| committer | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2012-08-09 23:34:41 +0000 |
| commit | 60d9bd267e38c6241e05f0253845e1d11d04f3b3 (patch) | |
| tree | adbb52deb6d42ab9f32ed347d18ff42384190c47 /hwaccess.h | |
| parent | b6304c1a1a89330e84eeee34a4c6ef99b163f367 (diff) | |
| download | ast2050-flashrom-60d9bd267e38c6241e05f0253845e1d11d04f3b3.zip ast2050-flashrom-60d9bd267e38c6241e05f0253845e1d11d04f3b3.tar.gz | |
Portability fixes and cleanups
Move Mac OS X IOKit/DirectHW availability checks in the Makefile from
compiler check to pciutils check.
Print the compiler error messages for feature detection.
Add DOS libpci in the Makefile includes only if a PCI-based programmer
was requested.
Restrict mmap usage in ich_descriptors_tool to Unix style systems.
Build ich_descriptors_tool with the correct .exe extension on
DOS/Windows.
Build ich_descriptors_tool by default on x86. (Patch by Stefan Tauner)
Print the Windows version instead of "unknown machine" on Windows.
Don't #define our own __DARWIN__, use the standard OS X detection
method.
Update the README.
Add more generated files to svn:ignore
Corresponding to flashrom svn r1567.
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Diffstat (limited to 'hwaccess.h')
| -rw-r--r-- | hwaccess.h | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -180,10 +180,6 @@ cpu_to_be(64) #include <asm/sunddi.h> #endif -#if (defined(__MACH__) && defined(__APPLE__)) -#define __DARWIN__ -#endif - /* Clarification about OUTB/OUTW/OUTL argument order: * OUT[BWL](val, port) */ @@ -203,7 +199,7 @@ cpu_to_be(64) #define INW(x) __extension__ ({ u_int inw_tmp = (x); inw(inw_tmp); }) #define INL(x) __extension__ ({ u_int inl_tmp = (x); inl(inl_tmp); }) #else -#if defined(__DARWIN__) +#if defined(__MACH__) && defined(__APPLE__) /* Header is part of the DirectHW library. */ #include <DirectHW/DirectHW.h> #define off64_t off_t @@ -303,7 +299,7 @@ static inline uint32_t inl(uint16_t port) #endif #endif -#if !defined(__DARWIN__) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(__DragonFly__) && !defined(__LIBPAYLOAD__) +#if !(defined(__MACH__) && defined(__APPLE__)) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(__DragonFly__) && !defined(__LIBPAYLOAD__) typedef struct { uint32_t hi, lo; } msr_t; msr_t rdmsr(int addr); int wrmsr(int addr, msr_t msr); |
