diff options
| -rw-r--r-- | sys/amd64/amd64/tsc.c | 10 | ||||
| -rw-r--r-- | sys/amd64/isa/clock.c | 10 | ||||
| -rw-r--r-- | sys/i386/i386/tsc.c | 10 | ||||
| -rw-r--r-- | sys/i386/isa/clock.c | 10 | ||||
| -rw-r--r-- | sys/isa/atrtc.c | 10 |
5 files changed, 35 insertions, 15 deletions
diff --git a/sys/amd64/amd64/tsc.c b/sys/amd64/amd64/tsc.c index 6a89ee131ab0..a8226bfee407 100644 --- a/sys/amd64/amd64/tsc.c +++ b/sys/amd64/amd64/tsc.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.23 1994/10/04 13:59:44 ache Exp $ + * $Id: clock.c,v 1.24 1994/10/04 18:39:10 ache Exp $ */ /* @@ -540,14 +540,18 @@ test_inittodr(time_t base) /* * Wire clock interrupt in. */ + +static u_int clkmask = HWI_MASK | SWI_MASK; +static u_int rtcmask = SWI_CLOCK_MASK; + void enablertclock() { register_intr(/* irq */ 0, /* XXX id */ 0, /* flags */ 0, clkintr, - HWI_MASK | SWI_MASK, /* unit */ 0); + &clkmask, /* unit */ 0); INTREN(IRQ0); register_intr(/* irq */ 8, /* XXX id */ 1, /* flags */ 0, rtcintr, - SWI_CLOCK_MASK, /* unit */ 0); + &rtcmask, /* unit */ 0); INTREN(IRQ8); outb(IO_RTC, RTC_STATUSB); outb(IO_RTC+1, RTCSB_PINTR | RTCSB_24HR); diff --git a/sys/amd64/isa/clock.c b/sys/amd64/isa/clock.c index 6a89ee131ab0..a8226bfee407 100644 --- a/sys/amd64/isa/clock.c +++ b/sys/amd64/isa/clock.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.23 1994/10/04 13:59:44 ache Exp $ + * $Id: clock.c,v 1.24 1994/10/04 18:39:10 ache Exp $ */ /* @@ -540,14 +540,18 @@ test_inittodr(time_t base) /* * Wire clock interrupt in. */ + +static u_int clkmask = HWI_MASK | SWI_MASK; +static u_int rtcmask = SWI_CLOCK_MASK; + void enablertclock() { register_intr(/* irq */ 0, /* XXX id */ 0, /* flags */ 0, clkintr, - HWI_MASK | SWI_MASK, /* unit */ 0); + &clkmask, /* unit */ 0); INTREN(IRQ0); register_intr(/* irq */ 8, /* XXX id */ 1, /* flags */ 0, rtcintr, - SWI_CLOCK_MASK, /* unit */ 0); + &rtcmask, /* unit */ 0); INTREN(IRQ8); outb(IO_RTC, RTC_STATUSB); outb(IO_RTC+1, RTCSB_PINTR | RTCSB_24HR); diff --git a/sys/i386/i386/tsc.c b/sys/i386/i386/tsc.c index 6a89ee131ab0..a8226bfee407 100644 --- a/sys/i386/i386/tsc.c +++ b/sys/i386/i386/tsc.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.23 1994/10/04 13:59:44 ache Exp $ + * $Id: clock.c,v 1.24 1994/10/04 18:39:10 ache Exp $ */ /* @@ -540,14 +540,18 @@ test_inittodr(time_t base) /* * Wire clock interrupt in. */ + +static u_int clkmask = HWI_MASK | SWI_MASK; +static u_int rtcmask = SWI_CLOCK_MASK; + void enablertclock() { register_intr(/* irq */ 0, /* XXX id */ 0, /* flags */ 0, clkintr, - HWI_MASK | SWI_MASK, /* unit */ 0); + &clkmask, /* unit */ 0); INTREN(IRQ0); register_intr(/* irq */ 8, /* XXX id */ 1, /* flags */ 0, rtcintr, - SWI_CLOCK_MASK, /* unit */ 0); + &rtcmask, /* unit */ 0); INTREN(IRQ8); outb(IO_RTC, RTC_STATUSB); outb(IO_RTC+1, RTCSB_PINTR | RTCSB_24HR); diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c index 6a89ee131ab0..a8226bfee407 100644 --- a/sys/i386/isa/clock.c +++ b/sys/i386/isa/clock.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.23 1994/10/04 13:59:44 ache Exp $ + * $Id: clock.c,v 1.24 1994/10/04 18:39:10 ache Exp $ */ /* @@ -540,14 +540,18 @@ test_inittodr(time_t base) /* * Wire clock interrupt in. */ + +static u_int clkmask = HWI_MASK | SWI_MASK; +static u_int rtcmask = SWI_CLOCK_MASK; + void enablertclock() { register_intr(/* irq */ 0, /* XXX id */ 0, /* flags */ 0, clkintr, - HWI_MASK | SWI_MASK, /* unit */ 0); + &clkmask, /* unit */ 0); INTREN(IRQ0); register_intr(/* irq */ 8, /* XXX id */ 1, /* flags */ 0, rtcintr, - SWI_CLOCK_MASK, /* unit */ 0); + &rtcmask, /* unit */ 0); INTREN(IRQ8); outb(IO_RTC, RTC_STATUSB); outb(IO_RTC+1, RTCSB_PINTR | RTCSB_24HR); diff --git a/sys/isa/atrtc.c b/sys/isa/atrtc.c index 6a89ee131ab0..a8226bfee407 100644 --- a/sys/isa/atrtc.c +++ b/sys/isa/atrtc.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.23 1994/10/04 13:59:44 ache Exp $ + * $Id: clock.c,v 1.24 1994/10/04 18:39:10 ache Exp $ */ /* @@ -540,14 +540,18 @@ test_inittodr(time_t base) /* * Wire clock interrupt in. */ + +static u_int clkmask = HWI_MASK | SWI_MASK; +static u_int rtcmask = SWI_CLOCK_MASK; + void enablertclock() { register_intr(/* irq */ 0, /* XXX id */ 0, /* flags */ 0, clkintr, - HWI_MASK | SWI_MASK, /* unit */ 0); + &clkmask, /* unit */ 0); INTREN(IRQ0); register_intr(/* irq */ 8, /* XXX id */ 1, /* flags */ 0, rtcintr, - SWI_CLOCK_MASK, /* unit */ 0); + &rtcmask, /* unit */ 0); INTREN(IRQ8); outb(IO_RTC, RTC_STATUSB); outb(IO_RTC+1, RTCSB_PINTR | RTCSB_24HR); |