1
0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-26 22:52:34 +02:00

hwaccess.h: fix compilation on OSX

DirectHW provides prototypes for out[bwl] and in[bwl], but we still
need to define the respective OUT[BWL] and IN[BWL] binding macros.

Apparently this has been broken since r1864 (or January 2015).

Corresponding to flashrom svn r1890.

Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
This commit is contained in:
Stefan Tauner 2015-05-23 23:59:23 +00:00
parent 95edc89a94
commit c71759d3d3

View File

@ -231,11 +231,6 @@ cpu_to_be(64)
#define INL(x) __extension__ ({ u_int inl_tmp = (x); inl(inl_tmp); }) #define INL(x) __extension__ ({ u_int inl_tmp = (x); inl(inl_tmp); })
#else #else
#if defined(__MACH__) && defined(__APPLE__)
/* Header is part of the DirectHW library. */
#include <DirectHW/DirectHW.h>
#else
#if defined (__sun) #if defined (__sun)
/* Note different order for outb */ /* Note different order for outb */
#define OUTB(x,y) outb(y, x) #define OUTB(x,y) outb(y, x)
@ -259,6 +254,12 @@ cpu_to_be(64)
#define INL inportl #define INL inportl
#else #else
#if defined(__MACH__) && defined(__APPLE__)
/* Header is part of the DirectHW library. */
#include <DirectHW/DirectHW.h>
#endif
/* This is the usual glibc interface. */ /* This is the usual glibc interface. */
#define OUTB outb #define OUTB outb
#define OUTW outw #define OUTW outw
@ -269,7 +270,6 @@ cpu_to_be(64)
#endif #endif
#endif #endif
#endif #endif
#endif
#if defined(__NetBSD__) || defined (__OpenBSD__) #if defined(__NetBSD__) || defined (__OpenBSD__)
#if defined(__i386__) || defined(__x86_64__) #if defined(__i386__) || defined(__x86_64__)