diff options
| author | Steve Murphree <smurph@cvs.openbsd.org> | 2001-12-20 06:07:29 +0000 |
|---|---|---|
| committer | Steve Murphree <smurph@cvs.openbsd.org> | 2001-12-20 06:07:29 +0000 |
| commit | 114e8abc12f5fa4603001f0a6eb0a059ba421d04 (patch) | |
| tree | 581e9ab7af4fead7f3e81edb8a2d3b48510e7cc4 /sys/arch/mvme88k/dev | |
| parent | 99f6bbd894a8f39be6e3ac6ef157f316e9887ebe (diff) | |
machine dependant pointer changes.
Diffstat (limited to 'sys/arch/mvme88k/dev')
| -rw-r--r-- | sys/arch/mvme88k/dev/clock.c | 6 | ||||
| -rw-r--r-- | sys/arch/mvme88k/dev/pcctwo.c | 9 | ||||
| -rw-r--r-- | sys/arch/mvme88k/dev/sclock.c | 6 |
3 files changed, 7 insertions, 14 deletions
diff --git a/sys/arch/mvme88k/dev/clock.c b/sys/arch/mvme88k/dev/clock.c index 3d9f772e23c..15ff3fc734c 100644 --- a/sys/arch/mvme88k/dev/clock.c +++ b/sys/arch/mvme88k/dev/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.15 2001/12/19 07:04:41 smurph Exp $ */ +/* $OpenBSD: clock.c,v 1.16 2001/12/20 06:07:28 smurph Exp $ */ /* * Copyright (c) 1999 Steve Murphree, Jr. * Copyright (c) 1995 Theo de Raadt @@ -191,7 +191,7 @@ clockattach(parent, self, args) sc->sc_profih.ih_ipl = ca->ca_ipl; prof_reset = ca->ca_ipl | PCC2_IRQ_IEN | PCC2_IRQ_ICLR; pcctwointr_establish(PCC2V_TIMER1, &sc->sc_profih); - mdfp.clock_init_func = &sbc_initclock; + md.clock_init_func = sbc_initclock; printf(": VME1x7"); break; #endif /* NPCCTWO */ @@ -202,7 +202,7 @@ clockattach(parent, self, args) sc->sc_profih.ih_wantframe = 1; sc->sc_profih.ih_ipl = ca->ca_ipl; sysconintr_establish(SYSCV_TIMER1, &sc->sc_profih); - mdfp.clock_init_func = &m188_initclock; + md.clock_init_func = m188_initclock; printf(": VME188"); break; #endif /* NSYSCON */ diff --git a/sys/arch/mvme88k/dev/pcctwo.c b/sys/arch/mvme88k/dev/pcctwo.c index 42b0abd49b7..9d889c57a11 100644 --- a/sys/arch/mvme88k/dev/pcctwo.c +++ b/sys/arch/mvme88k/dev/pcctwo.c @@ -1,6 +1,4 @@ - -/* $OpenBSD: pcctwo.c,v 1.13 2001/12/19 07:04:41 smurph Exp $ */ - +/* $OpenBSD: pcctwo.c,v 1.14 2001/12/20 06:07:28 smurph Exp $ */ /* * Copyright (c) 1995 Theo de Raadt * All rights reserved. @@ -190,11 +188,6 @@ void *args; sc->sc_pcc2->pcc2_vecbase = PCC2_VECBASE; sc->sc_pcc2->pcc2_genctl |= PCC2_GENCTL_IEN; /* global irq enable */ - /* - * Set pcc2intr_mask and pcc2intr_ipl. - */ - pcc2intr_ipl = (u_char *)&(sc->sc_pcc2->pcc2_ipl); - pcc2intr_mask = (u_char *)&(sc->sc_pcc2->pcc2_mask); config_search(pcctwo_scan, self, args); } diff --git a/sys/arch/mvme88k/dev/sclock.c b/sys/arch/mvme88k/dev/sclock.c index 1da18472c19..b3015601d56 100644 --- a/sys/arch/mvme88k/dev/sclock.c +++ b/sys/arch/mvme88k/dev/sclock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sclock.c,v 1.8 2001/12/16 23:49:46 miod Exp $ */ +/* $OpenBSD: sclock.c,v 1.9 2001/12/20 06:07:28 smurph Exp $ */ /* * Copyright (c) 1999 Steve Murphree, Jr. * @@ -191,7 +191,7 @@ sclockattach(parent, self, args) sc->sc_statih.ih_ipl = ca->ca_ipl; stat_reset = ca->ca_ipl | PCC2_IRQ_IEN | PCC2_IRQ_ICLR; pcctwointr_establish(PCC2V_TIMER2, &sc->sc_statih); - mdfp.statclock_init_func = &sbc_initstatclock; + md.statclock_init_func = sbc_initstatclock; printf(": VME1x7"); break; #endif /* NPCCTWO */ @@ -202,7 +202,7 @@ sclockattach(parent, self, args) sc->sc_statih.ih_wantframe = 1; sc->sc_statih.ih_ipl = ca->ca_ipl; sysconintr_establish(SYSCV_TIMER2, &sc->sc_statih); - mdfp.statclock_init_func = &m188_initstatclock; + md.statclock_init_func = m188_initstatclock; printf(": VME188"); break; #endif /* NSYSCON */ |