From 94b31b08db6cb7e69ef20acda3e2cda586dc968f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Mon, 23 Jun 2008 14:13:42 +0000 Subject: [PATCH] Don't check for not-intel when you mean ppc! git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26101 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../kernel/drivers/network/etherpci/etherpci.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/add-ons/kernel/drivers/network/etherpci/etherpci.c b/src/add-ons/kernel/drivers/network/etherpci/etherpci.c index 0dafee0034..73519acd3f 100644 --- a/src/add-ons/kernel/drivers/network/etherpci/etherpci.c +++ b/src/add-ons/kernel/drivers/network/etherpci/etherpci.c @@ -161,19 +161,20 @@ typedef struct etherpci_private { } etherpci_private_t; -#if __INTEL__ -#define ether_outb(device, offset, value) (*gPCIModInfo->write_io_8)((device->reg_base + (offset)), (value)) -#define ether_outw(device, offset, value) (*gPCIModInfo->write_io_16)((device->reg_base + (offset)), (value)) -#define ether_inb(device, offset) ((*gPCIModInfo->read_io_8)(device->reg_base + (offset))) -#define ether_inw(device, offset) ((*gPCIModInfo->read_io_16)(device->reg_base + (offset))) - -#else /* PPC */ +#if __POWERPC__ #define ether_inb(device, offset) (*((volatile uint8*)(device->reg_base + (offset)))); __eieio() #define ether_inw(device, offset) (*((volatile uint16*)(device->reg_base + (offset)))); __eieio() #define ether_outb(device, offset, value) (*((volatile uint8 *)(device->reg_base + (offset))) = (value)); __eieio() #define ether_outw(device, offset, value) (*((volatile uint16*)(device->reg_base + (offset))) = (value)); __eieio() +#else /* !PPC */ + +#define ether_outb(device, offset, value) (*gPCIModInfo->write_io_8)((device->reg_base + (offset)), (value)) +#define ether_outw(device, offset, value) (*gPCIModInfo->write_io_16)((device->reg_base + (offset)), (value)) +#define ether_inb(device, offset) ((*gPCIModInfo->read_io_8)(device->reg_base + (offset))) +#define ether_inw(device, offset) ((*gPCIModInfo->read_io_16)(device->reg_base + (offset))) + #endif #if 0