-Wall fixes needed by alpha

5 files changed, 20 insertions, 9 deletions

diff --git a/sys/dev/isa/isa.c b/sys/dev/isa/isa.c
index 0257c40fc25..23f05025c4a 100644
--- a/sys/dev/isa/isa.c
+++ b/sys/dev/isa/isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isa.c,v 1.17 1996/08/15 07:38:56 deraadt Exp $	*/
+/*	$OpenBSD: isa.c,v 1.18 1996/10/31 01:05:08 niklas Exp $	*/
 /*	$NetBSD: isa.c,v 1.85 1996/05/14 00:31:04 thorpej Exp $	*/
 
 /*-
@@ -47,7 +47,6 @@
 
 int isamatch __P((struct device *, void *, void *));
 void isaattach __P((struct device *, struct device *, void *));
-int isaprint __P((void *, char *));
 
 struct cfattach isa_ca = {
 	sizeof(struct isa_softc), isamatch, isaattach
diff --git a/sys/dev/isa/isavar.h b/sys/dev/isa/isavar.h
index 8474be26422..13f37dabd05 100644
--- a/sys/dev/isa/isavar.h
+++ b/sys/dev/isa/isavar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isavar.h,v 1.16 1996/08/15 17:31:42 shawn Exp $	*/
+/*	$OpenBSD: isavar.h,v 1.17 1996/10/31 01:05:10 niklas Exp $	*/
 /*	$NetBSD: isavar.h,v 1.23 1996/05/08 23:32:31 thorpej Exp $	*/
 
 /*
@@ -182,9 +182,11 @@ struct isa_softc {
  */
 
 /* ISA interrupt sharing types */
-void	isascan __P((struct device *parent, void *match));
 char	*isa_intr_typename __P((int type));
 
+void	isascan __P((struct device *parent, void *match));
+int	isaprint __P((void *, char *));
+
 #ifdef NEWCONFIG
 /*
  * Establish a device as being on the ISA bus (XXX NOT IMPLEMENTED).
diff --git a/sys/dev/pci/if_en_pci.c b/sys/dev/pci/if_en_pci.c
index bc11a05719d..d7ac0872de2 100644
--- a/sys/dev/pci/if_en_pci.c
+++ b/sys/dev/pci/if_en_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_en_pci.c,v 1.2 1996/06/21 21:37:37 chuck Exp $	*/
+/*	$OpenBSD: if_en_pci.c,v 1.3 1996/10/31 01:05:11 niklas Exp $	*/
 
 /*
  *
@@ -48,6 +48,7 @@
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
+#include <sys/systm.h>
 
 #include <net/if.h>
 
@@ -163,7 +164,8 @@ void *aux;
     return;
   }
   intrstr = pci_intr_string(scp->en_pc, ih);
-  scp->sc_ih = pci_intr_establish(scp->en_pc, ih, IPL_NET, en_intr, sc);
+  scp->sc_ih = pci_intr_establish(scp->en_pc, ih, IPL_NET, en_intr, sc,
+      sc->sc_dev.dv_xname);
   if (scp->sc_ih == NULL) {
     printf("%s: couldn't establish interrupt\n", sc->sc_dev.dv_xname);
     if (intrstr != NULL)
diff --git a/sys/dev/pci/ncr.c b/sys/dev/pci/ncr.c
index 5d76c19fc0b..530c79c43b8 100644
--- a/sys/dev/pci/ncr.c
+++ b/sys/dev/pci/ncr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ncr.c,v 1.16 1996/10/18 15:43:56 niklas Exp $	*/
+/*	$OpenBSD: ncr.c,v 1.17 1996/10/31 01:05:12 niklas Exp $	*/
 /*	$NetBSD: ncr.c,v 1.35.4.1 1996/06/03 20:32:17 cgd Exp $	*/
 
 /**************************************************************************
@@ -166,9 +166,15 @@
 #if defined(__NetBSD__) || defined(__OpenBSD__)
 #ifdef _KERNEL
 #define KERNEL
+
+/*
+ * Normally found in the userland header stddef.h, which isn't available.
+ */
+#define	offsetof(type, member)	((size_t)(&((type *)0)->member))
 #endif
-#endif
+#else
 #include <stddef.h>
+#endif
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/sys/dev/tc/tc.c b/sys/dev/tc/tc.c
index 690067798d1..5474b1c9bed 100644
--- a/sys/dev/tc/tc.c
+++ b/sys/dev/tc/tc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tc.c,v 1.6 1996/05/26 00:27:54 deraadt Exp $	*/
+/*	$OpenBSD: tc.c,v 1.7 1996/10/31 01:05:13 niklas Exp $	*/
 /*	$NetBSD: tc.c,v 1.16 1996/05/17 23:39:19 cgd Exp $	*/
 
 /*
@@ -36,6 +36,8 @@
 #include <dev/tc/tcvar.h>
 #include <dev/tc/tcdevs.h>
 
+#include <machine/autoconf.h>	/* for the proto of badaddr() */
+
 struct tc_softc {
 	struct	device sc_dv;