Try and clean system type constants a bit:

- save the second byte of vax_siedata into a new variable, vax_cpustype,
  and use it instead of (vax_siedata >> 8) & 0xff or other similar
  constructs.
- the VAX_SIE_KAxxx constants are duplicates of the VAX_STYP_xx constants.
  Standardize on the latter and kill the former.
- only keep VAX_VTYP_xx constants for KA46 and KA47, those are the only
  systems which use these constants and are told apart by a different
  SIE byte.

No functional change intended.

2 files changed, 4 insertions, 4 deletions

diff --git a/sys/arch/vax/stand/boot/boot.c b/sys/arch/vax/stand/boot/boot.c
index 597185c079e..17aec75e436 100644
--- a/sys/arch/vax/stand/boot/boot.c
+++ b/sys/arch/vax/stand/boot/boot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: boot.c,v 1.20 2011/07/06 18:32:59 miod Exp $ */
+/*	$OpenBSD: boot.c,v 1.21 2011/09/19 21:53:02 miod Exp $ */
 /*	$NetBSD: boot.c,v 1.18 2002/05/31 15:58:26 ragge Exp $ */
 /*-
  * Copyright (c) 1982, 1986 The Regents of the University of California.
@@ -99,7 +99,7 @@ Xmain(void)
 	if (((vax_boardtype == VAX_BTYP_46 &&
 	      (vax_siedata & 0xff) == VAX_VTYP_46) ||
 	     (vax_boardtype == VAX_BTYP_48 &&
-	      ((vax_siedata >> 8) & 0xff) == VAX_STYP_48)) &&
+	      vax_cpustype == VAX_STYP_48)) &&
 	    (vax_confdata & 0x100) == 0)
 		transition = ' ';
 
diff --git a/sys/arch/vax/stand/boot/if_le.c b/sys/arch/vax/stand/boot/if_le.c
index e7860d97762..1be0350cdda 100644
--- a/sys/arch/vax/stand/boot/if_le.c
+++ b/sys/arch/vax/stand/boot/if_le.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_le.c,v 1.6 2008/08/18 23:20:44 miod Exp $ */
+/*	$OpenBSD: if_le.c,v 1.7 2011/09/19 21:53:02 miod Exp $ */
 /*	$NetBSD: if_le.c,v 1.6 2000/05/20 13:30:03 ragge Exp $ */
 /*
  * Copyright (c) 1997, 1999 Ludd, University of Lule}, Sweden.
@@ -148,7 +148,7 @@ leopen(struct open_file *f, int adapt, int ctlr, int unit, int part)
 	next_rdesc = next_tdesc = 0;
 
 	if (vax_boardtype == VAX_BTYP_650 &&
-	    ((vax_siedata >> 8) & 0xff) == VAX_SIE_KA640) {
+	    vax_cpustype == VAX_STYP_640) {
 		lebufaddr = 0x20120000;
 		ea = (void *)0x20084200;
 		nireg = (void *)0x20084400;