diff --git a/sys/arch/atari/atari/autoconf.c b/sys/arch/atari/atari/autoconf.c
index 67829dbc1821..249ab22becac 100644
--- a/sys/arch/atari/atari/autoconf.c
+++ b/sys/arch/atari/atari/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.6 1996/03/17 01:26:35 thorpej Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.7 1996/03/20 12:41:30 leo Exp $	*/
 
 /*
  * Copyright (c) 1995 Leo Weppelman
@@ -38,6 +38,7 @@
 #include <sys/disklabel.h>
 #include <machine/disklabel.h>
 #include <machine/cpu.h>
+#include <atari/atari/device.h>
 
 void configure __P((void));
 static void setroot __P((void));
diff --git a/sys/arch/atari/atari/disksubr.c b/sys/arch/atari/atari/disksubr.c
index df21df2c4432..3370f782eef8 100644
--- a/sys/arch/atari/atari/disksubr.c
+++ b/sys/arch/atari/atari/disksubr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: disksubr.c,v 1.7 1996/02/22 10:10:47 leo Exp $	*/
+/*	$NetBSD: disksubr.c,v 1.8 1996/03/20 12:41:35 leo Exp $	*/
 
 /*
  * Copyright (c) 1995 Leo Weppelman.
@@ -37,6 +37,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
+#include <sys/cpu.h>
 #include <ufs/ffs/fs.h>
 #include <sys/disklabel.h>
 #include <machine/ahdilabel.h>
@@ -62,7 +63,9 @@ static u_int ahdi_getparts __P((dev_t, void (*)(struct buf *), u_int,
  * XXX unknown function but needed for /sys/scsi to link
  */
 int
-dk_establish()
+dk_establish(disk, device)
+	struct disk	*disk;
+	struct device	*device;
 {
 	return(-1);
 }
@@ -88,7 +91,6 @@ bounds_check_with_label(bp, lp, wlabel)
 			bp->b_flags |= B_ERROR;
 			return(-1);
 		}
-
 		maxsz = pp->p_size * (lp->d_secsize / DEV_BSIZE);
 		sz = (bp->b_bcount + DEV_BSIZE - 1) >> DEV_BSHIFT;
 	} else {
diff --git a/sys/arch/atari/atari/genassym.c b/sys/arch/atari/atari/genassym.c
index 740c11dd9871..877a6242ea58 100644
--- a/sys/arch/atari/atari/genassym.c
+++ b/sys/arch/atari/atari/genassym.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: genassym.c,v 1.8 1996/02/22 10:10:50 leo Exp $	*/
+/*	$NetBSD: genassym.c,v 1.9 1996/03/20 12:41:38 leo Exp $	*/
 
 /*
  * Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -160,9 +160,9 @@ main(void)
 	printf("#define\tSYS_exit %d\n", SYS_exit);
 	printf("#define\tSYS_execve %d\n", SYS_execve);
 	printf("#define\tSYS_sigreturn %d\n", SYS_sigreturn);
-	printf("#define\tATARI_68020 %d\n", ATARI_68020);
-	printf("#define\tATARI_68030 %d\n", ATARI_68030);
-	printf("#define\tATARI_68040 %d\n", ATARI_68040);
+	printf("#define\tATARI_68020 %ld\n", ATARI_68020);
+	printf("#define\tATARI_68030 %ld\n", ATARI_68030);
+	printf("#define\tATARI_68040 %ld\n", ATARI_68040);
 	printf("#define\tMMU_68030 %d\n", MMU_68030);
 	printf("#define\tMMU_68851 %d\n", MMU_68851);
 	printf("#define\tMMU_68040 %d\n", MMU_68040);
diff --git a/sys/arch/atari/dev/fd.c b/sys/arch/atari/dev/fd.c
index 97a2808cde86..776cbe424305 100644
--- a/sys/arch/atari/dev/fd.c
+++ b/sys/arch/atari/dev/fd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fd.c,v 1.16 1996/03/17 01:26:45 thorpej Exp $	*/
+/*	$NetBSD: fd.c,v 1.17 1996/03/20 12:41:48 leo Exp $	*/
 
 /*
  * Copyright (c) 1995 Leo Weppelman.
@@ -170,7 +170,7 @@ struct fd_types {
 		{ 2, 18, 2880 , FLP_HD },	/* 1.44 Mb	*/
 };
 
-typedef void	(*FPV)();
+typedef void	(*FPV) __P((void *));
 
 /*
  * {b,c}devsw[] function prototypes
@@ -199,6 +199,9 @@ static int	fdgetdisklabel __P((struct fd_softc *, dev_t));
 static int	fdselect __P((int, int, int));
 static void	fddeselect __P((void));
 static void	fdmoff __P((struct fd_softc *));
+       u_char	read_fdreg __P((u_short));
+       void	write_fdreg __P((u_short, u_short));
+       u_char	read_dmastat __P((void));
 
 extern __inline__ u_char read_fdreg(u_short regno)
 {
diff --git a/sys/arch/atari/dev/ite.c b/sys/arch/atari/dev/ite.c
index bce8be240a95..a6e029b09eb4 100644
--- a/sys/arch/atari/dev/ite.c
+++ b/sys/arch/atari/dev/ite.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ite.c,v 1.10 1996/03/19 13:15:34 leo Exp $	*/
+/*	$NetBSD: ite.c,v 1.11 1996/03/20 12:41:50 leo Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -91,16 +91,58 @@ u_char	cons_tabs[MAX_TABS];
 struct ite_softc *kbd_ite;
 int kbd_init;
 
-static void iteprecheckwrap __P((struct ite_softc *));
-static void itecheckwrap __P((struct ite_softc *));
+static __inline__ int  atoi __P((const char *));
+static __inline__ int  ite_argnum __P((struct ite_softc *));
+static __inline__ int  ite_zargnum __P((struct ite_softc *));
+static __inline__ void ite_cr __P((struct ite_softc *));
+static __inline__ void ite_crlf __P((struct ite_softc *));
+static __inline__ void ite_clrline __P((struct ite_softc *));
+static __inline__ void ite_clrscreen __P((struct ite_softc *));
+static __inline__ void ite_clrtobos __P((struct ite_softc *));
+static __inline__ void ite_clrtobol __P((struct ite_softc *));
+static __inline__ void ite_clrtoeol __P((struct ite_softc *));
+static __inline__ void ite_clrtoeos __P((struct ite_softc *));
+static __inline__ void ite_dnchar __P((struct ite_softc *, int));
+static __inline__ void ite_inchar __P((struct ite_softc *, int));
+static __inline__ void ite_inline __P((struct ite_softc *, int));
+static __inline__ void ite_lf __P((struct ite_softc *));
+static __inline__ void ite_dnline __P((struct ite_softc *, int));
+static __inline__ void ite_rlf __P((struct ite_softc *));
+static __inline__ void ite_sendstr __P((char *));
+static __inline__ void snap_cury __P((struct ite_softc *));
 
+static void	alignment_display __P((struct ite_softc *));
 static char	*index __P((const char *, int));
-static __inline__ int	atoi __P((const char *));
+static struct ite_softc *getitesp __P((dev_t));
+static void	itecheckwrap __P((struct ite_softc *));
+static void	iteprecheckwrap __P((struct ite_softc *));
+static void	itestart __P((struct tty *));
 static void	ite_switch __P((int));
+static void	repeat_handler __P((void *));
+
 void iteputchar __P((int c, struct ite_softc *ip));
 void ite_putstr __P((const u_char * s, int len, dev_t dev));
 void iteattach __P((struct device *, struct device *, void *));
-int itematch __P((struct device *, void *, void *));
+int  itematch __P((struct device *, void *, void *));
+
+/*
+ * Standard character device functions.
+ */
+dev_type_open(iteopen);
+dev_type_close(iteclose);
+dev_type_read(iteread);
+dev_type_write(itewrite);
+dev_type_ioctl(iteioctl);
+dev_type_tty(itetty);
+dev_type_stop(itestop);
+
+/*
+ * Console specific types.
+ */
+dev_type_cnprobe(itecnprobe);
+dev_type_cninit(itecninit);
+dev_type_cngetc(itecngetc);
+dev_type_cnputc(itecnputc);
 
 struct cfattach ite_ca = {
 	sizeof(struct ite_softc), itematch, iteattach
@@ -197,7 +239,7 @@ void		*auxp;
 	}
 }
 
-struct ite_softc *
+static struct ite_softc *
 getitesp(dev)
 	dev_t dev;
 {
@@ -445,12 +487,12 @@ itewrite(dev, uio, flag)
 	return ((*linesw[tp->t_line].l_write) (tp, uio, flag));
 }
 
-void
+int
 itestop(tp, flag)
 	struct tty *tp;
 	int flag;
 {
-
+	return (0);
 }
 
 struct tty *
@@ -824,7 +866,6 @@ static u_char tout_pending;
 
 /*ARGSUSED*/
 static void
-
 repeat_handler(arg)
 void *arg;
 {
@@ -1335,7 +1376,6 @@ index (cp, ch)
 }
 
 
-
 static __inline__ int
 ite_argnum (ip)
     struct ite_softc *ip;