Replace heuristics used to figure out which model we are running on, and

trust the cpuid value returned by the prom itself (verified against
/usr/opt/sdk/include/sys/dg_sys_info.h on a DG-UX filesystem).

9 files changed, 216 insertions, 164 deletions

diff --git a/sys/arch/aviion/aviion/av400_machdep.c b/sys/arch/aviion/aviion/av400_machdep.c
index 85493f1add1..761c8861e0f 100644
--- a/sys/arch/aviion/aviion/av400_machdep.c
+++ b/sys/arch/aviion/aviion/av400_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: av400_machdep.c,v 1.16 2010/04/21 19:33:45 miod Exp $	*/
+/*	$OpenBSD: av400_machdep.c,v 1.17 2010/04/24 18:44:25 miod Exp $	*/
 /*
  * Copyright (c) 2006, 2007, Miodrag Vallat.
  *
@@ -185,7 +185,6 @@ const struct vme_range vme_av400[] = {
 };
 
 const struct board board_av400 = {
-	"100/200/300/400/3000/4000/4300 series",
 	av400_bootstrap,
 	av400_memsize,
 	av400_startup,
@@ -195,9 +194,9 @@ const struct board board_av400 = {
 	av400_setipl,
 	av400_raiseipl,
 	av400_intsrc,
+	av400_get_vme_ranges,
 
 	av400_ptable,
-	vme_av400
 };
 
 /*
@@ -278,8 +277,6 @@ av400_bootstrap()
 	 * we can still use it.
 	 */
 	scm_getenaddr(hostaddr);
-	cpuid = scm_cpuid();
-	sysid = scm_sysid();
 }
 
 /*
@@ -577,3 +574,18 @@ out:
 	 */
 	set_psr(get_psr() | PSR_IND);
 }
+
+const struct vme_range *
+av400_get_vme_ranges(void)
+{
+	/* no VME slots on models 100/200/300 */
+	switch (cpuid) {
+	case AVIION_300_310:
+	case AVIION_300C_310C:
+	case AVIION_300CD_310CD:
+	case AVIION_300D_310D:
+		return NULL;
+	default:
+		return vme_av400;
+	}
+}
diff --git a/sys/arch/aviion/aviion/av530_machdep.c b/sys/arch/aviion/aviion/av530_machdep.c
index fd0e138da20..1da9e0bad35 100644
--- a/sys/arch/aviion/aviion/av530_machdep.c
+++ b/sys/arch/aviion/aviion/av530_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: av530_machdep.c,v 1.2 2010/04/21 19:33:45 miod Exp $	*/
+/*	$OpenBSD: av530_machdep.c,v 1.3 2010/04/24 18:44:25 miod Exp $	*/
 /*
  * Copyright (c) 2006, 2007, 2010 Miodrag Vallat.
  *
@@ -73,7 +73,6 @@ const struct vme_range vme_av530[] = {
 };
 
 const struct board board_av530 = {
-	"530/4600 series",
 	av530_bootstrap,
 	av530_memsize,
 	av530_startup,
@@ -83,9 +82,9 @@ const struct board board_av530 = {
 	av530_setipl,
 	av530_raiseipl,
 	av530_intsrc,
+	av530_get_vme_ranges,
 
 	av530_ptable,
-	vme_av530
 };
 
 /*
@@ -183,15 +182,13 @@ av530_bootstrap()
 	*(volatile u_int32_t *)AV_IENALL = 0;
 	*(volatile u_int32_t *)AV_EXIENALL = 0;
 
+#if 0
 	/*
 	 * Get all the information we'll need later from the PROM, while
 	 * we can still use it.
 	 */
-#if 0
 	scm_getenaddr(hostaddr);
 #endif
-	cpuid = scm_cpuid();
-	sysid = scm_sysid();
 }
 
 /*
@@ -592,3 +589,9 @@ out:
 	 */
 	set_psr(get_psr() | PSR_IND);
 }
+
+const struct vme_range *
+av530_get_vme_ranges()
+{
+	return vme_av530;
+}
diff --git a/sys/arch/aviion/aviion/machdep.c b/sys/arch/aviion/aviion/machdep.c
index 1ad3b855ae7..aa28b7f6848 100644
--- a/sys/arch/aviion/aviion/machdep.c
+++ b/sys/arch/aviion/aviion/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.35 2010/04/21 19:33:45 miod Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.36 2010/04/24 18:44:25 miod Exp $	*/
 /*
  * Copyright (c) 2007 Miodrag Vallat.
  *
@@ -112,15 +112,11 @@
 #endif /* DDB */
 
 void	aviion_bootstrap(void);
-int	aviion_identify(void);
-__dead void unconfigured(const char *);
-__dead void unrecognized(void);
-__dead void unsupported(const char *);
+void	aviion_identify(void);
 void	consinit(void);
 __dead void doboot(void);
 void	dumpconf(void);
 void	dumpsys(void);
-void	identifycpu(void);
 void	savectx(struct pcb *);
 void	secondary_main(void);
 vaddr_t	secondary_pre_main(void);
@@ -162,7 +158,7 @@ const char *prom_bootargs;			/* set in locore.S */
 char bootargs[256];				/* local copy */
 u_int bootdev, bootunit, bootpart;		/* set in locore.S */
 
-int32_t cpuid, sysid;
+int32_t cpuid;
 
 int cputyp;					/* set in locore.S */
 int avtyp;
@@ -223,12 +219,6 @@ consinit()
 #endif
 }
 
-void
-identifycpu()
-{
-	strlcpy(cpu_model, platform->descr, sizeof cpu_model);
-}
-
 /*
  * Set up real-time clocks.
  * These function pointers are set in dev/clock.c.
@@ -266,7 +256,6 @@ cpu_startup()
 	 * Good {morning,afternoon,evening,night}.
 	 */
 	printf(version);
-	identifycpu();
 	printf("real mem = %u (%uMB)\n", ptoa(physmem),
 	    ptoa(physmem)/1024/1024);
 
@@ -694,42 +683,7 @@ aviion_bootstrap()
 	/* Save a copy of our commandline before it gets overwritten. */
 	strlcpy(bootargs, prom_bootargs, sizeof bootargs);
 
-	avtyp = aviion_identify();
-
-	/* Set up interrupt and fp exception handlers based on the machine. */
-	switch (avtyp) {
-	case AV_400:
-#ifdef AV400
-		platform = &board_av400;
-#else
-		unconfigured("AV400");
-#endif
-		break;
-	case AV_530:
-#ifdef AV530
-		platform = &board_av530;
-#else
-		unsupported("AV530");
-#endif
-		break;
-	case AV_5000:
-#ifdef AV5000
-		platform = &board_av5000;
-#else
-		unsupported("AV5000");
-#endif
-		break;
-	case AV_6280:
-#ifdef AV6280
-		platform = &board_av6280;
-#else
-		unsupported("AV6280");
-#endif
-		break;
-	default:
-		unrecognized();
-		break;
-	};
+	aviion_identify();
 
 	cn_tab = &bootcons;
 	platform->bootstrap();
@@ -920,82 +874,127 @@ myetheraddr(u_char *cp)
  * These heuristics are probably not the best; feel free to come with better
  * ones...
  */
-int
-aviion_identify()
-{
-	/*
-	 * We don't know anything about 88110-based models.
-	 * Note that we can't use CPU_IS81x0 here since these are optimized
-	 * if the kernel you're running is compiled for only one processor
-	 * type, and we want to check against the real hardware.
-	 */
-	if (cputyp == CPU_88110)
-		return (0);
-
-	/*
-	 * Series 100/200/300/400/3000/4000/4300 do not have the VIRQLV
-	 * register at 0xfff85000.
-	 */
-	if (badaddr(0xfff85000, 4) != 0)
-		return (AV_400);
-
-	/*
-	 * Series 5000 and 6000 do not have an RTC counter at 0xfff8f084.
-	 */
-	if (badaddr(0xfff8f084, 4) != 0)
-		return (AV_5000);
-
-	/*
-	 * Series 4600/530 have IOFUSEs at 0xfffb0040 and 0xfffb00c0;
-	 * the second one may not be present if the I/O expansion board
-	 * is missing.
-	 */
-	if (badaddr(0xfffb0040, 1) == 0 /* && badaddr(0xfffb00c0, 1) == 0 */)
-		return (AV_530);
 
-	/*
-	 * Series 6280/8000-8 fall here.
-	 */
-	return (AV_6280);
-}
+struct aviion_system {
+	int32_t			 cpuid;
+	const char		*model;
+	const struct board	*platform;
+	const char		*kernel_option;
+};
+static const struct aviion_system aviion_systems[] = {
+#define	BOARD_UNSUPPORTED	NULL, NULL
+#ifdef AV400
+#define	BOARD_AV400		&board_av400, NULL
+#else
+#define	BOARD_AV400		NULL, "AV400"
+#endif
+#ifdef AV530
+#define	BOARD_AV530		&board_av530, NULL
+#else
+#define	BOARD_AV530		NULL, "AV530"
+#endif
+#ifdef AV5000
+#define	BOARD_AV5000		&board_av5000, NULL
+#else
+#define	BOARD_AV5000		BOARD_UNSUPPORTED /* NULL, "AV5000" */
+#endif
+#ifdef AV6280
+#define	BOARD_AV6280		&board_av6280, NULL
+#else
+#define	BOARD_AV6280		BOARD_UNSUPPORTED /* NULL, "AV6280" */
+#endif
+	{ AVIION_300_310,		"300/310",	BOARD_AV400 },
+	{ AVIION_5100_6100,		"5100/6100",	BOARD_UNSUPPORTED },
+	{ AVIION_400_4000,		"400/4000",	BOARD_AV400 },
+	{ AVIION_410_4100,		"410/4100",	BOARD_AV400 },
+	{ AVIION_300C_310C,		"300C/310C",	BOARD_AV400 },
+	{ AVIION_5200_6200,		"5200/6200",	BOARD_AV5000 },
+	{ AVIION_5240_6240,		"5240/6240",	BOARD_AV5000 },
+	{ AVIION_300CD_310CD,		"300CD/310CD",	BOARD_AV400 },
+	{ AVIION_300D_310D,		"300D/310D",	BOARD_AV400 },
+	{ AVIION_4600_530,		"4600/530",	BOARD_AV530 },
+	{ AVIION_4300_25,		"4300-25",	BOARD_AV400 },
+	{ AVIION_4300_20,		"4300-20",	BOARD_AV400 },
+	{ AVIION_4300_16,		"4300-16",	BOARD_AV400 },
+	{ AVIION_5255_6255,		"5255/6255",	BOARD_AV5000 },
+	{ AVIION_350,			"350",		BOARD_UNSUPPORTED },
+	{ AVIION_6280,			"6280",		BOARD_AV6280 },
+	{ AVIION_8500_9500,		"8500/9500",	BOARD_UNSUPPORTED },
+	{ AVIION_9500_HA,		"9500HA",	BOARD_UNSUPPORTED },
+	{ AVIION_500,			"500",		BOARD_UNSUPPORTED },
+	{ AVIION_5500,			"5500",		BOARD_UNSUPPORTED },
+	{ AVIION_450,			"450",		BOARD_UNSUPPORTED },
+	{ AVIION_8500_9500_45_1MB,	"8500/9500-45",	BOARD_UNSUPPORTED },
+	{ AVIION_10000,			"10000",	BOARD_UNSUPPORTED },
+	{ AVIION_10000_QT,		"10000QT",	BOARD_UNSUPPORTED },
+	{ AVIION_5500PLUS,		"5500+",	BOARD_UNSUPPORTED },
+	{ AVIION_450PLUS,		"450+",		BOARD_UNSUPPORTED },
+	{ AVIION_8500_9500_50_1MB,	"8500/9500-50",	BOARD_UNSUPPORTED },
+	{ AVIION_8500_9500_50_2MB,	"8500/9500-50d", BOARD_UNSUPPORTED },
+
+	{ AVIION_UNKNOWN1,		"\"Montezuma\"", BOARD_UNSUPPORTED },
+	{ AVIION_UNKNOWN2,		"\"Montezuma\"", BOARD_UNSUPPORTED },
+	{ AVIION_UNKNOWN3,		"\"Flintstone\"", BOARD_UNSUPPORTED },
+	{ AVIION_UNKNOWN1_DIS,		"\"Montezuma-\"", BOARD_UNSUPPORTED },
+	{ AVIION_UNKNOWN2_DIS,		"\"Montezuma-\"", BOARD_UNSUPPORTED },
+
+	{ 0 }
+#undef	BOARD_AV6280
+#undef	BOARD_AV5000
+#undef	BOARD_AV530
+#undef	BOARD_AV400
+};
 
-__dead void
-unconfigured(const char *model)
+void
+aviion_identify()
 {
+	const struct aviion_system *system;
 	char excuse[512];
+	extern char *hw_vendor, *hw_prod;
 
-	snprintf(excuse, sizeof excuse, "\n"
-	    "Sorry, support for the %s family is not present\n"
-	    "in this OpenBSD/" MACHINE " kernel.\n"
-	    "Please recompile your kernel with\n"
-	    "\toption\t%s\n"
-	    "in the kernel configuration file.\n", model, model);
-	scm_printf(excuse);
-	scm_halt();
-}
+	cpuid = scm_cpuid();
+	hostid = scm_sysid();
 
-__dead void
-unsupported(const char *model)
-{
-	char excuse[512];
+	for (system = aviion_systems; ; system++) {
+		if (system->cpuid != 0 && system->cpuid != cpuid)
+			continue;
 
-	snprintf(excuse, sizeof excuse, "\n"
-	    "Sorry, OpenBSD/" MACHINE " does not support the %s family "
-	    "(cpuid %04x) yet.\n",
-	    model, scm_cpuid());
-	scm_printf(excuse);
-	scm_halt();
-}
+		hw_vendor = "Data General";
+		hw_prod = "AViiON";
+		strlcpy(cpu_model, system->model, sizeof cpu_model);
 
-__dead void
-unrecognized(void)
-{
-	char excuse[512];
+		if (system->platform != NULL) {
+			platform = system->platform;
+			return;
+		}
+
+		if (system->kernel_option != NULL) {
+			/* unconfigured system */
+			snprintf(excuse, sizeof excuse, "\n"
+			    "Sorry, support for the %s system is not present\n"
+			    "in this OpenBSD/" MACHINE " kernel.\n"
+			    "Please recompile your kernel with\n"
+			    "\toption\t%s\n"
+			    "in the kernel configuration file.\n",
+			    system->model, system->kernel_option);
+		} else if (system->cpuid != 0) {
+			/* unsupported system */
+			snprintf(excuse, sizeof excuse, "\n"
+			    "Sorry, OpenBSD/" MACHINE
+			    " does not support the %s system"
+			    " (cpuid %04x) yet.\n\n"
+			    "Please contact <m88k@openbsd.org>\n",
+			    system->model, cpuid);
+		} else {
+			/* unrecgonized system */
+			snprintf(excuse, sizeof excuse, "\n"
+			    "Sorry, OpenBSD/" MACHINE
+			    " does not recognize this system (cpuid %04x).\n\n"
+			    "Please contact <m88k@openbsd.org>\n",
+			    cpuid);
+		}
+	}
 
-	snprintf(excuse, sizeof excuse, "\n"
-	    "Sorry, OpenBSD/" MACHINE " does not recognize this system "
-	    "(cpuid %04x) yet.\n",
-	    scm_cpuid());
 	scm_printf(excuse);
 	scm_halt();
 }
diff --git a/sys/arch/aviion/dev/if_le_syscon.c b/sys/arch/aviion/dev/if_le_syscon.c
index e684db8e4e0..06175a57d17 100644
--- a/sys/arch/aviion/dev/if_le_syscon.c
+++ b/sys/arch/aviion/dev/if_le_syscon.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_le_syscon.c,v 1.9 2010/04/18 15:06:39 miod Exp $	*/
+/*	$OpenBSD: if_le_syscon.c,v 1.10 2010/04/24 18:44:27 miod Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -92,10 +92,20 @@ void	le_syscon_wrcsr_interrupt(struct am7990_softc *, uint16_t, uint16_t);
 int
 le_syscon_match(struct device *parent, void *cf, void *aux)
 {
-	if (avtyp != AV_400)
+	switch (cpuid) {
+	case AVIION_300_310:
+	case AVIION_400_4000:
+	case AVIION_410_4100:
+	case AVIION_300C_310C:
+	case AVIION_300CD_310CD:
+	case AVIION_300D_310D:
+	case AVIION_4300_25:
+	case AVIION_4300_20:
+	case AVIION_4300_16:
+		return 1;
+	default:
 		return 0;
-
-	return 1;
+	}
 }
 
 void
diff --git a/sys/arch/aviion/dev/mainbus.c b/sys/arch/aviion/dev/mainbus.c
index 8d034f1c597..18ae8edb097 100644
--- a/sys/arch/aviion/dev/mainbus.c
+++ b/sys/arch/aviion/dev/mainbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mainbus.c,v 1.4 2010/04/21 19:33:47 miod Exp $ */
+/*	$OpenBSD: mainbus.c,v 1.5 2010/04/24 18:44:27 miod Exp $ */
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 2004, Miodrag Vallat.
@@ -130,9 +130,7 @@ mainbus_attach(struct device *parent, struct device *self, void *args)
 {
 	extern char cpu_model[];
 
-	printf(": %s, cpuid 0x%x", cpu_model, cpuid);
-	if (sysid != -1)
-		printf(", sysid %x", sysid);
+	printf(": %s, cpuid 0x%04x", cpu_model, cpuid);
 	printf("\n");
 
 	/*
diff --git a/sys/arch/aviion/dev/oosiop_syscon.c b/sys/arch/aviion/dev/oosiop_syscon.c
index d82bbb99b5b..8fd04b27191 100644
--- a/sys/arch/aviion/dev/oosiop_syscon.c
+++ b/sys/arch/aviion/dev/oosiop_syscon.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: oosiop_syscon.c,v 1.2 2010/04/21 19:33:47 miod Exp $	*/
+/*	$OpenBSD: oosiop_syscon.c,v 1.3 2010/04/24 18:44:27 miod Exp $	*/
 
 /*
  * Copyright (c) 2010 Miodrag Vallat.
@@ -53,8 +53,12 @@ oosiop_syscon_match(struct device *parent, void *match, void *aux)
 	struct confargs *ca = aux;
 	paddr_t fuse;
 
-	if (avtyp != AV_530)
+	switch (cpuid) {
+	case AVIION_4600_530:
+		break;
+	default:
 		return 0;
+	}
 
 	switch (ca->ca_paddr) {
 	case AV530_SCSI1:
diff --git a/sys/arch/aviion/dev/vme.c b/sys/arch/aviion/dev/vme.c
index 784b841664c..0a6367e6020 100644
--- a/sys/arch/aviion/dev/vme.c
+++ b/sys/arch/aviion/dev/vme.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vme.c,v 1.7 2010/04/21 19:33:47 miod Exp $	*/
+/*	$OpenBSD: vme.c,v 1.8 2010/04/24 18:44:27 miod Exp $	*/
 /*
  * Copyright (c) 2006, 2007, 2010 Miodrag Vallat.
  *
@@ -120,8 +120,7 @@ int	vmerw(struct vme_softc *, int, int, struct uio *, int);
 int
 vmematch(struct device *parent, void *vcf, void *aux)
 {
-	/* XXX no VME on AV100/AV200/AV300, though */
-	return (platform->vme_ranges != NULL && vme_cd.cd_ndevs == 0);
+	return (platform->get_vme_ranges() != NULL && vme_cd.cd_ndevs == 0);
 }
 
 void
@@ -175,7 +174,7 @@ vmeattach(struct device *parent, struct device *self, void *aux)
 	 */
 	*(volatile u_int32_t *)AV_EXTAM = 0x0d;
 
-	sc->sc_ranges = platform->vme_ranges;
+	sc->sc_ranges = platform->get_vme_ranges();
 	printf("\n");
 
 	/*
diff --git a/sys/arch/aviion/include/board.h b/sys/arch/aviion/include/board.h
index 2e894275dee..b4c6384b873 100644
--- a/sys/arch/aviion/include/board.h
+++ b/sys/arch/aviion/include/board.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: board.h,v 1.6 2010/04/21 19:33:47 miod Exp $	*/
+/*	$OpenBSD: board.h,v 1.7 2010/04/24 18:44:27 miod Exp $	*/
 /*
  * Copyright (c) 2006, 2007, Miodrag Vallat
  *
@@ -29,12 +29,52 @@
 
 #if !defined(_LOCORE)
 
-#include <machine/pmap_table.h>
+/*
+ * cpuid values
+ */
 
+#define	AVIION_300_310		0x7904	/* mono Maverick */
+#define	AVIION_5100_6100	0x7906	/* 20MHz Topgun */
+#define	AVIION_400_4000		0x7908	/* 16MHz Mav+ */
+#define	AVIION_410_4100		0x790c	/* 20MHz Mav+ */
+#define	AVIION_300C_310C	0x7910	/* color Maverick */
+#define	AVIION_5200_6200	0x7912	/* 25MHz Topgun */
+#define	AVIION_5240_6240	0x7918	/* 25MHz Shotgun */
+#define	AVIION_300CD_310CD	0x7920	/* dual duart color Maverick */
+#define	AVIION_300D_310D	0x7924	/* dual duart mono Maverick */
+#define	AVIION_4600_530		0x7930	/* Rolling Rock */
+#define	AVIION_4300_25		0x7932	/* 25MHz Terra */
+#define	AVIION_4300_20		0x7934	/* 20MHz Terra */
+#define	AVIION_4300_16		0x7936	/* 16MHz Terra */
+#define	AVIION_5255_6255	0x7942	/* 25MHz Tophat */
+#define	AVIION_350		0x7944	/* KME */
+#define	AVIION_6280		0x7946	/* High Noon */
+#define	AVIION_8500_9500	0x794a	/* Odyssey */
+#define	AVIION_9500_HA		0x794c	/* Oz */
+#define	AVIION_500		0x794e	/* Robin Hood */
+#define	AVIION_5500		0x7950	/* Schooner */
+#define	AVIION_450		0x7958	/* Inner Tube */
+#define	AVIION_8500_9500_45_1MB	0x795a	/* 45MHz Iliad (1MB L2) */
+#define	AVIION_10000		0x7960	/* Sierra */
+#define	AVIION_10000_QT		0x7962	/* Sierra QT */
+#define	AVIION_5500PLUS		0x7964	/* Schooner+ */
+#define	AVIION_450PLUS		0x7966	/* Inner Tube+ */
+#define	AVIION_8500_9500_50_1MB	0x7968	/* 50MHz Iliad (1MB L2) */
+#define	AVIION_8500_9500_50_2MB	0x796a	/* 50MHz Iliad (2MB L2) */
+
+/* did the following ever hit the market? */
+#define	AVIION_UNKNOWN1		0x7926	/* mono Montezuma */
+#define	AVIION_UNKNOWN2		0x7928	/* color Montezuma */
+#define	AVIION_UNKNOWN3		0x7956	/* Flintstone */
+#define	AVIION_UNKNOWN1_DIS	0xfff0	/* mono disabled Montezuma */
+#define	AVIION_UNKNOWN2_DIS	0xfff1	/* color disabled Montezuma */
+
+extern int32_t cpuid;
+
+#include <machine/pmap_table.h>
 struct vme_range;
 
 struct board {
-	const char	*descr;
 	void		(*bootstrap)(void);
 	vaddr_t		(*memsize)(void);
 	void		(*startup)(void);
@@ -46,10 +86,9 @@ struct board {
 	u_int		(*raiseipl)(u_int);
 
 	u_int64_t	(*intsrc)(int);
+	const struct vme_range *(*get_vme_ranges)(void);
 
 	pmap_table_t	ptable;
-
-	const struct vme_range *vme_ranges;
 };
 
 #define	md_interrupt_func(f)	platform->intr(f)
@@ -64,13 +103,16 @@ void	av##b##_init_clocks(void); \
 u_int	av##b##_getipl(void); \
 u_int	av##b##_setipl(u_int); \
 u_int	av##b##_raiseipl(u_int); \
-u_int64_t av##b##_intsrc(int);
+u_int64_t av##b##_intsrc(int); \
+const struct vme_range *av##b##_get_vme_ranges(void);
 
 DECLARE_BOARD(400);
 DECLARE_BOARD(530);
 DECLARE_BOARD(5000);
 DECLARE_BOARD(6280);
 
+extern const struct board *platform;/* just to have people confuse both names */
+
 /*
  * Logical values for interrupt sources.
  * When adding new sources, keep INTSRC_VME as the last item - syscon
@@ -96,9 +138,6 @@ DECLARE_BOARD(6280);
 void	intsrc_enable(u_int, int);
 void	intsrc_disable(u_int);
 
-extern int32_t cpuid, sysid;
-extern const struct board *platform;/* just to have people confuse both names */
-
 void cio_init_clocks(void);
 void rtc_init_clocks(void);
 
diff --git a/sys/arch/aviion/include/param.h b/sys/arch/aviion/include/param.h
index a926e8f6d87..0e2d70fa60b 100644
--- a/sys/arch/aviion/include/param.h
+++ b/sys/arch/aviion/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.2 2006/05/20 12:04:54 miod Exp $ */
+/*	$OpenBSD: param.h,v 1.3 2010/04/24 18:44:27 miod Exp $ */
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * Copyright (c) 1988 University of Utah.
@@ -49,16 +49,4 @@
 #define KERNBASE	0x00000000	/* start of kernel virtual */
 #define	KERNTEXTOFF	0x00001000	/* start of kernel text */
 
-#if !defined(_LOCORE)
-extern int avtyp;
-#endif
-
-/*
- * Values for the avtyp variable.
- */
-#define	AV_400		1	/* 100/200/300/400/3000/4000/4300 */
-#define	AV_530		2	/* 4600/530 */
-#define	AV_5000		3	/* 5000/6000 */
-#define	AV_6280		4	/* 6280/8000-8 */
-
 #endif /* !_MACHINE_PARAM_H_ */