Merge 64bit portability fixes from sys/i386 stuff.

14 files changed, 37 insertions, 37 deletions

diff --git a/sys/pc98/cbus/fdc.c b/sys/pc98/cbus/fdc.c
index f640ead..2500a0d 100644
--- a/sys/pc98/cbus/fdc.c
+++ b/sys/pc98/cbus/fdc.c
@@ -43,7 +43,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.30 1998/04/22 10:25:21 julian Exp $
+ *	$Id: fd.c,v 1.31 1998/05/07 08:36:48 kato Exp $
  *
  */
 
@@ -2470,7 +2470,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;
@@ -2504,7 +2504,7 @@ fdioctl(dev, cmd, addr, flag, p)
  * Slice ioctls come here
  */
 static int
-fdsioctl( void *private, int cmd, caddr_t addr, int flag, struct proc *p)
+fdsioctl( void *private, u_long cmd, caddr_t addr, int flag, struct proc *p)
 {
 	struct	subdev *sd = private;
  	fd_p	fd	= sd->drive;
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c
index d98f1d5..1fbaea0 100644
--- a/sys/pc98/cbus/sio.c
+++ b/sys/pc98/cbus/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.58 1998/06/01 12:40:24 kato Exp $
+ *	$Id: sio.c,v 1.59 1998/06/05 08:31:01 kato Exp $
  */
 
 #include "opt_comconsole.h"
@@ -2195,7 +2195,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/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c
index 21fbf48..b707d1e 100644
--- a/sys/pc98/i386/machdep.c
+++ b/sys/pc98/i386/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.84 1998/05/28 13:50:13 kato Exp $
+ *	$Id: machdep.c,v 1.85 1998/06/03 08:48:00 kato Exp $
  */
 
 #include "apm.h"
@@ -1672,7 +1672,7 @@ f00f_hack(void *unused) {
 int
 ptrace_set_pc(p, addr)
 	struct proc *p;
-	unsigned int addr;
+	unsigned long addr;
 {
 	p->p_md.md_regs->tf_eip = addr;
 	return (0);
@@ -1711,7 +1711,7 @@ int ptrace_read_u_check(p, addr, len)
 int ptrace_write_u(p, off, data)
 	struct proc *p;
 	vm_offset_t off;
-	int data;
+	long data;
 {
 	struct trapframe frame_copy;
 	vm_offset_t min;
diff --git a/sys/pc98/pc98/fd.c b/sys/pc98/pc98/fd.c
index f640ead..2500a0d 100644
--- a/sys/pc98/pc98/fd.c
+++ b/sys/pc98/pc98/fd.c
@@ -43,7 +43,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.30 1998/04/22 10:25:21 julian Exp $
+ *	$Id: fd.c,v 1.31 1998/05/07 08:36:48 kato Exp $
  *
  */
 
@@ -2470,7 +2470,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;
@@ -2504,7 +2504,7 @@ fdioctl(dev, cmd, addr, flag, p)
  * Slice ioctls come here
  */
 static int
-fdsioctl( void *private, int cmd, caddr_t addr, int flag, struct proc *p)
+fdsioctl( void *private, u_long cmd, caddr_t addr, int flag, struct proc *p)
 {
 	struct	subdev *sd = private;
  	fd_p	fd	= sd->drive;
diff --git a/sys/pc98/pc98/if_ed.c b/sys/pc98/pc98/if_ed.c
index fd2ae7f..78c0432 100644
--- a/sys/pc98/pc98/if_ed.c
+++ b/sys/pc98/pc98/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.46 1998/04/16 16:32:15 kato Exp $
+ *	$Id: if_ed.c,v 1.47 1998/04/17 22:37:01 des Exp $
  */
 
 /*
@@ -180,7 +180,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 *));
@@ -3332,7 +3332,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/pc98/pc98/if_fe.c b/sys/pc98/pc98/if_fe.c
index 38172d4..a0bdb22 100644
--- a/sys/pc98/pc98/if_fe.c
+++ b/sys/pc98/pc98/if_fe.c
@@ -21,7 +21,7 @@
  */
 
 /*
- * $Id: if_fe.c,v 1.29 1998/01/08 23:42:10 eivind Exp $
+ * $Id: if_fe.c,v 1.30 1998/02/27 15:23:37 kato Exp $
  *
  * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
  * To be used with FreeBSD 2.x
@@ -245,7 +245,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 * );
@@ -3150,7 +3150,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/pc98/pc98/lpt.c b/sys/pc98/pc98/lpt.c
index 501c6c7..692d986 100644
--- a/sys/pc98/pc98/lpt.c
+++ b/sys/pc98/pc98/lpt.c
@@ -46,7 +46,7 @@
  * SUCH DAMAGE.
  *
  *	from: unknown origin, 386BSD 0.1
- *	$Id: lpt.c,v 1.18 1998/02/20 12:25:23 kato Exp $
+ *	$Id: lpt.c,v 1.19 1998/04/16 16:32:49 kato Exp $
  */
 
 /*
@@ -286,7 +286,7 @@ static u_char *ctxmith;
 /* Functions for the lp# interface */
 static void lpattach(struct lpt_softc *,int);
 static int lpinittables(void);
-static int lpioctl(struct ifnet *, int, caddr_t);
+static int lpioctl(struct ifnet *, u_long, caddr_t);
 static int lpoutput(struct ifnet *, struct mbuf *, struct sockaddr *,
 	struct rtentry *);
 static void lpintr(int);
@@ -850,7 +850,7 @@ lptintr(int unit)
 }
 
 static	int
-lptioctl(dev_t dev, int cmd, caddr_t data, int flags, struct proc *p)
+lptioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
 {
 	int	error = 0;
         struct	lpt_softc *sc;
@@ -960,7 +960,7 @@ lpinittables (void)
  */
 
 static int
-lpioctl (struct ifnet *ifp, int cmd, caddr_t data)
+lpioctl (struct ifnet *ifp, u_long cmd, caddr_t data)
 {
     struct lpt_softc *sc = lpt_sc + ifp->if_unit;
     struct ifaddr *ifa = (struct ifaddr *)data;
diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c
index 21fbf48..b707d1e 100644
--- a/sys/pc98/pc98/machdep.c
+++ b/sys/pc98/pc98/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.84 1998/05/28 13:50:13 kato Exp $
+ *	$Id: machdep.c,v 1.85 1998/06/03 08:48:00 kato Exp $
  */
 
 #include "apm.h"
@@ -1672,7 +1672,7 @@ f00f_hack(void *unused) {
 int
 ptrace_set_pc(p, addr)
 	struct proc *p;
-	unsigned int addr;
+	unsigned long addr;
 {
 	p->p_md.md_regs->tf_eip = addr;
 	return (0);
@@ -1711,7 +1711,7 @@ int ptrace_read_u_check(p, addr, len)
 int ptrace_write_u(p, off, data)
 	struct proc *p;
 	vm_offset_t off;
-	int data;
+	long data;
 {
 	struct trapframe frame_copy;
 	vm_offset_t min;
diff --git a/sys/pc98/pc98/mse.c b/sys/pc98/pc98/mse.c
index b14ccc9..65a8aa5 100644
--- a/sys/pc98/pc98/mse.c
+++ b/sys/pc98/pc98/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.15 1998/01/16 11:20:20 kato Exp $
+ * $Id: mse.c,v 1.16 1998/01/24 02:54:38 eivind Exp $
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
@@ -465,7 +465,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/pc98/pc98/pcaudio.c b/sys/pc98/pc98/pcaudio.c
index 5aa60c4..83ad95d 100644
--- a/sys/pc98/pc98/pcaudio.c
+++ b/sys/pc98/pc98/pcaudio.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: pcaudio.c,v 1.14 1998/01/24 02:54:38 eivind Exp $
+ *	$Id: pcaudio.c,v 1.15 1998/04/16 16:33:21 kato Exp $
  */
 
 #include "pca.h"
@@ -419,7 +419,7 @@ pcawrite(dev_t dev, struct uio *uio, int flag)
 
 
 static int
-pcaioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
+pcaioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 {
 	audio_info_t *auptr;
 
diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c
index d98f1d5..1fbaea0 100644
--- a/sys/pc98/pc98/sio.c
+++ b/sys/pc98/pc98/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.58 1998/06/01 12:40:24 kato Exp $
+ *	$Id: sio.c,v 1.59 1998/06/05 08:31:01 kato Exp $
  */
 
 #include "opt_comconsole.h"
@@ -2195,7 +2195,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/pc98/pc98/spkr.c b/sys/pc98/pc98/spkr.c
index c43749f..9ee9942 100644
--- a/sys/pc98/pc98/spkr.c
+++ b/sys/pc98/pc98/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.11 1998/02/09 15:05:44 kato Exp $
+ *    $Id: spkr.c,v 1.12 1998/02/21 15:51:51 kato Exp $
  */
 
 /*
@@ -573,7 +573,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/pc98/pc98/syscons.c b/sys/pc98/pc98/syscons.c
index 189c0f5..311e6d1 100644
--- a/sys/pc98/pc98/syscons.c
+++ b/sys/pc98/pc98/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.85 1998/05/04 07:47:29 kato Exp $
+ *  $Id: syscons.c,v 1.86 1998/05/17 11:53:30 phk Exp $
  */
 
 #include "sc.h"
@@ -1113,7 +1113,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/pc98/pc98/wd.c b/sys/pc98/pc98/wd.c
index c27dc65..c545fe7 100644
--- a/sys/pc98/pc98/wd.c
+++ b/sys/pc98/pc98/wd.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wd.c	7.2 (Berkeley) 5/9/91
- *	$Id: wd.c,v 1.54 1998/05/07 08:37:27 kato Exp $
+ *	$Id: wd.c,v 1.55 1998/05/12 09:32:19 kato Exp $
  */
 
 /* TODO:
@@ -2339,7 +2339,7 @@ wdclose(dev_t dev, int flags, int fmt, struct proc *p)
 }
 
 int
-wdioctl(dev_t dev, int cmd, caddr_t addr, int flags, struct proc *p)
+wdioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
 {
 	int	lunit = dkunit(dev);
 	register struct disk *du;
@@ -3038,7 +3038,7 @@ wdsclose(void *private, int flags, int mode, struct proc *p)
 #endif /* 0 */
 
 static int
-wdsioctl( void *private, int cmd, caddr_t addr, int flag, struct proc *p)
+wdsioctl( void *private, u_long cmd, caddr_t addr, int flag, struct proc *p)
 {
 	register struct disk *du = private;
 #ifdef notyet