Sync with NetBSD 9600430. The port has gone over a major -Wall treat

1 files changed, 50 insertions, 46 deletions

diff --git a/sys/arch/amiga/dev/msc.c b/sys/arch/amiga/dev/msc.c
index fa93d077c83..15fb5d84db5 100644
--- a/sys/arch/amiga/dev/msc.c
+++ b/sys/arch/amiga/dev/msc.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: msc.c,v 1.3 1996/04/21 22:15:39 deraadt Exp $ */
-/*	$NetBSD: msc.c,v 1.5 1996/03/17 05:58:54 mhitch Exp $ */
+/*	$OpenBSD: msc.c,v 1.4 1996/05/02 06:44:22 niklas Exp $ */
+/*	$NetBSD: msc.c,v 1.6 1996/04/21 21:12:15 veego Exp $ */
 
 /*
  * Copyright (c) 1993 Zik.
@@ -59,7 +59,6 @@
 #include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
-#include <sys/conf.h>
 #include <sys/file.h>
 #include <sys/malloc.h>
 #include <sys/uio.h>
@@ -76,6 +75,9 @@
 #include <amiga/amiga/cia.h>
 #include <amiga/amiga/cc.h>
 
+#include <sys/conf.h>
+#include <machine/conf.h>
+
 /* 6502 code for A2232 card */
 #include "msc6502.h"
 
@@ -104,8 +106,8 @@
  * you have three boards with minor device numbers from 0 to 45.
  */
 
-int	mscparam();
-int	mscstart __P((struct tty *));
+int	mscparam __P((struct tty *, struct termios *));
+void	mscstart __P((struct tty *));
 int	mschwiflow __P((struct tty *, int));
 int	mscinitcard __P((struct zbus_args *));
 
@@ -117,45 +119,45 @@ struct	tty *msc_tty[MSCTTYS];		/* ttys for all lines */
 struct	vbl_node msc_vbl_node[NMSC];	/* vbl interrupt node per board */
 
 struct speedtab mscspeedtab_normal[] = {
-	0,	0,
-	50,	MSCPARAM_B50,
-	75,	MSCPARAM_B75,
-	110,	MSCPARAM_B110,
-	134,	MSCPARAM_B134,
-	150,	MSCPARAM_B150,
-	300,	MSCPARAM_B300,
-	600,	MSCPARAM_B600,
-	1200,	MSCPARAM_B1200,
-	1800,	MSCPARAM_B1800,
-	2400,	MSCPARAM_B2400,
-	3600,	MSCPARAM_B3600,
-	4800,	MSCPARAM_B4800,
-	7200,	MSCPARAM_B7200,
-	9600,	MSCPARAM_B9600,
-	19200,	MSCPARAM_B19200,
-	115200,	MSCPARAM_B115200,
-	-1,	-1
+	{ 0,		0		},
+	{ 50,		MSCPARAM_B50	},
+	{ 75,		MSCPARAM_B75 	},
+	{ 110,		MSCPARAM_B110 	},
+	{ 134,		MSCPARAM_B134	},
+	{ 150,		MSCPARAM_B150	},
+	{ 300,		MSCPARAM_B300	},
+	{ 600,		MSCPARAM_B600	},
+	{ 1200,		MSCPARAM_B1200	},
+	{ 1800,		MSCPARAM_B1800	},
+	{ 2400,		MSCPARAM_B2400	},
+	{ 3600,		MSCPARAM_B3600	},
+	{ 4800,		MSCPARAM_B4800	},
+	{ 7200,		MSCPARAM_B7200	},
+	{ 9600,		MSCPARAM_B9600	},
+	{ 19200,	MSCPARAM_B19200	},
+	{ 115200,	MSCPARAM_B115200 },
+	{ -1,		-1		}
 };
   
 struct speedtab mscspeedtab_turbo[] = {
-	0,	0,
-	100,	MSCPARAM_B50,
-	150,	MSCPARAM_B75,
-	220,	MSCPARAM_B110,
-	269,	MSCPARAM_B134,
-	300,	MSCPARAM_B150,
-	600,	MSCPARAM_B300,
-	1200,	MSCPARAM_B600,
-	2400,	MSCPARAM_B1200,
-	3600,	MSCPARAM_B1800,
-	4800,	MSCPARAM_B2400,
-	7200,	MSCPARAM_B3600,
-	9600,	MSCPARAM_B4800,
-	14400,	MSCPARAM_B7200,
-	19200,	MSCPARAM_B9600,
-	38400,	MSCPARAM_B19200,
-	230400,	MSCPARAM_B115200,
-	-1,	-1
+	{ 0,		0		},
+	{ 100,		MSCPARAM_B50	},
+	{ 150,		MSCPARAM_B75	},
+	{ 220,		MSCPARAM_B110	},
+	{ 269,		MSCPARAM_B134	},
+	{ 300,		MSCPARAM_B150	},
+	{ 600,		MSCPARAM_B300	},
+	{ 1200,		MSCPARAM_B600	},
+	{ 2400,		MSCPARAM_B1200	},
+	{ 3600,		MSCPARAM_B1800	},
+	{ 4800,		MSCPARAM_B2400	},
+	{ 7200,		MSCPARAM_B3600	},
+	{ 9600,		MSCPARAM_B4800	},
+	{ 14400,	MSCPARAM_B7200	},
+	{ 19200,	MSCPARAM_B9600	},
+	{ 38400,	MSCPARAM_B19200	},
+	{ 230400,	MSCPARAM_B115200 },
+	{ -1,		-1		}
 };
   
 struct   speedtab *mscspeedtab;
@@ -207,7 +209,6 @@ mscmatch(pdp, match, auxp)
 	struct device *pdp;
 	void *match, *auxp;
 {
-	struct cfdata *cdp = match;
 	struct zbus_args *zap;
 
 	zap = auxp;
@@ -818,7 +819,7 @@ NoRoomForYa:
 int
 mscioctl(dev, cmd, data, flag, p)
 	dev_t dev;
-	int cmd;
+	u_long cmd;
 	caddr_t data;
 	int flag;
 	struct proc *p;
@@ -930,7 +931,7 @@ mscparam(tp, t)
 	register struct tty *tp;
 	register struct termios *t;
 {
-  register int cfcr, cflag = t->c_cflag;
+  register int cflag = t->c_cflag;
   int slot;
   struct mscdevice *msc;
   volatile struct mscstatus *ms;
@@ -1043,7 +1044,7 @@ mschwiflow(tp, flag)
 
 }
 
-int
+void
 mscstart(tp)
 	register struct tty *tp;
 {
@@ -1159,12 +1160,14 @@ mscstop(tp, flag)
 	int flag;			/* defaulted to int anyway */
 {
 	register int s;
+#if 0
 	struct mscdevice *msc;
 	volatile struct mscstatus *ms;
+#endif
 
 	s = spltty();
 	if (tp->t_state & TS_BUSY) {
-		if (tp->t_state & TS_TTSTOP == 0) {
+		if ((tp->t_state & TS_TTSTOP) == 0) {
 			tp->t_state |= TS_FLUSH;
 #if 0
 			msc = &mscdev[MSCSLOT(tp->t_dev)];
@@ -1175,6 +1178,7 @@ mscstop(tp, flag)
 		}
 	}
 	splx(s);
+	return 0;
 }
  
 /*