From d54f1867511850fafc2bc0746cf0570dc9cc9ac7 Mon Sep 17 00:00:00 2001
From: Bill Joy <root@ucbvax.Berkeley.EDU>
Date: Fri, 3 Apr 1981 07:10:43 -0800
Subject: [PATCH] s/730/7ZZ

SCCS-vsn: sys/vax/vax/autoconf.c 4.30
SCCS-vsn: sys/vax/uba/uba.c 4.28
SCCS-vsn: sys/vax/vax/cpudata.c 4.3
SCCS-vsn: sys/vax/include/cpu.h 4.6
SCCS-vsn: sys/vax/vax/mem.h 4.9
SCCS-vsn: sys/vax/vax/nexus.h 4.10
SCCS-vsn: sys/vax/uba/ubareg.h 4.22
SCCS-vsn: sys/vax/stand/autoconf.c 4.4
SCCS-vsn: sys/vax/stand/srt0.c 4.8
SCCS-vsn: sys/vax/stand/uba.c 4.4
---
 usr/src/sys/vax/include/cpu.h    |  6 +++---
 usr/src/sys/vax/stand/autoconf.c | 16 ++++++++--------
 usr/src/sys/vax/stand/srt0.c     |  4 ++--
 usr/src/sys/vax/stand/uba.c      |  4 ++--
 usr/src/sys/vax/uba/uba.c        |  2 +-
 usr/src/sys/vax/uba/ubareg.h     | 10 +++++-----
 usr/src/sys/vax/vax/autoconf.c   |  6 +++---
 usr/src/sys/vax/vax/cpudata.c    | 14 +++++++-------
 usr/src/sys/vax/vax/mem.h        | 26 +++++++++++++-------------
 usr/src/sys/vax/vax/nexus.h      |  8 ++++----
 10 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/usr/src/sys/vax/include/cpu.h b/usr/src/sys/vax/include/cpu.h
index dd32b4494c..6b9aff702d 100644
--- a/usr/src/sys/vax/include/cpu.h
+++ b/usr/src/sys/vax/include/cpu.h
@@ -1,4 +1,4 @@
-/*	cpu.h	4.5	81/03/21	*/
+/*	cpu.h	4.6	81/04/03	*/
 
 #ifndef LOCORE
 /*
@@ -22,12 +22,12 @@ union cpusid {
 			:8,
 			cp_type:8;		/* VAX_750 */
 	} cpu750;
-	/* need structure for 730 */
+	/* need structure for 7ZZ */
 };
 #endif
 #define	VAX_780		1
 #define	VAX_750		2
-#define	VAX_730		3
+#define	VAX_7ZZ		3
 
 #define	VAX_MAX		3
 
diff --git a/usr/src/sys/vax/stand/autoconf.c b/usr/src/sys/vax/stand/autoconf.c
index 530ccd8137..87d539d3ba 100644
--- a/usr/src/sys/vax/stand/autoconf.c
+++ b/usr/src/sys/vax/stand/autoconf.c
@@ -1,4 +1,4 @@
-/*	autoconf.c	4.3	81/03/22	*/
+/*	autoconf.c	4.4	81/04/03	*/
 
 #include "../h/param.h"
 #include "../h/cpu.h"
@@ -33,11 +33,11 @@ struct	mba_regs *mbaddr750[] = { MTR(4), MTR(5), MTR(6), MTR(7) };
 #undef	UMA
 #undef	MTR
 
-#define	UTR(i)	((struct uba_regs *)(NEX730+(i)))
-#define	UMA	((caddr_t)UMEM730)
+#define	UTR(i)	((struct uba_regs *)(NEX7ZZ+(i)))
+#define	UMA	((caddr_t)UMEM7ZZ)
 
-struct	uba_regs *ubaddr730[] = { UTR(3) };
-caddr_t	umaddr730[] = { UMA };
+struct	uba_regs *ubaddr7ZZ[] = { UTR(3) };
+caddr_t	umaddr7ZZ[] = { UMA };
 
 #undef	UTR
 #undef	UMA
@@ -67,9 +67,9 @@ configure()
 		nuba = 0;
 		break;
 
-	case VAX_730:
-		ubaddr = ubaddr730;
-		umaddr = umaddr730;
+	case VAX_7ZZ:
+		ubaddr = ubaddr7ZZ;
+		umaddr = umaddr7ZZ;
 		nmba = nuba = 0;
 		break;
 	}
diff --git a/usr/src/sys/vax/stand/srt0.c b/usr/src/sys/vax/stand/srt0.c
index 3fbaf790d8..bcba3f7e14 100644
--- a/usr/src/sys/vax/stand/srt0.c
+++ b/usr/src/sys/vax/stand/srt0.c
@@ -1,4 +1,4 @@
-/*	srt0.c	4.7	81/03/22	*/
+/*	srt0.c	4.8	81/04/03	*/
 
 #include "../h/mtpr.h"
 #define	LOCORE
@@ -79,7 +79,7 @@ _badloc:
 0:
 	.word	8f-0b		# 1 is 780
 	.word	5f-0b		# 2 is 750
-	.word	5f-0b		# 3 is 730
+	.word	5f-0b		# 3 is 7ZZ
 5:
 	mtpr	$0xf,$MCESR
 	brb	1f
diff --git a/usr/src/sys/vax/stand/uba.c b/usr/src/sys/vax/stand/uba.c
index b04eafd9cb..47e4c661ba 100644
--- a/usr/src/sys/vax/stand/uba.c
+++ b/usr/src/sys/vax/stand/uba.c
@@ -1,4 +1,4 @@
-/*	uba.c	4.3	81/03/21	*/
+/*	uba.c	4.4	81/04/03	*/
 
 #include "../h/param.h"
 #include "../h/inode.h"
@@ -62,7 +62,7 @@ ubafree(io, mr)
 		ubauba(io->i_unit)->uba_dpr[bdp] |=
 		     UBADPR_PURGE|UBADPR_NXM|UBADPR_UCE;
 		break;
-	case VAX_730:
+	case VAX_7ZZ:
 		break;
 	}
 }
diff --git a/usr/src/sys/vax/uba/uba.c b/usr/src/sys/vax/uba/uba.c
index b897a185d2..2c623ad3ad 100644
--- a/usr/src/sys/vax/uba/uba.c
+++ b/usr/src/sys/vax/uba/uba.c
@@ -1,4 +1,4 @@
-/*	uba.c	4.27	81/03/22	*/
+/*	uba.c	4.28	81/04/03	*/
 
 #include "../h/param.h"
 #include "../h/systm.h"
diff --git a/usr/src/sys/vax/uba/ubareg.h b/usr/src/sys/vax/uba/ubareg.h
index 57b99d8546..ab28c7ba67 100644
--- a/usr/src/sys/vax/uba/ubareg.h
+++ b/usr/src/sys/vax/uba/ubareg.h
@@ -1,4 +1,4 @@
-/*	ubareg.h	4.21	81/03/21	*/
+/*	ubareg.h	4.22	81/04/03	*/
 
 /*
  * VAX UNIBUS adapter registers
@@ -105,12 +105,12 @@ struct uba_regs
  */
 #define	NBDP780	15
 #define	NBDP750	3
-#define	NBDP730	0
+#define	NBDP7ZZ	0
 #define	MAXNBDP	15
 
 #define	NUBA780	4
 #define	NUBA750	1
-#define	NUBA730	1
+#define	NUBA7ZZ	1
 #if VAX780
 #define	MAXNUBA	4
 #else
@@ -121,8 +121,8 @@ struct uba_regs
  * Formulas for locations of the last 8k of UNIBUS memory
  * for each possible uba.
  */
-#if VAX730
-#define	UMEM730		((u_short *)(0xffe000))
+#if VAX7ZZ
+#define	UMEM7ZZ		((u_short *)(0xffe000))
 #endif
 #if VAX750
 #define	UMEM750(i)	((u_short *)(0xffe000-(i)*0x40000))
diff --git a/usr/src/sys/vax/vax/autoconf.c b/usr/src/sys/vax/vax/autoconf.c
index 8af2252855..5735ed4612 100644
--- a/usr/src/sys/vax/vax/autoconf.c
+++ b/usr/src/sys/vax/vax/autoconf.c
@@ -1,4 +1,4 @@
-/*	autoconf.c	4.29	81/03/21	*/
+/*	autoconf.c	4.30	81/04/03	*/
 
 /*
  * Setup the system to run on the current machine.
@@ -378,8 +378,8 @@ unifind(vubp, pubp, vumem, pumem)
 		uhp->uh_bdpfree = (1<<NBDP750) - 1;
 		break;
 #endif
-#if VAX730
-	case VAX_730:
+#if VAX7ZZ
+	case VAX_7ZZ:
 		break;
 #endif
 	}
diff --git a/usr/src/sys/vax/vax/cpudata.c b/usr/src/sys/vax/vax/cpudata.c
index 5a420756e0..6a40814f61 100644
--- a/usr/src/sys/vax/vax/cpudata.c
+++ b/usr/src/sys/vax/vax/cpudata.c
@@ -1,4 +1,4 @@
-/*	cpudata.c	4.2	81/03/21	*/
+/*	cpudata.c	4.3	81/04/03	*/
 
 #include "../h/param.h"
 #include "../h/pte.h"
@@ -26,9 +26,9 @@ caddr_t	umaddr750[2] = {
 	(caddr_t) UMEM750(0), (caddr_t) UMEM750(1),
 };
 #endif
-#if VAX730
-caddr_t	umaddr730[1] = {
-	(caddr_t) UMEM730
+#if VAX7ZZ
+caddr_t	umaddr7ZZ[1] = {
+	(caddr_t) UMEM7ZZ
 };
 #endif
 
@@ -43,7 +43,7 @@ short	nexty750[NNEX750] = {
 	NEX_UBA0,	NEX_UBA1,	NEX_ANY,	NEX_ANY,
 	NEX_ANY,	NEX_ANY,	NEX_ANY,	NEX_ANY
 };
-short	nexty730[NNEX730] = {
+short	nexty7ZZ[NNEX7ZZ] = {
 	NEX_MEM16,	NEX_ANY,	NEX_ANY,	NEX_ANY,
 	NEX_ANY,	NEX_ANY,	NEX_ANY,	NEX_ANY,
 };
@@ -56,8 +56,8 @@ struct percpu percpu[] = {
 #if VAX750
 	VAX_750, NNEX750, NEX750, umaddr750, NBDP750, 0, nexty750,
 #endif
-#if VAX730
-	VAX_730, NNEX730, NEX730, umaddr730, NBDP730, 0, nexty730,
+#if VAX7ZZ
+	VAX_7ZZ, NNEX7ZZ, NEX7ZZ, umaddr7ZZ, NBDP7ZZ, 0, nexty7ZZ,
 #endif
 	0,
 };
diff --git a/usr/src/sys/vax/vax/mem.h b/usr/src/sys/vax/vax/mem.h
index b57733ac79..13f0928434 100644
--- a/usr/src/sys/vax/vax/mem.h
+++ b/usr/src/sys/vax/vax/mem.h
@@ -1,4 +1,4 @@
-/*	mem.h	4.8	81/04/02	*/
+/*	mem.h	4.9	81/04/03	*/
 
 /*
  * Memory controller registers
@@ -61,19 +61,19 @@ struct	mcr {
 #define	M750_ADDR(mcr)	(((mcr)->mc_reg[0] >> 8) & 0x7fff)
 #endif
 
-#if VAX730
-#define	M730_CRD	0x40000000	/* crd, in [1] */
-#define	M730_FTBPE	0x20000000	/* force tbuf parity error, in [1] */
-#define	M730_ENACRD	0x10000000	/* enable crd interrupt, in [1] */
-#define	M730_MME	0x08000000	/* mem-man enable (ala ipr), in [1] */
-#define	M730_DM		0x04000000	/* diagnostic mode, in [1] */
-#define	M730_DISECC	0x02000000	/* disable ecc, in [1] */
+#if VAX7ZZ
+#define	M7ZZ_CRD	0x40000000	/* crd, in [1] */
+#define	M7ZZ_FTBPE	0x20000000	/* force tbuf parity error, in [1] */
+#define	M7ZZ_ENACRD	0x10000000	/* enable crd interrupt, in [1] */
+#define	M7ZZ_MME	0x08000000	/* mem-man enable (ala ipr), in [1] */
+#define	M7ZZ_DM		0x04000000	/* diagnostic mode, in [1] */
+#define	M7ZZ_DISECC	0x02000000	/* disable ecc, in [1] */
 
-#define	M730_INH(mcr)	((mcr)->mc_reg[1] = M730_MME)
-#define	M730_ENA(mcr)	((mcr)->mc_reg[1] = (M730_MME|M730_ENACRD))
-#define	M730_ERR(mcr)	((mcr)->mc_reg[1] & M730_CRD)
-#define	M730_SYN(mcr)	((mcr)->mc_reg[0] & 0x7f)
-#define	M730_ADDR(mcr)	(((mcr)->mc_reg[0] >> 8) & 0x7fff)
+#define	M7ZZ_INH(mcr)	((mcr)->mc_reg[1] = M7ZZ_MME)
+#define	M7ZZ_ENA(mcr)	((mcr)->mc_reg[1] = (M7ZZ_MME|M7ZZ_ENACRD))
+#define	M7ZZ_ERR(mcr)	((mcr)->mc_reg[1] & M7ZZ_CRD)
+#define	M7ZZ_SYN(mcr)	((mcr)->mc_reg[0] & 0x7f)
+#define	M7ZZ_ADDR(mcr)	(((mcr)->mc_reg[0] >> 8) & 0x7fff)
 #endif
 
 #define	MEMINTVL	(60*60*10)		/* 10 minutes */
diff --git a/usr/src/sys/vax/vax/nexus.h b/usr/src/sys/vax/vax/nexus.h
index 2ddd18c214..18dbfafcbc 100644
--- a/usr/src/sys/vax/vax/nexus.h
+++ b/usr/src/sys/vax/vax/nexus.h
@@ -1,4 +1,4 @@
-/*	nexus.h	4.9	81/04/02	*/
+/*	nexus.h	4.10	81/04/03	*/
 
 /*
  * Information about nexus's.
@@ -17,9 +17,9 @@
 #define	NNEX750	16
 #define	NEX750	((struct nexus *)0xf20000)
 #endif
-#if VAX730
-#define	NNEX730	16
-#define	NEX730	((struct nexus *)0xf20000)
+#if VAX7ZZ
+#define	NNEX7ZZ	16
+#define	NEX7ZZ	((struct nexus *)0xf20000)
 #endif
 #define	NEXSIZE	0x2000
 
-- 
2.20.1