Fix DEC3000/300 TC slot numbering. There is an address space hole

between two TC option cards and 3 builtin TC devices.  Was uncovered by
mrg's change made at Nov 1999 and pointed by tsutsui.
This commit is contained in:
nisimura 2000-03-14 05:53:33 +00:00
parent 6f5486c425
commit 8bf44847a8

View File

@ -1,4 +1,4 @@
/* $NetBSD: tc_3000_300.c,v 1.21 2000/02/03 08:13:45 nisimura Exp $ */
/* $NetBSD: tc_3000_300.c,v 1.22 2000/03/14 05:53:33 nisimura Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: tc_3000_300.c,v 1.21 2000/02/03 08:13:45 nisimura Exp $");
__KERNEL_RCSID(0, "$NetBSD: tc_3000_300.c,v 1.22 2000/03/14 05:53:33 nisimura Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -69,17 +69,19 @@ int tc_3000_300_intrnull __P((void *));
struct tc_slotdesc tc_3000_300_slots[] = {
{ KV(0x100000000), C(TC_3000_300_DEV_OPT0), }, /* 0 - opt slot 0 */
{ KV(0x120000000), C(TC_3000_300_DEV_OPT1), }, /* 1 - opt slot 1 */
{ KV(0x180000000), C(TC_3000_300_DEV_BOGUS), }, /* 2 - TCDS ASIC */
{ KV(0x1a0000000), C(TC_3000_300_DEV_BOGUS), }, /* 3 - IOCTL ASIC */
{ KV(0x1c0000000), C(TC_3000_300_DEV_CXTURBO), }, /* 4 - CXTurbo */
{ KV(0x140000000), C(TC_3000_300_DEV_BOGUS), }, /* 2 - unused */
{ KV(0x160000000), C(TC_3000_300_DEV_BOGUS), }, /* 3 - unused */
{ KV(0x180000000), C(TC_3000_300_DEV_BOGUS), }, /* 4 - TCDS ASIC */
{ KV(0x1a0000000), C(TC_3000_300_DEV_BOGUS), }, /* 5 - IOCTL ASIC */
{ KV(0x1c0000000), C(TC_3000_300_DEV_BOGUS), }, /* 6 - CXTurbo */
};
int tc_3000_300_nslots =
sizeof(tc_3000_300_slots) / sizeof(tc_3000_300_slots[0]);
struct tc_builtin tc_3000_300_builtins[] = {
{ "PMAGB-BA", 4, 0x02000000, C(TC_3000_300_DEV_CXTURBO), },
{ "FLAMG-IO", 3, 0x00000000, C(TC_3000_300_DEV_IOASIC), },
{ "PMAZ-DS ", 2, 0x00000000, C(TC_3000_300_DEV_TCDS), },
{ "PMAGB-BA", 6, 0x02000000, C(TC_3000_300_DEV_CXTURBO), },
{ "FLAMG-IO", 5, 0x00000000, C(TC_3000_300_DEV_IOASIC), },
{ "PMAZ-DS ", 4, 0x00000000, C(TC_3000_300_DEV_TCDS), },
};
int tc_3000_300_nbuiltins =
sizeof(tc_3000_300_builtins) / sizeof(tc_3000_300_builtins[0]);