diff options
| author |   jasper <jasper@openbsd.org> | 2015-07-20 01:38:31 +0000 |
|---|---|---|
| committer | jasper <jasper@openbsd.org> | 2015-07-20 01:38:31 +0000 |
| commit | 0b0091d948f44453ed79ff130fa269194f49867b (patch) | |
| tree | 918121092c9432a95d2cdffa997d12b629c256db | |
| parent | INET6 is here to stay, so stop hauling around never-compiled code (diff) | |
| download | wireguard-openbsd-0b0091d948f44453ed79ff130fa269194f49867b.tar.xz wireguard-openbsd-0b0091d948f44453ed79ff130fa269194f49867b.zip | |
it's unlikely we'll run on physical octeon hardware that's little endian;
therefore remove unneeded ifdef blocks.
ok miod@ pirofti@
| -rw-r--r-- | sys/arch/octeon/dev/octcf.c | 5 | ||||
| -rw-r--r-- | sys/arch/octeon/dev/octeon_pcibus.h | 9 |
2 files changed, 3 insertions, 11 deletions
diff --git a/sys/arch/octeon/dev/octcf.c b/sys/arch/octeon/dev/octcf.c index b813fa07784..ba7fcb5e4a4 100644 --- a/sys/arch/octeon/dev/octcf.c +++ b/sys/arch/octeon/dev/octcf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: octcf.c,v 1.26 2015/07/19 23:46:50 jasper Exp $ */ +/* $OpenBSD: octcf.c,v 1.27 2015/07/20 01:38:31 jasper Exp $ */ /* $NetBSD: wd.c,v 1.193 1999/02/28 17:15:27 explorer Exp $ */ /* @@ -818,7 +818,6 @@ octcf_get_params(struct octcf_softc *wd, struct ataparams *params) free(tb, M_DEVBUF, 0); return CMD_ERR; } else { -#if BYTE_ORDER == BIG_ENDIAN /* * All the fields in the params structure are 16-bit * integers except for the ID strings which are char @@ -832,7 +831,7 @@ octcf_get_params(struct octcf_softc *wd, struct ataparams *params) swap16_multi((u_int16_t *)tb, 10); swap16_multi((u_int16_t *)tb + 20, 3); swap16_multi((u_int16_t *)tb + 47, ATAPARAMS_SIZE / 2 - 47); -#endif + /* Read in parameter block. */ bcopy(tb, params, sizeof(struct ataparams)); diff --git a/sys/arch/octeon/dev/octeon_pcibus.h b/sys/arch/octeon/dev/octeon_pcibus.h index 4ecc6497b17..f8f0de100a6 100644 --- a/sys/arch/octeon/dev/octeon_pcibus.h +++ b/sys/arch/octeon/dev/octeon_pcibus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: octeon_pcibus.h,v 1.2 2013/06/02 20:29:36 jasper Exp $ */ +/* $OpenBSD: octeon_pcibus.h,v 1.3 2015/07/20 01:38:31 jasper Exp $ */ /* * Copyright (c) 2003-2004 Opsycon AB (www.opsycon.com). @@ -34,17 +34,10 @@ #define OCTEON_PCIBUS_PCIIO_BASE 0x11A0000000000ULL -#if _BYTE_ORDER == _BIG_ENDIAN #define OCTEON_PCI_CFG0 0x80011F0000001804ULL #define OCTEON_PCI_CFG1 0x80011F0000001800ULL #define OCTEON_PCI_CONFIG_BASE0 0x8001190000000004ULL #define OCTEON_PCI_CONFIG_BASE1 0x8001190000000000ULL -#else -#define OCTEON_PCI_CFG0 0x80011F0000001800ULL -#define OCTEON_PCI_CFG1 0x80011F0000001804ULL -#define OCTEON_PCI_CONFIG_BASE0 0x8001190000000000ULL -#define OCTEON_PCI_CONFIG_BASE1 0x8001190000000004ULL -#endif #define OCTEON_PCI_CFG2 (OCTEON_PCI_CFG0 + 0x08UL) #define OCTEON_PCI_CFG3 (OCTEON_PCI_CFG1 + 0x08UL) |