G/C of unused interrupt stubs, and other cleanups.

sys/arch/x68k/dev/par.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: par.c,v 1.11 2000/03/27 15:53:04 minoura Exp $	*/
+/*	$NetBSD: par.c,v 1.12 2000/06/11 14:20:45 minoura Exp $	*/
 
 /*
  * Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -137,6 +137,12 @@ parmatch(pdp, cfp, aux)
 	ia->ia_size = 0x2000;
 	if (intio_map_allocate_region (pdp, ia, INTIO_MAP_TESTONLY))
 		return 0;
+	if (ia->ia_intr == INTIOCF_INTR_DEFAULT)
+		ia->ia_intr = 99;
+#if DIAGNOSTIC
+	if (ia->ia_intr != 99)
+		return 0;
+#endif
 
 	return 1;
 }
@@ -171,6 +177,9 @@ parattach(pdp, dp, aux)
 	intio_set_sicilian_intr(intio_get_sicilian_intr() &
 				~SICILIAN_INTR_PAR);
 
+	intio_intr_establish(ia->ia_intr, "par",
+			     (intio_intr_handler_t) parintr, (void*) 1);
+
 	callout_init(&sc->sc_timo_ch);
 	callout_init(&sc->sc_start_ch);
 }

sys/arch/x68k/x68k/conf.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: conf.c,v 1.18 1999/04/19 21:23:02 kleink Exp $	*/
+/*	$NetBSD: conf.c,v 1.19 2000/06/11 14:20:46 minoura Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -220,7 +220,7 @@ struct cdevsw	cdevsw[] =
 	cdev_notdef(),
 #endif
 	cdev_tty_init(NXCOM,com),	/* 16: serial port */
-	cdev_gen_init(NAUDIO,audio),	/* 17: /dev/adpcm /dev/pcm /dev/audio */
+	cdev_audio_init(NAUDIO,audio),	/* 17: /dev/adpcm /dev/pcm /dev/audio */
 	cdev_disk_init(NFD,fd),		/* 18: floppy disk */
 	cdev_disk_init(NVND,vnd),	/* 19: vnode disk driver */
 	cdev_tape_init(NST,st),		/* 20: SCSI tape */

sys/arch/x68k/x68k/locore.s

@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.58 2000/05/31 05:06:58 thorpej Exp $	*/
+/*	$NetBSD: locore.s,v 1.59 2000/06/11 14:20:46 minoura Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -515,40 +515,6 @@ ENTRY_NOPROFILE(spurintr)	/* level 0 */
 ENTRY_NOPROFILE(kbdtimer)
 	rte
 
-ENTRY_NOPROFILE(audiotrap)
-#if 0
-#if NADPCM > 0
-	INTERRUPT_SAVEREG
-	jbsr	_C_LABEL(audiointr)
-	INTERRUPT_RESTOREREG
-#endif
-#endif
-	addql	#1,_C_LABEL(intrcnt)+44
-	addql	#1,_C_LABEL(uvmexp)+UVMEXP_INTRS
-	jra	rei
-
-ENTRY_NOPROFILE(partrap)
-#if NPAR > 0
-	INTERRUPT_SAVEREG
-	movel	#1,sp@-
-	jbsr	_C_LABEL(parintr)
-	addql	#4,sp
-	INTERRUPT_RESTOREREG
-#endif
-	addql	#1,_C_LABEL(intrcnt)+48
-	addql	#1,_C_LABEL(uvmexp)+UVMEXP_INTRS
-	jra	rei
-
-ENTRY_NOPROFILE(audioerrtrap)
-#if NADPCM > 0
-	INTERRUPT_SAVEREG
-	jbsr	_C_LABEL(audioerrintr)
-	INTERRUPT_RESTOREREG
-#endif
-	addql	#1,_C_LABEL(intrcnt)+32
-	addql	#1,_C_LABEL(uvmexp)+UVMEXP_INTRS
-	jra	rei
-
 ENTRY_NOPROFILE(powtrap)
 #include "pow.h"
 #if NPOW > 0
@@ -556,7 +522,7 @@ ENTRY_NOPROFILE(powtrap)
 	jbsr	_C_LABEL(powintr)
 	INTERRUPT_RESTOREREG
 #endif
-	addql	#1,_C_LABEL(intrcnt)+52
+	addql	#1,_C_LABEL(intrcnt)+48
 	addql	#1,_C_LABEL(uvmexp)+UVMEXP_INTRS
 	jra	rei
 
@@ -569,7 +535,7 @@ ENTRY_NOPROFILE(com0trap)
 	addql	#4,sp
 	INTERRUPT_RESTOREREG
 #endif
-	addql	#1,_C_LABEL(intrcnt)+56
+	addql	#1,_C_LABEL(intrcnt)+52
 	addql	#1,_C_LABEL(uvmexp)+UVMEXP_INTRS
 	jra	rei
 
@@ -581,7 +547,7 @@ ENTRY_NOPROFILE(com1trap)
 	addql	#4,sp
 	INTERRUPT_RESTOREREG
 #endif
-	addql	#1,_C_LABEL(intrcnt)+56
+	addql	#1,_C_LABEL(intrcnt)+52
 	addql	#1,_C_LABEL(uvmexp)+UVMEXP_INTRS
 	jra	rei
 
@@ -1569,7 +1535,6 @@ GLOBAL(intrnames)
 	.asciz	"clock"
 	.asciz	"scsi"
 	.asciz	"audio"
-	.asciz	"ppi"
 	.asciz	"pow"
 	.asciz	"com"
 	.space	200

sys/arch/x68k/x68k/vectors.s

@@ -1,4 +1,4 @@
-|	$NetBSD: vectors.s,v 1.9 1999/08/05 15:58:17 minoura Exp $
+|	$NetBSD: vectors.s,v 1.10 2000/06/11 14:20:47 minoura Exp $
 
 | Copyright (c) 1988 University of Utah
 | Copyright (c) 1990, 1993
@@ -151,7 +151,7 @@ GLOBAL(vectab)
 	VECTOR(intiotrap)	/* 96: FDC */
 	VECTOR(fdeject)		/* 97: floppy ejection */
 	VECTOR(intiotrap)	/* 98: unassigned, reserved */
-	VECTOR(partrap)		/* 99: parallel port */
+	VECTOR(intiotrap)	/* 99: parallel port */
 	VECTOR(intiotrap)	/* 100: FDC DMA */
 	VECTOR(intiotrap)	/* 101: FDC DMA (error) */
 	VECTOR(intiotrap)	/* 102: unassigned, reserved */