Get rid of "integrate" and "hide" bad taste modifiers, thus get non-DDB

kernels to compile.

3 files changed, 42 insertions, 50 deletions

diff --git a/sys/arch/mac68k/dev/if_mc.c b/sys/arch/mac68k/dev/if_mc.c
index cc5db10344e..ee66a50f082 100644
--- a/sys/arch/mac68k/dev/if_mc.c
+++ b/sys/arch/mac68k/dev/if_mc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_mc.c,v 1.6 2002/03/14 01:26:35 millert Exp $	*/
+/*	$OpenBSD: if_mc.c,v 1.7 2002/04/20 00:17:05 miod Exp $	*/
 /*	$NetBSD: if_mc.c,v 1.4 1998/01/12 19:22:09 thorpej Exp $	*/
 
 /*-
@@ -86,17 +86,17 @@ struct cfdriver mc_cd = {
 	NULL, "mc", DV_IFNET
 };
 
-hide void	mcwatchdog(struct ifnet *);
-hide int	mcinit(struct mc_softc *sc);
-hide int	mcstop(struct mc_softc *sc);
-hide int	mcioctl(struct ifnet *ifp, u_long cmd, caddr_t data);
-hide void	mcstart(struct ifnet *ifp);
-hide void	mcreset(struct mc_softc *sc);
-
-integrate u_int	maceput(struct mc_softc *sc, struct mbuf *m0);
-integrate void	mc_tint(struct mc_softc *sc);
-integrate void	mace_read(struct mc_softc *, caddr_t, int);
-integrate struct mbuf *mace_get(struct mc_softc *, caddr_t, int);
+void	mcwatchdog(struct ifnet *);
+int	mcinit(struct mc_softc *sc);
+int	mcstop(struct mc_softc *sc);
+int	mcioctl(struct ifnet *ifp, u_long cmd, caddr_t data);
+void	mcstart(struct ifnet *ifp);
+void	mcreset(struct mc_softc *sc);
+
+u_int	maceput(struct mc_softc *sc, struct mbuf *m0);
+void	mc_tint(struct mc_softc *sc);
+void	mace_read(struct mc_softc *, caddr_t, int);
+struct mbuf *mace_get(struct mc_softc *, caddr_t, int);
 static void mace_calcladrf(struct arpcom *ac, u_int8_t *af);
 static inline u_int16_t ether_cmp(void *, void *);
 
@@ -179,7 +179,7 @@ mcsetup(sc, lladdr)
 	return (0);
 }
 
-hide int
+int
 mcioctl(ifp, cmd, data)
 	struct ifnet *ifp;
 	u_long cmd;
@@ -284,7 +284,7 @@ mcioctl(ifp, cmd, data)
 /*
  * Encapsulate a packet of type family for the local net.
  */
-hide void
+void
 mcstart(ifp)
 	struct ifnet *ifp;
 {
@@ -325,7 +325,7 @@ mcstart(ifp)
  * reset and restart the MACE.  Called in case of fatal
  * hardware/software errors.
  */
-hide void
+void
 mcreset(sc)
 	struct mc_softc *sc;
 {
@@ -333,7 +333,7 @@ mcreset(sc)
 	mcinit(sc);
 }
 
-hide int
+int
 mcinit(sc)
 	struct mc_softc *sc;
 {
@@ -407,7 +407,7 @@ mcinit(sc)
  * Called on final close of device, or if mcinit() fails
  * part way through.
  */
-hide int
+int
 mcstop(sc)
 	struct mc_softc *sc;
 {
@@ -428,7 +428,7 @@ mcstop(sc)
  * In all cases we just reset the chip, and any retransmission
  * will be handled by higher level protocol timeouts.
  */
-hide void
+void
 mcwatchdog(ifp)
 	struct ifnet *ifp;
 {
@@ -444,7 +444,7 @@ mcwatchdog(ifp)
 /*
  * stuff packet into MACE (at splnet)
  */
-integrate u_int
+u_int
 maceput(sc, m)
 	struct mc_softc *sc;
 	struct mbuf *m;
@@ -521,7 +521,7 @@ struct mc_softc *sc = arg;
 		mc_rint(sc);
 }
 
-integrate void
+void
 mc_tint(sc)
 	struct mc_softc *sc;
 {
@@ -566,7 +566,7 @@ mc_tint(sc)
 	mcstart(&sc->sc_if);
 }
 
-integrate void
+void
 mc_rint(sc)
 	struct mc_softc *sc;
 {
@@ -611,7 +611,7 @@ mc_rint(sc)
 #undef	rxf
 }
 
-integrate void
+void
 mace_read(sc, pkt, len)
 	struct mc_softc *sc;
 	caddr_t pkt;
@@ -656,7 +656,7 @@ mace_read(sc, pkt, len)
  * We copy the data into mbufs.  When full cluster sized units are present
  * we copy into clusters.
  */
-integrate struct mbuf *
+struct mbuf *
 mace_get(sc, pkt, totlen)
 	struct mc_softc *sc;
 	caddr_t pkt;
diff --git a/sys/arch/mac68k/dev/if_mc_obio.c b/sys/arch/mac68k/dev/if_mc_obio.c
index 232602ff489..9e475e172af 100644
--- a/sys/arch/mac68k/dev/if_mc_obio.c
+++ b/sys/arch/mac68k/dev/if_mc_obio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_mc_obio.c,v 1.3 2002/03/14 01:26:35 millert Exp $	*/
+/*	$OpenBSD: if_mc_obio.c,v 1.4 2002/04/20 00:17:05 miod Exp $	*/
 /*	$NetBSD: if_mc_obio.c,v 1.4 1998/01/13 19:24:54 scottr Exp $	*/
 
 /*-
@@ -60,15 +60,15 @@
 #define MACE_REG_BASE	0x50F1C000
 #define MACE_PROM_BASE	0x50F08000
 
-hide int	mc_obio_match(struct device *, void *, void *);
-hide void	mc_obio_attach(struct device *, struct device *, void *);
-hide void	mc_obio_init(struct mc_softc *sc);
-hide void	mc_obio_put(struct mc_softc *sc, u_int len);
-hide int	mc_dmaintr(void *arg);
-hide void	mc_reset_rxdma(struct mc_softc *sc);
-hide void	mc_reset_rxdma_set(struct mc_softc *, int set);
-hide void	mc_reset_txdma(struct mc_softc *sc);
-hide int	mc_obio_getaddr(struct mc_softc *, u_int8_t *);
+int	mc_obio_match(struct device *, void *, void *);
+void	mc_obio_attach(struct device *, struct device *, void *);
+void	mc_obio_init(struct mc_softc *sc);
+void	mc_obio_put(struct mc_softc *sc, u_int len);
+int	mc_dmaintr(void *arg);
+void	mc_reset_rxdma(struct mc_softc *sc);
+void	mc_reset_rxdma_set(struct mc_softc *, int set);
+void	mc_reset_txdma(struct mc_softc *sc);
+int	mc_obio_getaddr(struct mc_softc *, u_int8_t *);
 
 extern int	kvtop(register caddr_t addr);
 
@@ -76,7 +76,7 @@ struct cfattach mc_obio_ca = {
 	sizeof(struct mc_softc), mc_obio_match, mc_obio_attach
 };
 
-hide int
+int
 mc_obio_match(parent, cf, aux)
 	struct device *parent;
 	void *cf;
@@ -110,7 +110,7 @@ mc_obio_match(parent, cf, aux)
 	return found;
 }
 
-hide void
+void
 mc_obio_attach(parent, self, aux)
 	struct device *parent, *self;
 	void	*aux;
@@ -216,7 +216,7 @@ mc_obio_attach(parent, self, aux)
 }
 
 /* Bus-specific initialization */
-hide void
+void
 mc_obio_init(sc)
 	struct mc_softc *sc;
 {
@@ -224,7 +224,7 @@ mc_obio_init(sc)
 	mc_reset_txdma(sc);
 }
 
-hide void
+void
 mc_obio_put(sc, len)
 	struct mc_softc *sc;
 	u_int len;
@@ -330,7 +330,7 @@ mc_dmaintr(arg)
 }
 
 
-hide void
+void
 mc_reset_rxdma(sc)
 	struct mc_softc *sc;
 {
@@ -355,7 +355,7 @@ mc_reset_rxdma(sc)
 	psc_reg2(PSC_ENETRD_CMD + PSC_SET1) = 0x9800;
 }
 
-hide void
+void
 mc_reset_rxdma_set(sc, set)
 	struct mc_softc *sc;
 	int set;
@@ -368,7 +368,7 @@ mc_reset_rxdma_set(sc, set)
 	sc->sc_tail = 0;
 }
 
-hide void
+void
 mc_reset_txdma(sc)
 	struct mc_softc *sc;
 {
@@ -382,7 +382,7 @@ mc_reset_txdma(sc)
 	NIC_PUT(sc, MACE_MACCC, maccc);
 }
 
-hide int
+int
 mc_obio_getaddr(sc, lladdr)
 	struct mc_softc *sc;
 	u_int8_t *lladdr;
diff --git a/sys/arch/mac68k/dev/if_mcvar.h b/sys/arch/mac68k/dev/if_mcvar.h
index 74de54074b1..e4e80459ba8 100644
--- a/sys/arch/mac68k/dev/if_mcvar.h
+++ b/sys/arch/mac68k/dev/if_mcvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_mcvar.h,v 1.2 2002/03/14 01:26:35 millert Exp $	*/
+/*	$OpenBSD: if_mcvar.h,v 1.3 2002/04/20 00:17:05 miod Exp $	*/
 /*	$NetBSD: if_mcvar.h,v 1.3 1997/12/07 17:47:48 scottr Exp $	*/
 
 /*-
@@ -26,14 +26,6 @@
  *
  */
 
-#ifdef DDB
-#define	integrate
-#define hide
-#else
-#define	integrate	static __inline
-#define hide		static
-#endif
-
 #define	MC_REGSPACING	16
 #define	MC_REGSIZE	MACE_NREGS * MC_REGSPACING
 #define	MACE_REG(x)	((x)*MC_REGSPACING)