From ff2cafc85ab28f1d17299382903d6798c7215448 Mon Sep 17 00:00:00 2001
From: "Federico G. Schwindt" <fgsch@cvs.openbsd.org>
Date: Wed, 8 Jun 2005 20:43:41 +0000
Subject: use SMALL_KERNEL for all arch's, not just alpha and also apply the
 defs for sii3112 funcs; grange@ mickey@ deraadt@ ok.

---
 sys/dev/pci/pciide.c             | 14 +++++++-------
 sys/dev/pci/pciide_sii3112_reg.h | 10 +++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'sys/dev/pci')

diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c
index a8646e5df7b..a46b8874c3a 100644
--- a/sys/dev/pci/pciide.c
+++ b/sys/dev/pci/pciide.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pciide.c,v 1.194 2005/06/01 21:50:52 miod Exp $	*/
+/*	$OpenBSD: pciide.c,v 1.195 2005/06/08 20:43:40 fgsch Exp $	*/
 /*	$NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $	*/
 
 /*
@@ -108,6 +108,12 @@ int wdcdebug_pciide_mask = WDCDEBUG_PCIIDE_MASK;
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 
+#if defined(SMALL_KERNEL)
+#define	INLINE
+#else
+#define	INLINE __inline
+#endif
+
 #include <dev/pci/pciidereg.h>
 #include <dev/pci/pciidevar.h>
 #include <dev/pci/pciide_piix_reg.h>
@@ -130,12 +136,6 @@ int wdcdebug_pciide_mask = WDCDEBUG_PCIIDE_MASK;
 
 /* inlines for reading/writing 8-bit PCI registers */
 
-#if defined(SMALL_KERNEL) && defined(__alpha__)
-#define	INLINE
-#else
-#define	INLINE __inline
-#endif
-
 static INLINE u_int8_t pciide_pci_read(pci_chipset_tag_t, pcitag_t,
 					int);
 static INLINE void pciide_pci_write(pci_chipset_tag_t, pcitag_t,
diff --git a/sys/dev/pci/pciide_sii3112_reg.h b/sys/dev/pci/pciide_sii3112_reg.h
index 588f3edc128..c7af0442a4b 100644
--- a/sys/dev/pci/pciide_sii3112_reg.h
+++ b/sys/dev/pci/pciide_sii3112_reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pciide_sii3112_reg.h,v 1.2 2004/10/17 19:21:37 grange Exp $	*/
+/*	$OpenBSD: pciide_sii3112_reg.h,v 1.3 2005/06/08 20:43:40 fgsch Exp $	*/
 /*	$NetBSD: pciide_sii3112_reg.h,v 1.1 2003/03/20 04:22:50 thorpej Exp $	*/
 
 /*
@@ -337,7 +337,7 @@ struct pciide_satalink {
 	} regs[4];
 };
 
-static __inline uint32_t
+static INLINE uint32_t
 ba5_read_4_ind(struct pciide_softc *sc, bus_addr_t reg)
 {
 	uint32_t rv;
@@ -351,7 +351,7 @@ ba5_read_4_ind(struct pciide_softc *sc, bus_addr_t reg)
 	return (rv);
 }
 
-static __inline uint32_t
+static INLINE uint32_t
 ba5_read_4(struct pciide_softc *sc, bus_addr_t reg)
 {
 	struct pciide_satalink *sl = sc->sc_cookie;
@@ -365,7 +365,7 @@ ba5_read_4(struct pciide_softc *sc, bus_addr_t reg)
 #define	BA5_READ_4(sc, chan, reg)					\
 	ba5_read_4((sc), satalink_ba5_regmap[(chan)].reg)
 
-static __inline void
+static INLINE void
 ba5_write_4_ind(struct pciide_softc *sc, bus_addr_t reg, uint32_t val)
 {
 	int s;
@@ -376,7 +376,7 @@ ba5_write_4_ind(struct pciide_softc *sc, bus_addr_t reg, uint32_t val)
 	splx(s);
 }
 
-static __inline void
+static INLINE void
 ba5_write_4(struct pciide_softc *sc, bus_addr_t reg, uint32_t val)
 {
 	struct pciide_satalink *sl = sc->sc_cookie;
-- 
cgit v1.2.3