Stage 1 of a cleanup of the i386 interrupt registration mechanism.

Interrupts under the new scheme are managed by the i386 nexus with the
awareness of the resource manager.  There is further room for optimizing
the interfaces still.  All the users of register_intr()/intr_create()
should be gone, with the exception of pcic and i386/isa/clock.c.

2 files changed, 4 insertions, 39 deletions

diff --git a/sys/alpha/isa/isa.c b/sys/alpha/isa/isa.c
index 5b6b54e..db1104c 100644
--- a/sys/alpha/isa/isa.c
+++ b/sys/alpha/isa/isa.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: isa.c,v 1.9 1999/01/23 16:53:27 dfr Exp $
+ *	$Id: isa.c,v 1.10 1999/04/16 21:21:37 peter Exp $
  */
 
 #include <sys/param.h>
@@ -202,7 +202,7 @@ isa_intr_disable(int irq)
 	splx(s);
 }
 
-int
+intrmask_t
 isa_irq_pending(void)
 {
 	u_char irr1;
@@ -213,7 +213,7 @@ isa_irq_pending(void)
 	return ((irr2 << 8) | irr1);
 }
 
-int
+intrmask_t
 isa_irq_mask(void)
 {
 	u_char irr1;
diff --git a/sys/alpha/pci/pcibus.c b/sys/alpha/pci/pcibus.c
index f6cde88..f0c0eb2 100644
--- a/sys/alpha/pci/pcibus.c
+++ b/sys/alpha/pci/pcibus.c
@@ -23,7 +23,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: pcibus.c,v 1.9 1999/04/16 21:21:39 peter Exp $
+ * $Id: pcibus.c,v 1.10 1999/04/19 08:55:11 dfr Exp $
  *
  */
 
@@ -131,41 +131,6 @@ pci_cvt_to_bwx(vm_offset_t sparse)
 		return NULL;
 }
 
-#if 0
-
-/*
- * These can disappear when I update the pci code to use the new
- * device framework.
- */
-struct intrec *
-intr_create(void *dev_instance, int irq, inthand2_t handler, void *arg,
-	    intrmask_t *maskptr, int flags)
-{
-	struct resource *res;
-	device_t pcib = chipset.intrdev;
-	int zero = 0;
-	void *cookie;
-
-	res = BUS_ALLOC_RESOURCE(pcib, NULL, SYS_RES_IRQ, &zero,
-				irq, irq, 1, RF_SHAREABLE | RF_ACTIVE);
-	if (BUS_SETUP_INTR(pcib, pcib, res, (driver_intr_t *)handler, arg, &cookie))
-		return 0;
-
-	return (struct intrec *)cookie;
-}
-
-int
-intr_connect(struct intrec *idesc)
-{
-	/*
-	 * intr_create has already connected it (doesn't matter for the
-	 * only consumer of this interface (pci).
-	 */
-	return 0;
-}
-
-#endif
-
 void
 alpha_platform_assign_pciintr(pcicfgregs *cfg)
 {