From 0039d4aa0ce3466677ae90db665cad2d9a44a682 Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Sun, 13 Oct 1996 02:59:25 +0000
Subject: [PATCH] backout previous kprintf change

---
 sys/arch/alpha/alpha/clock.c         | 12 +++++-----
 sys/arch/alpha/alpha/cpu.c           | 36 ++++++++++++++--------------
 sys/arch/alpha/alpha/dec_2100_a50.c  | 18 +++++++-------
 sys/arch/alpha/alpha/dec_3000_300.c  | 12 +++++-----
 sys/arch/alpha/alpha/dec_3000_500.c  | 12 +++++-----
 sys/arch/alpha/alpha/dec_axppci_33.c | 18 +++++++-------
 sys/arch/alpha/alpha/dec_kn20aa.c    | 18 +++++++-------
 sys/arch/alpha/alpha/disksubr.c      |  6 ++---
 sys/arch/alpha/alpha/interrupt.c     | 24 +++++++++----------
 sys/arch/sparc/dev/am7930_sparc.c    |  8 +++----
 sys/arch/sparc/dev/amd7930.c         |  8 +++----
 sys/arch/sparc/dev/bwtwo.c           | 10 ++++----
 sys/arch/sparc/dev/cgeight.c         | 10 ++++----
 sys/arch/sparc/dev/cgfour.c          | 10 ++++----
 sys/arch/sparc/dev/cgfourteen.c      | 18 +++++++-------
 sys/dev/ic/am7930.c                  |  8 +++----
 16 files changed, 114 insertions(+), 114 deletions(-)

diff --git a/sys/arch/alpha/alpha/clock.c b/sys/arch/alpha/alpha/clock.c
index 8c1c14ee03d9..feb42a9235e1 100644
--- a/sys/arch/alpha/alpha/clock.c
+++ b/sys/arch/alpha/alpha/clock.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: clock.c,v 1.12 1996/10/10 23:50:17 christos Exp $	*/
+/*	$NetBSD: clock.c,v 1.13 1996/10/13 02:59:25 christos Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -76,7 +76,7 @@ clockattach(dev, fns)
 #ifdef EVCNT_COUNTERS
 	evcnt_attach(self, "intr", &clock_intr_evcnt);
 #endif
-	kprintf("\n");
+	printf("\n");
 
 	if (clockfns != NULL)
 		panic("clockattach: multiple clocks");
@@ -162,7 +162,7 @@ inittodr(base)
 	int badbase;
 
 	if (base < 5*SECYR) {
-		kprintf("WARNING: preposterous time in file system");
+		printf("WARNING: preposterous time in file system");
 		/* read the system clock anyway */
 		base = 6*SECYR + 186*SECDAY + SECDAY/2;
 		badbase = 1;
@@ -181,7 +181,7 @@ inittodr(base)
 		 */
 		time.tv_sec = base;
 		if (!badbase) {
-			kprintf("WARNING: preposterous clock chip time\n");
+			printf("WARNING: preposterous clock chip time\n");
 			resettodr();
 		}
 		goto bad;
@@ -206,11 +206,11 @@ inittodr(base)
 			deltat = -deltat;
 		if (deltat < 2 * SECDAY)
 			return;
-		kprintf("WARNING: clock %s %d days",
+		printf("WARNING: clock %s %d days",
 		    time.tv_sec < base ? "lost" : "gained", deltat / SECDAY);
 	}
 bad:
-	kprintf(" -- CHECK AND RESET THE DATE!\n");
+	printf(" -- CHECK AND RESET THE DATE!\n");
 }
 
 /*
diff --git a/sys/arch/alpha/alpha/cpu.c b/sys/arch/alpha/alpha/cpu.c
index 388a68b648ae..5873a092087d 100644
--- a/sys/arch/alpha/alpha/cpu.c
+++ b/sys/arch/alpha/alpha/cpu.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.11 1996/10/10 23:50:20 christos Exp $	*/
+/*	$NetBSD: cpu.c,v 1.12 1996/10/13 02:59:26 christos Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -89,65 +89,65 @@ cpuattach(parent, dev, aux)
 
         p = (struct pcs*)((char *)hwrpb + hwrpb->rpb_pcs_off +
 	    (dev->dv_unit * hwrpb->rpb_pcs_size));
-	kprintf(": ");
+	printf(": ");
 
 	major = (p->pcs_proc_type & PCS_PROC_MAJOR) >> PCS_PROC_MAJORSHIFT;
 	minor = (p->pcs_proc_type & PCS_PROC_MINOR) >> PCS_PROC_MINORSHIFT;
 
 	if (major < ncpu_major)
-		kprintf("%s", cpu_major[major]);
+		printf("%s", cpu_major[major]);
 	else
-		kprintf("UNKNOWN MAJOR TYPE (%d)", major);
+		printf("UNKNOWN MAJOR TYPE (%d)", major);
 
-	kprintf(", ");
+	printf(", ");
 
 	switch (major) {
 	case PCS_PROC_EV4:
 		if (minor < ndc21064_cpu_minor)
-			kprintf("%s", dc21064_cpu_minor[minor]);
+			printf("%s", dc21064_cpu_minor[minor]);
 		else
-			kprintf("UNKNOWN MINOR TYPE (%d)", minor);
+			printf("UNKNOWN MINOR TYPE (%d)", minor);
 		break;
 
 	case PCS_PROC_EV45:
 	case PCS_PROC_EV5:
-		kprintf("Pass %d", minor + 1);
+		printf("Pass %d", minor + 1);
 		break;
 
 	default:
-		kprintf("UNKNOWN MINOR TYPE (%d)", minor);
+		printf("UNKNOWN MINOR TYPE (%d)", minor);
 	}
 
 	if (p->pcs_proc_revision[0] != 0) {		/* XXX bad test? */
-		kprintf(", ");
+		printf(", ");
 
-		kprintf("Revision %c%c%c%c", p->pcs_proc_revision[0],
+		printf("Revision %c%c%c%c", p->pcs_proc_revision[0],
 		    p->pcs_proc_revision[1], p->pcs_proc_revision[2],
 		    p->pcs_proc_revision[3]);
 	}
 
-	kprintf("\n");
+	printf("\n");
 
 	if (p->pcs_proc_var != 0) {
-		kprintf("cpu%d: ", dev->dv_unit);
+		printf("cpu%d: ", dev->dv_unit);
 
 		needcomma = 0;
 		if (p->pcs_proc_var & PCS_VAR_VAXFP) {
-			kprintf("VAX FP support");
+			printf("VAX FP support");
 			needcomma = 1;
 		}
 		if (p->pcs_proc_var & PCS_VAR_IEEEFP) {
-			kprintf("%sIEEE FP support", needcomma ? ", " : "");
+			printf("%sIEEE FP support", needcomma ? ", " : "");
 			needcomma = 1;
 		}
 		if (p->pcs_proc_var & PCS_VAR_PE) {
-			kprintf("%sPrimary Eligible", needcomma ? ", " : "");
+			printf("%sPrimary Eligible", needcomma ? ", " : "");
 			needcomma = 1;
 		}
 		if (p->pcs_proc_var & PCS_VAR_RESERVED)
-			kprintf("%sreserved bits: 0x%lx", needcomma ? ", " : "",
+			printf("%sreserved bits: 0x%lx", needcomma ? ", " : "",
 			    p->pcs_proc_var & PCS_VAR_RESERVED);
-		kprintf("\n");
+		printf("\n");
 	}
 
 	/*
diff --git a/sys/arch/alpha/alpha/dec_2100_a50.c b/sys/arch/alpha/alpha/dec_2100_a50.c
index a649e41a173b..d8b6f1a1b00c 100644
--- a/sys/arch/alpha/alpha/dec_2100_a50.c
+++ b/sys/arch/alpha/alpha/dec_2100_a50.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dec_2100_a50.c,v 1.13 1996/10/10 23:50:21 christos Exp $	*/
+/*	$NetBSD: dec_2100_a50.c,v 1.14 1996/10/13 02:59:28 christos Exp $	*/
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -76,7 +76,7 @@ dec_2100_a50_modelname()
 		return "AlphaStation 255/233";
 
 	default:
-		ksprintf(s, "DEC 2100/A50 (\"Avanti\") family, variation %lx",
+		sprintf(s, "DEC 2100/A50 (\"Avanti\") family, variation %lx",
 		    hwrpb->rpb_variation & SV_ST_MASK);
 		return s;
 	}
@@ -135,8 +135,8 @@ dec_2100_a50_consinit()
 		break;
 
 	default:
-		kprintf("ctb->ctb_term_type = 0x%lx\n", ctb->ctb_term_type);
-		kprintf("ctb->ctb_turboslot = 0x%lx\n", ctb->ctb_turboslot);
+		printf("ctb->ctb_term_type = 0x%lx\n", ctb->ctb_term_type);
+		printf("ctb->ctb_turboslot = 0x%lx\n", ctb->ctb_turboslot);
 
 		panic("consinit: unknown console type %d\n",
 		    ctb->ctb_term_type);
@@ -162,7 +162,7 @@ dec_2100_a50_device_register(dev, aux)
 		scsiboot = (strcmp(b->protocol, "SCSI") == 0);
 		netboot = (strcmp(b->protocol, "BOOTP") == 0);
 #if 0
-		kprintf("scsiboot = %d, netboot = %d\n", scsiboot, netboot);
+		printf("scsiboot = %d, netboot = %d\n", scsiboot, netboot);
 #endif
 		initted =1;
 	}
@@ -178,7 +178,7 @@ dec_2100_a50_device_register(dev, aux)
 	
 			pcidev = dev;
 #if 0
-			kprintf("\npcidev = %s\n", pcidev->dv_xname);
+			printf("\npcidev = %s\n", pcidev->dv_xname);
 #endif
 			return;
 		}
@@ -197,7 +197,7 @@ dec_2100_a50_device_register(dev, aux)
 	
 			scsidev = dev;
 #if 0
-			kprintf("\nscsidev = %s\n", scsidev->dv_xname);
+			printf("\nscsidev = %s\n", scsidev->dv_xname);
 #endif
 			return;
 		}
@@ -234,7 +234,7 @@ dec_2100_a50_device_register(dev, aux)
 		/* we've found it! */
 		booted_device = dev;
 #if 0
-		kprintf("\nbooted_device = %s\n", booted_device->dv_xname);
+		printf("\nbooted_device = %s\n", booted_device->dv_xname);
 #endif
 		found = 1;
 	}
@@ -252,7 +252,7 @@ dec_2100_a50_device_register(dev, aux)
 	
 			booted_device = dev;
 #if 0
-			kprintf("\nbooted_device = %s\n", booted_device->dv_xname);
+			printf("\nbooted_device = %s\n", booted_device->dv_xname);
 #endif
 			found = 1;
 			return;
diff --git a/sys/arch/alpha/alpha/dec_3000_300.c b/sys/arch/alpha/alpha/dec_3000_300.c
index 6965b970a493..43c75694b5bd 100644
--- a/sys/arch/alpha/alpha/dec_3000_300.c
+++ b/sys/arch/alpha/alpha/dec_3000_300.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dec_3000_300.c,v 1.8 1996/10/10 23:50:22 christos Exp $	*/
+/*	$NetBSD: dec_3000_300.c,v 1.9 1996/10/13 02:59:30 christos Exp $	*/
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -59,7 +59,7 @@ dec_3000_300_modelname()
 		return "DEC 3000/300LX (\"Pelica+\")";
 
 	default:
-		kprintf("unknown system variation %lx\n",
+		printf("unknown system variation %lx\n",
 		    hwrpb->rpb_variation & SV_ST_MASK);
 		return NULL;
 	}
@@ -90,7 +90,7 @@ dec_3000_300_device_register(dev, aux)
 		scsiboot = (strcmp(b->protocol, "SCSI") == 0);
 		netboot = (strcmp(b->protocol, "BOOTP") == 0);
 #if 0
-		kprintf("scsiboot = %d, netboot = %d\n", scsiboot, netboot);
+		printf("scsiboot = %d, netboot = %d\n", scsiboot, netboot);
 #endif
 		initted =1;
 	}
@@ -104,7 +104,7 @@ dec_3000_300_device_register(dev, aux)
 			if (tcdsdev->tcdsda_slot == b->channel) {
 				scsidev = dev;
 #if 0
-				kprintf("\nscsidev = %s\n", dev->dv_xname);
+				printf("\nscsidev = %s\n", dev->dv_xname);
 #endif
 			}
 		}
@@ -144,7 +144,7 @@ dec_3000_300_device_register(dev, aux)
 		/* we've found it! */
 		booted_device = dev;
 #if 0
-		kprintf("\nbooted_device = %s\n", booted_device->dv_xname);
+		printf("\nbooted_device = %s\n", booted_device->dv_xname);
 #endif
 		found = 1;
 	}
@@ -160,7 +160,7 @@ dec_3000_300_device_register(dev, aux)
 
 			booted_device = dev;
 #if 0
-			kprintf("\nbooted_device = %s\n", booted_device->dv_xname);
+			printf("\nbooted_device = %s\n", booted_device->dv_xname);
 #endif
 			found = 1;
 			return;
diff --git a/sys/arch/alpha/alpha/dec_3000_500.c b/sys/arch/alpha/alpha/dec_3000_500.c
index 25abc21474e7..17e81ba8d4a5 100644
--- a/sys/arch/alpha/alpha/dec_3000_500.c
+++ b/sys/arch/alpha/alpha/dec_3000_500.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dec_3000_500.c,v 1.7 1996/10/10 23:50:24 christos Exp $	*/
+/*	$NetBSD: dec_3000_500.c,v 1.8 1996/10/13 02:59:31 christos Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -77,7 +77,7 @@ systype_flamingo:
 			goto systype_sandpiper;
 
 	default:
-		kprintf("unknown system variation %lx\n",
+		printf("unknown system variation %lx\n",
 		    hwrpb->rpb_variation & SV_ST_MASK);
 		return NULL;
 	}
@@ -108,7 +108,7 @@ dec_3000_500_device_register(dev, aux)
 		scsiboot = (strcmp(b->protocol, "SCSI") == 0);
 		netboot = (strcmp(b->protocol, "BOOTP") == 0);
 #if 0
-		kprintf("scsiboot = %d, netboot = %d\n", scsiboot, netboot);
+		printf("scsiboot = %d, netboot = %d\n", scsiboot, netboot);
 #endif
 		initted =1;
 	}
@@ -122,7 +122,7 @@ dec_3000_500_device_register(dev, aux)
 			if (tcdsdev->tcdsda_slot == b->channel) {
 				scsidev = dev;
 #if 0
-				kprintf("\nscsidev = %s\n", dev->dv_xname);
+				printf("\nscsidev = %s\n", dev->dv_xname);
 #endif
 			}
 		}
@@ -162,7 +162,7 @@ dec_3000_500_device_register(dev, aux)
 		/* we've found it! */
 		booted_device = dev;
 #if 0
-		kprintf("\nbooted_device = %s\n", booted_device->dv_xname);
+		printf("\nbooted_device = %s\n", booted_device->dv_xname);
 #endif
 		found = 1;
 	}
@@ -178,7 +178,7 @@ dec_3000_500_device_register(dev, aux)
 
 			booted_device = dev;
 #if 0
-			kprintf("\nbooted_device = %s\n", booted_device->dv_xname);
+			printf("\nbooted_device = %s\n", booted_device->dv_xname);
 #endif
 			found = 1;
 			return;
diff --git a/sys/arch/alpha/alpha/dec_axppci_33.c b/sys/arch/alpha/alpha/dec_axppci_33.c
index 1117e474518f..bb5dbb56dc05 100644
--- a/sys/arch/alpha/alpha/dec_axppci_33.c
+++ b/sys/arch/alpha/alpha/dec_axppci_33.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dec_axppci_33.c,v 1.11 1996/10/10 23:50:25 christos Exp $	*/
+/*	$NetBSD: dec_axppci_33.c,v 1.12 1996/10/13 02:59:32 christos Exp $	*/
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -59,7 +59,7 @@ dec_axppci_33_modelname()
 		return "Alpha PC AXPpci33 (\"NoName\")";
 		
 	default:
-		kprintf("unknown system variation %lx\n",
+		printf("unknown system variation %lx\n",
 		    hwrpb->rpb_variation & SV_ST_MASK);
 		return NULL;
 	}
@@ -118,8 +118,8 @@ dec_axppci_33_consinit()
 		break;
 
 	default:
-		kprintf("ctb->ctb_term_type = 0x%lx\n", ctb->ctb_term_type);
-		kprintf("ctb->ctb_turboslot = 0x%lx\n", ctb->ctb_turboslot);
+		printf("ctb->ctb_term_type = 0x%lx\n", ctb->ctb_term_type);
+		printf("ctb->ctb_turboslot = 0x%lx\n", ctb->ctb_turboslot);
 
 		panic("consinit: unknown console type %d\n",
 		    ctb->ctb_term_type);
@@ -145,7 +145,7 @@ dec_axppci_33_device_register(dev, aux)
 		scsiboot = (strcmp(b->protocol, "SCSI") == 0);
 		netboot = (strcmp(b->protocol, "BOOTP") == 0);
 #if 0
-		kprintf("scsiboot = %d, netboot = %d\n", scsiboot, netboot);
+		printf("scsiboot = %d, netboot = %d\n", scsiboot, netboot);
 #endif
 		initted =1;
 	}
@@ -161,7 +161,7 @@ dec_axppci_33_device_register(dev, aux)
 	
 			pcidev = dev;
 #if 0
-			kprintf("\npcidev = %s\n", pcidev->dv_xname);
+			printf("\npcidev = %s\n", pcidev->dv_xname);
 #endif
 			return;
 		}
@@ -180,7 +180,7 @@ dec_axppci_33_device_register(dev, aux)
 	
 			scsidev = dev;
 #if 0
-			kprintf("\nscsidev = %s\n", scsidev->dv_xname);
+			printf("\nscsidev = %s\n", scsidev->dv_xname);
 #endif
 			return;
 		}
@@ -217,7 +217,7 @@ dec_axppci_33_device_register(dev, aux)
 		/* we've found it! */
 		booted_device = dev;
 #if 0
-		kprintf("\nbooted_device = %s\n", booted_device->dv_xname);
+		printf("\nbooted_device = %s\n", booted_device->dv_xname);
 #endif
 		found = 1;
 	}
@@ -235,7 +235,7 @@ dec_axppci_33_device_register(dev, aux)
 	
 			booted_device = dev;
 #if 0
-			kprintf("\nbooted_device = %s\n", booted_device->dv_xname);
+			printf("\nbooted_device = %s\n", booted_device->dv_xname);
 #endif
 			found = 1;
 			return;
diff --git a/sys/arch/alpha/alpha/dec_kn20aa.c b/sys/arch/alpha/alpha/dec_kn20aa.c
index 9bb4d87ae67c..13ffe4b51332 100644
--- a/sys/arch/alpha/alpha/dec_kn20aa.c
+++ b/sys/arch/alpha/alpha/dec_kn20aa.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dec_kn20aa.c,v 1.11 1996/10/10 23:50:27 christos Exp $	*/
+/*	$NetBSD: dec_kn20aa.c,v 1.12 1996/10/13 02:59:33 christos Exp $	*/
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -59,7 +59,7 @@ dec_kn20aa_modelname()
 		return "AlphaStation 600 5/266 (KN20AA)";
 		
 	default:
-		kprintf("unknown system variation %lx\n",
+		printf("unknown system variation %lx\n",
 		    hwrpb->rpb_variation & SV_ST_MASK);
 		return NULL;
 	}
@@ -118,8 +118,8 @@ dec_kn20aa_consinit()
 		break;
 
 	default:
-		kprintf("ctb->ctb_term_type = 0x%lx\n", ctb->ctb_term_type);
-		kprintf("ctb->ctb_turboslot = 0x%lx\n", ctb->ctb_turboslot);
+		printf("ctb->ctb_term_type = 0x%lx\n", ctb->ctb_term_type);
+		printf("ctb->ctb_turboslot = 0x%lx\n", ctb->ctb_turboslot);
 
 		panic("consinit: unknown console type %d\n",
 		    ctb->ctb_term_type);
@@ -145,7 +145,7 @@ dec_kn20aa_device_register(dev, aux)
 		scsiboot = (strcmp(b->protocol, "SCSI") == 0);
 		netboot = (strcmp(b->protocol, "BOOTP") == 0);
 #if 0
-		kprintf("scsiboot = %d, netboot = %d\n", scsiboot, netboot);
+		printf("scsiboot = %d, netboot = %d\n", scsiboot, netboot);
 #endif
 		initted =1;
 	}
@@ -161,7 +161,7 @@ dec_kn20aa_device_register(dev, aux)
 	
 			pcidev = dev;
 #if 0
-			kprintf("\npcidev = %s\n", pcidev->dv_xname);
+			printf("\npcidev = %s\n", pcidev->dv_xname);
 #endif
 			return;
 		}
@@ -180,7 +180,7 @@ dec_kn20aa_device_register(dev, aux)
 	
 			scsidev = dev;
 #if 0
-			kprintf("\nscsidev = %s\n", scsidev->dv_xname);
+			printf("\nscsidev = %s\n", scsidev->dv_xname);
 #endif
 			return;
 		}
@@ -217,7 +217,7 @@ dec_kn20aa_device_register(dev, aux)
 		/* we've found it! */
 		booted_device = dev;
 #if 0
-		kprintf("\nbooted_device = %s\n", booted_device->dv_xname);
+		printf("\nbooted_device = %s\n", booted_device->dv_xname);
 #endif
 		found = 1;
 	}
@@ -235,7 +235,7 @@ dec_kn20aa_device_register(dev, aux)
 	
 			booted_device = dev;
 #if 0
-			kprintf("\nbooted_device = %s\n", booted_device->dv_xname);
+			printf("\nbooted_device = %s\n", booted_device->dv_xname);
 #endif
 			found = 1;
 			return;
diff --git a/sys/arch/alpha/alpha/disksubr.c b/sys/arch/alpha/alpha/disksubr.c
index df6d3f974dd6..fa873189c822 100644
--- a/sys/arch/alpha/alpha/disksubr.c
+++ b/sys/arch/alpha/alpha/disksubr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: disksubr.c,v 1.7 1996/10/10 23:50:28 christos Exp $	*/
+/*	$NetBSD: disksubr.c,v 1.8 1996/10/13 02:59:35 christos Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -56,9 +56,9 @@ dk_establish(dk, dev)
 #define CRAZYMAP(v) ((v) == 3 ? 0 : (v) == 0 ? 3 : (v))
 
 	if (bp == NULL) {
-		kprintf("no boot path\n");
+		printf("no boot path\n");
 	}
-	ksprintf(name, "%s%d", bp->name, CRAZYMAP(bp->val[0]));
+	sprintf(name, "%s%d", bp->name, CRAZYMAP(bp->val[0]));
 	if (strcmp(name, dev->dv_xname) == 0) {
 		bootdv = dev;
 	}
diff --git a/sys/arch/alpha/alpha/interrupt.c b/sys/arch/alpha/alpha/interrupt.c
index a930138d9939..c12f9ffb3515 100644
--- a/sys/arch/alpha/alpha/interrupt.c
+++ b/sys/arch/alpha/alpha/interrupt.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: interrupt.c,v 1.10 1996/10/10 23:50:29 christos Exp $	*/
+/*	$NetBSD: interrupt.c,v 1.11 1996/10/13 02:59:36 christos Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -156,19 +156,19 @@ machine_check(framep, vector, param)
 	return;
 
 fatal:
-	kprintf("\n");
-	kprintf("%s:\n", type);
-	kprintf("\n");
-	kprintf("    mces    = 0x%lx\n", mces);
-	kprintf("    vector  = 0x%lx\n", vector);
-	kprintf("    param   = 0x%lx\n", param);
-	kprintf("    pc      = 0x%lx\n", framep->tf_regs[FRAME_PC]);
-	kprintf("    ra      = 0x%lx\n", framep->tf_regs[FRAME_RA]);
-	kprintf("    curproc = %p\n", curproc);
+	printf("\n");
+	printf("%s:\n", type);
+	printf("\n");
+	printf("    mces    = 0x%lx\n", mces);
+	printf("    vector  = 0x%lx\n", vector);
+	printf("    param   = 0x%lx\n", param);
+	printf("    pc      = 0x%lx\n", framep->tf_regs[FRAME_PC]);
+	printf("    ra      = 0x%lx\n", framep->tf_regs[FRAME_RA]);
+	printf("    curproc = %p\n", curproc);
 	if (curproc != NULL)
-		kprintf("        pid = %d, comm = %s\n", curproc->p_pid,
+		printf("        pid = %d, comm = %s\n", curproc->p_pid,
 		    curproc->p_comm);
-	kprintf("\n");
+	printf("\n");
 	panic("machine check");
 }
 
diff --git a/sys/arch/sparc/dev/am7930_sparc.c b/sys/arch/sparc/dev/am7930_sparc.c
index 803bffb4d71c..3d6397dc5f04 100644
--- a/sys/arch/sparc/dev/am7930_sparc.c
+++ b/sys/arch/sparc/dev/am7930_sparc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: am7930_sparc.c,v 1.12 1996/10/11 00:46:19 christos Exp $	*/
+/*	$NetBSD: am7930_sparc.c,v 1.13 1996/10/13 02:59:30 christos Exp $	*/
 
 /*
  * Copyright (c) 1995 Rolf Grossmann
@@ -300,11 +300,11 @@ amd7930attach(parent, self, args)
 	register int pri;
 
 	if (ra->ra_nintr != 1) {
-		kprintf(": expected 1 interrupt, got %d\n", ra->ra_nintr);
+		printf(": expected 1 interrupt, got %d\n", ra->ra_nintr);
 		return;
 	}
 	pri = ra->ra_intr[0].int_pri;
-	kprintf(" pri %d, softpri %d\n", pri, PIL_AUSOFT);
+	printf(" pri %d, softpri %d\n", pri, PIL_AUSOFT);
 	amd = (volatile struct amd7930 *)(ra->ra_vaddr ?
 		ra->ra_vaddr : mapiodev(ra->ra_reg, 0, sizeof (*amd),
 					ca->ca_bustype));
@@ -335,7 +335,7 @@ amd7930attach(parent, self, args)
 	evcnt_attach(&sc->sc_dev, "intr", &sc->sc_intrcnt);
 
 	if (audio_hardware_attach(&sa_hw_if, sc) != 0)
-		kprintf("audio: could not attach to audio pseudo-device driver\n");
+		printf("audio: could not attach to audio pseudo-device driver\n");
 }
 
 static void
diff --git a/sys/arch/sparc/dev/amd7930.c b/sys/arch/sparc/dev/amd7930.c
index 72795a942317..df96717de013 100644
--- a/sys/arch/sparc/dev/amd7930.c
+++ b/sys/arch/sparc/dev/amd7930.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: amd7930.c,v 1.12 1996/10/11 00:46:19 christos Exp $	*/
+/*	$NetBSD: amd7930.c,v 1.13 1996/10/13 02:59:30 christos Exp $	*/
 
 /*
  * Copyright (c) 1995 Rolf Grossmann
@@ -300,11 +300,11 @@ amd7930attach(parent, self, args)
 	register int pri;
 
 	if (ra->ra_nintr != 1) {
-		kprintf(": expected 1 interrupt, got %d\n", ra->ra_nintr);
+		printf(": expected 1 interrupt, got %d\n", ra->ra_nintr);
 		return;
 	}
 	pri = ra->ra_intr[0].int_pri;
-	kprintf(" pri %d, softpri %d\n", pri, PIL_AUSOFT);
+	printf(" pri %d, softpri %d\n", pri, PIL_AUSOFT);
 	amd = (volatile struct amd7930 *)(ra->ra_vaddr ?
 		ra->ra_vaddr : mapiodev(ra->ra_reg, 0, sizeof (*amd),
 					ca->ca_bustype));
@@ -335,7 +335,7 @@ amd7930attach(parent, self, args)
 	evcnt_attach(&sc->sc_dev, "intr", &sc->sc_intrcnt);
 
 	if (audio_hardware_attach(&sa_hw_if, sc) != 0)
-		kprintf("audio: could not attach to audio pseudo-device driver\n");
+		printf("audio: could not attach to audio pseudo-device driver\n");
 }
 
 static void
diff --git a/sys/arch/sparc/dev/bwtwo.c b/sys/arch/sparc/dev/bwtwo.c
index f69445702599..cb3f4f565b76 100644
--- a/sys/arch/sparc/dev/bwtwo.c
+++ b/sys/arch/sparc/dev/bwtwo.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bwtwo.c,v 1.29 1996/10/11 00:46:20 christos Exp $ */
+/*	$NetBSD: bwtwo.c,v 1.30 1996/10/13 02:59:32 christos Exp $ */
 
 /*
  * Copyright (c) 1996 Jason R. Thorpe.  All rights reserved.
@@ -283,7 +283,7 @@ bwtwoattach(parent, self, args)
 	ramsize = fb->fb_type.fb_height * fb->fb_linebytes;
 	fb->fb_type.fb_cmsize = 0;
 	fb->fb_type.fb_size = ramsize;
-	kprintf(": %s, %d x %d", nam,
+	printf(": %s, %d x %d", nam,
 	    fb->fb_type.fb_width, fb->fb_type.fb_height);
 
 #if defined(SUN4)
@@ -322,7 +322,7 @@ bwtwoattach(parent, self, args)
 	bwtwo_set_video(sc, 1);
 
 	if (isconsole) {
-		kprintf(" (console)\n");
+		printf(" (console)\n");
 #ifdef RASTERCONSOLE
 		/*
 		 * XXX rcons doesn't seem to work properly on the overlay
@@ -333,7 +333,7 @@ bwtwoattach(parent, self, args)
 			fbrcons_init(fb);
 #endif
 	} else
-		kprintf("\n");
+		printf("\n");
 
 #if defined(SUN4C) || defined(SUN4M)
 	if (sbus)
@@ -357,7 +357,7 @@ bwtwoattach(parent, self, args)
 			ovnam = "unknown";
 			break;
 		}
-		kprintf("%s: %s overlay plane\n", sc->sc_dev.dv_xname, ovnam);
+		printf("%s: %s overlay plane\n", sc->sc_dev.dv_xname, ovnam);
 	}
 #endif
 
diff --git a/sys/arch/sparc/dev/cgeight.c b/sys/arch/sparc/dev/cgeight.c
index 5069f8e15273..e25c9750a69e 100644
--- a/sys/arch/sparc/dev/cgeight.c
+++ b/sys/arch/sparc/dev/cgeight.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cgeight.c,v 1.10 1996/10/11 00:46:22 christos Exp $	*/
+/*	$NetBSD: cgeight.c,v 1.11 1996/10/13 02:59:33 christos Exp $	*/
 
 /*
  * Copyright (c) 1996 Jason R. Thorpe.  All rights reserved.
@@ -197,7 +197,7 @@ cgeightattach(parent, self, args)
 	 */
 	if ((ca->ca_bustype != BUS_OBIO) ||
 	    ((fb->fb_flags & FB_PFOUR) == 0)) {
-		kprintf("%s: ignoring; not a pfour\n", sc->sc_dev.dv_xname);
+		printf("%s: ignoring; not a pfour\n", sc->sc_dev.dv_xname);
 		return;
 	}
 
@@ -212,7 +212,7 @@ cgeightattach(parent, self, args)
 
 	sc->sc_fb.fb_type.fb_cmsize = 256;
 	sc->sc_fb.fb_type.fb_size = ramsize;
-	kprintf(": cgeight/p4, %d x %d", fb->fb_type.fb_width,
+	printf(": cgeight/p4, %d x %d", fb->fb_type.fb_width,
 	    fb->fb_type.fb_height);
 
 	isconsole = 0;
@@ -274,13 +274,13 @@ cgeightattach(parent, self, args)
 
 #if 0	/* see above */
 	if (isconsole) {
-		kprintf(" (console)\n");
+		printf(" (console)\n");
 #if defined(RASTERCONSOLE) && 0	/* XXX been told it doesn't work well. */
 		fbrcons_init(fb);
 #endif
 	} else
 #endif /* 0 */
-		kprintf("\n");
+		printf("\n");
 
 	/*
 	 * Even though we're not using rconsole, we'd still like
diff --git a/sys/arch/sparc/dev/cgfour.c b/sys/arch/sparc/dev/cgfour.c
index 43bef477980a..e1e3b95d6417 100644
--- a/sys/arch/sparc/dev/cgfour.c
+++ b/sys/arch/sparc/dev/cgfour.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cgfour.c,v 1.10 1996/10/11 00:46:23 christos Exp $	*/
+/*	$NetBSD: cgfour.c,v 1.11 1996/10/13 02:59:34 christos Exp $	*/
 
 /*
  * Copyright (c) 1996 Jason R. Thorpe.  All rights reserved.
@@ -201,7 +201,7 @@ cgfourattach(parent, self, args)
 	 */
 	if ((ca->ca_bustype != BUS_OBIO) ||
 	    ((fb->fb_flags & FB_PFOUR) == 0)) {
-		kprintf("%s: ignoring; not a pfour\n", sc->sc_dev.dv_xname);
+		printf("%s: ignoring; not a pfour\n", sc->sc_dev.dv_xname);
 		return;
 	}
 
@@ -216,7 +216,7 @@ cgfourattach(parent, self, args)
 
 	fb->fb_type.fb_cmsize = 256;
 	fb->fb_type.fb_size = ramsize;
-	kprintf(": cgfour/p4, %d x %d", fb->fb_type.fb_width,
+	printf(": cgfour/p4, %d x %d", fb->fb_type.fb_width,
 	    fb->fb_type.fb_height);
 
 	isconsole = 0;
@@ -272,13 +272,13 @@ cgfourattach(parent, self, args)
 
 #if 0	/* See above. */
 	if (isconsole) {
-		kprintf(" (console)\n");
+		printf(" (console)\n");
 #if defined(RASTERCONSOLE) && 0	/* XXX been told it doesn't work well. */
 		fbrcons_init(fb);
 #endif
 	} else
 #endif /* 0 */
-		kprintf("\n");
+		printf("\n");
 
 	/*
 	 * Even though we're not using rconsole, we'd still like
diff --git a/sys/arch/sparc/dev/cgfourteen.c b/sys/arch/sparc/dev/cgfourteen.c
index e1bcccde7856..bed988d29454 100644
--- a/sys/arch/sparc/dev/cgfourteen.c
+++ b/sys/arch/sparc/dev/cgfourteen.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cgfourteen.c,v 1.4 1996/10/11 00:46:25 christos Exp $ */
+/*	$NetBSD: cgfourteen.c,v 1.5 1996/10/13 02:59:36 christos Exp $ */
 
 /*
  * Copyright (c) 1996 
@@ -214,7 +214,7 @@ cgfourteenattach(parent, self, args)
 	 */
 	if (ca->ca_ra.ra_len < 0x10000) {
 #ifdef DIAGNOSTIC
-		kprintf("warning: can't find all cgfourteen registers...\n");
+		printf("warning: can't find all cgfourteen registers...\n");
 #endif
 		ca->ca_ra.ra_len = 0x10000;
 	}
@@ -254,10 +254,10 @@ cgfourteenattach(parent, self, args)
 	 * Let the user know that we're here
 	 */
 #ifdef CG14_CG8
-	kprintf(": cgeight emulated at %dx%dx24bpp",
+	printf(": cgeight emulated at %dx%dx24bpp",
 	    sc->sc_fb.fb_type.fb_width, sc->sc_fb.fb_type.fb_height);
 #else
-	kprintf(": cgthree emulated at %dx%dx8bpp",
+	printf(": cgthree emulated at %dx%dx8bpp",
 	       sc->sc_fb.fb_type.fb_width, sc->sc_fb.fb_type.fb_height);
 #endif
 	/*
@@ -295,14 +295,14 @@ cgfourteenattach(parent, self, args)
 
 
 	if (isconsole) {
-		kprintf(" (console)\n");
+		printf(" (console)\n");
 #ifdef notdef
 #ifdef RASTERCONSOLE
 		fbrcons_init(&sc->sc_fb);
 #endif
 #endif /* notdef */
 	} else
-		kprintf("\n");
+		printf("\n");
 
 	/* Attach to /dev/fb */
 	if (node == fbnode)
@@ -604,7 +604,7 @@ cgfourteenmmap(dev, off, prot)
 	if ((unsigned)off >= sc->sc_fb.fb_type.fb_size *
 		sc->sc_fb.fb_type.fb_depth/8) {
 #ifdef DEBUG
-		kprintf("\nmmap request out of bounds: request 0x%x, "
+		printf("\nmmap request out of bounds: request 0x%x, "
 		    "bound 0x%x\n", (unsigned) off, 
 		    (unsigned)sc->sc_fb.fb_type.fb_size);
 #endif
@@ -760,7 +760,7 @@ cg14_get_cmap(p, cm, cmsize)
         if (start >= cmsize || start + count > cmsize)
 #ifdef DEBUG
 	{
-		kprintf("putcmaperror: start %d cmsize %d count %d\n",
+		printf("putcmaperror: start %d cmsize %d count %d\n",
 		    start,cmsize,count);
 #endif
                 return (EINVAL);
@@ -795,7 +795,7 @@ cg14_put_cmap(p, cm, cmsize)
         if (start >= cmsize || start + count > cmsize)
 #ifdef DEBUG
 	{
-		kprintf("putcmaperror: start %d cmsize %d count %d\n",
+		printf("putcmaperror: start %d cmsize %d count %d\n",
 		    start,cmsize,count);
 #endif
                 return (EINVAL);
diff --git a/sys/dev/ic/am7930.c b/sys/dev/ic/am7930.c
index 81829dbfb953..4d786e213112 100644
--- a/sys/dev/ic/am7930.c
+++ b/sys/dev/ic/am7930.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: am7930.c,v 1.12 1996/10/11 00:46:19 christos Exp $	*/
+/*	$NetBSD: am7930.c,v 1.13 1996/10/13 02:59:30 christos Exp $	*/
 
 /*
  * Copyright (c) 1995 Rolf Grossmann
@@ -300,11 +300,11 @@ amd7930attach(parent, self, args)
 	register int pri;
 
 	if (ra->ra_nintr != 1) {
-		kprintf(": expected 1 interrupt, got %d\n", ra->ra_nintr);
+		printf(": expected 1 interrupt, got %d\n", ra->ra_nintr);
 		return;
 	}
 	pri = ra->ra_intr[0].int_pri;
-	kprintf(" pri %d, softpri %d\n", pri, PIL_AUSOFT);
+	printf(" pri %d, softpri %d\n", pri, PIL_AUSOFT);
 	amd = (volatile struct amd7930 *)(ra->ra_vaddr ?
 		ra->ra_vaddr : mapiodev(ra->ra_reg, 0, sizeof (*amd),
 					ca->ca_bustype));
@@ -335,7 +335,7 @@ amd7930attach(parent, self, args)
 	evcnt_attach(&sc->sc_dev, "intr", &sc->sc_intrcnt);
 
 	if (audio_hardware_attach(&sa_hw_if, sc) != 0)
-		kprintf("audio: could not attach to audio pseudo-device driver\n");
+		printf("audio: could not attach to audio pseudo-device driver\n");
 }
 
 static void