Move the specification of EDGE/LEVEL triggered interrupts to

eisa_add_intr() which now takes an additional arguement (one of
EISA_TRIGGER_LEVEL or EISA_TRIGGER_EDGE).

The flag RR_SHAREABLE has no effect when passed to
bus_alloc_resource(dev, SYS_RES_IRQ, ...) in an EISA device context as
the eisa_alloc_resource() call (bus_alloc_resource method) now deals
with this flag directly, depending on the device ivars.

This change does nothing more than move all the 'shared = inb(foo + iobsse)'
nonesense to the device probe methods rather than the device attach.

Also, print out 'edge' or 'level' in the IRQ announcement message.

Reviewed by: dfr

1 files changed, 3 insertions, 3 deletions

diff --git a/sys/dev/pdq/if_fea.c b/sys/dev/pdq/if_fea.c
index 44c930ffa962..c98eb4bf96af 100644
--- a/sys/dev/pdq/if_fea.c
+++ b/sys/dev/pdq/if_fea.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_fea.c,v 1.15 1999/07/10 19:46:08 peter Exp $
+ * $Id: if_fea.c,v 1.16 1999/07/31 00:43:48 mdodd Exp $
  */
 
 /*
@@ -148,7 +148,7 @@ pdq_eisa_probe (dev)
 
 	eisa_add_iospace(dev, iobase, 0x200, RESVADDR_NONE);
 	eisa_add_mspace(dev, maddr, msize, RESVADDR_NONE);
-	eisa_add_intr(dev, irq);
+	eisa_add_intr(dev, irq, EISA_TRIGGER_LEVEL);
 	
 	return (0);
 }
@@ -196,7 +196,7 @@ pdq_eisa_attach (dev)
 
 	rid = 0;
 	irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid,
-				 0, ~0, 1, RF_SHAREABLE | RF_ACTIVE);
+				 0, ~0, 1, RF_ACTIVE);
 
 	if (!irq) {
 		device_printf(dev, "No, irq?!\n");