print parisc level w/ the the parisc version, not for each cpu

2 files changed, 15 insertions, 8 deletions

diff --git a/sys/arch/hppa/dev/cpu.c b/sys/arch/hppa/dev/cpu.c
index e615691ada3..9f3ec4ff12d 100644
--- a/sys/arch/hppa/dev/cpu.c
+++ b/sys/arch/hppa/dev/cpu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.c,v 1.16 2002/03/26 05:29:02 mickey Exp $	*/
+/*	$OpenBSD: cpu.c,v 1.17 2002/05/08 03:16:08 mickey Exp $	*/
 
 /*
  * Copyright (c) 1998-2002 Michael Shalayeff
@@ -118,7 +118,9 @@ cpuattach(parent, self, aux)
 		/* XXX p = hppa_mod_info(HPPA_TYPE_CPU,pdc_cversion[0]); */
 	}
 
-	printf (": %s rev %d ", p? p : cpu_typename, (*cpu_desidhash)());
+	printf (": %s ", p? p : cpu_typename);
+	if (sc->sc_dev.dv_xname)
+		(*cpu_desidhash)();
 
 	if ((err = pdc_call((iodcio_t)pdc, 0, PDC_MODEL, PDC_MODEL_INFO,
 			    &pdc_model)) < 0) {
diff --git a/sys/arch/hppa/hppa/machdep.c b/sys/arch/hppa/hppa/machdep.c
index 775c2980c20..bd4f3f46c3f 100644
--- a/sys/arch/hppa/hppa/machdep.c
+++ b/sys/arch/hppa/hppa/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.69 2002/05/08 03:06:45 mickey Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.70 2002/05/08 03:16:08 mickey Exp $	*/
 
 /*
  * Copyright (c) 1999-2002 Michael Shalayeff
@@ -579,8 +579,16 @@ cpu_startup()
 #endif
 	} else {
 		const char *p, *q;
+		char buf[32];
+		int lev;
+
 		i = pdc_model.hvers >> 4;
 		p = hppa_mod_info(HPPA_TYPE_BOARD, i);
+		if (!p) {
+			sprintf(buf, "(UNKNOWN 0x%x)", i);
+			p = buf;
+		}
+
 		switch (pdc_model.arch_rev) {
 		default:
 		case 0:
@@ -603,11 +611,8 @@ cpu_startup()
 			break;
 		}
 
-		if (p)
-			sprintf(cpu_model, "HP9000/%s PA-RISC %s", p, q);
-		else
-			sprintf(cpu_model, "HP9000/(UNKNOWN %x) PA-RISC %s",
-				i, q);
+		lev = 'a' + (*cpu_desidhash)();
+		sprintf(cpu_model, "HP9000/%s PA-RISC %s%c", p, q, lev);
 		printf("%s\n", cpu_model);
 	}