diff --git a/sys/arch/alpha/tc/ioasic.c b/sys/arch/alpha/tc/ioasic.c
index 34f64ded8a19..72df0d5ca263 100644
--- a/sys/arch/alpha/tc/ioasic.c
+++ b/sys/arch/alpha/tc/ioasic.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ioasic.c,v 1.28 2000/02/03 08:13:45 nisimura Exp $ */
+/* $NetBSD: ioasic.c,v 1.29 2000/03/15 03:07:46 nisimura Exp $ */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: ioasic.c,v 1.28 2000/02/03 08:13:45 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioasic.c,v 1.29 2000/03/15 03:07:46 nisimura Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -177,7 +177,6 @@ ioasicattach(parent, self, aux)
 		return;
 	}
 	sc->sc_dmat = ta->ta_dmat;
-	sc->sc_cookie = ta->ta_cookie;
 
 	ioasic_base = sc->sc_base = ta->ta_addr; /* XXX XXX XXX */
 
@@ -207,7 +206,7 @@ ioasicattach(parent, self, aux)
 		ioasicintrs[i].iai_func = ioasic_intrnull;
 		ioasicintrs[i].iai_arg = (void *)i;
 	}
-	tc_intr_establish(parent, sc->sc_cookie, TC_IPL_NONE, ioasic_intr, sc);
+	tc_intr_establish(parent, ta->ta_cookie, TC_IPL_NONE, ioasic_intr, sc);
 
 	/*
 	 * Try to configure each device.
diff --git a/sys/arch/pmax/tc/ioasic.c b/sys/arch/pmax/tc/ioasic.c
index 298e3ea94b89..252601516c10 100644
--- a/sys/arch/pmax/tc/ioasic.c
+++ b/sys/arch/pmax/tc/ioasic.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ioasic.c,v 1.11 2000/02/29 07:20:22 nisimura Exp $	*/
+/*	$NetBSD: ioasic.c,v 1.12 2000/03/15 03:07:47 nisimura Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: ioasic.c,v 1.11 2000/02/29 07:20:22 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioasic.c,v 1.12 2000/03/15 03:07:47 nisimura Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -145,7 +145,6 @@ ioasicattach(parent, self, aux)
 		return;
 	}
 	sc->sc_dmat = ta->ta_dmat;
-	sc->sc_cookie = ta->ta_cookie;
 
 	sc->sc_base = ta->ta_addr; /* XXX XXX XXX */
 
diff --git a/sys/dev/tc/ioasicvar.h b/sys/dev/tc/ioasicvar.h
index 6cb72780db8f..9ceba58ba261 100644
--- a/sys/dev/tc/ioasicvar.h
+++ b/sys/dev/tc/ioasicvar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: ioasicvar.h,v 1.11 1999/11/15 03:45:50 nisimura Exp $	*/
+/*	$NetBSD: ioasicvar.h,v 1.12 2000/03/15 03:07:44 nisimura Exp $	*/
 
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
@@ -27,11 +27,9 @@
  * rights to redistribute these changes.
  */
 
-/*
- * IOASIC subdevice attachment information.
- */
+#ifndef _DEV_TC_IOASICVAR_H_
+#define _DEV_TC_IOASICVAR_H_
 
-/* motherboard-specific autoconfiguration tables of ioasic child devices. */
 struct ioasic_dev {
 	char		*iad_modname;
 	tc_offset_t	iad_offset;
@@ -39,7 +37,6 @@ struct ioasic_dev {
 	u_int32_t	iad_intrbits;
 };
 
-/* Attachment arguments. */
 struct ioasicdev_attach_args {
 	char	iada_modname[TC_ROM_LLEN];
 	tc_offset_t iada_offset;
@@ -55,14 +52,12 @@ struct ioasicdev_attach_args {
 
 struct ioasic_softc {
 	struct	device sc_dv;
-
-	tc_addr_t sc_base;
-	void	*sc_cookie;
-
 	bus_space_tag_t sc_bst;
 	bus_space_handle_t sc_bsh;
 	bus_dma_tag_t sc_dmat;
-	bus_dmamap_t sc_lance_dmam;
+
+	tc_addr_t sc_base;		/* XXX offset XXX */
+	bus_dmamap_t sc_lance_dmam;	/* XXX LANCE XXX */
 };
 
 extern struct cfdriver ioasic_cd;
@@ -72,19 +67,11 @@ extern struct cfdriver ioasic_cd;
  */
 extern tc_addr_t ioasic_base;
 
-
-/*
- * Interrupt establishment/disestablishment functions
- */
 void    ioasic_intr_establish __P((struct device *, void *,
 	    int, int (*)(void *), void *));
 void    ioasic_intr_disestablish __P((struct device *, void *));
-
-
-/*
- * Miscellaneous helper functions.
- */
-int	ioasicprint __P((void *, const char *));
 int	ioasic_submatch __P((struct cfdata *, struct ioasicdev_attach_args *));
-void	ioasic_attach_devs __P((struct ioasic_softc *sc, 
-	    struct ioasic_dev *ioasic_devs, int ioasic_ndevs));
+void	ioasic_attach_devs __P((struct ioasic_softc *,
+	    struct ioasic_dev *, int));
+
+#endif /* _DEV_TC_IOASICVAR_ */