diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2004-07-02 18:02:14 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2004-07-02 18:02:14 +0000 |
| commit | 437842e5ed5cfc39e32bf7eacf513cdcc9dba2f9 (patch) | |
| tree | 2e827e6820aecdabccf37ff8eb9670c77742f3a3 /sys/arch/mvme68k | |
| parent | ed4e5f9f1ef8a718709fcaabd3ca869465bb2b03 (diff) | |
During bootup, only print the VMEChip2 decoder settings for those which are
enabled.
Diffstat (limited to 'sys/arch/mvme68k')
| -rw-r--r-- | sys/arch/mvme68k/dev/vme.c | 63 |
1 files changed, 33 insertions, 30 deletions
diff --git a/sys/arch/mvme68k/dev/vme.c b/sys/arch/mvme68k/dev/vme.c index ebe470f3cfc..fa8674b84ce 100644 --- a/sys/arch/mvme68k/dev/vme.c +++ b/sys/arch/mvme68k/dev/vme.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vme.c,v 1.20 2004/07/02 17:57:29 miod Exp $ */ +/* $OpenBSD: vme.c,v 1.21 2004/07/02 18:02:13 miod Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -455,32 +455,38 @@ vme2chip_init(sc) /* turn off SYSFAIL LED */ vme2->vme2_tctl &= ~VME2_TCTL_SYSFAIL; - ctl = vme2->vme2_masterctl; + /* + * Display the VMEChip2 decoder status. + */ printf("%s: using BUG parameters\n", sc->sc_dev.dv_xname); - /* setup a A32D16 space */ - printf("%s: 1phys 0x%08lx-0x%08lx to VME 0x%08lx-0x%08lx\n", - sc->sc_dev.dv_xname, - vme2->vme2_master1 << 16, vme2->vme2_master1 & 0xffff0000, - vme2->vme2_master1 << 16, vme2->vme2_master1 & 0xffff0000); - - /* setup a A32D32 space */ - printf("%s: 2phys 0x%08lx-0x%08lx to VME 0x%08lx-0x%08lx\n", - sc->sc_dev.dv_xname, - vme2->vme2_master2 << 16, vme2->vme2_master2 & 0xffff0000, - vme2->vme2_master2 << 16, vme2->vme2_master2 & 0xffff0000); - - /* setup a A24D16 space */ - printf("%s: 3phys 0x%08lx-0x%08lx to VME 0x%08lx-0x%08lx\n", - sc->sc_dev.dv_xname, - vme2->vme2_master3 << 16, vme2->vme2_master3 & 0xffff0000, - vme2->vme2_master3 << 16, vme2->vme2_master3 & 0xffff0000); - - /* setup a XXXXXX space */ - printf("%s: 4phys 0x%08lx-0x%08lx to VME 0x%08lx-0x%08lx\n", - sc->sc_dev.dv_xname, - vme2->vme2_master4 << 16, vme2->vme2_master4 & 0xffff0000, - (vme2->vme2_master4 << 16) + (vme2->vme2_master4mod << 16), - (vme2->vme2_master4 & 0xffff0000) + (vme2->vme2_master4 & 0xffff0000)); + ctl = vme2->vme2_gcsrctl; + if (ctl & VME2_GCSRCTL_MDEN1) { + printf("%s: 1phys 0x%08lx-0x%08lx to VME 0x%08lx-0x%08lx\n", + sc->sc_dev.dv_xname, + vme2->vme2_master1 << 16, vme2->vme2_master1 & 0xffff0000, + vme2->vme2_master1 << 16, vme2->vme2_master1 & 0xffff0000); + } + if (ctl & VME2_GCSRCTL_MDEN2) { + printf("%s: 2phys 0x%08lx-0x%08lx to VME 0x%08lx-0x%08lx\n", + sc->sc_dev.dv_xname, + vme2->vme2_master2 << 16, vme2->vme2_master2 & 0xffff0000, + vme2->vme2_master2 << 16, vme2->vme2_master2 & 0xffff0000); + } + if (ctl & VME2_GCSRCTL_MDEN3) { + printf("%s: 3phys 0x%08lx-0x%08lx to VME 0x%08lx-0x%08lx\n", + sc->sc_dev.dv_xname, + vme2->vme2_master3 << 16, vme2->vme2_master3 & 0xffff0000, + vme2->vme2_master3 << 16, vme2->vme2_master3 & 0xffff0000); + } + if (ctl & VME2_GCSRCTL_MDEN4) { + printf("%s: 4phys 0x%08lx-0x%08lx to VME 0x%08lx-0x%08lx\n", + sc->sc_dev.dv_xname, + vme2->vme2_master4 << 16, vme2->vme2_master4 & 0xffff0000, + (vme2->vme2_master4 << 16) + (vme2->vme2_master4mod << 16), + (vme2->vme2_master4 & 0xffff0000) + + (vme2->vme2_master4mod & 0xffff0000)); + } + /* * Map the VME irq levels to the cpu levels 1:1. * This is rather inflexible, but much easier. @@ -490,10 +496,7 @@ vme2chip_init(sc) (4 << VME2_IRQL4_VME4SHIFT) | (3 << VME2_IRQL4_VME3SHIFT) | (2 << VME2_IRQL4_VME2SHIFT) | (1 << VME2_IRQL4_VME1SHIFT); printf("%s: vme to cpu irq level 1:1\n",sc->sc_dev.dv_xname); - /* - printf("%s: vme2_irql4 = 0x%08x\n", sc->sc_dev.dv_xname, - vme2->vme2_irql4); - */ + #if NPCCTWO > 0 if (vmebustype == BUS_PCCTWO) { /* |