better autoconf_verbose prints

2 files changed, 9 insertions, 7 deletions

diff --git a/sys/arch/hppa/hppa/autoconf.c b/sys/arch/hppa/hppa/autoconf.c
index 464e9de3977..9564f694ebd 100644
--- a/sys/arch/hppa/hppa/autoconf.c
+++ b/sys/arch/hppa/hppa/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.18 2002/03/14 01:26:31 millert Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.19 2002/04/22 01:49:42 mickey Exp $	*/
 
 /*
  * Copyright (c) 1998-2001 Michael Shalayeff
@@ -395,11 +395,9 @@ pdc_scanbus(self, ca, bus, maxmod)
 			    dp.dp_flags, PZF_BITS,
 			    dp.dp_bc[0], dp.dp_bc[1], dp.dp_bc[2],
 			    dp.dp_bc[3], dp.dp_bc[4], dp.dp_bc[5]);
-			printf("mod %x layers %x/%x/%x/%x/%x/%x\n",
-			    dp.dp_mod,
-			    dp.dp_layers[0], dp.dp_layers[1],
-			    dp.dp_layers[2], dp.dp_layers[3],
-			    dp.dp_layers[4], dp.dp_layers[5]);
+			printf("mod %x hpa %x type %x sv %x\n",
+			    dp.dp_mod, pdc_memmap.hpa,
+			    nca.ca_type.iodc_type, nca.ca_type.iodc_sv_model);
 		}
 
 		config_found_sm(self, &nca, mbprint, mbsubmatch);
diff --git a/sys/arch/hppa/hppa/mainbus.c b/sys/arch/hppa/hppa/mainbus.c
index 0130d90a335..c25d76f990e 100644
--- a/sys/arch/hppa/hppa/mainbus.c
+++ b/sys/arch/hppa/hppa/mainbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mainbus.c,v 1.31 2002/04/21 22:54:10 mickey Exp $	*/
+/*	$OpenBSD: mainbus.c,v 1.32 2002/04/22 01:49:42 mickey Exp $	*/
 
 /*
  * Copyright (c) 1998-2001 Michael Shalayeff
@@ -895,6 +895,10 @@ mbsubmatch(parent, match, aux)
 	register struct confargs *ca = aux;
 	register int ret;
 
+	if (autoconf_verbose)
+		printf(">> hpa %x off %x cf_off %x\n",
+		    ca->ca_hpa, ca->ca_hpa & ~ca->ca_hpamask, cf->hppacf_off);
+
 	if (ca->ca_hpa && ~ca->ca_hpamask && cf->hppacf_off != -1 &&
 	    ((ca->ca_hpa & ~ca->ca_hpamask) != cf->hppacf_off))
 		return (0);