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

configured in drivers.

5 files changed, 20 insertions, 21 deletions

diff --git a/sys/i386/isa/README.le b/sys/i386/isa/README.le
index 52e4df5..a8c33c1 100644
--- a/sys/i386/isa/README.le
+++ b/sys/i386/isa/README.le
@@ -1,4 +1,4 @@
-$Id$
+$Id: README.le,v 1.4 1997/02/22 09:35:49 peter Exp $
 
 ----------------
 
@@ -38,7 +38,7 @@ i386/conf/files.i386 file.
 After that is done you will need to edit your config file (in
 i386/conf) and a line similar to:
 
-device le0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector le_intr
+device le0 at isa? port 0x300 net irq 5 iomem 0xd0000
 
 [The above line assumes the board is still at the factory defaults.]
 Change the port, irq, and iomem value if needed to your configuration.
diff --git a/sys/i386/isa/README.stl b/sys/i386/isa/README.stl
index 20b62f7..84e8ab6 100644
--- a/sys/i386/isa/README.stl
+++ b/sys/i386/isa/README.stl
@@ -328,7 +328,7 @@ i386/isa/stallion.c		optional	stl	device-driver
             - enter a line for each board that you want to use. For stallion.c
               boards entries should look like:
 
-device		stl0	at isa? port 0x2a0 tty irq 10 vector stlintr
+device		stl0	at isa? port 0x2a0 tty irq 10
 
               For istallion.c boards, the entries should look like:
 
diff --git a/sys/i386/isa/snd/README b/sys/i386/isa/snd/README
index 289f044..a4cd79d 100644
--- a/sys/i386/isa/snd/README
+++ b/sys/i386/isa/snd/README
@@ -69,7 +69,7 @@ APPLICATIONS:
 
       controller pnp0  # this is required for PnP support
 
-      device	 pcm0 at isa ? port? tty irq N drq D flags F vector pcmintr
+      device	 pcm0 at isa ? port? tty irq N drq D flags F
 
     where
 
@@ -95,13 +95,13 @@ APPLICATIONS:
     You can use multiple sound cards, in which case you need more
     lines like
 
-      device	 pcm1 at isa ? port? tty irq N drq D flags F vector pcmintr
-      device	 pcm2 at isa ? port? tty irq N drq D flags F vector pcmintr
+      device	 pcm1 at isa ? port? tty irq N drq D flags F
+      device	 pcm2 at isa ? port? tty irq N drq D flags F
       ...
 
     EXAMPLES: a typical "device" line for the SB16 (full duplex) is
 
-      device pcm0 at isa ? port? tty irq 5 drq 1 flags 0x15 vector pcmintr
+      device pcm0 at isa ? port? tty irq 5 drq 1 flags 0x15
 
     The driver will check at the default addresses (or the one you
     specify) which type of SoundBlaster you have (1.5, 2.0, 3.X
@@ -113,7 +113,7 @@ APPLICATIONS:
     For a WSS-compatible codec (non PnP) working in full duplex using
     dma channels 1 and 3, you can specify:
 
-      device pcm0 at isa ? port 0x530 tty irq 7 drq 1 flags 0x13 vector pcmintr
+      device pcm0 at isa ? port 0x530 tty irq 7 drq 1 flags 0x13
 
     (0x530 is a default if no port address is specified).  The
     "flags 0x13" specifies that you have a dual dma board with
@@ -130,10 +130,9 @@ APPLICATIONS:
 
     For PnP cards, only the line for "pcm0" is needed (the code
     will allocate entries for more cards if found), but IT MUST
-    INCLUDE ALL FIELDS, including "vector pcmintr". You can use
-    the following line:
+    INCLUDE ALL FIELDS. You can use the following line:
 
-      device pcm0 at isa ? port? tty irq 7 drq 1 vector pcmintr
+      device pcm0 at isa ? port? tty irq 7 drq 1
 
     NOTE that:
       - the parameters for the PnP device(s) will be read from the
diff --git a/sys/i386/isa/sound/README.FREEBSD b/sys/i386/isa/sound/README.FREEBSD
index 3603bfe..9979d12 100644
--- a/sys/i386/isa/sound/README.FREEBSD
+++ b/sys/i386/isa/sound/README.FREEBSD
@@ -90,7 +90,7 @@ Lugi also has  Sujal's PnP driver .
 This is my kernel configuration for my SB16 PnP:
 
 controller      snd0
-device sb0      at isa? port 0x220 irq 10 conflicts drq 3 vector sbintr
+device sb0      at isa? port 0x220 irq 10 conflicts drq 3
 device sbxvi0   at isa? port? irq? drq 5 conflicts
 device opl0     at isa? port 0x388 conflicts
 device sbmidi0  at isa? port 0x300 irq? conflicts
@@ -123,13 +123,13 @@ To configure your guspnp PRO if you have a motherboard which supports
 PnP:
 
 	controller snd0
-	device gus0 at isa?  vector gusintr
+	device gus0 at isa?
 
 NONPNP CONFIGURATION
 To configure your guspnp PRO if your motherboard does NOT support
 PnP:
 
-device gus0 at isa? port  0x220 irq 11 drq 1 flags 0x3 vector gusintr
+device gus0 at isa? port  0x220 irq 11 drq 1 flags 0x3
 
 
 the gus pnp is fully software configurable and the above configuration
diff --git a/sys/i386/isa/sound/sound.doc b/sys/i386/isa/sound/sound.doc
index 0b43822..b91901e 100644
--- a/sys/i386/isa/sound/sound.doc
+++ b/sys/i386/isa/sound/sound.doc
@@ -1,4 +1,4 @@
-$Id$
+$Id: sound.doc,v 1.8 1997/02/22 09:38:15 peter Exp $
 
 Instructions on using audio on a FreeBSD 2.1 (or 2.0-current) system.
 See also /sys/i386/conf/LINT.
@@ -14,10 +14,10 @@ Uncomment one or more of these device entries, depending on what type of
 sound card you have:
 
 # ProAudioSpectrum PCM and Midi - for PAS
-#device pas0     at isa? port 0x388 irq 10 drq 6 vector pasintr
+#device pas0     at isa? port 0x388 irq 10 drq 6
 
 # SoundBlaster DSP driver - for SB, SB Pro, SB16, PAS(emulating SB)
-#device sb0      at isa? port 0x220 irq 7 drq 1 vector sbintr
+#device sb0      at isa? port 0x220 irq 7 drq 1
 
 # SoundBlaster 16 DSP driver - for SB16 - requires sb0 device
 #device sbxvi0   at isa? drq 5
@@ -28,13 +28,13 @@ sound card you have:
 # Gravis UltraSound - for GUS, GUS16, GUSMAX
 # For cards that use 2 DMA Channels:
 #     drq = Write DMA Channel, flags = Read DMA Channel
-#device gus0 at isa? port 0x220 irq 11 drq 1 flags 0x3 vector gusintr
+#device gus0 at isa? port 0x220 irq 11 drq 1 flags 0x3
 
 # Gravis UltraSound 16 bit option - for GUS16 - requires gus0
-#device gusxvi0 at isa? port 0x530 irq 7 drq 3 vector adintr
+#device gusxvi0 at isa? port 0x530 irq 7 drq 3
 
 # MS Sound System (AD1848 Based Boards)
-#device mss0 at isa? port 0x530 irq 10 drq 1 vector adintr
+#device mss0 at isa? port 0x530 irq 10 drq 1
 
 # Yamaha OPL-2/OPL-3 FM - for SB, SB Pro, SB16, PAS
 #device opl0     at isa? port 0x388
@@ -43,7 +43,7 @@ sound card you have:
 #device mpu0     at isa? port 0x330 irq 6 drq 0
 
 # 6850 UART Midi
-#device uart0 at isa? port 0x330 irq 5 vector "m6850intr"
+#device uart0 at isa? port 0x330 irq 5
 
 You may add one or more of the following depending on what you do and don't
 want compiled into your kernel.  Note:  Excluding things with EXCLUDE_...