Module Name: src
Committed By: abs
Date: Thu Jun 28 13:58:21 UTC 2012
Modified Files:
src/sys/arch/vax/include: vsbus.h
src/sys/arch/vax/vsa: dz_vsbus.c vsbus.c
Log Message:
Define and use VS_REGS_KA49 rather than magic numbers. From OpenBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/vax/include/vsbus.h
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/vax/vsa/dz_vsbus.c
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/vax/vsa/vsbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/vax/include/vsbus.h
diff -u src/sys/arch/vax/include/vsbus.h:1.18 src/sys/arch/vax/include/vsbus.h:1.19
--- src/sys/arch/vax/include/vsbus.h:1.18 Tue Mar 11 05:34:02 2008
+++ src/sys/arch/vax/include/vsbus.h Thu Jun 28 13:58:21 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vsbus.h,v 1.18 2008/03/11 05:34:02 matt Exp $ */
+/* $NetBSD: vsbus.h,v 1.19 2012/06/28 13:58:21 abs Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -60,10 +60,13 @@ struct vsbus_attach_args {
*/
#define VS_CFGTST 0x20020000 /* config register */
#define VS_REGS 0x20080000 /* Misc CPU internal regs */
+#define VS_REGS_KA49 0x25c00000 /* ... same, on 512KB ROM systems */
#define NI_ADDR 0x20090000 /* Ethernet address */
#define DZ_CSR 0x200a0000 /* DZ11-compatible chip csr */
+#define DZ_CSR_KA49 0x25000000 /* ... same, on 512KB ROM systems */
#define VS_CLOCK 0x200b0000 /* clock chip address */
#define SCA_REGS 0x200c0000 /* disk device addresses */
+#define SCA_REGS_KA49 0x26000000 /* ... same, on 512KB ROM systems */
#define NI_BASE 0x200e0000 /* LANCE CSRs */
#define NI_IOSIZE (128 * VAX_NBPG) /* IO address size */
Index: src/sys/arch/vax/vsa/dz_vsbus.c
diff -u src/sys/arch/vax/vsa/dz_vsbus.c:1.42 src/sys/arch/vax/vsa/dz_vsbus.c:1.43
--- src/sys/arch/vax/vsa/dz_vsbus.c:1.42 Tue Dec 14 23:31:16 2010
+++ src/sys/arch/vax/vsa/dz_vsbus.c Thu Jun 28 13:58:21 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dz_vsbus.c,v 1.42 2010/12/14 23:31:16 matt Exp $ */
+/* $NetBSD: dz_vsbus.c,v 1.43 2012/06/28 13:58:21 abs Exp $ */
/*
* Copyright (c) 1998 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dz_vsbus.c,v 1.42 2010/12/14 23:31:16 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dz_vsbus.c,v 1.43 2012/06/28 13:58:21 abs Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -123,7 +123,7 @@ dz_vsbus_match(device_t parent, cfdata_t
#if VAX53 || VAX49 || VAXANY
if (vax_boardtype == VAX_BTYP_53 || vax_boardtype == VAX_BTYP_49)
- if (cf->cf_loc[VSBUSCF_CSR] != 0x25000000)
+ if (cf->cf_loc[VSBUSCF_CSR] != DZ_CSR_KA49)
return 0; /* Ugly */
#endif
@@ -262,12 +262,12 @@ dzcnprobe(struct consdev *cndev)
break;
case VAX_BTYP_49:
- ioaddr = 0x25000000;
+ ioaddr = DZ_CSR_KA49;
diagcons = (vax_confdata & 8 ? 3 : 0);
break;
case VAX_BTYP_53:
- ioaddr = 0x25000000;
+ ioaddr = DZ_CSR_KA49;
diagcons = 3;
break;
Index: src/sys/arch/vax/vsa/vsbus.c
diff -u src/sys/arch/vax/vsa/vsbus.c:1.59 src/sys/arch/vax/vsa/vsbus.c:1.60
--- src/sys/arch/vax/vsa/vsbus.c:1.59 Tue Dec 14 23:31:17 2010
+++ src/sys/arch/vax/vsa/vsbus.c Thu Jun 28 13:58:21 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vsbus.c,v 1.59 2010/12/14 23:31:17 matt Exp $ */
+/* $NetBSD: vsbus.c,v 1.60 2012/06/28 13:58:21 abs Exp $ */
/*
* Copyright (c) 1996, 1999 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vsbus.c,v 1.59 2010/12/14 23:31:17 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vsbus.c,v 1.60 2012/06/28 13:58:21 abs Exp $");
#include "opt_cputype.h"
@@ -122,7 +122,7 @@ vsbus_attach(device_t parent, device_t s
#if VAX49 || VAX53
case VAX_BTYP_53:
case VAX_BTYP_49:
- sc->sc_vsregs = vax_map_physmem(0x25c00000, 1);
+ sc->sc_vsregs = vax_map_physmem(VS_REGS_KA49, 1);
sc->sc_intreq = (char *)sc->sc_vsregs + 12;
sc->sc_intclr = (char *)sc->sc_vsregs + 12;
sc->sc_intmsk = (char *)sc->sc_vsregs + 8;
