Removed all `vector xxxintr' specifications. Interrupt handlers are now

configured in drivers.

1 files changed, 30 insertions, 30 deletions

diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 6be6d21..9f65bdf 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC,v 1.125 1998/10/16 01:30:11 obrien Exp $
+#	$Id: GENERIC,v 1.126 1998/10/18 16:24:32 wpaul Exp $
 
 machine		"i386"
 cpu		"I386_CPU"
@@ -46,7 +46,7 @@ controller	isa0
 controller	eisa0
 controller	pci0
 
-controller	fdc0	at isa? port "IO_FD1" bio irq 6 drq 2 vector fdintr
+controller	fdc0	at isa? port "IO_FD1" bio irq 6 drq 2
 disk		fd0	at fdc0 drive 0
 disk		fd1	at fdc0 drive 1
 # Unless you know very well what you're doing, leave ft0 at drive 2, or
@@ -55,11 +55,11 @@ disk		fd1	at fdc0 drive 1
 tape		ft0	at fdc0 drive 2
 
 options		"CMD640"	# work around CMD640 chip deficiency
-controller	wdc0	at isa? port "IO_WD1" bio irq 14 vector wdintr
+controller	wdc0	at isa? port "IO_WD1" bio irq 14
 disk		wd0	at wdc0 drive 0
 disk		wd1	at wdc0 drive 1
 
-controller	wdc1	at isa? port "IO_WD2" bio irq 15 vector wdintr
+controller	wdc1	at isa? port "IO_WD2" bio irq 15
 disk		wd2	at wdc1 drive 0
 disk		wd3	at wdc1 drive 1
 
@@ -85,11 +85,11 @@ controller	adv0	at isa? port ? cam irq ?
 controller	adw0
 controller	bt0	at isa? port ? cam irq ?
 controller	aha0	at isa? port ? cam irq ?
-#controller	uha0	at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr
-#controller	aic0	at isa? port 0x340 bio irq 11 vector aicintr
-#controller	nca0	at isa? port 0x1f88 bio irq 10 vector ncaintr
-#controller	nca1	at isa? port 0x350 bio irq 5 vector ncaintr
-#controller	sea0	at isa? bio irq 5 iomem 0xc8000 iosiz 0x2000 vector seaintr
+#controller	uha0	at isa? port "IO_UHA0" bio irq ? drq 5
+#controller	aic0	at isa? port 0x340 bio irq 11
+#controller	nca0	at isa? port 0x1f88 bio irq 10
+#controller	nca1	at isa? port 0x350 bio irq 5
+#controller	sea0	at isa? bio irq 5 iomem 0xc8000 iosiz 0x2000
 
 controller	scbus0
 
@@ -101,23 +101,23 @@ device		pass0
 
 device		cd0	#Only need one of these, the code dynamically grows
 
-device		wt0	at isa? port 0x300 bio irq 5 drq 1 vector wtintr
-device		mcd0	at isa? port 0x300 bio irq 10 vector mcdintr
+device		wt0	at isa? port 0x300 bio irq 5 drq 1
+device		mcd0	at isa? port 0x300 bio irq 10
 
 controller	matcd0	at isa? port 0x230 bio
 
 device		scd0	at isa? port 0x230 bio
 
 # syscons is the default console driver, resembling an SCO console
-device		sc0	at isa? port "IO_KBD" conflicts tty irq 1 vector scintr
+device		sc0	at isa? port "IO_KBD" conflicts tty irq 1
 # Enable this and PCVT_FREEBSD for pcvt vt220 compatible console driver
-#device		vt0	at isa? port "IO_KBD" conflicts tty irq 1 vector pcrint
+#device		vt0	at isa? port "IO_KBD" conflicts tty irq 1
 #options		XSERVER			# support for X server
 #options		FAT_CURSOR		# start with block cursor
 # If you have a ThinkPAD, uncomment this along with the rest of the PCVT lines
 #options		PCVT_SCANSET=2		# IBM keyboards are non-std
 
-device		npx0	at isa? port "IO_NPX" irq 13 vector npxintr
+device		npx0	at isa? port "IO_NPX" irq 13
 
 #
 # Laptop support (see LINT for more options)
@@ -129,14 +129,14 @@ device		apm0    at isa?	disable	flags 0x31 # Advanced Power Management
 #device		pcic0	at card?
 #device		pcic1	at card?
 
-device		sio0	at isa? port "IO_COM1" flags 0x10 tty irq 4 vector siointr
-device		sio1	at isa? port "IO_COM2" tty irq 3 vector siointr
-device		sio2	at isa? disable port "IO_COM3" tty irq 5 vector siointr
-device		sio3	at isa? disable port "IO_COM4" tty irq 9 vector siointr
+device		sio0	at isa? port "IO_COM1" flags 0x10 tty irq 4
+device		sio1	at isa? port "IO_COM2" tty irq 3
+device		sio2	at isa? disable port "IO_COM3" tty irq 5
+device		sio3	at isa? disable port "IO_COM4" tty irq 9
 
-device		lpt0	at isa? port? tty irq 7 vector lptintr
+device		lpt0	at isa? port? tty irq 7
 
-device		psm0	at isa? port "IO_KBD" conflicts tty irq 12 vector psmintr
+device		psm0	at isa? port "IO_KBD" conflicts tty irq 12
 
 # Order is important here due to intrusive probes, do *not* alphabetize
 # this list of network interfaces until the probes have been fixed.
@@ -150,16 +150,16 @@ device tx0
 device vx0
 device xl0
 
-device ed0 at isa? port 0x280 net irq 10 iomem 0xd8000 vector edintr
-device ie0 at isa? port 0x300 net irq 10 iomem 0xd0000 vector ieintr
-device ep0 at isa? port 0x300 net irq 10 vector epintr
-device ex0 at isa? port? net irq? vector exintr
-device fe0 at isa? port 0x300 net irq ? vector feintr
-device le0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector le_intr
-device lnc0 at isa? port 0x280 net irq 10 drq 0 vector lncintr
-device ze0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zeintr
-device zp0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zpintr
-device cs0 at isa? port 0x300 net irq ? vector csintr
+device ed0 at isa? port 0x280 net irq 10 iomem 0xd8000
+device ie0 at isa? port 0x300 net irq 10 iomem 0xd0000
+device ep0 at isa? port 0x300 net irq 10
+device ex0 at isa? port? net irq?
+device fe0 at isa? port 0x300 net irq ?
+device le0 at isa? port 0x300 net irq 5 iomem 0xd0000
+device lnc0 at isa? port 0x280 net irq 10 drq 0
+device ze0 at isa? port 0x300 net irq 10 iomem 0xd8000
+device zp0 at isa? port 0x300 net irq 10 iomem 0xd8000
+device cs0 at isa? port 0x300 net irq ?
 
 pseudo-device	loop
 pseudo-device	ether