diff options
| author | scottr <scottr@NetBSD.org> | 1997-02-28 07:46:59 +0000 |
|---|---|---|
| committer | scottr <scottr@NetBSD.org> | 1997-02-28 07:46:59 +0000 |
| commit | 359101fb43346f5b43d94de60821b51bfedb5894 (patch) | |
| tree | c50fa77b684e1159db98d1f5218394b88f60a05d /sys/arch | |
| parent | 8f37a2983b7dca09d5304532c50f3426c516d750 (diff) | |
Convert to generalized VIA interrupt registration
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/mac68k/dev/esp.c | 10 | ||||
| -rw-r--r-- | sys/arch/mac68k/dev/sbc.c | 6 | ||||
| -rw-r--r-- | sys/arch/mac68k/mac68k/clock.c | 8 | ||||
| -rw-r--r-- | sys/arch/mac68k/obio/esp.c | 10 |
4 files changed, 18 insertions, 16 deletions
diff --git a/sys/arch/mac68k/dev/esp.c b/sys/arch/mac68k/dev/esp.c index 190678d9e4d..642a4b6f930 100644 --- a/sys/arch/mac68k/dev/esp.c +++ b/sys/arch/mac68k/dev/esp.c @@ -1,4 +1,4 @@ -/* $NetBSD: esp.c,v 1.7 1997/02/27 14:06:25 briggs Exp $ */ +/* $NetBSD: esp.c,v 1.8 1997/02/28 07:46:59 scottr Exp $ */ /* * Copyright (c) 1996 Charles M. Hannum. All rights reserved. @@ -185,8 +185,8 @@ espattach(parent, self, aux) unsigned long reg_offset; esc->sc_reg = (volatile u_char *) SCSIBase; - mac68k_register_scsi_irq( - (void (*)(void *)) ncr53c9x_intr, esc); + via2_register_irq(VIA2_SCSIIRQ, + (void (*)(void *))ncr53c9x_intr, esc); esc->irq_mask = V2IF_SCSIIRQ; reg_offset = SCSIBase - IOBase; if (reg_offset == 0x10000) { @@ -196,8 +196,8 @@ espattach(parent, self, aux) } } else { esc->sc_reg = (volatile u_char *) SCSIBase + 0x402; - mac68k_register_scsi_b_irq( - (void (*)(void *)) ncr53c9x_intr, sc); + via2_register_irq(VIA2_SCSIDRQ, + (void (*)(void *))ncr53c9x_intr, esc); esc->irq_mask = V2IF_SCSIDRQ; /* V2IF_T1? */ sc->sc_freq = 25000000; } diff --git a/sys/arch/mac68k/dev/sbc.c b/sys/arch/mac68k/dev/sbc.c index f853f6abefa..fafa94659ed 100644 --- a/sys/arch/mac68k/dev/sbc.c +++ b/sys/arch/mac68k/dev/sbc.c @@ -1,4 +1,4 @@ -/* $NetBSD: sbc.c,v 1.20 1997/02/26 22:29:08 gwr Exp $ */ +/* $NetBSD: sbc.c,v 1.21 1997/02/28 07:47:01 scottr Exp $ */ /* * Copyright (C) 1996 Scott Reynolds. All rights reserved. @@ -341,8 +341,8 @@ sbc_attach(parent, self, args) ncr_sc->sc_dma_start = sbc_dma_start; ncr_sc->sc_dma_eop = sbc_dma_eop; ncr_sc->sc_dma_stop = sbc_dma_stop; - mac68k_register_scsi_drq(sbc_drq_intr, ncr_sc); - mac68k_register_scsi_irq(sbc_irq_intr, ncr_sc); + via2_register_irq(VIA2_SCSIDRQ, sbc_drq_intr, ncr_sc); + via2_register_irq(VIA2_SCSIIRQ, sbc_irq_intr, ncr_sc); } else ncr_sc->sc_flags |= NCR5380_FORCE_POLLING; diff --git a/sys/arch/mac68k/mac68k/clock.c b/sys/arch/mac68k/mac68k/clock.c index 553957fa942..f0ceb56be44 100644 --- a/sys/arch/mac68k/mac68k/clock.c +++ b/sys/arch/mac68k/mac68k/clock.c @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.32 1997/01/15 01:28:53 perry Exp $ */ +/* $NetBSD: clock.c,v 1.33 1997/02/28 07:49:19 scottr Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -95,6 +95,8 @@ #include "clockreg.h" #include <machine/viareg.h> +void rtclock_intr __P((void)); + #define DIFF19041970 2082844800 #define DIFF19701990 630720000 #define DIFF19702010 1261440000 @@ -481,7 +483,7 @@ mac68k_calibrate_delay() /* Disable VIA1 timer 1 interrupts and set up service routine */ via_reg(VIA1, vIER) = V1IF_T1; - mac68k_register_via1_t1_irq(delay_timer1_irq); + via1_register_irq(VIA1_T1, delay_timer1_irq, NULL); /* Set the timer for one-shot mode, then clear and enable interrupts */ via_reg(VIA1, vACR) &= ~ACR_T1LATCH; @@ -497,7 +499,7 @@ mac68k_calibrate_delay() /* Disable timer interrupts and reset service routine */ via_reg(VIA1, vIER) = V1IF_T1; - mac68k_register_via1_t1_irq(NULL); + via1_register_irq(VIA1_T1, (void (*)(void *))rtclock_intr, NULL); /* * If this weren't integer math, the following would look diff --git a/sys/arch/mac68k/obio/esp.c b/sys/arch/mac68k/obio/esp.c index 190678d9e4d..642a4b6f930 100644 --- a/sys/arch/mac68k/obio/esp.c +++ b/sys/arch/mac68k/obio/esp.c @@ -1,4 +1,4 @@ -/* $NetBSD: esp.c,v 1.7 1997/02/27 14:06:25 briggs Exp $ */ +/* $NetBSD: esp.c,v 1.8 1997/02/28 07:46:59 scottr Exp $ */ /* * Copyright (c) 1996 Charles M. Hannum. All rights reserved. @@ -185,8 +185,8 @@ espattach(parent, self, aux) unsigned long reg_offset; esc->sc_reg = (volatile u_char *) SCSIBase; - mac68k_register_scsi_irq( - (void (*)(void *)) ncr53c9x_intr, esc); + via2_register_irq(VIA2_SCSIIRQ, + (void (*)(void *))ncr53c9x_intr, esc); esc->irq_mask = V2IF_SCSIIRQ; reg_offset = SCSIBase - IOBase; if (reg_offset == 0x10000) { @@ -196,8 +196,8 @@ espattach(parent, self, aux) } } else { esc->sc_reg = (volatile u_char *) SCSIBase + 0x402; - mac68k_register_scsi_b_irq( - (void (*)(void *)) ncr53c9x_intr, sc); + via2_register_irq(VIA2_SCSIDRQ, + (void (*)(void *))ncr53c9x_intr, esc); esc->irq_mask = V2IF_SCSIDRQ; /* V2IF_T1? */ sc->sc_freq = 25000000; } |
