|
 |
4a6317d |
From 67b1241475fa89270bede67d6f67fcb9cae972c2 Mon Sep 17 00:00:00 2001
|
|
|
a1e5088 |
From: Peter Lemenkov <lemenkov@gmail.com>
|
|
|
a1e5088 |
Date: Sun, 17 Oct 2010 12:53:18 +0400
|
|
|
bbd9bbe |
Subject: [PATCH 10/10] Move arch-checking #ifdef block into header
|
|
|
a1e5088 |
|
|
|
a1e5088 |
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
|
|
a1e5088 |
---
|
|
|
a1e5088 |
hwaccess.c | 7 -------
|
|
|
a1e5088 |
hwaccess.h | 21 ++++++++-------------
|
|
|
a1e5088 |
2 files changed, 8 insertions(+), 20 deletions(-)
|
|
|
a1e5088 |
|
|
|
a1e5088 |
diff --git a/hwaccess.c b/hwaccess.c
|
|
|
4a6317d |
index 9ef0b7d..c3335d8 100644
|
|
|
a1e5088 |
--- a/hwaccess.c
|
|
|
a1e5088 |
+++ b/hwaccess.c
|
|
|
a1e5088 |
@@ -31,13 +31,6 @@
|
|
|
a1e5088 |
#endif
|
|
|
a1e5088 |
#include "flash.h"
|
|
|
a1e5088 |
|
|
|
a1e5088 |
-#if !( defined(__i386__) || \
|
|
|
a1e5088 |
- defined(__x86_64__) || defined(__amd64) || \
|
|
|
a1e5088 |
- defined (__mips) || defined (__mips__) || defined (_mips) || defined (mips) || \
|
|
|
a1e5088 |
- defined(__powerpc__) || defined(__powerpc64__) || defined(__ppc__) || defined(__ppc64__))
|
|
|
a1e5088 |
-#error Unknown architecture
|
|
|
a1e5088 |
-#endif
|
|
|
a1e5088 |
-
|
|
|
a1e5088 |
#if defined(__i386__) || defined(__x86_64__)
|
|
|
a1e5088 |
#if defined(__FreeBSD__) || defined(__DragonFly__)
|
|
|
a1e5088 |
int io_fd;
|
|
|
a1e5088 |
diff --git a/hwaccess.h b/hwaccess.h
|
|
|
4a6317d |
index b73513b..807bb8f 100644
|
|
|
a1e5088 |
--- a/hwaccess.h
|
|
|
a1e5088 |
+++ b/hwaccess.h
|
|
|
a1e5088 |
@@ -26,6 +26,13 @@
|
|
|
a1e5088 |
|
|
|
a1e5088 |
#include "config.h"
|
|
|
a1e5088 |
|
|
|
a1e5088 |
+#if !( defined(__i386__) || \
|
|
|
a1e5088 |
+ defined(__x86_64__) || defined(__amd64) || \
|
|
|
a1e5088 |
+ defined (__mips) || defined (__mips__) || defined (_mips) || defined (mips) || \
|
|
|
a1e5088 |
+ defined(__powerpc__) || defined(__powerpc64__) || defined(__ppc__) || defined(__ppc64__))
|
|
|
a1e5088 |
+#error Unknown architecture
|
|
|
a1e5088 |
+#endif
|
|
|
a1e5088 |
+
|
|
|
a1e5088 |
#if defined (HAVE_SYS_IO_H)
|
|
|
a1e5088 |
#include <sys/io.h>
|
|
|
a1e5088 |
#endif /* defined (HAVE_SYS_IO_H) */
|
|
|
bbd9bbe |
@@ -183,7 +190,7 @@ cpu_to_be(64)
|
|
|
a1e5088 |
#define off64_t off_t
|
|
|
a1e5088 |
#define lseek64 lseek
|
|
|
a1e5088 |
#endif
|
|
|
a1e5088 |
-#if defined (__sun) && (defined(__i386) || defined(__amd64))
|
|
|
a1e5088 |
+#if defined (__sun)
|
|
|
a1e5088 |
/* Note different order for outb */
|
|
|
a1e5088 |
#define OUTB(x,y) outb(y, x)
|
|
|
a1e5088 |
#define OUTW(x,y) outw(y, x)
|
|
|
bbd9bbe |
@@ -301,18 +308,6 @@ int libpayload_wrmsr(int addr, msr_t msr);
|
|
|
a1e5088 |
#define wrmsr libpayload_wrmsr
|
|
|
a1e5088 |
#endif
|
|
|
a1e5088 |
|
|
|
a1e5088 |
-#elif defined(__powerpc__) || defined(__powerpc64__) || defined(__ppc__) || defined(__ppc64__)
|
|
|
a1e5088 |
-
|
|
|
a1e5088 |
-/* PCI port I/O is not yet implemented on PowerPC. */
|
|
|
a1e5088 |
-
|
|
|
a1e5088 |
-#elif defined (__mips) || defined (__mips__) || defined (_mips) || defined (mips)
|
|
|
a1e5088 |
-
|
|
|
a1e5088 |
-/* PCI port I/O is not yet implemented on MIPS. */
|
|
|
a1e5088 |
-
|
|
|
a1e5088 |
-#else
|
|
|
a1e5088 |
-
|
|
|
a1e5088 |
-#error Unknown architecture, please check if it supports PCI port IO.
|
|
|
a1e5088 |
-
|
|
|
a1e5088 |
#endif
|
|
|
a1e5088 |
#endif
|
|
|
a1e5088 |
|
|
|
a1e5088 |
--
|
|
|
4a6317d |
1.7.5.1
|
|
|
a1e5088 |
|