This commit fixes various 64bit portability problems required for

FreeBSD/alpha.  The most significant item is to change the command
argument to ioctl functions from int to u_long.  This change brings us
inline with various other BSD versions.  Driver writers may like to
use (__FreeBSD_version == 300003) to detect this change.

The prototype FreeBSD/alpha machdep will follow in a couple of days
time.

39 files changed, 92 insertions, 85 deletions

diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c
index 53c4b20..72704e1 100644
--- a/sys/dev/ar/if_ar.c
+++ b/sys/dev/ar/if_ar.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_ar.c,v 1.17 1998/01/08 23:40:37 eivind Exp $
+ * $Id: if_ar.c,v 1.18 1998/04/17 22:36:33 des Exp $
  */
 
 /*
@@ -181,7 +181,7 @@ struct isa_driver ardriver = {arprobe, arattach, "arc"};
 
 static void ar_xmit(struct ar_softc *sc);
 static void arstart(struct ifnet *ifp);
-static int arioctl(struct ifnet *ifp, int cmd, caddr_t data);
+static int arioctl(struct ifnet *ifp, u_long cmd, caddr_t data);
 static void arwatchdog(struct ifnet *ifp);
 static int ar_packet_avail(struct ar_softc *sc, int *len, u_char *rxstat);
 static void ar_copy_rxbuf(struct mbuf *m, struct ar_softc *sc, int len);
@@ -597,7 +597,7 @@ top_arstart:
 }
 
 static int
-arioctl(struct ifnet *ifp, int cmd, caddr_t data)
+arioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	int s, error;
 	int was_up, should_be_up;
diff --git a/sys/dev/ar/if_ar_isa.c b/sys/dev/ar/if_ar_isa.c
index 53c4b20..72704e1 100644
--- a/sys/dev/ar/if_ar_isa.c
+++ b/sys/dev/ar/if_ar_isa.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_ar.c,v 1.17 1998/01/08 23:40:37 eivind Exp $
+ * $Id: if_ar.c,v 1.18 1998/04/17 22:36:33 des Exp $
  */
 
 /*
@@ -181,7 +181,7 @@ struct isa_driver ardriver = {arprobe, arattach, "arc"};
 
 static void ar_xmit(struct ar_softc *sc);
 static void arstart(struct ifnet *ifp);
-static int arioctl(struct ifnet *ifp, int cmd, caddr_t data);
+static int arioctl(struct ifnet *ifp, u_long cmd, caddr_t data);
 static void arwatchdog(struct ifnet *ifp);
 static int ar_packet_avail(struct ar_softc *sc, int *len, u_char *rxstat);
 static void ar_copy_rxbuf(struct mbuf *m, struct ar_softc *sc, int len);
@@ -597,7 +597,7 @@ top_arstart:
 }
 
 static int
-arioctl(struct ifnet *ifp, int cmd, caddr_t data)
+arioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	int s, error;
 	int was_up, should_be_up;
diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index 4cb4de2..3687fe7 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -309,7 +309,7 @@ SYSCTL_INT(_hw_bt848, OID_AUTO, card, CTLFLAG_RW, &bt848_card, -1, "");
 SYSCTL_INT(_hw_bt848, OID_AUTO, tuner, CTLFLAG_RW, &bt848_tuner, -1, "");
 SYSCTL_INT(_hw_bt848, OID_AUTO, reverse_mute, CTLFLAG_RW, &bt848_reverse_mute, -1, "");
 
-typedef int ioctl_cmd_t;
+typedef u_long ioctl_cmd_t;
 #endif  /* __FreeBSD__ */
 
 #ifdef __bsdi__
diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c
index 683b2be..00791e8 100644
--- a/sys/dev/ccd/ccd.c
+++ b/sys/dev/ccd/ccd.c
@@ -1,4 +1,4 @@
-/* $Id: ccd.c,v 1.31 1998/02/22 10:01:23 jkh Exp $ */
+/* $Id: ccd.c,v 1.32 1998/03/09 20:39:26 julian Exp $ */
 
 /*	$NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $	*/
 
@@ -1027,7 +1027,7 @@ ccdiodone(cbp)
 static int
 ccdioctl(dev, cmd, data, flag, p)
 	dev_t dev;
-	int cmd;
+	u_long cmd;
 	caddr_t data;
 	int flag;
 	struct proc *p;
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index 5dd4762..04a0a1c 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.61 1998/02/13 12:45:47 phk Exp $
+ *	$Id: cy.c,v 1.62 1998/03/18 20:52:28 dg Exp $
  */
 
 #include "opt_compat.h"
@@ -1383,7 +1383,7 @@ siointr1(com)
 static int
 sioioctl(dev, cmd, data, flag, p)
 	dev_t		dev;
-	int		cmd;
+	u_long		cmd;
 	caddr_t		data;
 	int		flag;
 	struct proc	*p;
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index 5dd4762..04a0a1c 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.61 1998/02/13 12:45:47 phk Exp $
+ *	$Id: cy.c,v 1.62 1998/03/18 20:52:28 dg Exp $
  */
 
 #include "opt_compat.h"
@@ -1383,7 +1383,7 @@ siointr1(com)
 static int
 sioioctl(dev, cmd, data, flag, p)
 	dev_t		dev;
-	int		cmd;
+	u_long		cmd;
 	caddr_t		data;
 	int		flag;
 	struct proc	*p;
diff --git a/sys/dev/de/if_devar.h b/sys/dev/de/if_devar.h
index b6fdba7..eb2b4c7 100644
--- a/sys/dev/de/if_devar.h
+++ b/sys/dev/de/if_devar.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_devar.h,v 1.26 1998/02/11 01:28:29 thorpej Exp $	*/
-/*	$Id: if_devar.h,v 1.4 1997/11/08 14:46:58 peter Exp $ */
+/*	$Id: if_devar.h,v 1.5 1998/03/08 16:54:00 peter Exp $ */
 
 /*-
  * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@@ -913,7 +913,7 @@ static void tulip_softintr(void);
 
 #if defined(__FreeBSD__)
 typedef void ifnet_ret_t;
-typedef int ioctl_cmd_t;
+typedef u_long ioctl_cmd_t;
 #if defined(TULIP_HDR_DATA)
 static tulip_softc_t *tulips[TULIP_MAX_DEVICES];
 #endif
diff --git a/sys/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c
index 27ee53b..d975422 100644
--- a/sys/dev/dgb/dgb.c
+++ b/sys/dev/dgb/dgb.c
@@ -1,5 +1,5 @@
 /*-
- *  dgb.c $Id: dgb.c,v 1.34 1998/04/21 21:06:22 brian Exp $
+ *  dgb.c $Id: dgb.c,v 1.35 1998/04/21 21:06:56 brian Exp $
  *
  *  Digiboard driver.
  *
@@ -1567,7 +1567,7 @@ dgbpoll(unit_c)
 static	int
 dgbioctl(dev, cmd, data, flag, p)
 	dev_t		dev;
-	int		cmd;
+	u_long		cmd;
 	caddr_t		data;
 	int		flag;
 	struct proc	*p;
diff --git a/sys/dev/dpt/dpt_control.c b/sys/dev/dpt/dpt_control.c
index fe3188d..ad7b0df 100644
--- a/sys/dev/dpt/dpt_control.c
+++ b/sys/dev/dpt/dpt_control.c
@@ -36,7 +36,7 @@
  * future.
  */
 
-#ident "$Id: dpt_control.c,v 1.4 1998/04/17 22:36:20 des Exp $"
+#ident "$Id: dpt_control.c,v 1.5 1998/06/02 00:32:38 eivind Exp $"
 
 #include "opt_dpt.h"
 
@@ -74,7 +74,7 @@ static int      dpt_open(dev_t dev, int flags, int fmt, struct proc * p);
 static int      dpt_close(dev_t dev, int flags, int fmt, struct proc * p);
 static int      dpt_write(dev_t dev, struct uio * uio, int ioflag);
 static int      dpt_read(dev_t dev, struct uio * uio, int ioflag);
-static int      dpt_ioctl(dev_t dev, int cmd, caddr_t cmdarg, int flags, struct proc * p);
+static int      dpt_ioctl(dev_t dev, u_long cmd, caddr_t cmdarg, int flags, struct proc * p);
 
 
 /* This has to be modified as the processor and CPU are not known yet */
@@ -666,7 +666,7 @@ dpt_read(dev_t dev, struct uio * uio, int ioflag)
  */
 
 static int
-dpt_ioctl(dev_t dev, int cmd, caddr_t cmdarg, int flags, struct proc * p)
+dpt_ioctl(dev_t dev, u_long cmd, caddr_t cmdarg, int flags, struct proc * p)
 {
 	int             minor_no;
 	dpt_softc_t    *dpt;
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 3e15d49..d670bf2 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ed.c,v 1.139 1998/04/15 17:45:15 bde Exp $
+ *	$Id: if_ed.c,v 1.140 1998/04/17 22:36:34 des Exp $
  */
 
 /*
@@ -139,7 +139,7 @@ static int ed_attach		__P((struct ed_softc *, int, int));
 static int ed_attach_isa	__P((struct isa_device *));
 
 static void ed_init		__P((void *));
-static int ed_ioctl		__P((struct ifnet *, int, caddr_t));
+static int ed_ioctl		__P((struct ifnet *, u_long, caddr_t));
 static int ed_probe		__P((struct isa_device *));
 static void ed_start		__P((struct ifnet *));
 static void ed_reset		__P((struct ifnet *));
@@ -2582,7 +2582,7 @@ edintr(unit)
 static int
 ed_ioctl(ifp, command, data)
 	register struct ifnet *ifp;
-	int     command;
+	u_long     command;
 	caddr_t data;
 {
 	struct ed_softc *sc = ifp->if_softc;
diff --git a/sys/dev/en/midwayvar.h b/sys/dev/en/midwayvar.h
index c17db92..b9f41da 100644
--- a/sys/dev/en/midwayvar.h
+++ b/sys/dev/en/midwayvar.h
@@ -72,7 +72,7 @@
 
 #define EN_INTR_TYPE void
 #define EN_INTR_RET(X) return
-#define EN_IOCTL_CMDT int
+#define EN_IOCTL_CMDT u_long
 
 struct device {
   char dv_xname[IFNAMSIZ];
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index 6e96c8f..9087bb5 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -38,7 +38,7 @@
  */
 
 /*
- *  $Id: if_ep.c,v 1.73 1998/02/27 05:38:30 msmith Exp $
+ *  $Id: if_ep.c,v 1.74 1998/03/28 13:24:01 bde Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
@@ -116,7 +116,7 @@ static	int eeprom_rdy __P((struct ep_softc *sc));
 static	int ep_isa_probe __P((struct isa_device *));
 static struct ep_board * ep_look_for_board_at __P((struct isa_device *is));
 static	int ep_isa_attach __P((struct isa_device *));
-static	int epioctl __P((struct ifnet * ifp, int, caddr_t));
+static	int epioctl __P((struct ifnet * ifp, u_long, caddr_t));
 
 static	void epinit __P((struct ep_softc *));
 static	void epread __P((struct ep_softc *));
@@ -1197,7 +1197,7 @@ out:
 static int
 epioctl(ifp, cmd, data)
     register struct ifnet *ifp;
-    int cmd;
+    u_long cmd;
     caddr_t data;
 {
     register struct ifaddr *ifa = (struct ifaddr *) data;
diff --git a/sys/dev/ex/if_ex.c b/sys/dev/ex/if_ex.c
index 1f58a06..f64ef74 100644
--- a/sys/dev/ex/if_ex.c
+++ b/sys/dev/ex/if_ex.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ex.c,v 1.10 1998/01/08 23:40:52 eivind Exp $
+ *	$Id: if_ex.c,v 1.11 1998/03/28 13:24:06 bde Exp $
  */
 
 /*
@@ -119,7 +119,7 @@ static int ex_attach __P((struct isa_device *));
 static void ex_init __P((void *));
 static void ex_start __P((struct ifnet *));
 static void ex_stop __P((int));
-static int ex_ioctl __P((struct ifnet *, int, caddr_t));
+static int ex_ioctl __P((struct ifnet *, u_long, caddr_t));
 static void ex_reset __P((int));
 static void ex_watchdog __P((struct ifnet *));
 
@@ -760,7 +760,7 @@ void ex_rx_intr(int unit)
 }
 
 
-int ex_ioctl(register struct ifnet *ifp, int cmd, caddr_t data)
+int ex_ioctl(register struct ifnet *ifp, u_long cmd, caddr_t data)
 {
   register struct ifaddr *ifa = (struct ifaddr *) data;
   struct ex_softc *sc = &ex_sc[ifp->if_unit];
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index 5445b3f..5a9d93c 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -43,7 +43,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.111 1998/05/06 22:14:41 julian Exp $
+ *	$Id: fd.c,v 1.112 1998/05/06 23:35:36 julian Exp $
  *
  */
 
@@ -2040,7 +2040,7 @@ fdformat(dev, finfo, p)
 static int
 fdioctl(dev, cmd, addr, flag, p)
 	dev_t dev;
-	int cmd;
+	u_long cmd;
 	caddr_t addr;
 	int flag;
 	struct proc *p;
diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c
index 81a4b72..8fae123 100644
--- a/sys/dev/fe/if_fe.c
+++ b/sys/dev/fe/if_fe.c
@@ -21,7 +21,7 @@
  */
 
 /*
- * $Id: if_fe.c,v 1.39 1998/02/27 06:39:31 msmith Exp $
+ * $Id: if_fe.c,v 1.40 1998/03/28 13:24:09 bde Exp $
  *
  * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
  * To be used with FreeBSD 2.x
@@ -239,7 +239,7 @@ static struct fe_softc {
 static int		fe_probe	( struct isa_device * );
 static int		fe_attach	( struct isa_device * );
 static void		fe_init		( int );
-static int		fe_ioctl	( struct ifnet *, int, caddr_t );
+static int		fe_ioctl	( struct ifnet *, u_long, caddr_t );
 static void		fe_start	( struct ifnet * );
 static void		fe_reset	( int );
 static void		fe_watchdog	( struct ifnet * );
@@ -2471,7 +2471,7 @@ feintr ( int unit )
  * pretty ugly.
  */
 static int
-fe_ioctl ( struct ifnet * ifp, int command, caddr_t data )
+fe_ioctl ( struct ifnet * ifp, u_long command, caddr_t data )
 {
 	struct fe_softc *sc = ifp->if_softc;
 	int s, error = 0;
diff --git a/sys/dev/fxp/if_fxpvar.h b/sys/dev/fxp/if_fxpvar.h
index 53945e0..a9d845b 100644
--- a/sys/dev/fxp/if_fxpvar.h
+++ b/sys/dev/fxp/if_fxpvar.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_fxpvar.h,v 1.3 1997/09/29 11:27:43 davidg Exp $
+ *	$Id: if_fxpvar.h,v 1.4 1997/11/29 08:11:01 davidg Exp $
  */
 
 /*
@@ -107,6 +107,6 @@ struct fxp_softc {
 #define	FXP_FORMAT		"fxp%d"
 #define	FXP_ARGS(sc)		(sc)->arpcom.ac_if.if_unit
 #define	FXP_INTR_TYPE		void
-#define	FXP_IOCTLCMD_TYPE	int
+#define	FXP_IOCTLCMD_TYPE	u_long
 #define	FXP_BPFTAP_ARG(ifp)	ifp
 #endif /* __NetBSD__ */
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index a34f11d..0e96d6f 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -47,7 +47,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ie.c,v 1.51 1998/03/28 13:24:13 bde Exp $
+ *	$Id: if_ie.c,v 1.52 1998/04/15 17:45:20 bde Exp $
  */
 
 /*
@@ -184,7 +184,7 @@ static int	ee16_probe(struct isa_device * dvp);
 static int	check_ie_present(int unit, caddr_t where, unsigned size);
 static void	ieinit(int unit);
 static void	ie_stop(int unit);
-static int	ieioctl(struct ifnet * ifp, int command, caddr_t data);
+static int	ieioctl(struct ifnet * ifp, u_long command, caddr_t data);
 static void	iestart(struct ifnet * ifp);
 
 static void	el_reset_586(int unit);
@@ -2251,7 +2251,7 @@ ie_stop(int unit)
 }
 
 static int
-ieioctl(struct ifnet *ifp, int command, caddr_t data)
+ieioctl(struct ifnet *ifp, u_long command, caddr_t data)
 {
 	struct ifaddr *ifa = (struct ifaddr *) data;
 	struct ie_softc *ie = ifp->if_softc;
diff --git a/sys/dev/joy/joy.c b/sys/dev/joy/joy.c
index 072be4e..f64d99e5 100644
--- a/sys/dev/joy/joy.c
+++ b/sys/dev/joy/joy.c
@@ -188,7 +188,7 @@ joyread (dev_t dev, struct uio *uio, int flag)
 }
 
 static	int
-joyioctl (dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
+joyioctl (dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 {
     int unit = UNIT (dev);
     int i = joypart (dev);
diff --git a/sys/dev/lnc/if_lnc.c b/sys/dev/lnc/if_lnc.c
index eb1c4fe..bff5d17 100644
--- a/sys/dev/lnc/if_lnc.c
+++ b/sys/dev/lnc/if_lnc.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_lnc.c,v 1.41 1998/05/27 09:59:13 paul Exp $
+ * $Id: if_lnc.c,v 1.42 1998/05/27 11:05:17 paul Exp $
  */
 
 /*
@@ -175,7 +175,7 @@ static void lnc_init __P((struct lnc_softc *sc));
 static __inline int mbuf_to_buffer __P((struct mbuf *m, char *buffer));
 static __inline struct mbuf *chain_to_cluster __P((struct mbuf *m));
 static void lnc_start __P((struct ifnet *ifp));
-static int lnc_ioctl __P((struct ifnet *ifp, int command, caddr_t data));
+static int lnc_ioctl __P((struct ifnet *ifp, u_long command, caddr_t data));
 static void lnc_watchdog __P((struct ifnet *ifp));
 #ifdef DEBUG
 static void lnc_dump_state __P((struct lnc_softc *sc));
@@ -1749,7 +1749,7 @@ lnc_start(struct ifnet *ifp)
 }
 
 static int
-lnc_ioctl(struct ifnet * ifp, int command, caddr_t data)
+lnc_ioctl(struct ifnet * ifp, u_long command, caddr_t data)
 {
 
 	struct lnc_softc *sc = ifp->if_softc;
diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c
index 9121a71..1129d94 100644
--- a/sys/dev/mcd/mcd.c
+++ b/sys/dev/mcd/mcd.c
@@ -40,7 +40,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mcd.c,v 1.96 1997/12/02 21:06:25 phk Exp $
+ *	$Id: mcd.c,v 1.97 1998/01/24 02:54:22 eivind Exp $
  */
 static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
@@ -506,7 +506,7 @@ static void mcd_start(int unit)
 	return;
 }
 
-int mcdioctl(dev_t dev, int cmd, caddr_t addr, int flags, struct proc *p)
+int mcdioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
 {
 	struct mcd_data *cd;
 	int unit,part,retry,r;
diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c
index 2f558d8..d907e4c 100644
--- a/sys/dev/mse/mse.c
+++ b/sys/dev/mse/mse.c
@@ -11,7 +11,7 @@
  * this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  *
- * $Id: mse.c,v 1.36 1997/12/07 08:09:16 yokota Exp $
+ * $Id: mse.c,v 1.37 1998/01/24 02:54:22 eivind Exp $
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
@@ -401,7 +401,7 @@ mseread(dev, uio, ioflag)
 static int
 mseioctl(dev, cmd, addr, flag, p)
 	dev_t dev;
-	int cmd;
+	u_long cmd;
 	caddr_t addr;
 	int flag;
 	struct proc *p;
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index 530408b..a88ee89 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pci.c,v 1.81 1998/01/24 02:54:47 eivind Exp $
+ * $Id: pci.c,v 1.82 1998/04/01 21:07:36 tegge Exp $
  *
  */
 
@@ -31,6 +31,7 @@
 #if NPCI > 0
 
 #include "opt_devfs.h"
+#include "opt_simos.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -434,6 +435,11 @@ pci_probebus(int bus)
 	pcicfgregs probe;
 	int bushigh = bus;
 
+#ifdef SIMOS
+#undef PCI_SLOTMAX
+#define PCI_SLOTMAX 0
+#endif
+
 	bzero(&probe, sizeof probe);
 	probe.parent = pci_bridgeto(bus);
 	probe.bus = bus;
@@ -509,7 +515,7 @@ pci_close(dev_t dev, int flag, int devtype, struct proc *p)
 }
 
 static int
-pci_ioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
+pci_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 {
 	struct pci_io *io;
 	int error;
diff --git a/sys/dev/pdq/pdqvar.h b/sys/dev/pdq/pdqvar.h
index 6bb3065..5587d18 100644
--- a/sys/dev/pdq/pdqvar.h
+++ b/sys/dev/pdq/pdqvar.h
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pdqvar.h,v 1.19 1996/07/31 21:38:44 thomas Exp $
+ * $Id: pdqvar.h,v 1.1.1.1 1997/01/17 23:19:49 joerg Exp $
  *
  */
 
@@ -105,7 +105,7 @@ enum _pdq_type_t {
 #include <machine/cpufunc.h>
 #include <machine/clock.h>
 typedef void ifnet_ret_t;
-typedef int ioctl_cmd_t;
+typedef u_long ioctl_cmd_t;
 typedef enum { PDQ_BUS_EISA, PDQ_BUS_PCI } pdq_bus_t;
 typedef	u_int16_t pdq_bus_ioport_t;
 typedef volatile pdq_uint32_t *pdq_bus_memaddr_t;
diff --git a/sys/dev/ppbus/nlpt.c b/sys/dev/ppbus/nlpt.c
index 46a1ea1..2915806 100644
--- a/sys/dev/ppbus/nlpt.c
+++ b/sys/dev/ppbus/nlpt.c
@@ -47,7 +47,7 @@
  *
  *	from: unknown origin, 386BSD 0.1
  *	From Id: lpt.c,v 1.55.2.1 1996/11/12 09:08:38 phk Exp
- *	$Id: nlpt.c,v 1.6 1997/12/02 21:06:09 phk Exp $
+ *	$Id: nlpt.c,v 1.7 1998/01/24 02:54:05 eivind Exp $
  */
 
 /*
@@ -760,7 +760,7 @@ nlptintr(int unit)
 }
 
 static	int
-nlptioctl(dev_t dev, int cmd, caddr_t data, int flags, struct proc *p)
+nlptioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
 {
 	int	error = 0;
         struct	lpt_data *sc;
diff --git a/sys/dev/ppbus/ppi.c b/sys/dev/ppbus/ppi.c
index bbc2bdc..f742e4b 100644
--- a/sys/dev/ppbus/ppi.c
+++ b/sys/dev/ppbus/ppi.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppi.c,v 1.5 1997/09/01 00:51:49 bde Exp $
+ *	$Id: ppi.c,v 1.6 1998/01/02 09:30:39 msmith Exp $
  *
  */
 #include "ppi.h"
@@ -164,7 +164,7 @@ ppiclose(dev_t dev, int flags, int fmt, struct proc *p)
 }
 
 static int
-ppiioctl(dev_t dev, int cmd, caddr_t data, int flags, struct proc *p)
+ppiioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
 {
 	u_int unit = minor(dev);
 	struct ppi_data *ppi = ppidata[unit];
diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c
index 784527f..31d738c 100644
--- a/sys/dev/rc/rc.c
+++ b/sys/dev/rc/rc.c
@@ -1090,7 +1090,8 @@ struct rc_softc         *rcb;
 static	int
 rcioctl(dev, cmd, data, flag, p)
 dev_t           dev;
-int             cmd, flag;
+u_long          cmd;
+int		flag;
 caddr_t         data;
 struct proc     *p;
 {
diff --git a/sys/dev/rp/rp.c b/sys/dev/rp/rp.c
index e6f2af0..1c6e526 100644
--- a/sys/dev/rp/rp.c
+++ b/sys/dev/rp/rp.c
@@ -1586,7 +1586,7 @@ rpdtrwakeup(void *chan)
 int
 rpioctl(dev, cmd, data, flag, p)
 	dev_t	dev;
-	int	cmd;
+	u_long	cmd;
 	caddr_t data;
 	int	flag;
 	struct	proc	*p;
diff --git a/sys/dev/scd/scd.c b/sys/dev/scd/scd.c
index 6d25f89..339ccfd 100644
--- a/sys/dev/scd/scd.c
+++ b/sys/dev/scd/scd.c
@@ -41,7 +41,7 @@
  */
 
 
-/* $Id: scd.c,v 1.35 1998/01/24 02:54:24 eivind Exp $ */
+/* $Id: scd.c,v 1.36 1998/04/15 17:45:48 bde Exp $ */
 
 /* Please send any comments to micke@dynas.se */
 
@@ -418,7 +418,7 @@ scd_start(int unit)
 }
 
 static	int
-scdioctl(dev_t dev, int cmd, caddr_t addr, int flags, struct proc *p)
+scdioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
 {
 	struct scd_data *cd;
 	int unit,part;
diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c
index 52838cf..92dda3d 100644
--- a/sys/dev/si/si.c
+++ b/sys/dev/si/si.c
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- *	$Id: si.c,v 1.69 1998/03/23 16:27:37 peter Exp $
+ *	$Id: si.c,v 1.70 1998/03/28 13:24:39 bde Exp $
  */
 
 #ifndef lint
@@ -1481,7 +1481,7 @@ sidevtotty(dev_t dev)
 static	int
 siioctl(dev, cmd, data, flag, p)
 	dev_t dev;
-	int cmd;
+	u_long cmd;
 	caddr_t data;
 	int flag;
 	struct proc *p;
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index 898f080..776a50c 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.204 1998/06/03 09:43:38 bde Exp $
+ *	$Id: sio.c,v 1.205 1998/06/03 12:30:10 bde Exp $
  */
 
 #include "opt_comconsole.h"
@@ -1688,7 +1688,7 @@ cont:
 static int
 sioioctl(dev, cmd, data, flag, p)
 	dev_t		dev;
-	int		cmd;
+	u_long		cmd;
 	caddr_t		data;
 	int		flag;
 	struct proc	*p;
diff --git a/sys/dev/snp/snp.c b/sys/dev/snp/snp.c
index 4679f01..c4b13e5 100644
--- a/sys/dev/snp/snp.c
+++ b/sys/dev/snp/snp.c
@@ -395,7 +395,7 @@ snpdown(snp)
 static	int
 snpioctl(dev, cmd, data, flags, p)
 	dev_t           dev;
-	int             cmd;
+	u_long          cmd;
 	caddr_t         data;
 	int             flags;
 	struct proc    *p;
diff --git a/sys/dev/speaker/spkr.c b/sys/dev/speaker/spkr.c
index 952d822..e090bc8 100644
--- a/sys/dev/speaker/spkr.c
+++ b/sys/dev/speaker/spkr.c
@@ -4,7 +4,7 @@
  * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
  * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
  *
- *    $Id: spkr.c,v 1.32 1998/02/09 06:08:41 eivind Exp $
+ *    $Id: spkr.c,v 1.33 1998/02/20 13:46:55 bde Exp $
  */
 
 #include "speaker.h"
@@ -540,7 +540,7 @@ spkrclose(dev, flags, fmt, p)
 int
 spkrioctl(dev, cmd, cmdarg, flags, p)
 	dev_t		dev;
-	int		cmd;
+	u_long		cmd;
 	caddr_t		cmdarg;
 	int		flags;
 	struct proc	*p;
diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c
index 546756f..00427ba 100644
--- a/sys/dev/sr/if_sr.c
+++ b/sys/dev/sr/if_sr.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr.c,v 1.11 1998/01/30 19:49:54 jhay Exp $
+ * $Id: if_sr.c,v 1.12 1998/04/17 22:36:35 des Exp $
  */
 
 /*
@@ -273,7 +273,7 @@ void	srintr_hc(struct sr_hardc *hc);
 static int	srattach(struct sr_hardc *hc);
 static void	sr_xmit(struct sr_softc *sc);
 static void	srstart(struct ifnet *ifp);
-static int	srioctl(struct ifnet *ifp, int cmd, caddr_t data);
+static int	srioctl(struct ifnet *ifp, u_long cmd, caddr_t data);
 static void	srwatchdog(struct ifnet *ifp);
 static int	sr_packet_avail(struct sr_softc *sc, int *len, u_char *rxstat);
 static void	sr_copy_rxbuf(struct mbuf *m, struct sr_softc *sc, int len);
@@ -1243,7 +1243,7 @@ static int bug_splats[] = {0, 0, 0, 0, 0, 0, 0, 0};
 #endif
 
 static int
-srioctl(struct ifnet *ifp, int cmd, caddr_t data)
+srioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	int s, error, was_up, should_be_up;
 	struct sppp *sp = (struct sppp *)ifp;
diff --git a/sys/dev/sr/if_sr_isa.c b/sys/dev/sr/if_sr_isa.c
index 546756f..00427ba 100644
--- a/sys/dev/sr/if_sr_isa.c
+++ b/sys/dev/sr/if_sr_isa.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr.c,v 1.11 1998/01/30 19:49:54 jhay Exp $
+ * $Id: if_sr.c,v 1.12 1998/04/17 22:36:35 des Exp $
  */
 
 /*
@@ -273,7 +273,7 @@ void	srintr_hc(struct sr_hardc *hc);
 static int	srattach(struct sr_hardc *hc);
 static void	sr_xmit(struct sr_softc *sc);
 static void	srstart(struct ifnet *ifp);
-static int	srioctl(struct ifnet *ifp, int cmd, caddr_t data);
+static int	srioctl(struct ifnet *ifp, u_long cmd, caddr_t data);
 static void	srwatchdog(struct ifnet *ifp);
 static int	sr_packet_avail(struct sr_softc *sc, int *len, u_char *rxstat);
 static void	sr_copy_rxbuf(struct mbuf *m, struct sr_softc *sc, int len);
@@ -1243,7 +1243,7 @@ static int bug_splats[] = {0, 0, 0, 0, 0, 0, 0, 0};
 #endif
 
 static int
-srioctl(struct ifnet *ifp, int cmd, caddr_t data)
+srioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	int s, error, was_up, should_be_up;
 	struct sppp *sp = (struct sppp *)ifp;
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index c7c02e9..748833b 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.260 1998/04/17 10:03:11 des Exp $
+ *  $Id: syscons.c,v 1.261 1998/05/17 11:52:18 phk Exp $
  */
 
 #include "sc.h"
@@ -984,7 +984,7 @@ scparam(struct tty *tp, struct termios *t)
 }
 
 int
-scioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
+scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 {
     int error;
     u_int i;
diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c
index 5e3da26..691f2fc 100644
--- a/sys/dev/tx/if_tx.c
+++ b/sys/dev/tx/if_tx.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_tx.c,v 1.9 1998/04/13 14:15:40 semenu Exp $
+ *	$Id: if_tx.c,v 1.10 1998/04/15 17:47:05 bde Exp $
  *
  */
 
@@ -106,7 +106,7 @@ DATA_SET ( pcidevice_set, txdevice );
 static int
 epic_ifioctl __P((
     register struct ifnet * ifp,
-    int command, caddr_t data))
+    u_long command, caddr_t data))
 {
 	epic_softc_t *sc = ifp->if_softc;
 	struct ifreq *ifr = (struct ifreq *) data;
diff --git a/sys/dev/vn/vn.c b/sys/dev/vn/vn.c
index 516a9f8..57ba1ca 100644
--- a/sys/dev/vn/vn.c
+++ b/sys/dev/vn/vn.c
@@ -38,7 +38,7 @@
  * from: Utah Hdr: vn.c 1.13 94/04/02
  *
  *	from: @(#)vn.c	8.6 (Berkeley) 4/1/94
- *	$Id: vn.c,v 1.58 1998/04/24 07:53:59 julian Exp $
+ *	$Id: vn.c,v 1.59 1998/05/06 22:14:38 julian Exp $
  */
 
 /*
@@ -605,7 +605,7 @@ vniodone( struct buf *bp) {
 
 /* ARGSUSED */
 static	int
-vnioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
+vnioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 {
 	struct vn_softc *vn = vn_softc[vnunit(dev)];
 	struct vn_ioctl *vio;
diff --git a/sys/dev/vx/if_vx.c b/sys/dev/vx/if_vx.c
index abefc3c..c02fd75 100644
--- a/sys/dev/vx/if_vx.c
+++ b/sys/dev/vx/if_vx.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $Id: if_vx.c,v 1.16 1998/02/21 05:35:02 gpalmer Exp $
  *
  */
 
@@ -118,7 +118,7 @@ static struct connector_entry {
 static void vxtxstat __P((struct vx_softc *));
 static int vxstatus __P((struct vx_softc *));
 static void vxinit __P((void *));
-static int vxioctl __P((struct ifnet *, int, caddr_t)); 
+static int vxioctl __P((struct ifnet *, u_long, caddr_t)); 
 static void vxstart __P((struct ifnet *ifp));
 static void vxwatchdog __P((struct ifnet *));
 static void vxreset __P((struct vx_softc *));
@@ -896,7 +896,7 @@ vxget(sc, totlen)
 static int
 vxioctl(ifp, cmd, data)
     register struct ifnet *ifp;
-    int cmd;
+    u_long cmd;
     caddr_t data;
 {
     struct vx_softc *sc = vx_softc[ifp->if_unit];
diff --git a/sys/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c
index 8908c20..c4bd4db 100644
--- a/sys/dev/wl/if_wl.c
+++ b/sys/dev/wl/if_wl.c
@@ -1,4 +1,4 @@
-/* $Id: if_wl.c,v 1.10 1998/01/08 23:41:04 eivind Exp $ */
+/* $Id: if_wl.c,v 1.11 1998/02/20 13:11:47 bde Exp $ */
 /* 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -301,7 +301,7 @@ SYSCTL_INT(_machdep, OID_AUTO, wl_gather_snr, CTLFLAG_RW, &gathersnr, 0, "");
 
 static void	wlstart(struct ifnet *ifp);
 static void	wlinit(void *xsc);
-static int	wlioctl(struct ifnet *ifp, int cmd, caddr_t data);
+static int	wlioctl(struct ifnet *ifp, u_long cmd, caddr_t data);
 static timeout_t wlwatchdog;
 static void	wlxmt(int unt, struct mbuf *m);
 static int	wldiag(int unt); 
@@ -1169,7 +1169,7 @@ wlread(int unit, u_short fd_p)
  *
  */
 static int
-wlioctl(struct ifnet *ifp, int cmd, caddr_t data)
+wlioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
     register struct ifaddr	*ifa = (struct ifaddr *)data;
     register struct ifreq	*ifr = (struct ifreq *)data;