diff options
| author |   briggs <briggs@openbsd.org> | 1996-10-28 03:48:53 +0000 |
|---|---|---|
| committer | briggs <briggs@openbsd.org> | 1996-10-28 03:48:53 +0000 |
| commit | dd4c6b0695fb29a73766ed515b5518e64640df94 (patch) | |
| tree | 6ec365d491ae2d30a1f6a9b0095a9617a24fcfb8 | |
| parent | Disallow null strings ("") as path names; ignore trailing / on path names, (diff) | |
| download | wireguard-openbsd-dd4c6b0695fb29a73766ed515b5518e64640df94.tar.xz wireguard-openbsd-dd4c6b0695fb29a73766ed515b5518e64640df94.zip | |
Most 040 models have scsi regs at base + 0x10000, not base + 0xf000
like the Q700.
| -rw-r--r-- | sys/arch/mac68k/mac68k/machdep.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/sys/arch/mac68k/mac68k/machdep.c b/sys/arch/mac68k/mac68k/machdep.c index b9d60762b95..3611f2cd985 100644 --- a/sys/arch/mac68k/mac68k/machdep.c +++ b/sys/arch/mac68k/mac68k/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.21 1996/10/23 04:49:48 briggs Exp $ */ +/* $OpenBSD: machdep.c,v 1.22 1996/10/28 03:48:53 briggs Exp $ */ /* $NetBSD: machdep.c,v 1.122 1996/10/15 06:40:39 scottr Exp $ */ /* @@ -2517,7 +2517,16 @@ mac68k_set_io_offsets(base) Via1Base = (volatile u_char *) base; sccA = (volatile u_char *) base + 0xc000; ASCBase = (volatile u_char *) base + 0x14000; - SCSIBase = base + 0xf000; + switch (current_mac_model->machineid) { + case MACH_MACQ900: + case MACH_MACQ950: + case MACH_MACQ700: + SCSIBase = base + 0xf000; + break; + default: + SCSIBase = base + 0x10000; + break; + } break; case MACH_CLASSQ2: /* @@ -2528,12 +2537,12 @@ mac68k_set_io_offsets(base) Via1Base = (volatile u_char *) base; sccA = (volatile u_char *) base + 0xc020; ASCBase = (volatile u_char *) base + 0x14000; - SCSIBase = base + 0xf000; + SCSIBase = base + 0x10000; break; case MACH_CLASSAV: Via1Base = (volatile u_char *) base; sccA = (volatile u_char *) base + 0x4000; - ASCBase = NULL; + ASCBase = (volatile u_char *) base + 0x14000; SCSIBase = base + 0x18000; break; case MACH_CLASSII: |