summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/alpha/alpha/autoconf.c66
-rw-r--r--sys/arch/alpha/alpha/clock.c12
-rw-r--r--sys/arch/alpha/alpha/cpu.c36
-rw-r--r--sys/arch/alpha/alpha/dec_2100_a50.c18
-rw-r--r--sys/arch/alpha/alpha/dec_3000_300.c12
-rw-r--r--sys/arch/alpha/alpha/dec_3000_500.c12
-rw-r--r--sys/arch/alpha/alpha/dec_axppci_33.c18
-rw-r--r--sys/arch/alpha/alpha/dec_kn20aa.c18
-rw-r--r--sys/arch/alpha/alpha/disksubr.c6
-rw-r--r--sys/arch/alpha/alpha/interrupt.c24
-rw-r--r--sys/arch/alpha/alpha/machdep.c118
-rw-r--r--sys/arch/alpha/alpha/mainbus.c8
-rw-r--r--sys/arch/alpha/alpha/mcclock.c4
-rw-r--r--sys/arch/alpha/alpha/md_root.c4
-rw-r--r--sys/arch/alpha/alpha/pmap.c144
-rw-r--r--sys/arch/alpha/alpha/pmap.old.c158
-rw-r--r--sys/arch/alpha/alpha/rd_root.c4
-rw-r--r--sys/arch/alpha/alpha/trap.c64
-rw-r--r--sys/arch/alpha/alpha/vm_machdep.c10
-rw-r--r--sys/arch/alpha/include/asm.h4
-rw-r--r--sys/arch/alpha/isa/isafcns_jensen.c12
-rw-r--r--sys/arch/alpha/isa/pckbd.c24
-rw-r--r--sys/arch/alpha/isa/pms.c6
-rw-r--r--sys/arch/alpha/pci/apecs.c14
-rw-r--r--sys/arch/alpha/pci/apecs_pci.c6
-rw-r--r--sys/arch/alpha/pci/cia.c8
-rw-r--r--sys/arch/alpha/pci/cia_pci.c6
-rw-r--r--sys/arch/alpha/pci/lca.c8
-rw-r--r--sys/arch/alpha/pci/lca_pci.c6
-rw-r--r--sys/arch/alpha/pci/pci_2100_a50.c10
-rw-r--r--sys/arch/alpha/pci/pci_axppci_33.c12
-rw-r--r--sys/arch/alpha/pci/pci_kn20aa.c16
-rw-r--r--sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c8
-rw-r--r--sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c14
-rw-r--r--sys/arch/alpha/pci/pcivga.c16
-rw-r--r--sys/arch/alpha/pci/pcs_bus_io_common.c8
-rw-r--r--sys/arch/alpha/pci/pcs_bus_mem_common.c14
-rw-r--r--sys/arch/alpha/pci/sio.c12
-rw-r--r--sys/arch/pica/dev/asc.c78
-rw-r--r--sys/arch/pica/dev/com.c12
-rw-r--r--sys/arch/pica/dev/dma.c6
-rw-r--r--sys/arch/pica/dev/fd.c44
-rw-r--r--sys/arch/pica/dev/if_sn.c55
-rw-r--r--sys/arch/pica/dev/lpt.c10
-rw-r--r--sys/arch/pica/dev/pccons.c28
-rw-r--r--sys/arch/pica/include/asm.h6
-rw-r--r--sys/arch/pica/pica/autoconf.c4
-rw-r--r--sys/arch/pica/pica/clock.c12
-rw-r--r--sys/arch/pica/pica/clock_mc.c6
-rw-r--r--sys/arch/pica/pica/cpu.c74
-rw-r--r--sys/arch/pica/pica/disksubr.c6
-rw-r--r--sys/arch/pica/pica/elf.c4
-rw-r--r--sys/arch/pica/pica/locore.S6
-rw-r--r--sys/arch/pica/pica/machdep.c44
-rw-r--r--sys/arch/pica/pica/mainbus.c4
-rw-r--r--sys/arch/pica/pica/minidebug.c202
-rw-r--r--sys/arch/pica/pica/pica.c8
-rw-r--r--sys/arch/pica/pica/pica_trap.c4
-rw-r--r--sys/arch/pica/pica/pmap.c72
-rw-r--r--sys/arch/pica/pica/swapgeneric.c18
-rw-r--r--sys/arch/pica/pica/trap.c30
-rw-r--r--sys/dev/dec/mcclock.c4
62 files changed, 838 insertions, 839 deletions
diff --git a/sys/arch/alpha/alpha/autoconf.c b/sys/arch/alpha/alpha/autoconf.c
index b74559d0ac7..6a9982ee477 100644
--- a/sys/arch/alpha/alpha/autoconf.c
+++ b/sys/arch/alpha/alpha/autoconf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.12 1996/10/03 19:57:58 cgd Exp $ */
+/* $NetBSD: autoconf.c,v 1.13 1996/10/10 23:50:13 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -90,7 +90,7 @@ configure()
(void)spl0();
if (booted_device == NULL)
- printf("WARNING: can't figure what device matches \"%s\"\n",
+ kprintf("WARNING: can't figure what device matches \"%s\"\n",
boot_dev);
setroot();
swapconf();
@@ -172,20 +172,20 @@ getdisk(str, len, defpart, devp)
register struct device *dv;
if ((dv = parsedisk(str, len, defpart, devp)) == NULL) {
- printf("use one of:");
+ kprintf("use one of:");
#ifdef RAMDISK_HOOKS
- printf(" %s[a-h]", fakerdrootdev.dv_xname);
+ kprintf(" %s[a-h]", fakerdrootdev.dv_xname);
#endif
for (dv = alldevs.tqh_first; dv != NULL;
dv = dv->dv_list.tqe_next) {
if (dv->dv_class == DV_DISK)
- printf(" %s[a-h]", dv->dv_xname);
+ kprintf(" %s[a-h]", dv->dv_xname);
#ifdef NFSCLIENT
if (dv->dv_class == DV_IFNET)
- printf(" %s", dv->dv_xname);
+ kprintf(" %s", dv->dv_xname);
#endif
}
- printf(" halt\n");
+ kprintf(" halt\n");
}
return (dv);
}
@@ -290,14 +290,14 @@ setroot()
if (boothowto & RB_ASKNAME) {
for (;;) {
- printf("root device");
+ kprintf("root device");
if (bootdv != NULL) {
- printf(" (default %s", bootdv->dv_xname);
+ kprintf(" (default %s", bootdv->dv_xname);
if (bootdv->dv_class == DV_DISK)
- printf("%c", bootpartition + 'a');
- printf(")");
+ kprintf("%c", bootpartition + 'a');
+ kprintf(")");
}
- printf(": ");
+ kprintf(": ");
len = getstr(buf, sizeof(buf));
if (len == 0 && bootdv != NULL) {
strcpy(buf, bootdv->dv_xname);
@@ -328,12 +328,12 @@ setroot()
goto gotswap;
}
for (;;) {
- printf("swap device");
- printf(" (default %s", rootdv->dv_xname);
+ kprintf("swap device");
+ kprintf(" (default %s", rootdv->dv_xname);
if (rootdv->dv_class == DV_DISK)
- printf("b");
- printf(")");
- printf(": ");
+ kprintf("b");
+ kprintf(")");
+ kprintf(": ");
len = getstr(buf, sizeof(buf));
if (len == 0) {
switch (rootdv->dv_class) {
@@ -403,7 +403,7 @@ gotswap:
strcpy(root_device, "??");
} else {
/* Root on known block device. */
- sprintf(root_device, "%s%d%c", rootdevname,
+ ksprintf(root_device, "%s%d%c", rootdevname,
DISKUNIT(rootdev), DISKPART(rootdev) + 'a');
}
@@ -421,17 +421,17 @@ gotswap:
#if defined(FFS)
case DV_DISK:
mountroot = ffs_mountroot;
- sprintf(root_device, "%s%c", rootdv->dv_xname,
+ ksprintf(root_device, "%s%c", rootdv->dv_xname,
DISKPART(rootdev) + 'a');
- printf("root on %s", root_device);
+ kprintf("root on %s", root_device);
if (nswapdev != NODEV)
- printf(" swap on %s%c", swapdv->dv_xname,
+ kprintf(" swap on %s%c", swapdv->dv_xname,
DISKPART(nswapdev) + 'a');
- printf("\n");
+ kprintf("\n");
break;
#endif
default:
- printf("can't figure root, hope your kernel is right\n");
+ kprintf("can't figure root, hope your kernel is right\n");
return;
}
@@ -475,7 +475,7 @@ getstr(cp, size)
switch (c) {
case '\n':
case '\r':
- printf("\n");
+ kprintf("\n");
*lp++ = '\0';
return (len);
case '\b':
@@ -484,21 +484,21 @@ getstr(cp, size)
if (len) {
--len;
--lp;
- printf("\b \b");
+ kprintf("\b \b");
}
continue;
case '@':
case 'u'&037:
len = 0;
lp = cp;
- printf("\n");
+ kprintf("\n");
continue;
default:
if (len + 1 >= size || c < ' ') {
- printf("\007");
+ kprintf("\007");
continue;
}
- printf("%c", c);
+ kprintf("%c", c);
++len;
*lp++ = c;
}
@@ -520,7 +520,7 @@ parse_prom_bootdev()
prom_getenv(PROM_E_BOOTED_DEV, boot_dev, sizeof(boot_dev));
bcopy(boot_dev, hacked_boot_dev, sizeof hacked_boot_dev);
#if 0
- printf("parse_prom_bootdev: boot dev = \"%s\"\n", boot_dev);
+ kprintf("parse_prom_bootdev: boot dev = \"%s\"\n", boot_dev);
#endif
i = 0;
@@ -541,9 +541,9 @@ parse_prom_bootdev()
return; /* doesn't look like anything we know! */
#if 0
- printf("i = %d, done = %d\n", i, done);
+ kprintf("i = %d, done = %d\n", i, done);
for (i--; i >= 0; i--)
- printf("%d = %s\n", i, boot_fields[i]);
+ kprintf("%d = %s\n", i, boot_fields[i]);
#endif
bd.protocol = boot_fields[0];
@@ -556,9 +556,9 @@ parse_prom_bootdev()
bd.ctrl_dev_type = boot_fields[7];
#if 0
- printf("parsed: proto = %s, bus = %d, slot = %d, channel = %d,\n",
+ kprintf("parsed: proto = %s, bus = %d, slot = %d, channel = %d,\n",
bd.protocol, bd.bus, bd.slot, bd.channel);
- printf("\tremote = %s, unit = %d, dev_type = %d, ctrl_type = %s\n",
+ kprintf("\tremote = %s, unit = %d, dev_type = %d, ctrl_type = %s\n",
bd.remote_address, bd.unit, bd.boot_dev_type, bd.ctrl_dev_type);
#endif
diff --git a/sys/arch/alpha/alpha/clock.c b/sys/arch/alpha/alpha/clock.c
index 2d17787bd35..8c1c14ee03d 100644
--- a/sys/arch/alpha/alpha/clock.c
+++ b/sys/arch/alpha/alpha/clock.c
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.11 1996/07/11 03:47:55 cgd Exp $ */
+/* $NetBSD: clock.c,v 1.12 1996/10/10 23:50:17 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
- printf("\n");
+ kprintf("\n");
if (clockfns != NULL)
panic("clockattach: multiple clocks");
@@ -162,7 +162,7 @@ inittodr(base)
int badbase;
if (base < 5*SECYR) {
- printf("WARNING: preposterous time in file system");
+ kprintf("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) {
- printf("WARNING: preposterous clock chip time\n");
+ kprintf("WARNING: preposterous clock chip time\n");
resettodr();
}
goto bad;
@@ -206,11 +206,11 @@ inittodr(base)
deltat = -deltat;
if (deltat < 2 * SECDAY)
return;
- printf("WARNING: clock %s %d days",
+ kprintf("WARNING: clock %s %d days",
time.tv_sec < base ? "lost" : "gained", deltat / SECDAY);
}
bad:
- printf(" -- CHECK AND RESET THE DATE!\n");
+ kprintf(" -- CHECK AND RESET THE DATE!\n");
}
/*
diff --git a/sys/arch/alpha/alpha/cpu.c b/sys/arch/alpha/alpha/cpu.c
index 2b511e4b9ba..388a68b648a 100644
--- a/sys/arch/alpha/alpha/cpu.c
+++ b/sys/arch/alpha/alpha/cpu.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.10 1996/07/09 00:53:48 cgd Exp $ */
+/* $NetBSD: cpu.c,v 1.11 1996/10/10 23:50:20 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));
- printf(": ");
+ kprintf(": ");
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)
- printf("%s", cpu_major[major]);
+ kprintf("%s", cpu_major[major]);
else
- printf("UNKNOWN MAJOR TYPE (%d)", major);
+ kprintf("UNKNOWN MAJOR TYPE (%d)", major);
- printf(", ");
+ kprintf(", ");
switch (major) {
case PCS_PROC_EV4:
if (minor < ndc21064_cpu_minor)
- printf("%s", dc21064_cpu_minor[minor]);
+ kprintf("%s", dc21064_cpu_minor[minor]);
else
- printf("UNKNOWN MINOR TYPE (%d)", minor);
+ kprintf("UNKNOWN MINOR TYPE (%d)", minor);
break;
case PCS_PROC_EV45:
case PCS_PROC_EV5:
- printf("Pass %d", minor + 1);
+ kprintf("Pass %d", minor + 1);
break;
default:
- printf("UNKNOWN MINOR TYPE (%d)", minor);
+ kprintf("UNKNOWN MINOR TYPE (%d)", minor);
}
if (p->pcs_proc_revision[0] != 0) { /* XXX bad test? */
- printf(", ");
+ kprintf(", ");
- printf("Revision %c%c%c%c", p->pcs_proc_revision[0],
+ kprintf("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]);
}
- printf("\n");
+ kprintf("\n");
if (p->pcs_proc_var != 0) {
- printf("cpu%d: ", dev->dv_unit);
+ kprintf("cpu%d: ", dev->dv_unit);
needcomma = 0;
if (p->pcs_proc_var & PCS_VAR_VAXFP) {
- printf("VAX FP support");
+ kprintf("VAX FP support");
needcomma = 1;
}
if (p->pcs_proc_var & PCS_VAR_IEEEFP) {
- printf("%sIEEE FP support", needcomma ? ", " : "");
+ kprintf("%sIEEE FP support", needcomma ? ", " : "");
needcomma = 1;
}
if (p->pcs_proc_var & PCS_VAR_PE) {
- printf("%sPrimary Eligible", needcomma ? ", " : "");
+ kprintf("%sPrimary Eligible", needcomma ? ", " : "");
needcomma = 1;
}
if (p->pcs_proc_var & PCS_VAR_RESERVED)
- printf("%sreserved bits: 0x%lx", needcomma ? ", " : "",
+ kprintf("%sreserved bits: 0x%lx", needcomma ? ", " : "",
p->pcs_proc_var & PCS_VAR_RESERVED);
- printf("\n");
+ kprintf("\n");
}
/*
diff --git a/sys/arch/alpha/alpha/dec_2100_a50.c b/sys/arch/alpha/alpha/dec_2100_a50.c
index b00828489ef..a649e41a173 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.12 1996/09/17 19:46:37 cgd Exp $ */
+/* $NetBSD: dec_2100_a50.c,v 1.13 1996/10/10 23:50:21 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -76,7 +76,7 @@ dec_2100_a50_modelname()
return "AlphaStation 255/233";
default:
- sprintf(s, "DEC 2100/A50 (\"Avanti\") family, variation %lx",
+ ksprintf(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:
- printf("ctb->ctb_term_type = 0x%lx\n", ctb->ctb_term_type);
- printf("ctb->ctb_turboslot = 0x%lx\n", ctb->ctb_turboslot);
+ kprintf("ctb->ctb_term_type = 0x%lx\n", ctb->ctb_term_type);
+ kprintf("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
- printf("scsiboot = %d, netboot = %d\n", scsiboot, netboot);
+ kprintf("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
- printf("\npcidev = %s\n", pcidev->dv_xname);
+ kprintf("\npcidev = %s\n", pcidev->dv_xname);
#endif
return;
}
@@ -197,7 +197,7 @@ dec_2100_a50_device_register(dev, aux)
scsidev = dev;
#if 0
- printf("\nscsidev = %s\n", scsidev->dv_xname);
+ kprintf("\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
- printf("\nbooted_device = %s\n", booted_device->dv_xname);
+ kprintf("\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
- printf("\nbooted_device = %s\n", booted_device->dv_xname);
+ kprintf("\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 a8c82ecefc9..6965b970a49 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.7 1996/09/17 21:04:25 cgd Exp $ */
+/* $NetBSD: dec_3000_300.c,v 1.8 1996/10/10 23:50:22 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -59,7 +59,7 @@ dec_3000_300_modelname()
return "DEC 3000/300LX (\"Pelica+\")";
default:
- printf("unknown system variation %lx\n",
+ kprintf("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
- printf("scsiboot = %d, netboot = %d\n", scsiboot, netboot);
+ kprintf("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
- printf("\nscsidev = %s\n", dev->dv_xname);
+ kprintf("\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
- printf("\nbooted_device = %s\n", booted_device->dv_xname);
+ kprintf("\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
- printf("\nbooted_device = %s\n", booted_device->dv_xname);
+ kprintf("\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 25b2e55f29e..25abc21474e 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.6 1996/09/17 21:04:29 cgd Exp $ */
+/* $NetBSD: dec_3000_500.c,v 1.7 1996/10/10 23:50:24 christos Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -77,7 +77,7 @@ systype_flamingo:
goto systype_sandpiper;
default:
- printf("unknown system variation %lx\n",
+ kprintf("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
- printf("scsiboot = %d, netboot = %d\n", scsiboot, netboot);
+ kprintf("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
- printf("\nscsidev = %s\n", dev->dv_xname);
+ kprintf("\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
- printf("\nbooted_device = %s\n", booted_device->dv_xname);
+ kprintf("\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
- printf("\nbooted_device = %s\n", booted_device->dv_xname);
+ kprintf("\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 cf159c30e2e..1117e474518 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.10 1996/09/17 19:46:39 cgd Exp $ */
+/* $NetBSD: dec_axppci_33.c,v 1.11 1996/10/10 23:50:25 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -59,7 +59,7 @@ dec_axppci_33_modelname()
return "Alpha PC AXPpci33 (\"NoName\")";
default:
- printf("unknown system variation %lx\n",
+ kprintf("unknown system variation %lx\n",
hwrpb->rpb_variation & SV_ST_MASK);
return NULL;
}
@@ -118,8 +118,8 @@ dec_axppci_33_consinit()
break;
default:
- printf("ctb->ctb_term_type = 0x%lx\n", ctb->ctb_term_type);
- printf("ctb->ctb_turboslot = 0x%lx\n", ctb->ctb_turboslot);
+ kprintf("ctb->ctb_term_type = 0x%lx\n", ctb->ctb_term_type);
+ kprintf("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
- printf("scsiboot = %d, netboot = %d\n", scsiboot, netboot);
+ kprintf("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
- printf("\npcidev = %s\n", pcidev->dv_xname);
+ kprintf("\npcidev = %s\n", pcidev->dv_xname);
#endif
return;
}
@@ -180,7 +180,7 @@ dec_axppci_33_device_register(dev, aux)
scsidev = dev;
#if 0
- printf("\nscsidev = %s\n", scsidev->dv_xname);
+ kprintf("\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
- printf("\nbooted_device = %s\n", booted_device->dv_xname);
+ kprintf("\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
- printf("\nbooted_device = %s\n", booted_device->dv_xname);
+ kprintf("\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 96828113bec..9bb4d87ae67 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.10 1996/09/17 19:46:41 cgd Exp $ */
+/* $NetBSD: dec_kn20aa.c,v 1.11 1996/10/10 23:50:27 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -59,7 +59,7 @@ dec_kn20aa_modelname()
return "AlphaStation 600 5/266 (KN20AA)";
default:
- printf("unknown system variation %lx\n",
+ kprintf("unknown system variation %lx\n",
hwrpb->rpb_variation & SV_ST_MASK);
return NULL;
}
@@ -118,8 +118,8 @@ dec_kn20aa_consinit()
break;
default:
- printf("ctb->ctb_term_type = 0x%lx\n", ctb->ctb_term_type);
- printf("ctb->ctb_turboslot = 0x%lx\n", ctb->ctb_turboslot);
+ kprintf("ctb->ctb_term_type = 0x%lx\n", ctb->ctb_term_type);
+ kprintf("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
- printf("scsiboot = %d, netboot = %d\n", scsiboot, netboot);
+ kprintf("scsiboot = %d, netboot = %d\n", scsiboot, netboot);
#endif
initted =1;
}
@@ -161,7 +161,7 @@ dec_kn20aa_device_register(dev, aux)
pcidev = dev;
#if 0
- printf("\npcidev = %s\n", pcidev->dv_xname);
+ kprintf("\npcidev = %s\n", pcidev->dv_xname);
#endif
return;
}
@@ -180,7 +180,7 @@ dec_kn20aa_device_register(dev, aux)
scsidev = dev;
#if 0
- printf("\nscsidev = %s\n", scsidev->dv_xname);
+ kprintf("\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
- printf("\nbooted_device = %s\n", booted_device->dv_xname);
+ kprintf("\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
- printf("\nbooted_device = %s\n", booted_device->dv_xname);
+ kprintf("\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 9e3d2252742..df6d3f974dd 100644
--- a/sys/arch/alpha/alpha/disksubr.c
+++ b/sys/arch/alpha/alpha/disksubr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.6 1996/04/29 16:34:50 cgd Exp $ */
+/* $NetBSD: disksubr.c,v 1.7 1996/10/10 23:50:28 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) {
- printf("no boot path\n");
+ kprintf("no boot path\n");
}
- sprintf(name, "%s%d", bp->name, CRAZYMAP(bp->val[0]));
+ ksprintf(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 da0eda87561..a930138d993 100644
--- a/sys/arch/alpha/alpha/interrupt.c
+++ b/sys/arch/alpha/alpha/interrupt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.c,v 1.9 1996/07/14 04:20:40 cgd Exp $ */
+/* $NetBSD: interrupt.c,v 1.10 1996/10/10 23:50:29 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -156,19 +156,19 @@ machine_check(framep, vector, param)
return;
fatal:
- 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);
+ 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);
if (curproc != NULL)
- printf(" pid = %d, comm = %s\n", curproc->p_pid,
+ kprintf(" pid = %d, comm = %s\n", curproc->p_pid,
curproc->p_comm);
- printf("\n");
+ kprintf("\n");
panic("machine check");
}
diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c
index aa589e7d580..605c6c38713 100644
--- a/sys/arch/alpha/alpha/machdep.c
+++ b/sys/arch/alpha/alpha/machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.44 1996/10/01 20:21:37 cgd Exp $ */
+/* $NetBSD: machdep.c,v 1.45 1996/10/10 23:50:31 christos Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -271,23 +271,23 @@ alpha_init(pfn, ptb)
#define cnt mddtp->mddt_cluster_cnt
#define usage(n) mddtp->mddt_clusters[(n)].mddt_usage
if (cnt != 2 && cnt != 3) {
- printf("WARNING: weird number (%ld) of mem clusters\n", cnt);
+ kprintf("WARNING: weird number (%ld) of mem clusters\n", cnt);
mddtweird = 1;
} else if (usage(0) != MDDT_PALCODE ||
usage(1) != MDDT_SYSTEM ||
(cnt == 3 && usage(2) != MDDT_PALCODE)) {
mddtweird = 1;
- printf("WARNING: %ld mem clusters, but weird config\n", cnt);
+ kprintf("WARNING: %ld mem clusters, but weird config\n", cnt);
}
for (i = 0; i < cnt; i++) {
if ((usage(i) & MDDT_mbz) != 0) {
- printf("WARNING: mem cluster %d has weird usage %lx\n",
+ kprintf("WARNING: mem cluster %d has weird usage %lx\n",
i, usage(i));
mddtweird = 1;
}
if (mddtp->mddt_clusters[i].mddt_pg_cnt == 0) {
- printf("WARNING: mem cluster %d has pg cnt == 0\n", i);
+ kprintf("WARNING: mem cluster %d has pg cnt == 0\n", i);
mddtweird = 1;
}
/* XXX other things to check? */
@@ -296,26 +296,26 @@ alpha_init(pfn, ptb)
#undef usage
if (mddtweird) {
- printf("\n");
- printf("complete memory cluster information:\n");
+ kprintf("\n");
+ kprintf("complete memory cluster information:\n");
for (i = 0; i < mddtp->mddt_cluster_cnt; i++) {
- printf("mddt %d:\n", i);
- printf("\tpfn %lx\n",
+ kprintf("mddt %d:\n", i);
+ kprintf("\tpfn %lx\n",
mddtp->mddt_clusters[i].mddt_pfn);
- printf("\tcnt %lx\n",
+ kprintf("\tcnt %lx\n",
mddtp->mddt_clusters[i].mddt_pg_cnt);
- printf("\ttest %lx\n",
+ kprintf("\ttest %lx\n",
mddtp->mddt_clusters[i].mddt_pg_test);
- printf("\tbva %lx\n",
+ kprintf("\tbva %lx\n",
mddtp->mddt_clusters[i].mddt_v_bitaddr);
- printf("\tbpa %lx\n",
+ kprintf("\tbpa %lx\n",
mddtp->mddt_clusters[i].mddt_p_bitaddr);
- printf("\tbcksum %lx\n",
+ kprintf("\tbcksum %lx\n",
mddtp->mddt_clusters[i].mddt_bit_cksum);
- printf("\tusage %lx\n",
+ kprintf("\tusage %lx\n",
mddtp->mddt_clusters[i].mddt_usage);
}
- printf("\n");
+ kprintf("\n");
}
/*
* END MDDT WEIRDNESS CHECKING
@@ -350,13 +350,13 @@ alpha_init(pfn, ptb)
maxmem = physmem;
#if 0
- printf("totalphysmem = %d\n", totalphysmem);
- printf("physmem = %d\n", physmem);
- printf("firstusablepage = %d\n", firstusablepage);
- printf("lastusablepage = %d\n", lastusablepage);
- printf("resvmem = %d\n", resvmem);
- printf("unusedmem = %d\n", unusedmem);
- printf("unknownmem = %d\n", unknownmem);
+ kprintf("totalphysmem = %d\n", totalphysmem);
+ kprintf("physmem = %d\n", physmem);
+ kprintf("firstusablepage = %d\n", firstusablepage);
+ kprintf("lastusablepage = %d\n", lastusablepage);
+ kprintf("resvmem = %d\n", resvmem);
+ kprintf("unusedmem = %d\n", unusedmem);
+ kprintf("unknownmem = %d\n", unknownmem);
#endif
/*
@@ -581,7 +581,7 @@ alpha_init(pfn, ptb)
*/
prom_getenv(PROM_E_BOOTED_OSFLAGS, boot_flags, sizeof(boot_flags));
#if 0
- printf("boot flags = \"%s\"\n", boot_flags);
+ kprintf("boot flags = \"%s\"\n", boot_flags);
#endif
boothowto = RB_SINGLE;
@@ -667,14 +667,14 @@ cpu_startup()
/*
* Good {morning,afternoon,evening,night}.
*/
- printf(version);
+ kprintf(version);
identifycpu();
- printf("real mem = %d (%d reserved for PROM, %d used by NetBSD)\n",
+ kprintf("real mem = %d (%d reserved for PROM, %d used by NetBSD)\n",
ctob(totalphysmem), ctob(resvmem), ctob(physmem));
if (unusedmem)
- printf("WARNING: unused memory = %d bytes\n", ctob(unusedmem));
+ kprintf("WARNING: unused memory = %d bytes\n", ctob(unusedmem));
if (unknownmem)
- printf("WARNING: %d bytes of memory with unknown purpose\n",
+ kprintf("WARNING: %d bytes of memory with unknown purpose\n",
ctob(unknownmem));
/*
@@ -740,8 +740,8 @@ cpu_startup()
#if defined(DEBUG)
pmapdebug = opmapdebug;
#endif
- printf("avail mem = %ld\n", (long)ptoa(cnt.v_free_count));
- printf("using %ld buffers containing %ld bytes of memory\n",
+ kprintf("avail mem = %ld\n", (long)ptoa(cnt.v_free_count));
+ kprintf("using %ld buffers containing %ld bytes of memory\n",
(long)nbuf, (long)(bufpages * CLBYTES));
/*
@@ -762,17 +762,17 @@ identifycpu()
/*
* print out CPU identification information.
*/
- printf("%s, %ldMHz\n", cpu_model,
+ kprintf("%s, %ldMHz\n", cpu_model,
hwrpb->rpb_cc_freq / 1000000); /* XXX true for 21164? */
- printf("%ld byte page size, %d processor%s.\n",
+ kprintf("%ld byte page size, %d processor%s.\n",
hwrpb->rpb_page_size, ncpus, ncpus == 1 ? "" : "s");
#if 0
/* this isn't defined for any systems that we run on? */
- printf("serial number 0x%lx 0x%lx\n",
+ kprintf("serial number 0x%lx 0x%lx\n",
((long *)hwrpb->rpb_ssn)[0], ((long *)hwrpb->rpb_ssn)[1]);
/* and these aren't particularly useful! */
- printf("variation: 0x%lx, revision 0x%lx\n",
+ kprintf("variation: 0x%lx, revision 0x%lx\n",
hwrpb->rpb_variation, *(long *)hwrpb->rpb_revision);
#endif
}
@@ -825,13 +825,13 @@ haltsys:
doshutdownhooks();
#ifdef BOOTKEY
- printf("hit any key to %s...\n", howto & RB_HALT ? "halt" : "reboot");
+ kprintf("hit any key to %s...\n", howto & RB_HALT ? "halt" : "reboot");
cngetc();
- printf("\n");
+ kprintf("\n");
#endif
/* Finally, halt/reboot the system. */
- printf("%s\n\n", howto & RB_HALT ? "halted." : "rebooting...");
+ kprintf("%s\n\n", howto & RB_HALT ? "halted." : "rebooting...");
prom_halt(howto & RB_HALT);
/*NOTREACHED*/
}
@@ -966,15 +966,15 @@ dumpsys()
if (dumpsize == 0)
dumpconf();
if (dumplo < 0) {
- printf("\ndump to dev %x not possible\n", dumpdev);
+ kprintf("\ndump to dev %x not possible\n", dumpdev);
return;
}
- printf("\ndumping to dev %x, offset %ld\n", dumpdev, dumplo);
+ kprintf("\ndumping to dev %x, offset %ld\n", dumpdev, dumplo);
psize = (*bdevsw[major(dumpdev)].d_psize)(dumpdev);
- printf("dump ");
+ kprintf("dump ");
if (psize == -1) {
- printf("area unavailable\n");
+ kprintf("area unavailable\n");
return;
}
@@ -993,7 +993,7 @@ dumpsys()
/* Print out how many MBs we to go. */
n = bytes - i;
if (n && (n % (1024*1024)) == 0)
- printf("%d ", n / (1024 * 1024));
+ kprintf("%d ", n / (1024 * 1024));
/* Limit size for next transfer. */
if (n > BYTES_PER_DUMP)
@@ -1013,34 +1013,34 @@ err:
switch (error) {
case ENXIO:
- printf("device bad\n");
+ kprintf("device bad\n");
break;
case EFAULT:
- printf("device not ready\n");
+ kprintf("device not ready\n");
break;
case EINVAL:
- printf("area improper\n");
+ kprintf("area improper\n");
break;
case EIO:
- printf("i/o error\n");
+ kprintf("i/o error\n");
break;
case EINTR:
- printf("aborted from console\n");
+ kprintf("aborted from console\n");
break;
case 0:
- printf("succeeded\n");
+ kprintf("succeeded\n");
break;
default:
- printf("error %d\n", error);
+ kprintf("error %d\n", error);
break;
}
- printf("\n\n");
+ kprintf("\n\n");
delay(1000);
}
@@ -1131,7 +1131,7 @@ printregs(regp)
int i;
for (i = 0; i < 32; i++)
- printf("R%d:\t0x%016lx%s", i, regp->r_regs[i],
+ kprintf("R%d:\t0x%016lx%s", i, regp->r_regs[i],
i & 1 ? "\n" : "\t");
}
@@ -1144,7 +1144,7 @@ regdump(framep)
frametoreg(framep, &reg);
reg.r_regs[R_SP] = alpha_pal_rdusp();
- printf("REGISTERS:\n");
+ kprintf("REGISTERS:\n");
printregs(&reg);
}
@@ -1194,13 +1194,13 @@ sendsig(catcher, sig, mask, code)
(void)grow(p, (u_long)scp);
#ifdef DEBUG
if ((sigdebug & SDB_KSTACK) && p->p_pid == sigpid)
- printf("sendsig(%d): sig %d ssp %p usp %p\n", p->p_pid,
+ kprintf("sendsig(%d): sig %d ssp %p usp %p\n", p->p_pid,
sig, &oonstack, scp);
#endif
if (useracc((caddr_t)scp, fsize, B_WRITE) == 0) {
#ifdef DEBUG
if ((sigdebug & SDB_KSTACK) && p->p_pid == sigpid)
- printf("sendsig(%d): useracc failed on sig %d\n",
+ kprintf("sendsig(%d): useracc failed on sig %d\n",
p->p_pid, sig);
#endif
/*
@@ -1256,7 +1256,7 @@ sendsig(catcher, sig, mask, code)
(void) copyout((caddr_t)&ksc, (caddr_t)scp, fsize);
#ifdef DEBUG
if (sigdebug & SDB_FOLLOW)
- printf("sendsig(%d): sig %d scp %p code %lx\n", p->p_pid, sig,
+ kprintf("sendsig(%d): sig %d scp %p code %lx\n", p->p_pid, sig,
scp, code);
#endif
@@ -1273,10 +1273,10 @@ sendsig(catcher, sig, mask, code)
#ifdef DEBUG
if (sigdebug & SDB_FOLLOW)
- printf("sendsig(%d): pc %lx, catcher %lx\n", p->p_pid,
+ kprintf("sendsig(%d): pc %lx, catcher %lx\n", p->p_pid,
frame->tf_regs[FRAME_PC], frame->tf_regs[FRAME_A3]);
if ((sigdebug & SDB_KSTACK) && p->p_pid == sigpid)
- printf("sendsig(%d): sig %d returns\n",
+ kprintf("sendsig(%d): sig %d returns\n",
p->p_pid, sig);
#endif
}
@@ -1307,7 +1307,7 @@ sys_sigreturn(p, v, retval)
scp = SCARG(uap, sigcntxp);
#ifdef DEBUG
if (sigdebug & SDB_FOLLOW)
- printf("sigreturn: pid %d, scp %p\n", p->p_pid, scp);
+ kprintf("sigreturn: pid %d, scp %p\n", p->p_pid, scp);
#endif
if (ALIGN(scp) != (u_int64_t)scp)
@@ -1348,7 +1348,7 @@ sys_sigreturn(p, v, retval)
#ifdef DEBUG
if (sigdebug & SDB_FOLLOW)
- printf("sigreturn(%d): returns\n", p->p_pid);
+ kprintf("sigreturn(%d): returns\n", p->p_pid);
#endif
return (EJUSTRETURN);
}
diff --git a/sys/arch/alpha/alpha/mainbus.c b/sys/arch/alpha/alpha/mainbus.c
index 1e2250541fb..4449cdd2198 100644
--- a/sys/arch/alpha/alpha/mainbus.c
+++ b/sys/arch/alpha/alpha/mainbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.10 1996/08/27 21:53:46 cgd Exp $ */
+/* $NetBSD: mainbus.c,v 1.11 1996/10/10 23:50:33 christos Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -91,7 +91,7 @@ mbattach(parent, self, aux)
extern int cputype, ncpus;
extern char *cpu_iobus;
- printf("\n");
+ kprintf("\n");
sc->sc_bus.ab_dv = (struct device *)sc;
sc->sc_bus.ab_type = BUS_MAIN;
@@ -120,7 +120,7 @@ mbattach(parent, self, aux)
cpuattachcnt++;
}
if (ncpus != cpuattachcnt)
- printf("WARNING: %d cpus in machine, %d attached\n",
+ kprintf("WARNING: %d cpus in machine, %d attached\n",
ncpus, cpuattachcnt);
if (cpu_iobus != NULL) {
@@ -140,7 +140,7 @@ mbprint(aux, pnp)
struct confargs *ca = aux;
if (pnp)
- printf("%s at %s", ca->ca_name, pnp);
+ kprintf("%s at %s", ca->ca_name, pnp);
return (UNCONF);
}
diff --git a/sys/arch/alpha/alpha/mcclock.c b/sys/arch/alpha/alpha/mcclock.c
index 1a4c48b10eb..68934105698 100644
--- a/sys/arch/alpha/alpha/mcclock.c
+++ b/sys/arch/alpha/alpha/mcclock.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclock.c,v 1.2 1996/04/17 22:22:32 cgd Exp $ */
+/* $NetBSD: mcclock.c,v 1.3 1996/10/10 23:50:35 christos Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -59,7 +59,7 @@ mcclock_attach(sc, busfns)
const struct mcclock_busfns *busfns;
{
- printf(": mc146818 or compatible");
+ kprintf(": mc146818 or compatible");
sc->sc_busfns = busfns;
diff --git a/sys/arch/alpha/alpha/md_root.c b/sys/arch/alpha/alpha/md_root.c
index 02bb3865d3c..8bd78ebb87c 100644
--- a/sys/arch/alpha/alpha/md_root.c
+++ b/sys/arch/alpha/alpha/md_root.c
@@ -1,4 +1,4 @@
-/* $NetBSD: md_root.c,v 1.3 1996/10/03 19:54:45 cgd Exp $ */
+/* $NetBSD: md_root.c,v 1.4 1996/10/10 23:50:41 christos Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -62,7 +62,7 @@ rd_attach_hook(unit, rd)
rd->rd_addr = (caddr_t)rd_root_image;
rd->rd_size = (size_t)rd_root_size;
rd->rd_type = RD_KMEM_FIXED;
- printf("rd%d: internal %dK image area\n", unit,
+ kprintf("rd%d: internal %dK image area\n", unit,
ROOTBYTES / 1024);
}
}
diff --git a/sys/arch/alpha/alpha/pmap.c b/sys/arch/alpha/alpha/pmap.c
index acd7e4b5294..85e54b88eee 100644
--- a/sys/arch/alpha/alpha/pmap.c
+++ b/sys/arch/alpha/alpha/pmap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.15 1996/08/20 23:08:08 cgd Exp $ */
+/* $NetBSD: pmap.c,v 1.16 1996/10/10 23:50:37 christos Exp $ */
/*
* Copyright (c) 1992, 1996 Carnegie Mellon University
@@ -99,7 +99,7 @@
#define spl_t int
#define vm_page_fictitious_addr 0
#define aligned_block_copy(src, dest, size) bcopy((void *)src, (void *)dest, size)
-#define db_printf printf
+#define db_printf kprintf
#define tbia ALPHA_TBIA
#define alphacache_Iflush alpha_pal_imb
#define cpu_number() 0
@@ -571,11 +571,11 @@ pt_entry_t *pmap_pte(pmap, addr)
register pt_entry_t pte;
if (DOPDB(PDB_FOLLOW|PDB_PTE))
- printf("pmap_pte(%p, 0x%lx)\n", pmap, addr);
+ kprintf("pmap_pte(%p, 0x%lx)\n", pmap, addr);
if (pmap->dirbase == 0) {
if (DOVPDB(PDB_FOLLOW|PDB_PTE))
- printf("pmap_pte: dirbase == 0\n");
+ kprintf("pmap_pte: dirbase == 0\n");
ptep = PT_ENTRY_NULL;
goto out;
}
@@ -584,7 +584,7 @@ pt_entry_t *pmap_pte(pmap, addr)
pte = *pmap_pde(pmap,addr);
if ((pte & ALPHA_PTE_VALID) == 0) {
if (DOVPDB(PDB_FOLLOW|PDB_PTE))
- printf("pmap_pte: l1 not valid\n");
+ kprintf("pmap_pte: l1 not valid\n");
ptep = PT_ENTRY_NULL;
goto out;
}
@@ -594,7 +594,7 @@ pt_entry_t *pmap_pte(pmap, addr)
pte = ptp[pte2num(addr)];
if ((pte & ALPHA_PTE_VALID) == 0) {
if (DOVPDB(PDB_FOLLOW|PDB_PTE))
- printf("pmap_pte: l2 not valid\n");
+ kprintf("pmap_pte: l2 not valid\n");
ptep = PT_ENTRY_NULL;
goto out;
}
@@ -605,7 +605,7 @@ pt_entry_t *pmap_pte(pmap, addr)
out:
if (DOPDB(PDB_FOLLOW|PDB_PTE))
- printf("pmap_pte: returns %p\n", ptep);
+ kprintf("pmap_pte: returns %p\n", ptep);
return (ptep);
}
@@ -648,7 +648,7 @@ pmap_bootstrap(firstaddr, ptaddr, maxasn)
long npages;
if (DOPDB(PDB_FOLLOW|PDB_BOOTSTRAP))
- printf("pmap_bootstrap(0x%lx, 0x%lx, %d)\n", firstaddr, ptaddr,
+ kprintf("pmap_bootstrap(0x%lx, 0x%lx, %d)\n", firstaddr, ptaddr,
maxasn);
/* must be page aligned */
@@ -696,13 +696,13 @@ pmap_bootstrap(firstaddr, ptaddr, maxasn)
vallocsz(root_kpdes, pt_entry_t *, PAGE_SIZE);
if (DOVPDB(PDB_BOOTSTRAP))
- printf("pmap_bootstrap: root_kpdes = %p\n", root_kpdes);
+ kprintf("pmap_bootstrap: root_kpdes = %p\n", root_kpdes);
kernel_pmap->dirbase = root_kpdes;
kernel_pmap->dirpfn = alpha_btop(kvtophys((vm_offset_t)root_kpdes));
/* First, copy mappings for things below VM_MIN_KERNEL_ADDRESS */
if (DOVPDB(PDB_BOOTSTRAP))
- printf("pmap_bootstrap: setting up root_kpdes (copy 0x%lx)\n",
+ kprintf("pmap_bootstrap: setting up root_kpdes (copy 0x%lx)\n",
pdenum(VM_MIN_KERNEL_ADDRESS) * sizeof root_kpdes[0]);
bzero(root_kpdes, PAGE_SIZE);
bcopy((caddr_t)ptaddr, root_kpdes,
@@ -716,7 +716,7 @@ pmap_bootstrap(firstaddr, ptaddr, maxasn)
template &= ~ALPHA_PTE_GLOBAL;
root_kpdes[pdenum(VPTBASE)] = template;
if (DOVPDB(PDB_BOOTSTRAP))
- printf("pmap_bootstrap: VPT PTE 0x%lx at 0x%lx)\n",
+ kprintf("pmap_bootstrap: VPT PTE 0x%lx at 0x%lx)\n",
root_kpdes[pdenum(VPTBASE)], &root_kpdes[pdenum(VPTBASE)]);
#if 0
@@ -737,12 +737,12 @@ pmap_bootstrap(firstaddr, ptaddr, maxasn)
#define enough_kseg2() (PAGE_SIZE)
if (DOVPDB(PDB_BOOTSTRAP))
- printf("pmap_bootstrap: allocating kvseg segment pages\n");
+ kprintf("pmap_bootstrap: allocating kvseg segment pages\n");
vallocsz(pte, pt_entry_t *, enough_kseg2()); /* virtual */
pa = kvtophys(pte); /* physical */
bzero(pte, enough_kseg2());
if (DOVPDB(PDB_BOOTSTRAP))
- printf("pmap_bootstrap: kvseg segment pages at %p\n", pte);
+ kprintf("pmap_bootstrap: kvseg segment pages at %p\n", pte);
#undef enough_kseg2
@@ -751,7 +751,7 @@ pmap_bootstrap(firstaddr, ptaddr, maxasn)
*/
if (DOVPDB(PDB_BOOTSTRAP))
- printf("pmap_bootstrap: inserting segment pages into root\n");
+ kprintf("pmap_bootstrap: inserting segment pages into root\n");
tbia();
pte_ktemplate(template,pa,VM_PROT_READ|VM_PROT_WRITE);
pde = pmap_pde(kernel_pmap,K2SEG_BASE);
@@ -772,7 +772,7 @@ pmap_bootstrap(firstaddr, ptaddr, maxasn)
* But don't we need some seg2 pagetables to start with ?
*/
if (DOVPDB(PDB_BOOTSTRAP))
- printf("pmap_bootstrap: allocating kvseg page table pages\n");
+ kprintf("pmap_bootstrap: allocating kvseg page table pages\n");
pde = &pte[pte2num(K2SEG_BASE)];
for (i = pmap_kernel_vm; i > 0; i--) {
register int j;
@@ -795,7 +795,7 @@ pmap_bootstrap(firstaddr, ptaddr, maxasn)
avail_end = alpha_ptob(lastusablepage + 1);
mem_size = avail_end - avail_start;
if (DOVPDB(PDB_BOOTSTRAP))
- printf("pmap_bootstrap: avail: 0x%lx -> 0x%lx (0x%lx)\n",
+ kprintf("pmap_bootstrap: avail: 0x%lx -> 0x%lx (0x%lx)\n",
avail_start, avail_end, mem_size);
/*
@@ -803,7 +803,7 @@ pmap_bootstrap(firstaddr, ptaddr, maxasn)
* lock bits, and the reference/modify byte array.
*/
if (DOVPDB(PDB_BOOTSTRAP))
- printf("pmap_bootstrap: allocating page management data\n");
+ kprintf("pmap_bootstrap: allocating page management data\n");
npages = ((BYTE_SIZE * mem_size) /
(BYTE_SIZE * (PAGE_SIZE + sizeof (struct pv_entry) + 1) + 1));
@@ -822,7 +822,7 @@ pmap_bootstrap(firstaddr, ptaddr, maxasn)
panic("pmap_bootstrap");
mem_size = avail_end - avail_start;
if (DOVPDB(PDB_BOOTSTRAP))
- printf("pmap_bootstrap: avail: 0x%lx -> 0x%lx (0x%lx)\n",
+ kprintf("pmap_bootstrap: avail: 0x%lx -> 0x%lx (0x%lx)\n",
avail_start, avail_end, mem_size);
/*
@@ -832,8 +832,8 @@ pmap_bootstrap(firstaddr, ptaddr, maxasn)
virtual_avail = alpha_round_page(K2SEG_BASE);
virtual_end = trunc_page(K2SEG_BASE + pde2tova(pmap_kernel_vm));
if (DOVPDB(PDB_BOOTSTRAP)) {
- printf("pmap_bootstrap: virtual_avail = %p\n", virtual_avail);
- printf("pmap_bootstrap: virtual_end = %p\n", virtual_end);
+ kprintf("pmap_bootstrap: virtual_avail = %p\n", virtual_avail);
+ kprintf("pmap_bootstrap: virtual_end = %p\n", virtual_end);
}
/*
@@ -845,7 +845,7 @@ pmap_bootstrap(firstaddr, ptaddr, maxasn)
pmap_tlbpid_init(maxasn);
if (DOVPDB(PDB_BOOTSTRAP))
- printf("pmap_bootstrap: leaving\n");
+ kprintf("pmap_bootstrap: leaving\n");
}
pmap_rid_of_console()
@@ -880,7 +880,7 @@ pmap_bootstrap_alloc(size)
extern boolean_t vm_page_startup_initialized;
if (DOPDB(PDB_FOLLOW|PDB_BOOTSTRAP_ALLOC))
- printf("pmap_bootstrap_alloc(%lx)\n", size);
+ kprintf("pmap_bootstrap_alloc(%lx)\n", size);
if (vm_page_startup_initialized)
panic("pmap_bootstrap_alloc: called after startup initialized");
@@ -893,13 +893,13 @@ pmap_bootstrap_alloc(size)
bzero((caddr_t)val, size);
if (DOVPDB(PDB_BOOTSTRAP_ALLOC))
- printf("pmap_bootstrap_alloc: returns %p\n", val);
+ kprintf("pmap_bootstrap_alloc: returns %p\n", val);
return ((void *)val);
}
/*
* Unmap the PROM mappings. PROM mappings are kept around
- * by pmap_bootstrap, so we can still use the prom's printf.
+ * by pmap_bootstrap, so we can still use the prom's kprintf.
* Basically, blow away all mappings in the level one PTE
* table below VM_MIN_KERNEL_ADDRESS. The Virtual Page Table
* Is at the end of virtual space, so it's safe.
@@ -912,14 +912,14 @@ pmap_unmap_prom()
extern pt_entry_t *rom_ptep, rom_pte;
if (DOPDB(PDB_FOLLOW|PDB_UNMAP_PROM))
- printf("pmap_unmap_prom\n");
+ kprintf("pmap_unmap_prom\n");
/* XXX save old pte so that we can remap prom if necessary */
rom_ptep = &root_kpdes[0]; /* XXX */
rom_pte = *rom_ptep & ~ALPHA_PTE_ASM; /* XXX */
if (DOVPDB(PDB_UNMAP_PROM))
- printf("pmap_unmap_prom: zero 0x%lx, rom_pte was 0x%lx\n",
+ kprintf("pmap_unmap_prom: zero 0x%lx, rom_pte was 0x%lx\n",
pdenum(VM_MIN_KERNEL_ADDRESS) * sizeof root_kpdes[0],
rom_pte);
/* Mark all mappings before VM_MIN_KERNEL_ADDRESS as invalid. */
@@ -927,7 +927,7 @@ pmap_unmap_prom()
prom_mapped = 0;
ALPHA_TBIA();
if (DOVPDB(PDB_UNMAP_PROM))
- printf("pmap_unmap_prom: leaving\n");
+ kprintf("pmap_unmap_prom: leaving\n");
}
/*
@@ -1075,7 +1075,7 @@ pmap_create(size)
register pmap_t p;
if (DOPDB(PDB_FOLLOW|PDB_CREATE))
- printf("pmap_create(%d)\n", size);
+ kprintf("pmap_create(%d)\n", size);
/*
* A software use-only map doesn't even need a map.
@@ -1096,7 +1096,7 @@ pmap_create(size)
out:
if (DOVPDB(PDB_FOLLOW|PDB_CREATE))
- printf("pmap_create: returning %p\n", p);
+ kprintf("pmap_create: returning %p\n", p);
return (p);
}
@@ -1108,7 +1108,7 @@ pmap_pinit(p)
extern struct vmspace vmspace0;
if (DOPDB(PDB_FOLLOW|PDB_PINIT))
- printf("pmap_init(%p)\n", p);
+ kprintf("pmap_init(%p)\n", p);
#if 0
/* XXX cgd WHY NOT pmap_page_table_page_alloc()? */
@@ -1122,13 +1122,13 @@ pmap_pinit(p)
(vm_offset_t)p->dirbase));
if (DOVPDB(PDB_FOLLOW|PDB_PINIT))
- printf("pmap_init(%p): dirbase = %p, dirpfn = 0x%x\n", p,
+ kprintf("pmap_init(%p): dirbase = %p, dirpfn = 0x%x\n", p,
p->dirbase, p->dirpfn);
aligned_block_copy(root_kpdes, p->dirbase, ALPHA_PGBYTES);
p->ref_count = 1;
p->pid = -1;
if (DOVPDB(PDB_FOLLOW|PDB_PINIT))
- printf("pmap_init(%p): first pde = 0x%lx\n", p->dirbase[0]);
+ kprintf("pmap_init(%p): first pde = 0x%lx\n", p->dirbase[0]);
{
pt_entry_t template;
@@ -1138,7 +1138,7 @@ pmap_pinit(p)
template &= ~ALPHA_PTE_GLOBAL;
p->dirbase[pdenum(VPTBASE)] = template;
}
-printf("PMAP_PINIT: FIRST ENT = 0x%lx\n", p->dirbase[0]);
+kprintf("PMAP_PINIT: FIRST ENT = 0x%lx\n", p->dirbase[0]);
simple_lock_init(&p->lock);
p->cpus_using = 0;
@@ -1154,7 +1154,7 @@ printf("PMAP_PINIT: FIRST ENT = 0x%lx\n", p->dirbase[0]);
out:
if (DOVPDB(PDB_FOLLOW|PDB_PINIT))
- printf("pmap_init: leaving\n", p);
+ kprintf("pmap_init: leaving\n", p);
}
/*
@@ -1170,7 +1170,7 @@ void pmap_destroy(p)
register spl_t s;
if (DOPDB(PDB_FOLLOW|PDB_DESTROY))
- printf("pmap_destroy(%p)\n", p);
+ kprintf("pmap_destroy(%p)\n", p);
if (p == PMAP_NULL)
goto out;
@@ -1187,7 +1187,7 @@ void pmap_destroy(p)
}
out:
if (DOVPDB(PDB_FOLLOW|PDB_DESTROY))
- printf("pmap_destroy: leaving\n");
+ kprintf("pmap_destroy: leaving\n");
}
void
@@ -1198,11 +1198,11 @@ pmap_release(p)
register vm_offset_t pa;
if (DOPDB(PDB_FOLLOW|PDB_RELEASE))
- printf("pmap_release(%p)\n", p);
+ kprintf("pmap_release(%p)\n", p);
if (p->dirbase == NULL) {
if (DOPDB(PDB_FOLLOW|PDB_ANOMALOUS|PDB_RELEASE))
- printf("pmap_release: already reclaimed\n");
+ kprintf("pmap_release: already reclaimed\n");
/* resources already reclaimed */
goto out;
}
@@ -1237,7 +1237,7 @@ pmap_release(p)
out:
if (DOVPDB(PDB_FOLLOW|PDB_RELEASE))
- printf("pmap_release: leaving\n");
+ kprintf("pmap_release: leaving\n");
}
/*
@@ -1737,7 +1737,7 @@ pmap_enter(pmap, v, pa, prot, wired)
vm_offset_t old_pa;
if (DOPDB(PDB_FOLLOW|PDB_ENTER))
- printf("pmap_enter(%p, 0x%lx, 0x%lx, 0x%x, %d)\n",
+ kprintf("pmap_enter(%p, 0x%lx, 0x%lx, 0x%x, %d)\n",
pmap, v, pa, prot, wired);
assert(pa != vm_page_fictitious_addr);
@@ -1786,7 +1786,7 @@ Retry:
*/
if (DOVPDB(PDB_FOLLOW|PDB_ENTER))
- printf("pmap_enter: same PA already mapped there (0x%lx)\n",
+ kprintf("pmap_enter: same PA already mapped there (0x%lx)\n",
*pte);
if (wired && !(*pte & ALPHA_PTE_WIRED))
@@ -1815,7 +1815,7 @@ Retry:
*/
if (*pte) {
if (DOVPDB(PDB_FOLLOW|PDB_ENTER))
- printf("pmap_enter: removing old PTE (0x%lx)\n", *pte);
+ kprintf("pmap_enter: removing old PTE (0x%lx)\n", *pte);
/*
* Invalidate the translation buffer,
@@ -1833,7 +1833,7 @@ Retry:
if (valid_page(pa)) {
if (DOVPDB(PDB_FOLLOW|PDB_ENTER))
- printf("pmap_enter: valid page\n");
+ kprintf("pmap_enter: valid page\n");
/*
* Enter the mapping in the PV list for this
@@ -1849,7 +1849,7 @@ Retry:
* No mappings yet
*/
if (DOVPDB(PDB_FOLLOW|PDB_ENTER))
- printf("pmap_enter: first mapping\n");
+ kprintf("pmap_enter: first mapping\n");
pv_h->va = v;
pv_h->pmap = pmap;
pv_h->next = PV_ENTRY_NULL;
@@ -1858,7 +1858,7 @@ Retry:
}
else {
if (DOVPDB(PDB_FOLLOW|PDB_ENTER))
- printf("pmap_enter: second+ mapping\n");
+ kprintf("pmap_enter: second+ mapping\n");
#if DEBUG
{
@@ -1923,7 +1923,7 @@ Retry:
i = ptes_per_vm_page;
do {
if (DOVPDB(PDB_FOLLOW|PDB_ENTER))
- printf("pmap_enter: entering PTE 0x%lx at %p\n",
+ kprintf("pmap_enter: entering PTE 0x%lx at %p\n",
template, pte);
*pte = template;
pte++;
@@ -1939,7 +1939,7 @@ Retry:
PMAP_READ_UNLOCK(pmap, spl);
out:
if (DOVPDB(PDB_FOLLOW|PDB_ENTER))
- printf("pmap_enter: done\n");
+ kprintf("pmap_enter: done\n");
}
/*
@@ -2009,7 +2009,7 @@ pmap_extract(pmap, va)
spl_t spl;
if (DOPDB(PDB_FOLLOW|PDB_EXTRACT))
- printf("pmap_extract(%p, 0x%lx)\n", pmap, va);
+ kprintf("pmap_extract(%p, 0x%lx)\n", pmap, va);
/*
* Special translation for kernel addresses in
@@ -2018,7 +2018,7 @@ pmap_extract(pmap, va)
if (ISA_K0SEG(va)) {
pa = K0SEG_TO_PHYS(va);
if (DOPDB(PDB_FOLLOW|PDB_EXTRACT))
- printf("pmap_extract: returns 0x%lx\n", pa);
+ kprintf("pmap_extract: returns 0x%lx\n", pa);
goto out;
}
@@ -2039,7 +2039,7 @@ pmap_extract(pmap, va)
out:
if (DOPDB(PDB_FOLLOW|PDB_EXTRACT))
- printf("pmap_extract: returns 0x%lx\n", pa);
+ kprintf("pmap_extract: returns 0x%lx\n", pa);
return(pa);
}
@@ -2094,7 +2094,7 @@ pmap_expand(map, v)
spl_t spl;
if (DOPDB(PDB_FOLLOW|PDB_EXPAND))
- printf("pmap_expand(%p, 0x%lx)\n", map, v);
+ kprintf("pmap_expand(%p, 0x%lx)\n", map, v);
/* Would have to go through all maps to add this page */
if (map == kernel_pmap)
@@ -2109,7 +2109,7 @@ pmap_expand(map, v)
pt_entry_t *pte;
if (DOVPDB(PDB_FOLLOW|PDB_EXPAND))
- printf("pmap_expand: needs pde\n");
+ kprintf("pmap_expand: needs pde\n");
pa = pmap_page_table_page_alloc();
@@ -2141,7 +2141,7 @@ pmap_expand(map, v)
do {
*pte = template;
if (DOVPDB(PDB_FOLLOW|PDB_EXPAND))
- printf("pmap_expand: inserted l1 pte (0x%lx) at %p\n",
+ kprintf("pmap_expand: inserted l1 pte (0x%lx) at %p\n",
template, pte);
pte++;
pte_increment_pa(template);
@@ -2182,7 +2182,7 @@ pmap_expand(map, v)
do {
*pdp = template;
if (DOVPDB(PDB_FOLLOW|PDB_EXPAND))
- printf("pmap_expand: inserted l2 pte (0x%lx) at %p\n",
+ kprintf("pmap_expand: inserted l2 pte (0x%lx) at %p\n",
template, pdp);
pdp++;
pte_increment_pa(template);
@@ -2191,7 +2191,7 @@ pmap_expand(map, v)
out:
if (DOVPDB(PDB_FOLLOW|PDB_EXPAND))
- printf("pmap_expand: leaving\n");
+ kprintf("pmap_expand: leaving\n");
return;
}
@@ -2337,20 +2337,20 @@ pmap_activate(pmap, hwpcb, cpu)
{
if (DOPDB(PDB_FOLLOW|PDB_ACTIVATE))
- printf("pmap_activate(%p, %p, %d)\n", pmap, hwpcb, cpu);
+ kprintf("pmap_activate(%p, %p, %d)\n", pmap, hwpcb, cpu);
#if 0
PMAP_ACTIVATE(my_pmap, th, my_cpu);
#else
if (DOVPDB(PDB_ACTIVATE))
- printf("pmap_activate: old pid = %d\n", pmap->pid);
+ kprintf("pmap_activate: old pid = %d\n", pmap->pid);
if (pmap->pid < 0) pmap_tlbpid_assign(pmap);
hwpcb->apcb_asn = pmap->pid;
hwpcb->apcb_ptbr = pmap->dirpfn;
if (pmap != kernel_pmap)
pmap->cpus_using = TRUE;
if (DOVPDB(PDB_ACTIVATE))
- printf("pmap_activate: new pid = %d, new ptbr = 0x%lx\n",
+ kprintf("pmap_activate: new pid = %d, new ptbr = 0x%lx\n",
pmap->pid, pmap->dirpfn);
#endif
}
@@ -2369,13 +2369,13 @@ pmap_deactivate(pmap, hwpcb, cpu)
int cpu;
{
if (DOPDB(PDB_FOLLOW|PDB_DEACTIVATE))
- printf("pmap_deactivate(%p, %p, %d)\n", pmap, hwpcb, cpu);
+ kprintf("pmap_deactivate(%p, %p, %d)\n", pmap, hwpcb, cpu);
#if 0
PMAP_DEACTIVATE(pmap, th, which_cpu);
#else
if (DOVPDB(PDB_DEACTIVATE))
- printf("pmap_deactivate: pid = %d, ptbr = 0x%lx\n",
+ kprintf("pmap_deactivate: pid = %d, ptbr = 0x%lx\n",
pmap->pid, pmap->dirpfn);
pmap->cpus_using = FALSE;
#endif
@@ -2404,14 +2404,14 @@ pmap_zero_page(phys)
{
if (DOPDB(PDB_FOLLOW|PDB_ZERO_PAGE))
- printf("pmap_zero_page(0x%lx)\n", phys);
+ kprintf("pmap_zero_page(0x%lx)\n", phys);
assert(phys != vm_page_fictitious_addr);
bzero((void *)phystokv(phys), PAGE_SIZE);
if (DOVPDB(PDB_FOLLOW|PDB_ZERO_PAGE))
- printf("pmap_zero_page: leaving\n");
+ kprintf("pmap_zero_page: leaving\n");
}
#endif
@@ -2426,7 +2426,7 @@ pmap_copy_page(src, dst)
{
if (DOPDB(PDB_FOLLOW|PDB_COPY_PAGE))
- printf("pmap_copy_page(0x%lx, 0x%lx)\n", src, dst);
+ kprintf("pmap_copy_page(0x%lx, 0x%lx)\n", src, dst);
assert(src != vm_page_fictitious_addr);
assert(dst != vm_page_fictitious_addr);
@@ -2434,7 +2434,7 @@ pmap_copy_page(src, dst)
aligned_block_copy(phystokv(src), phystokv(dst), PAGE_SIZE);
if (DOVPDB(PDB_FOLLOW|PDB_COPY_PAGE))
- printf("pmap_copy_page: leaving\n");
+ kprintf("pmap_copy_page: leaving\n");
}
#endif
@@ -2968,7 +2968,7 @@ set_ptbr(pmap_t map, pcb_t pcb, boolean_t switchit)
vm_offset_t pa;
pa = pmap_resident_extract(kernel_pmap, (vm_offset_t)map->dirbase);
-printf("set_ptbr (switch = %d): dirbase = 0x%lx, pa = 0x%lx\n", switchit, map->dirbase, pa);
+kprintf("set_ptbr (switch = %d): dirbase = 0x%lx, pa = 0x%lx\n", switchit, map->dirbase, pa);
if (pa == 0)
panic("set_ptbr");
#if 0
@@ -3010,7 +3010,7 @@ pmap_tlbpid_init(maxasn)
simple_lock_init(&tlbpid_lock);
if (DOVPDB(PDB_FOLLOW|PDB_TLBPID_INIT))
- printf("pmap_tlbpid_init: maxasn = %d\n", maxasn);
+ kprintf("pmap_tlbpid_init: maxasn = %d\n", maxasn);
pmap_max_asn = maxasn;
if (maxasn == 0) {
@@ -3043,7 +3043,7 @@ pmap_tlbpid_assign(map)
register int pid, next_pid;
if (DOVPDB(PDB_FOLLOW|PDB_TLBPID_ASSIGN))
- printf("pmap_tlbpid_assign: pmap %p had %d\n", map, map->pid);
+ kprintf("pmap_tlbpid_assign: pmap %p had %d\n", map, map->pid);
if (pmap_max_asn && map->pid < 0) {
@@ -3075,7 +3075,7 @@ got_a_free_one:
simple_unlock(&tlbpid_lock);
}
if (DOVPDB(PDB_FOLLOW|PDB_TLBPID_ASSIGN))
- printf("pmap_tlbpid_assign: pmap %p got %d\n", map, map->pid);
+ kprintf("pmap_tlbpid_assign: pmap %p got %d\n", map, map->pid);
}
pmap_tlbpid_destroy(pid, locked)
@@ -3085,7 +3085,7 @@ pmap_tlbpid_destroy(pid, locked)
struct pmap *map;
if (DOVPDB(PDB_FOLLOW|PDB_TLBPID_DESTROY))
- printf("pmap_tlbpid_destroy(%d, %d)\n", pid, locked);
+ kprintf("pmap_tlbpid_destroy(%d, %d)\n", pid, locked);
if (pid < 0) /* no longer in use */
return;
@@ -3294,11 +3294,11 @@ sanity(pmap, addr)
register pt_entry_t *ptp;
register pt_entry_t pte;
- printf("checking dirbase...\n");
+ kprintf("checking dirbase...\n");
assert(pmap->dirbase != 0);
- printf("checking dirpfn...\n");
+ kprintf("checking dirpfn...\n");
assert(pmap->dirpfn == curproc->p_addr->u_pcb.pcb_hw.apcb_ptbr);
- printf("checking pid...\n");
+ kprintf("checking pid...\n");
assert(pmap->pid == curproc->p_addr->u_pcb.pcb_hw.apcb_asn);
diff --git a/sys/arch/alpha/alpha/pmap.old.c b/sys/arch/alpha/alpha/pmap.old.c
index e765541ff29..b9cd324d39e 100644
--- a/sys/arch/alpha/alpha/pmap.old.c
+++ b/sys/arch/alpha/alpha/pmap.old.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.old.c,v 1.11 1996/07/14 20:00:27 cgd Exp $ */
+/* $NetBSD: pmap.old.c,v 1.12 1996/10/10 23:50:39 christos Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -290,7 +290,7 @@ pmap_bootstrap(firstaddr, ptaddr)
#ifdef DEBUG
if (pmapdebug & (PDB_FOLLOW|PDB_BOOTSTRAP))
- printf("pmap_bootstrap(0x%lx, 0x%lx)\n", firstaddr, ptaddr);
+ kprintf("pmap_bootstrap(0x%lx, 0x%lx)\n", firstaddr, ptaddr);
#endif
/* must be page aligned */
@@ -417,9 +417,9 @@ pmap_bootstrap(firstaddr, ptaddr)
mem_size = NBPG + avail_end - avail_start;
#endif
#if 0
- printf("avail_start = 0x%lx\n", avail_start);
- printf("avail_end = 0x%lx\n", avail_end);
- printf("mem_size = 0x%lx\n", mem_size);
+ kprintf("avail_start = 0x%lx\n", avail_start);
+ kprintf("avail_end = 0x%lx\n", avail_end);
+ kprintf("mem_size = 0x%lx\n", mem_size);
#endif
virtual_avail = VM_MIN_KERNEL_ADDRESS;
@@ -437,7 +437,7 @@ pmap_bootstrap(firstaddr, ptaddr)
/*
* Unmap the PROM mappings. PROM mappings are kept around
- * by pmap_bootstrap, so we can still use the prom's printf.
+ * by pmap_bootstrap, so we can still use the prom's kprintf.
* Basically, blow away all mappings in the level one PTE
* table below VM_MIN_KERNEL_ADDRESS. The Virtual Page Table
* Is at the end of virtual space, so it's safe.
@@ -451,7 +451,7 @@ pmap_unmap_prom()
#ifdef DEBUG
if (pmapdebug & (PDB_FOLLOW|PDB_BOOTSTRAP))
- printf("pmap_unmap_prom\n");
+ kprintf("pmap_unmap_prom\n");
#endif
/* XXX save old pte so that we can remap prom if necessary */
@@ -485,7 +485,7 @@ pmap_bootstrap_alloc(size)
#ifdef DEBUG
if (pmapdebug & (PDB_FOLLOW|PDB_BOOTSTRAP))
- printf("pmap_bootstrap_alloc(%lx)\n", size);
+ kprintf("pmap_bootstrap_alloc(%lx)\n", size);
#endif
if (vm_page_startup_initialized)
panic("pmap_bootstrap_alloc: called after startup initialized");
@@ -512,7 +512,7 @@ pmap_init(phys_start, phys_end)
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW)
- printf("pmap_init(%x, %x)\n", phys_start, phys_end);
+ kprintf("pmap_init(%x, %x)\n", phys_start, phys_end);
#endif
/* initialize protection array */
@@ -536,8 +536,8 @@ pmap_init(phys_start, phys_end)
vm_first_phys = phys_start;
vm_last_phys = phys_end;
#if 0
- printf("vm_first_phys = 0x%lx\n", vm_first_phys);
- printf("vm_last_phys = 0x%lx\n", vm_last_phys);
+ kprintf("vm_first_phys = 0x%lx\n", vm_first_phys);
+ kprintf("vm_last_phys = 0x%lx\n", vm_last_phys);
#endif
pmap_initialized = TRUE;
}
@@ -558,7 +558,7 @@ pmap_map(virt, start, end, prot)
{
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW)
- printf("pmap_map(%lx, %lx, %lx, %lx)\n", virt, start, end, prot);
+ kprintf("pmap_map(%lx, %lx, %lx, %lx)\n", virt, start, end, prot);
#endif
while (start < end) {
pmap_enter(pmap_kernel(), virt, start, prot, FALSE);
@@ -588,7 +588,7 @@ pmap_create(size)
#ifdef DEBUG
if (pmapdebug & (PDB_FOLLOW|PDB_CREATE))
- printf("pmap_create(%lx)\n", size);
+ kprintf("pmap_create(%lx)\n", size);
#endif
/*
* Software use map does not need a pmap
@@ -618,7 +618,7 @@ pmap_pinit(pmap)
#ifdef DEBUG
if (pmapdebug & (PDB_FOLLOW|PDB_CREATE))
- printf("pmap_pinit(%lx)\n", pmap);
+ kprintf("pmap_pinit(%lx)\n", pmap);
#endif
/*
* No need to allocate page table space yet but we do need a
@@ -646,7 +646,7 @@ pmap_destroy(pmap)
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW)
- printf("pmap_destroy(%lx)\n", pmap);
+ kprintf("pmap_destroy(%lx)\n", pmap);
#endif
if (pmap == NULL)
return;
@@ -672,7 +672,7 @@ pmap_release(pmap)
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW)
- printf("pmap_release(%lx)\n", pmap);
+ kprintf("pmap_release(%lx)\n", pmap);
#endif
#ifdef notdef /* DIAGNOSTIC */
/* count would be 0 from pmap_destroy... */
@@ -697,7 +697,7 @@ pmap_reference(pmap)
{
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW)
- printf("pmap_reference(%lx)\n", pmap);
+ kprintf("pmap_reference(%lx)\n", pmap);
#endif
if (pmap != NULL) {
simple_lock(&pmap->pm_lock);
@@ -724,7 +724,7 @@ pmap_remove(pmap, sva, eva)
#ifdef DEBUG
if (pmapdebug & (PDB_FOLLOW|PDB_REMOVE|PDB_PROTECT))
- printf("pmap_remove(%lx, %lx, %lx)\n", pmap, sva, eva);
+ kprintf("pmap_remove(%lx, %lx, %lx)\n", pmap, sva, eva);
#endif
if (pmap == NULL)
@@ -784,7 +784,7 @@ pmap_page_protect(pa, prot)
#ifdef DEBUG
if ((pmapdebug & (PDB_FOLLOW|PDB_PROTECT)) ||
prot == VM_PROT_NONE && (pmapdebug & PDB_REMOVE))
- printf("pmap_page_protect(%lx, %lx)\n", pa, prot);
+ kprintf("pmap_page_protect(%lx, %lx)\n", pa, prot);
#endif
if (!PAGE_IS_MANAGED(pa))
return;
@@ -820,7 +820,7 @@ pmap_page_protect(pa, prot)
pv = pv->pv_next;
#ifdef DEBUG
if (pmapdebug & PDB_PARANOIA)
- printf("%s wired mapping for %lx not removed\n",
+ kprintf("%s wired mapping for %lx not removed\n",
"pmap_page_protect:", pa);
#endif
}
@@ -844,7 +844,7 @@ pmap_protect(pmap, sva, eva, prot)
#ifdef DEBUG
if (pmapdebug & (PDB_FOLLOW|PDB_PROTECT))
- printf("pmap_protect(%lx, %lx, %lx, %lx)\n", pmap, sva, eva, prot);
+ kprintf("pmap_protect(%lx, %lx, %lx, %lx)\n", pmap, sva, eva, prot);
#endif
if (pmap == NULL)
@@ -931,7 +931,7 @@ pmap_enter(pmap, va, pa, prot, wired)
#ifdef DEBUG
if (pmapdebug & (PDB_FOLLOW|PDB_ENTER))
- printf("pmap_enter(%lx, %lx, %lx, %lx, %lx)\n",
+ kprintf("pmap_enter(%lx, %lx, %lx, %lx, %lx)\n",
pmap, va, pa, prot, wired);
#endif
if (pmap == NULL)
@@ -960,7 +960,7 @@ pmap_enter(pmap, va, pa, prot, wired)
opa = pmap_pte_pa(pte);
#ifdef DEBUG
if (pmapdebug & PDB_ENTER)
- printf("enter: pte %lx, *pte %lx\n", pte, *pte);
+ kprintf("enter: pte %lx, *pte %lx\n", pte, *pte);
#endif
/*
@@ -979,7 +979,7 @@ pmap_enter(pmap, va, pa, prot, wired)
if (pmap_pte_w_chg(pte, wired ? PG_WIRED : 0)) {
#ifdef DEBUG
if (pmapdebug & PDB_ENTER)
- printf("enter: wiring change -> %lx\n", wired);
+ kprintf("enter: wiring change -> %lx\n", wired);
#endif
if (wired)
pmap->pm_stats.wired_count++;
@@ -1010,7 +1010,7 @@ pmap_enter(pmap, va, pa, prot, wired)
if (opa) {
#ifdef DEBUG
if (pmapdebug & PDB_ENTER)
- printf("enter: removing old mapping %lx\n", va);
+ kprintf("enter: removing old mapping %lx\n", va);
#endif
pmap_remove_mapping(pmap, va, pte, PRM_TFLUSH|PRM_CFLUSH);
#ifdef PMAPSTATS
@@ -1043,7 +1043,7 @@ pmap_enter(pmap, va, pa, prot, wired)
s = splimp();
#ifdef DEBUG
if (pmapdebug & PDB_ENTER)
- printf("enter: pv at %lx: %lx/%lx/%lx\n",
+ kprintf("enter: pv at %lx: %lx/%lx/%lx\n",
pv, pv->pv_va, pv->pv_pmap, pv->pv_next);
#endif
/*
@@ -1119,7 +1119,7 @@ validate:
npte |= PG_WIRED;
#ifdef DEBUG
if (pmapdebug & PDB_ENTER)
- printf("enter: new pte value %lx\n", npte);
+ kprintf("enter: new pte value %lx\n", npte);
#endif
/*
* Remember if this was a wiring-only change.
@@ -1152,7 +1152,7 @@ pmap_change_wiring(pmap, va, wired)
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW)
- printf("pmap_change_wiring(%lx, %lx, %lx)\n", pmap, va, wired);
+ kprintf("pmap_change_wiring(%lx, %lx, %lx)\n", pmap, va, wired);
#endif
if (pmap == NULL)
return;
@@ -1166,7 +1166,7 @@ pmap_change_wiring(pmap, va, wired)
*/
if (!pmap_ste_v(pmap, va)) {
if (pmapdebug & PDB_PARANOIA)
- printf("pmap_change_wiring: invalid STE for %lx\n", va);
+ kprintf("pmap_change_wiring: invalid STE for %lx\n", va);
return;
}
/*
@@ -1175,7 +1175,7 @@ pmap_change_wiring(pmap, va, wired)
*/
if (!pmap_pte_v(pte)) {
if (pmapdebug & PDB_PARANOIA)
- printf("pmap_change_wiring: invalid PTE for %lx\n", va);
+ kprintf("pmap_change_wiring: invalid PTE for %lx\n", va);
}
#endif
/*
@@ -1209,7 +1209,7 @@ pmap_extract(pmap, va)
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW)
- printf("pmap_extract(%lx, %lx) -> ", pmap, va);
+ kprintf("pmap_extract(%lx, %lx) -> ", pmap, va);
#endif
pa = 0;
if (pmap && pmap_ste_v(pmap, va)) {
@@ -1220,7 +1220,7 @@ pmap_extract(pmap, va)
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW)
- printf("%lx\n", pa);
+ kprintf("%lx\n", pa);
#endif
return(pa);
}
@@ -1241,7 +1241,7 @@ void pmap_copy(dst_pmap, src_pmap, dst_addr, len, src_addr)
{
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW)
- printf("pmap_copy(%lx, %lx, %lx, %lx, %lx)\n",
+ kprintf("pmap_copy(%lx, %lx, %lx, %lx, %lx)\n",
dst_pmap, src_pmap, dst_addr, len, src_addr);
#endif
}
@@ -1258,7 +1258,7 @@ void pmap_update()
{
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW)
- printf("pmap_update()\n");
+ kprintf("pmap_update()\n");
#endif
ALPHA_TBIA();
}
@@ -1293,7 +1293,7 @@ pmap_collect(pmap)
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW)
- printf("pmap_collect(%lx)\n", pmap);
+ kprintf("pmap_collect(%lx)\n", pmap);
#endif
#ifdef PMAPSTATS
kpt_stats.collectscans++;
@@ -1318,7 +1318,7 @@ pmap_collect(pmap)
#ifdef DEBUG
if (pv->pv_va < (vm_offset_t)Sysmap ||
pv->pv_va >= (vm_offset_t)Sysmap + ALPHA_MAX_PTSIZE)
- printf("collect: kernel PT VA out of range\n");
+ kprintf("collect: kernel PT VA out of range\n");
else
goto ok;
pmap_pvdump(pa);
@@ -1333,7 +1333,7 @@ ok:
#ifdef DEBUG
if (pmapdebug & (PDB_PTPAGE|PDB_COLLECT)) {
- printf("collect: freeing KPT page at %lx (ste %lx@%lx)\n",
+ kprintf("collect: freeing KPT page at %lx (ste %lx@%lx)\n",
pv->pv_va, *pv->pv_ptpte, pv->pv_ptpte);
opmapdebug = pmapdebug;
pmapdebug |= PDB_PTPAGE;
@@ -1363,7 +1363,7 @@ ok:
if (kpt == (struct kpt_page *)0)
panic("pmap_collect: lost a KPT page");
if (pmapdebug & (PDB_PTPAGE|PDB_COLLECT))
- printf("collect: %lx (%lx) to free list\n",
+ kprintf("collect: %lx (%lx) to free list\n",
kpt->kpt_va, kpa);
#endif
*pkpt = kpt->kpt_next;
@@ -1378,11 +1378,11 @@ ok:
pmapdebug = opmapdebug;
if (*ste)
- printf("collect: kernel STE at %lx still valid (%lx)\n",
+ kprintf("collect: kernel STE at %lx still valid (%lx)\n",
ste, *ste);
ste = &Sysptmap[(pt_entry_t *)ste-pmap_ste(pmap_kernel(), 0)];
if (*ste)
- printf("collect: kernel PTmap at %lx still valid (%lx)\n",
+ kprintf("collect: kernel PTmap at %lx still valid (%lx)\n",
ste, *ste);
#endif
}
@@ -1397,7 +1397,7 @@ pmap_activate(pmap)
#ifdef DEBUG
if (pmapdebug & (PDB_FOLLOW|PDB_SEGTAB))
- printf("pmap_activate(%lx)\n", pmap);
+ kprintf("pmap_activate(%lx)\n", pmap);
#endif
iscurproc = curproc != NULL && pmap == curproc->p_vmspace->vm_map.pmap;
@@ -1418,7 +1418,7 @@ pmap_zero_page(phys)
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW)
- printf("pmap_zero_page(%lx)\n", phys);
+ kprintf("pmap_zero_page(%lx)\n", phys);
#endif
p = (caddr_t)ALPHA_PHYS_TO_K0SEG(phys);
bzero(p, PAGE_SIZE);
@@ -1438,7 +1438,7 @@ pmap_copy_page(src, dst)
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW)
- printf("pmap_copy_page(%lx, %lx)\n", src, dst);
+ kprintf("pmap_copy_page(%lx, %lx)\n", src, dst);
#endif
s = (caddr_t)ALPHA_PHYS_TO_K0SEG(src);
d = (caddr_t)ALPHA_PHYS_TO_K0SEG(dst);
@@ -1467,7 +1467,7 @@ pmap_pageable(pmap, sva, eva, pageable)
{
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW)
- printf("pmap_pageable(%lx, %lx, %lx, %lx)\n",
+ kprintf("pmap_pageable(%lx, %lx, %lx, %lx)\n",
pmap, sva, eva, pageable);
#endif
/*
@@ -1484,7 +1484,7 @@ pmap_pageable(pmap, sva, eva, pageable)
#ifdef DEBUG
if ((pmapdebug & (PDB_FOLLOW|PDB_PTPAGE)) == PDB_PTPAGE)
- printf("pmap_pageable(%lx, %lx, %lx, %lx)\n",
+ kprintf("pmap_pageable(%lx, %lx, %lx, %lx)\n",
pmap, sva, eva, pageable);
#endif
if (!pmap_ste_v(pmap, sva))
@@ -1497,7 +1497,7 @@ pmap_pageable(pmap, sva, eva, pageable)
return;
#ifdef DEBUG
if (pv->pv_va != sva || pv->pv_next) {
- printf("pmap_pageable: bad PT page va %lx next %lx\n",
+ kprintf("pmap_pageable: bad PT page va %lx next %lx\n",
pv->pv_va, pv->pv_next);
return;
}
@@ -1508,12 +1508,12 @@ pmap_pageable(pmap, sva, eva, pageable)
pmap_clear_modify(pa);
#ifdef DEBUG
if ((PHYS_TO_VM_PAGE(pa)->flags & PG_CLEAN) == 0) {
- printf("pa %lx: flags=%lx: not clean\n",
+ kprintf("pa %lx: flags=%lx: not clean\n",
pa, PHYS_TO_VM_PAGE(pa)->flags);
PHYS_TO_VM_PAGE(pa)->flags |= PG_CLEAN;
}
if (pmapdebug & PDB_PTPAGE)
- printf("pmap_pageable: PT page %lx(%lx) unmodified\n",
+ kprintf("pmap_pageable: PT page %lx(%lx) unmodified\n",
sva, *pmap_pte(pmap, sva));
if (pmapdebug & PDB_WIRING)
pmap_check_wiring("pageable", sva);
@@ -1531,7 +1531,7 @@ pmap_clear_modify(pa)
{
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW)
- printf("pmap_clear_modify(%lx)\n", pa);
+ kprintf("pmap_clear_modify(%lx)\n", pa);
#endif
if (!PAGE_IS_MANAGED(pa)) /* XXX why not panic? */
return;
@@ -1552,7 +1552,7 @@ void pmap_clear_reference(pa)
{
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW)
- printf("pmap_clear_reference(%lx)\n", pa);
+ kprintf("pmap_clear_reference(%lx)\n", pa);
#endif
if (!PAGE_IS_MANAGED(pa)) /* XXX why not panic? */
return;
@@ -1580,7 +1580,7 @@ pmap_is_referenced(pa)
rv = (pmap_attributes[pa_index(pa)] & PMAP_ATTR_REF) != 0;
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW) {
- printf("pmap_is_referenced(%lx) -> %c\n", pa, "FT"[rv]);
+ kprintf("pmap_is_referenced(%lx) -> %c\n", pa, "FT"[rv]);
}
#endif
return rv;
@@ -1604,7 +1604,7 @@ pmap_is_modified(pa)
rv = (pmap_attributes[pa_index(pa)] & PMAP_ATTR_MOD) != 0;
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW) {
- printf("pmap_is_modified(%lx) -> %c\n", pa, "FT"[rv]);
+ kprintf("pmap_is_modified(%lx) -> %c\n", pa, "FT"[rv]);
}
#endif
return rv;
@@ -1682,7 +1682,7 @@ pmap_remove_mapping(pmap, va, pte, flags)
pt_entry_t opte;
if (pmapdebug & (PDB_FOLLOW|PDB_REMOVE|PDB_PROTECT))
- printf("pmap_remove_mapping(%lx, %lx, %lx, %lx)\n",
+ kprintf("pmap_remove_mapping(%lx, %lx, %lx, %lx)\n",
pmap, va, pte, flags);
#endif
@@ -1713,7 +1713,7 @@ pmap_remove_mapping(pmap, va, pte, flags)
*/
#ifdef DEBUG
if (pmapdebug & PDB_REMOVE)
- printf("remove: invalidating pte at %lx\n", pte);
+ kprintf("remove: invalidating pte at %lx\n", pte);
#endif
*pte = PG_NV;
if ((flags & PRM_TFLUSH) && active_pmap(pmap))
@@ -1793,7 +1793,7 @@ pmap_remove_mapping(pmap, va, pte, flags)
#endif
#ifdef DEBUG
if (pmapdebug & (PDB_REMOVE|PDB_PTPAGE))
- printf("remove: ste was %lx@%lx pte was %lx@%lx\n",
+ kprintf("remove: ste was %lx@%lx pte was %lx@%lx\n",
*ste, ste, opte, pmap_pte(pmap, va));
#endif
*ste = PG_NV;
@@ -1805,7 +1805,7 @@ pmap_remove_mapping(pmap, va, pte, flags)
if (ptpmap != pmap_kernel()) {
#ifdef DEBUG
if (pmapdebug & (PDB_REMOVE|PDB_SEGTAB))
- printf("remove: stab %lx, refcnt %d\n",
+ kprintf("remove: stab %lx, refcnt %d\n",
ptpmap->pm_stab, ptpmap->pm_sref - 1);
if ((pmapdebug & PDB_PARANOIA) &&
ptpmap->pm_stab != (pt_entry_t *)trunc_page(ste))
@@ -1814,7 +1814,7 @@ pmap_remove_mapping(pmap, va, pte, flags)
if (--(ptpmap->pm_sref) == 0) {
#ifdef DEBUG
if (pmapdebug&(PDB_REMOVE|PDB_SEGTAB))
- printf("remove: free stab %lx\n",
+ kprintf("remove: free stab %lx\n",
ptpmap->pm_stab);
#endif
kmem_free_wakeup(st_map,
@@ -1872,7 +1872,7 @@ pmap_changebit(pa, bit, setem)
#ifdef DEBUG
if (pmapdebug & PDB_BITS)
- printf("pmap_changebit(%lx, %lx, %s)\n",
+ kprintf("pmap_changebit(%lx, %lx, %s)\n",
pa, bit, setem ? "set" : "clear");
#endif
if (!PAGE_IS_MANAGED(pa))
@@ -1953,7 +1953,7 @@ pmap_enter_ptpage(pmap, va)
#ifdef DEBUG
if (pmapdebug & (PDB_FOLLOW|PDB_ENTER|PDB_PTPAGE))
- printf("pmap_enter_ptpage: pmap %lx, va %lx\n", pmap, va);
+ kprintf("pmap_enter_ptpage: pmap %lx, va %lx\n", pmap, va);
#endif
#ifdef PMAPSTATS
enter_stats.ptpneeded++;
@@ -1978,7 +1978,7 @@ pmap_enter_ptpage(pmap, va)
PMAP_ACTIVATE(pmap, 1);
#ifdef DEBUG
if (pmapdebug & (PDB_ENTER|PDB_PTPAGE|PDB_SEGTAB))
- printf("enter: pmap %lx stab %lx(%lx)\n",
+ kprintf("enter: pmap %lx stab %lx(%lx)\n",
pmap, pmap->pm_stab, pmap->pm_stpte);
#endif
}
@@ -2002,7 +2002,7 @@ pmap_enter_ptpage(pmap, va)
*/
#ifdef DEBUG
if (pmapdebug & PDB_COLLECT)
- printf("enter: no KPT pages, collecting...\n");
+ kprintf("enter: no KPT pages, collecting...\n");
#endif
pmap_collect(pmap_kernel());
if ((kpt = kpt_free_list) == (struct kpt_page *)0)
@@ -2022,7 +2022,7 @@ pmap_enter_ptpage(pmap, va)
if (pmapdebug & (PDB_ENTER|PDB_PTPAGE)) {
int ix = pmap_ste(pmap, va) - pmap_ste(pmap, 0);
- printf("enter: add &Sysptmap[%d]: %lx (KPT page %lx)\n",
+ kprintf("enter: add &Sysptmap[%d]: %lx (KPT page %lx)\n",
ix, Sysptmap[ix], kpt->kpt_va);
}
#endif
@@ -2040,11 +2040,11 @@ pmap_enter_ptpage(pmap, va)
pmap->pm_sref++;
#ifdef DEBUG
if (pmapdebug & (PDB_ENTER|PDB_PTPAGE))
- printf("enter: about to fault UPT pg at %lx\n", va);
+ kprintf("enter: about to fault UPT pg at %lx\n", va);
#endif
s = vm_fault(pt_map, va, VM_PROT_READ|VM_PROT_WRITE, FALSE);
if (s != KERN_SUCCESS) {
- printf("vm_fault(pt_map, %lx, RW, 0) -> %d\n", va, s);
+ kprintf("vm_fault(pt_map, %lx, RW, 0) -> %d\n", va, s);
panic("pmap_enter: vm_fault failed");
}
ptpa = pmap_extract(pmap_kernel(), va);
@@ -2080,7 +2080,7 @@ pmap_enter_ptpage(pmap, va)
pv->pv_ptpmap = pmap;
#ifdef DEBUG
if (pmapdebug & (PDB_ENTER|PDB_PTPAGE))
- printf("enter: new PT page at PA %lx, ste at %lx\n", ptpa, ste);
+ kprintf("enter: new PT page at PA %lx, ste at %lx\n", ptpa, ste);
#endif
/*
@@ -2096,7 +2096,7 @@ pmap_enter_ptpage(pmap, va)
if (pmap != pmap_kernel()) {
#ifdef DEBUG
if (pmapdebug & (PDB_ENTER|PDB_PTPAGE|PDB_SEGTAB))
- printf("enter: stab %lx refcnt %d\n",
+ kprintf("enter: stab %lx refcnt %d\n",
pmap->pm_stab, pmap->pm_sref);
#endif
}
@@ -2129,7 +2129,7 @@ pmap_emulate_reference(p, v, user, write)
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW)
- printf("pmap_emulate_reference: 0x%lx, 0x%lx, %d, %d\n",
+ kprintf("pmap_emulate_reference: 0x%lx, 0x%lx, %d, %d\n",
p, v, user, write);
#endif
@@ -2151,8 +2151,8 @@ pmap_emulate_reference(p, v, user, write)
}
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW) {
- printf("\tpte = 0x%lx, ", pte);
- printf("*pte = 0x%lx\n", *pte);
+ kprintf("\tpte = 0x%lx, ", pte);
+ kprintf("*pte = 0x%lx\n", *pte);
}
#endif
#ifdef DEBUG /* These checks are more expensive */
@@ -2181,11 +2181,11 @@ pmap_emulate_reference(p, v, user, write)
pa = pmap_pte_pa(pte);
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW)
- printf("\tpa = 0x%lx\n", pa);
+ kprintf("\tpa = 0x%lx\n", pa);
#endif
#ifdef DIAGNOSTIC
if (!PAGE_IS_MANAGED(pa))
- printf("WARNING: pmap_emulate_reference(0x%lx, 0x%lx, %d, %d): pa 0x%lx not managed\n", p, v, user, write, pa);
+ kprintf("WARNING: pmap_emulate_reference(0x%lx, 0x%lx, %d, %d): pa 0x%lx not managed\n", p, v, user, write, pa);
#endif
/*
@@ -2210,7 +2210,7 @@ pmap_emulate_reference(p, v, user, write)
* This is apparently normal. Why? -- cgd
* XXX because was being called on unmanaged pages?
*/
- printf("warning: pmap_changebit didn't.");
+ kprintf("warning: pmap_changebit didn't.");
#endif
*pte &= ~faultoff;
ALPHA_TBIS(v);
@@ -2225,12 +2225,12 @@ pmap_pvdump(pa)
{
register pv_entry_t pv;
- printf("pa %lx", pa);
+ kprintf("pa %lx", pa);
for (pv = pa_to_pvh(pa); pv; pv = pv->pv_next)
- printf(" -> pmap %lx, va %lx, stpte %lx, ptpmap %lx, flags %lx",
+ kprintf(" -> pmap %lx, va %lx, stpte %lx, ptpmap %lx, flags %lx",
pv->pv_pmap, pv->pv_va, pv->pv_ptpte, pv->pv_ptpmap,
pv->pv_flags);
- printf("\n");
+ kprintf("\n");
}
/* static */
@@ -2249,7 +2249,7 @@ pmap_check_wiring(str, va)
return;
if (!vm_map_lookup_entry(pt_map, va, &entry)) {
- printf("wired_check: entry for %lx not found\n", va);
+ kprintf("wired_check: entry for %lx not found\n", va);
return;
}
count = 0;
@@ -2257,7 +2257,7 @@ pmap_check_wiring(str, va)
if (*pte)
count++;
if (entry->wired_count != count)
- printf("*%s*: %lx: w%d/a%d\n",
+ kprintf("*%s*: %lx: w%d/a%d\n",
str, va, entry->wired_count, count);
}
#endif
@@ -2269,7 +2269,7 @@ vtophys(vaddr)
vm_offset_t paddr;
if (vaddr < ALPHA_K0SEG_BASE) {
- printf("vtophys: invalid vaddr 0x%lx", vaddr);
+ kprintf("vtophys: invalid vaddr 0x%lx", vaddr);
paddr = vaddr;
} else if (vaddr <= ALPHA_K0SEG_END)
paddr = ALPHA_K0SEG_TO_PHYS(vaddr);
@@ -2277,7 +2277,7 @@ vtophys(vaddr)
paddr = vatopa(vaddr);
#if 0
- printf("vtophys(0x%lx) -> %lx\n", vaddr, paddr);
+ kprintf("vtophys(0x%lx) -> %lx\n", vaddr, paddr);
#endif
return (paddr);
diff --git a/sys/arch/alpha/alpha/rd_root.c b/sys/arch/alpha/alpha/rd_root.c
index 5cfab746b91..37d8f0168ad 100644
--- a/sys/arch/alpha/alpha/rd_root.c
+++ b/sys/arch/alpha/alpha/rd_root.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rd_root.c,v 1.3 1996/10/03 19:54:45 cgd Exp $ */
+/* $NetBSD: rd_root.c,v 1.4 1996/10/10 23:50:41 christos Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -62,7 +62,7 @@ rd_attach_hook(unit, rd)
rd->rd_addr = (caddr_t)rd_root_image;
rd->rd_size = (size_t)rd_root_size;
rd->rd_type = RD_KMEM_FIXED;
- printf("rd%d: internal %dK image area\n", unit,
+ kprintf("rd%d: internal %dK image area\n", unit,
ROOTBYTES / 1024);
}
}
diff --git a/sys/arch/alpha/alpha/trap.c b/sys/arch/alpha/alpha/trap.c
index eac8a87d1ef..3ccbef4160f 100644
--- a/sys/arch/alpha/alpha/trap.c
+++ b/sys/arch/alpha/alpha/trap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.14 1996/09/07 22:26:42 mycroft Exp $ */
+/* $NetBSD: trap.c,v 1.15 1996/10/10 23:50:43 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -187,8 +187,8 @@ sigfpe: i = SIGFPE;
#ifdef NEW_PMAP
{
int instr;
-printf("REAL SIGILL: PC = 0x%lx, RA = 0x%lx\n", framep->tf_regs[FRAME_PC], framep->tf_regs[FRAME_RA]);
-printf("INSTRUCTION (%d) = 0x%lx\n", copyin((void*)framep->tf_regs[FRAME_PC] - 4, &instr, 4), instr);
+kprintf("REAL SIGILL: PC = 0x%lx, RA = 0x%lx\n", framep->tf_regs[FRAME_PC], framep->tf_regs[FRAME_RA]);
+kprintf("INSTRUCTION (%d) = 0x%lx\n", copyin((void*)framep->tf_regs[FRAME_PC] - 4, &instr, 4), instr);
regdump(framep);
panic("foo");
}
@@ -202,7 +202,7 @@ panic("foo");
* FP is enabled.
*/
if (fpcurproc == p) {
- printf("trap: fp disabled for fpcurproc == %p",
+ kprintf("trap: fp disabled for fpcurproc == %p",
p);
goto dopanic;
}
@@ -218,34 +218,34 @@ panic("foo");
goto out;
default:
- printf("trap: unknown IF type 0x%lx\n", a0);
+ kprintf("trap: unknown IF type 0x%lx\n", a0);
goto dopanic;
}
break;
case ALPHA_KENTRY_MM:
#ifdef NEW_PMAP
- printf("mmfault: 0x%lx, 0x%lx, %d\n", a0, a1, a2);
+ kprintf("mmfault: 0x%lx, 0x%lx, %d\n", a0, a1, a2);
#endif
switch (a1) {
case ALPHA_MMCSR_FOR:
case ALPHA_MMCSR_FOE:
#ifdef NEW_PMAP
- printf("mmfault for/foe in\n");
+ kprintf("mmfault for/foe in\n");
#endif
pmap_emulate_reference(p, a0, user, 0);
#ifdef NEW_PMAP
- printf("mmfault for/foe out\n");
+ kprintf("mmfault for/foe out\n");
#endif
goto out;
case ALPHA_MMCSR_FOW:
#ifdef NEW_PMAP
- printf("mmfault fow in\n");
+ kprintf("mmfault fow in\n");
#endif
pmap_emulate_reference(p, a0, user, 1);
#ifdef NEW_PMAP
- printf("mmfault fow out\n");
+ kprintf("mmfault fow out\n");
#endif
goto out;
@@ -261,7 +261,7 @@ panic("foo");
extern vm_map_t kernel_map;
#ifdef NEW_PMAP
- printf("mmfault invaltrans/access in\n");
+ kprintf("mmfault invaltrans/access in\n");
#endif
/*
* If it was caused by fuswintr or suswintr,
@@ -276,13 +276,13 @@ panic("foo");
(unsigned long)fswintrberr &&
p->p_addr->u_pcb.pcb_accessaddr == a0) {
#ifdef NEW_PMAP
- printf("mmfault nfintr in\n");
+ kprintf("mmfault nfintr in\n");
#endif
framep->tf_regs[FRAME_PC] =
p->p_addr->u_pcb.pcb_onfault;
p->p_addr->u_pcb.pcb_onfault = 0;
#ifdef NEW_PMAP
- printf("mmfault nfintr out\n");
+ kprintf("mmfault nfintr out\n");
#endif
goto out;
}
@@ -315,11 +315,11 @@ panic("foo");
va = trunc_page((vm_offset_t)a0);
#ifdef NEW_PMAP
- printf("mmfault going to vm_fault\n");
+ kprintf("mmfault going to vm_fault\n");
#endif
rv = vm_fault(map, va, ftype, FALSE);
#ifdef NEW_PMAP
- printf("mmfault back from vm_fault\n");
+ kprintf("mmfault back from vm_fault\n");
#endif
/*
* If this was a stack access we keep track of the
@@ -342,14 +342,14 @@ panic("foo");
}
if (rv == KERN_SUCCESS) {
#ifdef NEW_PMAP
- printf("mmfault vm_fault success\n");
+ kprintf("mmfault vm_fault success\n");
#endif
goto out;
}
if (!user) {
#ifdef NEW_PMAP
- printf("mmfault check copyfault\n");
+ kprintf("mmfault check copyfault\n");
#endif
/* Check for copyin/copyout fault */
if (p != NULL &&
@@ -367,7 +367,7 @@ panic("foo");
}
default:
- printf("trap: unknown MMCSR value 0x%lx\n", a1);
+ kprintf("trap: unknown MMCSR value 0x%lx\n", a1);
goto dopanic;
}
break;
@@ -383,20 +383,20 @@ out:
return;
dopanic:
- printf("\n");
- printf("fatal %s trap:\n", user ? "user" : "kernel");
- printf("\n");
- printf(" trap entry = 0x%lx\n", entry);
- printf(" a0 = 0x%lx\n", a0);
- printf(" a1 = 0x%lx\n", a1);
- printf(" a2 = 0x%lx\n", a2);
- 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);
+ kprintf("\n");
+ kprintf("fatal %s trap:\n", user ? "user" : "kernel");
+ kprintf("\n");
+ kprintf(" trap entry = 0x%lx\n", entry);
+ kprintf(" a0 = 0x%lx\n", a0);
+ kprintf(" a1 = 0x%lx\n", a1);
+ kprintf(" a2 = 0x%lx\n", a2);
+ 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);
if (curproc != NULL)
- printf(" pid = %d, comm = %s\n", curproc->p_pid,
+ kprintf(" pid = %d, comm = %s\n", curproc->p_pid,
curproc->p_comm);
- printf("\n");
+ kprintf("\n");
/* XXX dump registers */
/* XXX kernel debugger */
@@ -509,7 +509,7 @@ syscall(code, framep)
#ifdef SYSCALL_DEBUG
scdebug_call(p, code, args + hidden);
#ifdef NEW_PMAP
- printf("called from 0x%lx, ra 0x%lx\n", framep->tf_regs[FRAME_PC], framep->tf_regs[FRAME_RA]);
+ kprintf("called from 0x%lx, ra 0x%lx\n", framep->tf_regs[FRAME_PC], framep->tf_regs[FRAME_RA]);
#endif
#endif
if (error == 0) {
@@ -543,7 +543,7 @@ syscall(code, framep)
#ifdef SYSCALL_DEBUG
scdebug_ret(p, code, error, rval);
#ifdef NEW_PMAP
- printf("outgoing pc 0x%lx, ra 0x%lx\n", framep->tf_regs[FRAME_PC], framep->tf_regs[FRAME_RA]);
+ kprintf("outgoing pc 0x%lx, ra 0x%lx\n", framep->tf_regs[FRAME_PC], framep->tf_regs[FRAME_RA]);
#endif
#endif
diff --git a/sys/arch/alpha/alpha/vm_machdep.c b/sys/arch/alpha/alpha/vm_machdep.c
index dc234ee20ea..f2abbc6c88d 100644
--- a/sys/arch/alpha/alpha/vm_machdep.c
+++ b/sys/arch/alpha/alpha/vm_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.18 1996/10/07 23:57:22 cgd Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.19 1996/10/10 23:50:44 christos Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -151,7 +151,7 @@ cpu_fork(p1, p2)
&((struct user *)(PG_PFNUM(*ptep) << PGSHIFT))->u_pcb;
#else
p2->p_md.md_pcbpaddr = (void *)vtophys((vm_offset_t)&up->u_pcb);
- printf("process %d pcbpaddr = 0x%lx, pmap = %p\n",
+ kprintf("process %d pcbpaddr = 0x%lx, pmap = %p\n",
p2->p_pid, p2->p_md.md_pcbpaddr, &p2->p_vmspace->vm_pmap);
#endif
@@ -185,7 +185,7 @@ cpu_fork(p1, p2)
#ifndef NEW_PMAP
PMAP_ACTIVATE(&p2->p_vmspace->vm_pmap, 0);
#else
-printf("NEW PROCESS %d USP = %p\n", p2->p_pid, p2->p_addr->u_pcb.pcb_hw.apcb_usp);
+kprintf("NEW PROCESS %d USP = %p\n", p2->p_pid, p2->p_addr->u_pcb.pcb_hw.apcb_usp);
#endif
/*
@@ -196,7 +196,7 @@ printf("NEW PROCESS %d USP = %p\n", p2->p_pid, p2->p_addr->u_pcb.pcb_hw.apcb_usp
if (p1 != curproc)
panic("cpu_fork: curproc");
if ((up->u_pcb.pcb_hw.apcb_flags & ALPHA_PCB_FLAGS_FEN) != 0)
- printf("DANGER WILL ROBINSON: FEN SET IN cpu_fork!\n");
+ kprintf("DANGER WILL ROBINSON: FEN SET IN cpu_fork!\n");
#endif
/*
@@ -217,7 +217,7 @@ printf("NEW PROCESS %d USP = %p\n", p2->p_pid, p2->p_addr->u_pcb.pcb_hw.apcb_usp
sizeof(struct trapframe));
#ifdef NEW_PMAP
-printf("FORK CHILD: pc = %p, ra = %p\n", p2tf->tf_regs[FRAME_PC], p2tf->tf_regs[FRAME_RA]);
+kprintf("FORK CHILD: pc = %p, ra = %p\n", p2tf->tf_regs[FRAME_PC], p2tf->tf_regs[FRAME_RA]);
#endif
/*
* Set up return-value registers as fork() libc stub expects.
diff --git a/sys/arch/alpha/include/asm.h b/sys/arch/alpha/include/asm.h
index ea5711cce4f..4a603ecec26 100644
--- a/sys/arch/alpha/include/asm.h
+++ b/sys/arch/alpha/include/asm.h
@@ -1,4 +1,4 @@
-/* $NetBSD: asm.h,v 1.6 1996/09/15 22:42:29 cgd Exp $ */
+/* $NetBSD: asm.h,v 1.7 1996/10/10 23:50:50 christos Exp $ */
/*
* Copyright (c) 1991,1990,1989,1994,1995,1996 Carnegie Mellon University
@@ -436,7 +436,7 @@ label: ASCIZ msg; \
*/
#define PRINTF(msg,label) \
MSG(msg,a0,label); \
- CALL(printf)
+ CALL(kprintf)
/*
* PANIC
diff --git a/sys/arch/alpha/isa/isafcns_jensen.c b/sys/arch/alpha/isa/isafcns_jensen.c
index 5ac135aea69..ae2bb26657a 100644
--- a/sys/arch/alpha/isa/isafcns_jensen.c
+++ b/sys/arch/alpha/isa/isafcns_jensen.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isafcns_jensen.c,v 1.2 1996/04/12 01:54:04 cgd Exp $ */
+/* $NetBSD: isafcns_jensen.c,v 1.3 1996/10/10 23:50:53 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -68,7 +68,7 @@ jensen_inb(ioaddr)
rval = ((val) >> (8 * offset)) & 0xff;
rval = val & 0xff;
-printf("inb(0x%x) => 0x%x @ %p => 0x%x\n", ioaddr, val, port, rval);
+kprintf("inb(0x%x) => 0x%x @ %p => 0x%x\n", ioaddr, val, port, rval);
return rval;
}
@@ -106,7 +106,7 @@ jensen_inl(ioaddr)
rval = ((val) >> (8 * offset)) & 0xffffffff;
rval = val & 0xffffffff;
-printf("inl(0x%x) => 0x%x @ %p => 0x%x\n", ioaddr, val, port, rval);
+kprintf("inl(0x%x) => 0x%x @ %p => 0x%x\n", ioaddr, val, port, rval);
return rval;
}
@@ -123,7 +123,7 @@ jensen_outb(ioaddr, val)
nval = val /*<< (8 * offset)*/;
port = (int32_t *)phystok0seg(0x300000000L | 0 << 5 | ioaddr << 7);
-printf("outb(0x%x, 0x%x) => 0x%x @ %p\n", ioaddr, val, nval, port);
+kprintf("outb(0x%x, 0x%x) => 0x%x @ %p\n", ioaddr, val, nval, port);
*port = nval;
}
@@ -140,7 +140,7 @@ jensen_outw(ioaddr, val)
nval = val /*<< (8 * offset)*/;
port = (int32_t *)phystok0seg(0x300000000L | 1 << 5 | ioaddr << 7);
-printf("outb(0x%x, 0x%x) => 0x%x @ %p\n", ioaddr, val, nval, port);
+kprintf("outb(0x%x, 0x%x) => 0x%x @ %p\n", ioaddr, val, nval, port);
*port = nval;
}
@@ -157,7 +157,7 @@ jensen_outl(ioaddr, val)
nval = val /*<< (8 * offset)*/;
port = (int32_t *)phystok0seg(0x300000000L | 3 << 5 | ioaddr << 7);
-printf("outb(0x%x, 0x%x) => 0x%x @ %p\n", ioaddr, val, nval, port);
+kprintf("outb(0x%x, 0x%x) => 0x%x @ %p\n", ioaddr, val, nval, port);
*port = nval;
}
diff --git a/sys/arch/alpha/isa/pckbd.c b/sys/arch/alpha/isa/pckbd.c
index 0a212449aeb..5f3ade0b45d 100644
--- a/sys/arch/alpha/isa/pckbd.c
+++ b/sys/arch/alpha/isa/pckbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbd.c,v 1.7 1996/05/05 01:41:53 thorpej Exp $ */
+/* $NetBSD: pckbd.c,v 1.8 1996/10/10 23:50:55 christos Exp $ */
/*-
* Copyright (c) 1993, 1994, 1995 Charles Hannum. All rights reserved.
@@ -256,7 +256,7 @@ kbd_cmd(val, polling)
break;
}
#ifdef DIAGNOSTIC
- printf("kbd_cmd: input char %x lost\n",
+ kprintf("kbd_cmd: input char %x lost\n",
c);
#endif
}
@@ -300,7 +300,7 @@ pckbdprobe(parent, match, aux)
/* Enable interrupts and keyboard, etc. */
if (!kbc_put8042cmd(CMDBYTE)) {
- printf("pcprobe: command error\n");
+ kprintf("pcprobe: command error\n");
return 0;
}
@@ -309,7 +309,7 @@ pckbdprobe(parent, match, aux)
kbd_flush_input();
/* Reset the keyboard. */
if (!kbd_cmd(KBC_RESET, 1)) {
- printf("pcprobe: reset error %d\n", 1);
+ kprintf("pcprobe: reset error %d\n", 1);
goto lose;
}
for (i = 600000; i; i--)
@@ -320,7 +320,7 @@ pckbdprobe(parent, match, aux)
}
if (i == 0 || bus_io_read_1(pckbd_bc, pckbd_data_ioh, 0)
!= KBR_RSTDONE) {
- printf("pcprobe: reset error %d\n", 2);
+ kprintf("pcprobe: reset error %d\n", 2);
goto lose;
}
/*
@@ -331,7 +331,7 @@ pckbdprobe(parent, match, aux)
kbd_flush_input();
/* Just to be sure. */
if (!kbd_cmd(KBC_ENABLE, 1)) {
- printf("pcprobe: reset error %d\n", 3);
+ kprintf("pcprobe: reset error %d\n", 3);
goto lose;
}
@@ -351,13 +351,13 @@ pckbdprobe(parent, match, aux)
if (kbc_get8042cmd() & KC8_TRANS) {
/* The 8042 is translating for us; use AT codes. */
if (!kbd_cmd(KBC_SETTABLE, 1) || !kbd_cmd(2, 1)) {
- printf("pcprobe: reset error %d\n", 4);
+ kprintf("pcprobe: reset error %d\n", 4);
goto lose;
}
} else {
/* Stupid 8042; set keyboard to XT codes. */
if (!kbd_cmd(KBC_SETTABLE, 1) || !kbd_cmd(1, 1)) {
- printf("pcprobe: reset error %d\n", 5);
+ kprintf("pcprobe: reset error %d\n", 5);
goto lose;
}
}
@@ -399,10 +399,10 @@ pckbdattach(parent, self, aux)
sc->sc_bellactive = sc->sc_bellpitch = 0;
#if NWSCONS
- printf("\n");
+ kprintf("\n");
kbdattach(self, &pckbd_wscons_idev);
#else
- printf(": no wscons driver present; no input possible\n");
+ kprintf(": no wscons driver present; no input possible\n");
#endif
}
@@ -461,7 +461,7 @@ do_async_update(poll)
old_lock_state = lock_state;
if (!kbd_cmd(KBC_MODEIND, poll) ||
!kbd_cmd(lock_state, poll)) {
- printf("pc: timeout updating leds\n");
+ kprintf("pc: timeout updating leds\n");
(void) kbd_cmd(KBC_ENABLE, poll);
}
}
@@ -469,7 +469,7 @@ do_async_update(poll)
old_typematic_rate = typematic_rate;
if (!kbd_cmd(KBC_TYPEMATIC, poll) ||
!kbd_cmd(typematic_rate, poll)) {
- printf("pc: timeout updating typematic rate\n");
+ kprintf("pc: timeout updating typematic rate\n");
(void) kbd_cmd(KBC_ENABLE, poll);
}
}
diff --git a/sys/arch/alpha/isa/pms.c b/sys/arch/alpha/isa/pms.c
index 5fc6e3ae649..273594ea6d9 100644
--- a/sys/arch/alpha/isa/pms.c
+++ b/sys/arch/alpha/isa/pms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pms.c,v 1.1 1996/04/12 01:53:06 cgd Exp $ */
+/* $NetBSD: pms.c,v 1.2 1996/10/10 23:50:56 christos Exp $ */
/*-
* Copyright (c) 1994 Charles Hannum.
@@ -213,13 +213,13 @@ pmsattach(parent, self, aux)
if (bus_io_map(pms_bc, PMS_DATA, 1, &pms_data_ioh) ||
bus_io_map(pms_bc, PMS_CNTRL, 1, &pms_cntrl_ioh)) {
- printf(": can't map I/O ports!\n");
+ kprintf(": can't map I/O ports!\n");
return;
}
msattach(self, &pms_mdev_spec);
- printf("\n");
+ kprintf("\n");
/* Other initialization was done by pmsprobe. */
sc->sc_state = 0;
diff --git a/sys/arch/alpha/pci/apecs.c b/sys/arch/alpha/pci/apecs.c
index 8690928ad31..33d87e74797 100644
--- a/sys/arch/alpha/pci/apecs.c
+++ b/sys/arch/alpha/pci/apecs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: apecs.c,v 1.10 1996/08/27 21:53:53 cgd Exp $ */
+/* $NetBSD: apecs.c,v 1.11 1996/10/10 23:50:58 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -133,16 +133,16 @@ apecsattach(parent, self, aux)
/* XXX SGMAP FOO */
- printf(": DECchip %s Core Logic chipset\n",
+ kprintf(": DECchip %s Core Logic chipset\n",
acp->ac_memwidth == 128 ? "21072" : "21071");
- printf("%s: DC21071-CA pass %d, %d-bit memory bus\n",
+ kprintf("%s: DC21071-CA pass %d, %d-bit memory bus\n",
self->dv_xname, acp->ac_comanche_pass2 ? 2 : 1, acp->ac_memwidth);
- printf("%s: DC21071-DA pass %d\n", self->dv_xname,
+ kprintf("%s: DC21071-DA pass %d\n", self->dv_xname,
acp->ac_epic_pass2 ? 2 : 1);
/* XXX print bcache size */
if (!acp->ac_epic_pass2)
- printf("WARNING: 21071-DA NOT PASS2... NO BETS...\n");
+ kprintf("WARNING: 21071-DA NOT PASS2... NO BETS...\n");
switch (hwrpb->rpb_type) {
#if defined(DEC_2100_A50)
@@ -170,7 +170,7 @@ apecsprint(aux, pnp)
/* only PCIs can attach to APECSes; easy. */
if (pnp)
- printf("%s at %s", pba->pba_busname, pnp);
- printf(" bus %d", pba->pba_bus);
+ kprintf("%s at %s", pba->pba_busname, pnp);
+ kprintf(" bus %d", pba->pba_bus);
return (UNCONF);
}
diff --git a/sys/arch/alpha/pci/apecs_pci.c b/sys/arch/alpha/pci/apecs_pci.c
index b57a1a55427..059b58d90aa 100644
--- a/sys/arch/alpha/pci/apecs_pci.c
+++ b/sys/arch/alpha/pci/apecs_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: apecs_pci.c,v 1.7 1996/07/09 00:54:31 cgd Exp $ */
+/* $NetBSD: apecs_pci.c,v 1.8 1996/10/10 23:51:00 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -140,7 +140,7 @@ apecs_conf_read(cpv, tag, offset)
}
#if 0
- printf("apecs_conf_read: tag 0x%lx, reg 0x%lx -> %x @ %p%s\n", tag, reg,
+ kprintf("apecs_conf_read: tag 0x%lx, reg 0x%lx -> %x @ %p%s\n", tag, reg,
data, datap, ba ? " (badaddr)" : "");
#endif
@@ -184,7 +184,7 @@ apecs_conf_write(cpv, tag, offset, data)
}
#if 0
- printf("apecs_conf_write: tag 0x%lx, reg 0x%lx -> 0x%x @ %p\n", tag,
+ kprintf("apecs_conf_write: tag 0x%lx, reg 0x%lx -> 0x%x @ %p\n", tag,
reg, data, datap);
#endif
}
diff --git a/sys/arch/alpha/pci/cia.c b/sys/arch/alpha/pci/cia.c
index a6686943ce5..0ff9efaf56f 100644
--- a/sys/arch/alpha/pci/cia.c
+++ b/sys/arch/alpha/pci/cia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cia.c,v 1.9 1996/08/27 21:53:56 cgd Exp $ */
+/* $NetBSD: cia.c,v 1.10 1996/10/10 23:51:01 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -122,7 +122,7 @@ ciaattach(parent, self, aux)
cia_init(ccp);
/* XXX print chipset information */
- printf("\n");
+ kprintf("\n");
switch (hwrpb->rpb_type) {
#if defined(DEC_KN20AA)
@@ -153,7 +153,7 @@ ciaprint(aux, pnp)
/* only PCIs can attach to CIAs; easy. */
if (pnp)
- printf("%s at %s", pba->pba_busname, pnp);
- printf(" bus %d", pba->pba_bus);
+ kprintf("%s at %s", pba->pba_busname, pnp);
+ kprintf(" bus %d", pba->pba_bus);
return (UNCONF);
}
diff --git a/sys/arch/alpha/pci/cia_pci.c b/sys/arch/alpha/pci/cia_pci.c
index 30b37f53357..74058d15911 100644
--- a/sys/arch/alpha/pci/cia_pci.c
+++ b/sys/arch/alpha/pci/cia_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cia_pci.c,v 1.3 1996/07/09 00:54:41 cgd Exp $ */
+/* $NetBSD: cia_pci.c,v 1.4 1996/10/10 23:51:03 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -140,7 +140,7 @@ cia_conf_read(cpv, tag, offset)
}
#if 0
- printf("cia_conf_read: tag 0x%lx, reg 0x%lx -> %x @ %p%s\n", tag, reg,
+ kprintf("cia_conf_read: tag 0x%lx, reg 0x%lx -> %x @ %p%s\n", tag, reg,
data, datap, ba ? " (badaddr)" : "");
#endif
@@ -184,7 +184,7 @@ cia_conf_write(cpv, tag, offset, data)
}
#if 0
- printf("cia_conf_write: tag 0x%lx, reg 0x%lx -> 0x%x @ %p\n", tag,
+ kprintf("cia_conf_write: tag 0x%lx, reg 0x%lx -> 0x%x @ %p\n", tag,
reg, data, datap);
#endif
}
diff --git a/sys/arch/alpha/pci/lca.c b/sys/arch/alpha/pci/lca.c
index 7caf818c357..842d62c7bc1 100644
--- a/sys/arch/alpha/pci/lca.c
+++ b/sys/arch/alpha/pci/lca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lca.c,v 1.8 1996/08/27 21:53:58 cgd Exp $ */
+/* $NetBSD: lca.c,v 1.9 1996/10/10 23:51:04 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -179,7 +179,7 @@ lcaattach(parent, self, aux)
#endif
/* XXX print chipset information */
- printf("\n");
+ kprintf("\n");
switch (hwrpb->rpb_type) {
#if defined(DEC_AXPPCI_33)
@@ -207,7 +207,7 @@ lcaprint(aux, pnp)
/* only PCIs can attach to LCAes; easy. */
if (pnp)
- printf("%s at %s", pba->pba_busname, pnp);
- printf(" bus %d", pba->pba_bus);
+ kprintf("%s at %s", pba->pba_busname, pnp);
+ kprintf(" bus %d", pba->pba_bus);
return (UNCONF);
}
diff --git a/sys/arch/alpha/pci/lca_pci.c b/sys/arch/alpha/pci/lca_pci.c
index 2d1189970c0..0088a82a3b8 100644
--- a/sys/arch/alpha/pci/lca_pci.c
+++ b/sys/arch/alpha/pci/lca_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lca_pci.c,v 1.4 1996/07/09 00:54:48 cgd Exp $ */
+/* $NetBSD: lca_pci.c,v 1.5 1996/10/10 23:51:05 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -149,7 +149,7 @@ lca_conf_read(cpv, tag, offset)
}
#if 0
- printf("lca_conf_read: tag 0x%lx, reg 0x%lx -> %x @ %p%s\n", tag, reg,
+ kprintf("lca_conf_read: tag 0x%lx, reg 0x%lx -> %x @ %p%s\n", tag, reg,
data, datap, ba ? " (badaddr)" : "");
#endif
@@ -199,7 +199,7 @@ lca_conf_write(cpv, tag, offset, data)
}
#if 0
- printf("lca_conf_write: tag 0x%lx, reg 0x%lx -> 0x%x @ %p\n", tag,
+ kprintf("lca_conf_write: tag 0x%lx, reg 0x%lx -> 0x%x @ %p\n", tag,
reg, data, datap);
#endif
}
diff --git a/sys/arch/alpha/pci/pci_2100_a50.c b/sys/arch/alpha/pci/pci_2100_a50.c
index 32198ee1524..5080d294cae 100644
--- a/sys/arch/alpha/pci/pci_2100_a50.c
+++ b/sys/arch/alpha/pci/pci_2100_a50.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_2100_a50.c,v 1.8 1996/07/14 04:08:21 cgd Exp $ */
+/* $NetBSD: pci_2100_a50.c,v 1.9 1996/10/10 23:51:07 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -74,7 +74,7 @@ pci_2100_a50_pickintr(acp)
sioII = (sioclass & 0xff) >= 3;
if (!sioII)
- printf("WARNING: SIO NOT SIO II... NO BETS...\n");
+ kprintf("WARNING: SIO NOT SIO II... NO BETS...\n");
pc->pc_intr_v = acp;
pc->pc_intr_map = dec_2100_a50_intr_map;
@@ -108,7 +108,7 @@ dec_2100_a50_intr_map(acv, bustag, buspin, line, ihp)
return 1;
}
if (buspin > 4) {
- printf("pci_map_int: bad interrupt pin %d\n", buspin);
+ kprintf("pci_map_int: bad interrupt pin %d\n", buspin);
return 1;
}
@@ -169,7 +169,7 @@ dec_2100_a50_intr_map(acv, bustag, buspin, line, ihp)
pirqreg = pci_conf_read(pc, pci_make_tag(pc, 0, APECS_SIO_DEVICE, 0),
SIO_PCIREG_PIRQ_RTCTRL);
#if 0
- printf("pci_2100_a50_map_int: device %d pin %c: pirq %d, reg = %x\n",
+ kprintf("pci_2100_a50_map_int: device %d pin %c: pirq %d, reg = %x\n",
device, '@' + buspin, pirq, pirqreg);
#endif
pirqline = (pirqreg >> (pirq * 8)) & 0xff;
@@ -178,7 +178,7 @@ dec_2100_a50_intr_map(acv, bustag, buspin, line, ihp)
pirqline &= 0xf;
#if 0
- printf("pci_2100_a50_map_int: device %d pin %c: mapped to line %d\n",
+ kprintf("pci_2100_a50_map_int: device %d pin %c: mapped to line %d\n",
device, '@' + buspin, pirqline);
#endif
diff --git a/sys/arch/alpha/pci/pci_axppci_33.c b/sys/arch/alpha/pci/pci_axppci_33.c
index bbe642eb110..2cbbf293543 100644
--- a/sys/arch/alpha/pci/pci_axppci_33.c
+++ b/sys/arch/alpha/pci/pci_axppci_33.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_axppci_33.c,v 1.6 1996/07/14 04:08:22 cgd Exp $ */
+/* $NetBSD: pci_axppci_33.c,v 1.7 1996/10/10 23:51:08 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -75,7 +75,7 @@ pci_axppci_33_pickintr(lcp)
sioII = (sioclass & 0xff) >= 3;
if (!sioII)
- printf("WARNING: SIO NOT SIO II... NO BETS...\n");
+ kprintf("WARNING: SIO NOT SIO II... NO BETS...\n");
pc->pc_intr_v = lcp;
pc->pc_intr_map = dec_axppci_33_intr_map;
@@ -109,7 +109,7 @@ dec_axppci_33_intr_map(lcv, bustag, buspin, line, ihp)
return 1;
}
if (buspin > 4) {
- printf("pci_map_int: bad interrupt pin %d\n", buspin);
+ kprintf("pci_map_int: bad interrupt pin %d\n", buspin);
return 1;
}
@@ -165,7 +165,7 @@ dec_axppci_33_intr_map(lcv, bustag, buspin, line, ihp)
};
break;
default:
- printf("dec_axppci_33_pci_map_int: unknown device %d\n",
+ kprintf("dec_axppci_33_pci_map_int: unknown device %d\n",
device);
panic("dec_axppci_33_pci_map_int: bad device number");
}
@@ -173,7 +173,7 @@ dec_axppci_33_intr_map(lcv, bustag, buspin, line, ihp)
pirqreg = pci_conf_read(pc, pci_make_tag(pc, 0, LCA_SIO_DEVICE, 0),
SIO_PCIREG_PIRQ_RTCTRL);
#if 0
- printf("pci_axppci_33_map_int: device %d pin %c: pirq %d, reg = %x\n",
+ kprintf("pci_axppci_33_map_int: device %d pin %c: pirq %d, reg = %x\n",
device, '@' + buspin, pirq, pirqreg);
#endif
pirqline = (pirqreg >> (pirq * 8)) & 0xff;
@@ -182,7 +182,7 @@ dec_axppci_33_intr_map(lcv, bustag, buspin, line, ihp)
pirqline &= 0xf;
#if 0
- printf("pci_axppci_33_map_int: device %d pin %c: mapped to line %d\n",
+ kprintf("pci_axppci_33_map_int: device %d pin %c: mapped to line %d\n",
device, '@' + buspin, pirqline);
#endif
diff --git a/sys/arch/alpha/pci/pci_kn20aa.c b/sys/arch/alpha/pci/pci_kn20aa.c
index ba90436ee3c..7b7b036250a 100644
--- a/sys/arch/alpha/pci/pci_kn20aa.c
+++ b/sys/arch/alpha/pci/pci_kn20aa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_kn20aa.c,v 1.16 1996/08/19 04:28:25 cgd Exp $ */
+/* $NetBSD: pci_kn20aa.c,v 1.17 1996/10/10 23:51:10 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -140,7 +140,7 @@ dec_kn20aa_intr_map(ccv, bustag, buspin, line, ihp)
return 1;
}
if (buspin > 4) {
- printf("pci_map_int: bad interrupt pin %d\n", buspin);
+ kprintf("pci_map_int: bad interrupt pin %d\n", buspin);
return 1;
}
@@ -177,7 +177,7 @@ dec_kn20aa_intr_map(ccv, bustag, buspin, line, ihp)
default:
#ifdef KN20AA_BOGUS_IRQ_FROB
*ihp = 0xdeadbeef;
- printf("\n\n BOGUS INTERRUPT MAPPING: dev %d, pin %d\n",
+ kprintf("\n\n BOGUS INTERRUPT MAPPING: dev %d, pin %d\n",
device, buspin);
return (0);
#endif
@@ -204,7 +204,7 @@ dec_kn20aa_intr_string(ccv, ih)
#ifdef KN20AA_BOGUS_IRQ_FROB
if (ih == 0xdeadbeef) {
- sprintf(irqstr, "BOGUS");
+ ksprintf(irqstr, "BOGUS");
return (irqstr);
}
#endif
@@ -212,7 +212,7 @@ dec_kn20aa_intr_string(ccv, ih)
panic("dec_kn20aa_a50_intr_string: bogus kn20aa IRQ 0x%x\n",
ih);
- sprintf(irqstr, "kn20aa irq %d", ih);
+ ksprintf(irqstr, "kn20aa irq %d", ih);
return (irqstr);
}
@@ -231,13 +231,13 @@ dec_kn20aa_intr_establish(ccv, ih, level, func, arg)
int i;
char chars[10];
- printf("dec_kn20aa_intr_establish: BOGUS IRQ\n");
+ kprintf("dec_kn20aa_intr_establish: BOGUS IRQ\n");
do {
- printf("IRQ to enable? ");
+ kprintf("IRQ to enable? ");
getstr(chars, 10);
i = atoi(chars);
} while (i < 0 || i > 32);
- printf("ENABLING IRQ %d\n", i);
+ kprintf("ENABLING IRQ %d\n", i);
kn20aa_enable_intr(i);
return ((void *)0xbabefacedeadbeef);
}
diff --git a/sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c b/sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c
index c3f33a7a7be..74a18db6460 100644
--- a/sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c
+++ b/sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_swiz_bus_io_chipdep.c,v 1.6 1996/07/09 00:54:57 cgd Exp $ */
+/* $NetBSD: pci_swiz_bus_io_chipdep.c,v 1.7 1996/10/10 23:51:13 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -134,14 +134,14 @@ __C(CHIP,_io_map)(v, ioaddr, iosize, iohp)
} else
#endif
{
- printf("\n");
+ kprintf("\n");
#ifdef CHIP_IO_W1_START
- printf("%s: window[1]=0x%lx-0x%lx\n",
+ kprintf("%s: window[1]=0x%lx-0x%lx\n",
__S(__C(CHIP,_io_map)), CHIP_IO_W1_START(v),
CHIP_IO_W1_END(v)-1);
#endif
#ifdef CHIP_IO_W2_START
- printf("%s: window[2]=0x%lx-0x%lx\n",
+ kprintf("%s: window[2]=0x%lx-0x%lx\n",
__S(__C(CHIP,_io_map)), CHIP_IO_W2_START(v),
CHIP_IO_W2_END(v)-1);
#endif
diff --git a/sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c b/sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c
index 4b8870f9d19..d223e77d4cb 100644
--- a/sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c
+++ b/sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_swiz_bus_mem_chipdep.c,v 1.7 1996/07/09 00:55:00 cgd Exp $ */
+/* $NetBSD: pci_swiz_bus_mem_chipdep.c,v 1.8 1996/10/10 23:51:15 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -110,9 +110,9 @@ __C(CHIP,_mem_map)(v, memaddr, memsize, cacheable, memhp)
} else
#endif
{
- printf("\n");
+ kprintf("\n");
#ifdef CHIP_D_MEM_W1_START
- printf("%s: window[1]=0x%lx-0x%lx\n",
+ kprintf("%s: window[1]=0x%lx-0x%lx\n",
__S(__C(CHIP,_mem_map)), CHIP_D_MEM_W1_START(v),
CHIP_D_MEM_W1_END(v)-1);
#endif
@@ -142,19 +142,19 @@ __C(CHIP,_mem_map)(v, memaddr, memsize, cacheable, memhp)
} else
#endif
{
- printf("\n");
+ kprintf("\n");
#ifdef CHIP_S_MEM_W1_START
- printf("%s: window[1]=0x%lx-0x%lx\n",
+ kprintf("%s: window[1]=0x%lx-0x%lx\n",
__S(__C(CHIP,_mem_map)), CHIP_S_MEM_W1_START(v),
CHIP_S_MEM_W1_END(v)-1);
#endif
#ifdef CHIP_S_MEM_W2_START
- printf("%s: window[2]=0x%lx-0x%lx\n",
+ kprintf("%s: window[2]=0x%lx-0x%lx\n",
__S(__C(CHIP,_mem_map)), CHIP_S_MEM_W2_START(v),
CHIP_S_MEM_W2_END(v)-1);
#endif
#ifdef CHIP_S_MEM_W3_START
- printf("%s: window[3]=0x%lx-0x%lx\n",
+ kprintf("%s: window[3]=0x%lx-0x%lx\n",
__S(__C(CHIP,_mem_map)), CHIP_S_MEM_W3_START(v),
CHIP_S_MEM_W3_END(v)-1);
#endif
diff --git a/sys/arch/alpha/pci/pcivga.c b/sys/arch/alpha/pci/pcivga.c
index 51e9d47afef..17e06782afa 100644
--- a/sys/arch/alpha/pci/pcivga.c
+++ b/sys/arch/alpha/pci/pcivga.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcivga.c,v 1.9 1996/08/27 21:54:01 cgd Exp $ */
+/* $NetBSD: pcivga.c,v 1.10 1996/10/10 23:51:12 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -179,16 +179,16 @@ pcivgaattach(parent, self, aux)
}
pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo);
- printf(": %s (rev. 0x%02x)\n", devinfo,
+ kprintf(": %s (rev. 0x%02x)\n", devinfo,
PCI_REVISION(pa->pa_class));
#if 0
if (sc->sc_dc->dc_tgaconf == NULL) {
- printf("unknown board configuration\n");
+ kprintf("unknown board configuration\n");
return;
}
- printf("board type %s\n", sc->sc_dc->dc_tgaconf->tgac_name);
- printf("%s: %d x %d, %dbpp, %s RAMDAC\n", sc->sc_dev.dv_xname,
+ kprintf("board type %s\n", sc->sc_dc->dc_tgaconf->tgac_name);
+ kprintf("%s: %d x %d, %dbpp, %s RAMDAC\n", sc->sc_dev.dv_xname,
sc->sc_dc->dc_wid, sc->sc_dc->dc_ht,
sc->sc_dc->dc_tgaconf->tgac_phys_depth,
sc->sc_dc->dc_tgaconf->tgac_ramdac->tgar_name);
@@ -199,7 +199,7 @@ pcivgaattach(parent, self, aux)
if (PCI_INTERRUPT_PIN(pci_intrdata) != PCI_INTERRUPT_PIN_NONE) {
sc->sc_intr = pci_map_int(sc->sc_pcitag, IPL_TTY, tgaintr, sc);
if (sc->sc_intr == NULL)
- printf("%s: WARNING: couldn't map interrupt\n",
+ kprintf("%s: WARNING: couldn't map interrupt\n",
sc->sc_dev.dv_xname);
}
#endif
@@ -225,7 +225,7 @@ pcivgaprint(aux, pnp)
{
if (pnp)
- printf("wscons at %s", pnp);
+ kprintf("wscons at %s", pnp);
return (UNCONF);
}
@@ -305,7 +305,7 @@ pcivga_cursor(id, on, row, col)
int pos;
#if 0
- printf("pcivga_cursor: %d %d\n", row, col);
+ kprintf("pcivga_cursor: %d %d\n", row, col);
#endif
/* turn the cursor off */
if (!on) {
diff --git a/sys/arch/alpha/pci/pcs_bus_io_common.c b/sys/arch/alpha/pci/pcs_bus_io_common.c
index 340be95393b..c481fd712ee 100644
--- a/sys/arch/alpha/pci/pcs_bus_io_common.c
+++ b/sys/arch/alpha/pci/pcs_bus_io_common.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcs_bus_io_common.c,v 1.6 1996/07/09 00:54:57 cgd Exp $ */
+/* $NetBSD: pcs_bus_io_common.c,v 1.7 1996/10/10 23:51:13 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -134,14 +134,14 @@ __C(CHIP,_io_map)(v, ioaddr, iosize, iohp)
} else
#endif
{
- printf("\n");
+ kprintf("\n");
#ifdef CHIP_IO_W1_START
- printf("%s: window[1]=0x%lx-0x%lx\n",
+ kprintf("%s: window[1]=0x%lx-0x%lx\n",
__S(__C(CHIP,_io_map)), CHIP_IO_W1_START(v),
CHIP_IO_W1_END(v)-1);
#endif
#ifdef CHIP_IO_W2_START
- printf("%s: window[2]=0x%lx-0x%lx\n",
+ kprintf("%s: window[2]=0x%lx-0x%lx\n",
__S(__C(CHIP,_io_map)), CHIP_IO_W2_START(v),
CHIP_IO_W2_END(v)-1);
#endif
diff --git a/sys/arch/alpha/pci/pcs_bus_mem_common.c b/sys/arch/alpha/pci/pcs_bus_mem_common.c
index dcf40e66ea8..1e5876c7b53 100644
--- a/sys/arch/alpha/pci/pcs_bus_mem_common.c
+++ b/sys/arch/alpha/pci/pcs_bus_mem_common.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcs_bus_mem_common.c,v 1.7 1996/07/09 00:55:00 cgd Exp $ */
+/* $NetBSD: pcs_bus_mem_common.c,v 1.8 1996/10/10 23:51:15 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -110,9 +110,9 @@ __C(CHIP,_mem_map)(v, memaddr, memsize, cacheable, memhp)
} else
#endif
{
- printf("\n");
+ kprintf("\n");
#ifdef CHIP_D_MEM_W1_START
- printf("%s: window[1]=0x%lx-0x%lx\n",
+ kprintf("%s: window[1]=0x%lx-0x%lx\n",
__S(__C(CHIP,_mem_map)), CHIP_D_MEM_W1_START(v),
CHIP_D_MEM_W1_END(v)-1);
#endif
@@ -142,19 +142,19 @@ __C(CHIP,_mem_map)(v, memaddr, memsize, cacheable, memhp)
} else
#endif
{
- printf("\n");
+ kprintf("\n");
#ifdef CHIP_S_MEM_W1_START
- printf("%s: window[1]=0x%lx-0x%lx\n",
+ kprintf("%s: window[1]=0x%lx-0x%lx\n",
__S(__C(CHIP,_mem_map)), CHIP_S_MEM_W1_START(v),
CHIP_S_MEM_W1_END(v)-1);
#endif
#ifdef CHIP_S_MEM_W2_START
- printf("%s: window[2]=0x%lx-0x%lx\n",
+ kprintf("%s: window[2]=0x%lx-0x%lx\n",
__S(__C(CHIP,_mem_map)), CHIP_S_MEM_W2_START(v),
CHIP_S_MEM_W2_END(v)-1);
#endif
#ifdef CHIP_S_MEM_W3_START
- printf("%s: window[3]=0x%lx-0x%lx\n",
+ kprintf("%s: window[3]=0x%lx-0x%lx\n",
__S(__C(CHIP,_mem_map)), CHIP_S_MEM_W3_START(v),
CHIP_S_MEM_W3_END(v)-1);
#endif
diff --git a/sys/arch/alpha/pci/sio.c b/sys/arch/alpha/pci/sio.c
index b51c0197986..e587f73655f 100644
--- a/sys/arch/alpha/pci/sio.c
+++ b/sys/arch/alpha/pci/sio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sio.c,v 1.9 1996/08/27 21:54:03 cgd Exp $ */
+/* $NetBSD: sio.c,v 1.10 1996/10/10 23:51:19 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -125,7 +125,7 @@ sioattach(parent, self, aux)
haseisa = (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_INTEL_PCEB);
pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo);
- printf(": %s (rev. 0x%02x)\n", devinfo,
+ kprintf(": %s (rev. 0x%02x)\n", devinfo,
PCI_REVISION(pa->pa_class));
if (sio) {
@@ -134,7 +134,7 @@ sioattach(parent, self, aux)
rev = PCI_REVISION(pa->pa_class);
if (rev < 3)
- printf("%s: WARNING: SIO I SUPPORT UNTESTED\n",
+ kprintf("%s: WARNING: SIO I SUPPORT UNTESTED\n",
self->dv_xname);
}
@@ -176,7 +176,7 @@ sioprint(aux, pnp)
register union sio_attach_args *sa = aux;
if (pnp)
- printf("%s at %s", sa->sa_name, pnp);
+ kprintf("%s at %s", sa->sa_name, pnp);
return (UNCONF);
}
@@ -216,12 +216,12 @@ sio_eisa_intr_map(v, irq, ihp)
#define ICU_LEN 16 /* number of ISA IRQs (XXX) */
if (irq >= ICU_LEN) {
- printf("sio_eisa_intr_map: bad IRQ %d\n", irq);
+ kprintf("sio_eisa_intr_map: bad IRQ %d\n", irq);
*ihp = -1;
return 1;
}
if (irq == 2) {
- printf("sio_eisa_intr_map: changed IRQ 2 to IRQ 9\n");
+ kprintf("sio_eisa_intr_map: changed IRQ 2 to IRQ 9\n");
irq = 9;
}
diff --git a/sys/arch/pica/dev/asc.c b/sys/arch/pica/dev/asc.c
index 5982505d7a0..be9b30718ca 100644
--- a/sys/arch/pica/dev/asc.c
+++ b/sys/arch/pica/dev/asc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: asc.c,v 1.5 1996/08/28 19:00:30 cgd Exp $ */
+/* $NetBSD: asc.c,v 1.6 1996/10/10 23:44:49 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -585,7 +585,7 @@ ascattach(parent, self, aux)
*/
BUS_INTR_ESTABLISH(ca, asc_intr, (void *)asc);
- printf(": NCR53C94, target %d\n", id);
+ kprintf(": NCR53C94, target %d\n", id);
/*
* Fill in the prototype scsi link.
@@ -652,7 +652,7 @@ asc_scsi_cmd(xs)
if (asc->cmd[sc_link->target]) {
if (asc->cmdq[sc_link->target]) {
splx(s);
- printf("asc_scsi_cmd: called when target busy");
+ kprintf("asc_scsi_cmd: called when target busy");
xs->error = XS_DRIVER_STUFFUP;
return TRY_AGAIN_LATER;
}
@@ -793,7 +793,7 @@ asc_startcmd(asc, target)
#ifdef DEBUG
if (asc_debug > 1) {
- printf("asc_startcmd: %s target %d cmd %x len %d\n",
+ kprintf("asc_startcmd: %s target %d cmd %x len %d\n",
asc->sc_dev.dv_xname, target,
state->cmd.opcode, state->buflen);
}
@@ -906,7 +906,7 @@ asc_intr(sc)
if (++asc_logp >= &asc_log[NLOG])
asc_logp = asc_log;
if (asc_debug > 2)
- printf("asc_intr: status %x ss %x ir %x cond %d:%x\n",
+ kprintf("asc_intr: status %x ss %x ir %x cond %d:%x\n",
status, ss, ir, scpt - asc_scripts, scpt->condition);
#endif
@@ -929,7 +929,7 @@ asc_intr(sc)
* to request the device for a MSG_OUT phase.
*/
if (status & ASC_CSR_PE) {
- printf("%s: SCSI device %d: incomming parity error seen\n",
+ kprintf("%s: SCSI device %d: incomming parity error seen\n",
asc->sc_dev.dv_xname, asc->target);
asc->st[asc->target].flags |= PARITY_ERR;
}
@@ -939,7 +939,7 @@ asc_intr(sc)
* Probably a bug in a device driver.
*/
if (status & ASC_CSR_GE) {
- printf("%s: SCSI device %d: gross error\n",
+ kprintf("%s: SCSI device %d: gross error\n",
asc->sc_dev.dv_xname, asc->target);
goto abort;
}
@@ -954,7 +954,7 @@ asc_intr(sc)
case ASC_PHASE_DATAO:
ASC_TC_GET(regs, len);
fifo = regs->asc_flags & ASC_FLAGS_FIFO_CNT;
- printf("asc_intr: data overrun: buflen %d dmalen %d tc %d fifo %d\n",
+ kprintf("asc_intr: data overrun: buflen %d dmalen %d tc %d fifo %d\n",
state->buflen, state->dmalen, len, fifo);
goto abort;
@@ -1002,7 +1002,7 @@ asc_intr(sc)
fifo = regs->asc_flags & ASC_FLAGS_FIFO_CNT;
/* flush any data in the FIFO */
if (fifo && !(state->flags & DMA_IN_PROGRESS)) {
-printf("asc_intr: fifo flush %d len %d fifo %x\n", fifo, len, regs->asc_fifo);
+kprintf("asc_intr: fifo flush %d len %d fifo %x\n", fifo, len, regs->asc_fifo);
regs->asc_cmd = ASC_CMD_FLUSH;
readback(regs->asc_cmd);
DELAY(2);
@@ -1014,7 +1014,7 @@ printf("asc_intr: fifo flush %d len %d fifo %x\n", fifo, len, regs->asc_fifo);
else if (state->flags & DMA_IN) {
u_char *cp;
- printf("asc_intr: IN: dmalen %d len %d fifo %d\n",
+ kprintf("asc_intr: IN: dmalen %d len %d fifo %d\n",
state->dmalen, len, fifo); /* XXX */
}
regs->asc_cmd = ASC_CMD_FLUSH;
@@ -1043,7 +1043,7 @@ printf("asc_intr: fifo flush %d len %d fifo %x\n", fifo, len, regs->asc_fifo);
* and resume DMA at the start address.
*/
if (len & 1) {
- printf("asc_intr: msg in len %d (fifo %d)\n",
+ kprintf("asc_intr: msg in len %d (fifo %d)\n",
len, fifo); /* XXX */
len = state->dmalen - len;
goto do_in;
@@ -1058,7 +1058,7 @@ printf("asc_intr: fifo flush %d len %d fifo %x\n", fifo, len, regs->asc_fifo);
} else if (state->flags & DMA_IN) {
if (len) {
#ifdef DEBUG
- printf("asc_intr: 1: bn %d len %d (fifo %d)\n",
+ kprintf("asc_intr: 1: bn %d len %d (fifo %d)\n",
asc_debug_bn, len, fifo); /* XXX */
#endif
goto abort;
@@ -1080,7 +1080,7 @@ printf("asc_intr: fifo flush %d len %d fifo %x\n", fifo, len, regs->asc_fifo);
&asc_scripts[SCRIPT_RESUME_NO_DATA];
} else if (state->flags & DMA_OUT) {
if (len) {
- printf("asc_intr: 2: len %d (fifo %d)\n", len,
+ kprintf("asc_intr: 2: len %d (fifo %d)\n", len,
fifo); /* XXX */
/* XXX THEO */
#if 1
@@ -1126,7 +1126,7 @@ printf("asc_intr: fifo flush %d len %d fifo %x\n", fifo, len, regs->asc_fifo);
if (ir & ASC_INT_RESET) {
register int i;
- printf("%s: SCSI bus reset!!\n", asc->sc_dev.dv_xname);
+ kprintf("%s: SCSI bus reset!!\n", asc->sc_dev.dv_xname);
/* need to flush any pending commands */
for (i = 0; i < ASC_NCMD; i++) {
if (!asc->cmd[i])
@@ -1185,7 +1185,7 @@ printf("asc_intr: fifo flush %d len %d fifo %x\n", fifo, len, regs->asc_fifo);
/* FALLTHROUGH */
default:
- printf("%s: SCSI device %d: unexpected disconnect\n",
+ kprintf("%s: SCSI device %d: unexpected disconnect\n",
asc->sc_dev.dv_xname, asc->target);
#ifdef DEBUG
asc_DumpLog("asc_disc");
@@ -1295,7 +1295,7 @@ asc_get_status(asc, status, ss, ir)
* Get the last two bytes in the FIFO.
*/
if ((data = regs->asc_flags & ASC_FLAGS_FIFO_CNT) != 2) {
- printf("asc_get_status: cmdreg %x, fifo cnt %d\n",
+ kprintf("asc_get_status: cmdreg %x, fifo cnt %d\n",
regs->asc_cmd, data); /* XXX */
#ifdef DEBUG
asc_DumpLog("get_status"); /* XXX */
@@ -1324,7 +1324,7 @@ asc_get_status(asc, status, ss, ir)
return (1);
#ifdef DEBUG
- printf("asc_get_status: status %x cmd %x\n",
+ kprintf("asc_get_status: status %x cmd %x\n",
asc->st[asc->target].statusByte, data);
asc_DumpLog("asc_get_status");
#endif
@@ -1352,7 +1352,7 @@ asc_end(asc, status, ss, ir)
#ifdef DEBUG
if (asc_debug > 1) {
- printf("asc_end: %s target %d cmd %x err %d resid %d\n",
+ kprintf("asc_end: %s target %d cmd %x err %d resid %d\n",
asc->sc_dev.dv_xname, target,
state->cmd.opcode, scsicmd->error, state->buflen);
}
@@ -1468,7 +1468,7 @@ asc_dma_in(asc, status, ss, ir)
ASC_TC_PUT(regs, len);
#ifdef DEBUG
if (asc_debug > 2)
- printf("asc_dma_in: buflen %d, len %d\n", state->buflen, len);
+ kprintf("asc_dma_in: buflen %d, len %d\n", state->buflen, len);
#endif
/* check for next chunk */
@@ -1497,7 +1497,7 @@ asc_last_dma_in(asc, status, ss, ir)
fifo = regs->asc_flags & ASC_FLAGS_FIFO_CNT;
#ifdef DEBUG
if (asc_debug > 2)
- printf("asc_last_dma_in: buflen %d dmalen %d tc %d fifo %d\n",
+ kprintf("asc_last_dma_in: buflen %d dmalen %d tc %d fifo %d\n",
state->buflen, state->dmalen, len, fifo);
#endif
if (fifo) {
@@ -1543,7 +1543,7 @@ asc_resume_in(asc, status, ss, ir)
ASC_TC_PUT(regs, len);
#ifdef DEBUG
if (asc_debug > 2)
- printf("asc_resume_in: buflen %d, len %d\n", state->buflen,
+ kprintf("asc_resume_in: buflen %d, len %d\n", state->buflen,
len);
#endif
@@ -1572,7 +1572,7 @@ asc_resume_dma_in(asc, status, ss, ir)
len = state->dmaresid;
off = state->dmalen - len;
if ((off & 1) && state->sync_offset) {
- printf("asc_resume_dma_in: odd xfer dmalen %d len %d off %d\n",
+ kprintf("asc_resume_dma_in: odd xfer dmalen %d len %d off %d\n",
state->dmalen, len, off); /* XXX */
regs->asc_res_fifo = ((u_char *)state->buf)[off];
/*XXX Need to flush cache ? */
@@ -1581,7 +1581,7 @@ asc_resume_dma_in(asc, status, ss, ir)
ASC_TC_PUT(regs, len);
#ifdef DEBUG
if (asc_debug > 2)
- printf("asc_resume_dma_in: buflen %d dmalen %d len %d off %d\n",
+ kprintf("asc_resume_dma_in: buflen %d dmalen %d len %d off %d\n",
state->dmalen, state->buflen, len, off);
#endif
@@ -1611,7 +1611,7 @@ asc_dma_out(asc, status, ss, ir)
ASC_TC_GET(regs, len);
fifo = regs->asc_flags & ASC_FLAGS_FIFO_CNT;
if (len || fifo)
- printf("asc_dma_out: buflen %d dmalen %d tc %d fifo %d\n",
+ kprintf("asc_dma_out: buflen %d dmalen %d tc %d fifo %d\n",
state->buflen, state->dmalen, len, fifo); /* XXX */
len += fifo;
len = state->dmalen - len;
@@ -1634,7 +1634,7 @@ asc_dma_out(asc, status, ss, ir)
ASC_TC_PUT(regs, len);
#ifdef DEBUG
if (asc_debug > 2)
- printf("asc_dma_out: buflen %d, len %d\n", state->buflen, len);
+ kprintf("asc_dma_out: buflen %d, len %d\n", state->buflen, len);
#endif
/* check for next chunk */
@@ -1662,7 +1662,7 @@ asc_last_dma_out(asc, status, ss, ir)
fifo = regs->asc_flags & ASC_FLAGS_FIFO_CNT;
#ifdef DEBUG
if (asc_debug > 2)
- printf("asc_last_dma_out: buflen %d dmalen %d tc %d fifo %d\n",
+ kprintf("asc_last_dma_out: buflen %d dmalen %d tc %d fifo %d\n",
state->buflen, state->dmalen, len, fifo);
#endif
if (fifo) {
@@ -1707,7 +1707,7 @@ asc_resume_out(asc, status, ss, ir)
ASC_TC_PUT(regs, len);
#ifdef DEBUG
if (asc_debug > 2)
- printf("asc_resume_out: buflen %d, len %d\n", state->buflen,
+ kprintf("asc_resume_out: buflen %d, len %d\n", state->buflen,
len);
#endif
@@ -1736,7 +1736,7 @@ asc_resume_dma_out(asc, status, ss, ir)
len = state->dmaresid;
off = state->dmalen - len;
if (off & 1) {
- printf("asc_resume_dma_out: odd xfer dmalen %d len %d off %d\n",
+ kprintf("asc_resume_dma_out: odd xfer dmalen %d len %d off %d\n",
state->dmalen, len, off); /* XXX */
regs->asc_fifo = ((u_char *)state->buf)[off];
/*XXX Need to flush Cache ? */
@@ -1747,7 +1747,7 @@ asc_resume_dma_out(asc, status, ss, ir)
ASC_TC_PUT(regs, len);
#ifdef DEBUG
if (asc_debug > 2)
- printf("asc_resume_dma_out: buflen %d dmalen %d len %d off %d\n",
+ kprintf("asc_resume_dma_out: buflen %d dmalen %d len %d off %d\n",
state->dmalen, state->buflen, len, off);
#endif
@@ -1798,7 +1798,7 @@ asc_replysync(asc, status, ss, ir)
#ifdef DEBUG
if (asc_debug > 2)
- printf("asc_replysync: %x %x\n",
+ kprintf("asc_replysync: %x %x\n",
asc_to_scsi_period[state->sync_period] * asc->tb_ticks,
state->sync_offset);
#endif
@@ -1865,7 +1865,7 @@ asc_msg_in(asc, status, ss, ir)
/* process an extended message */
#ifdef DEBUG
if (asc_debug > 2)
- printf("asc_msg_in: msg %x %x %x\n",
+ kprintf("asc_msg_in: msg %x %x %x\n",
state->msg_in[0],
state->msg_in[1],
state->msg_in[2]);
@@ -1881,7 +1881,7 @@ asc_msg_in(asc, status, ss, ir)
i = asc->min_period;
else if (i >= asc->max_period) {
/* can't do sync transfer, period too long */
- printf("%s: SCSI device %d: sync xfer period too long (%d)\n",
+ kprintf("%s: SCSI device %d: sync xfer period too long (%d)\n",
asc->sc_dev.dv_xname, asc->target, i);
i = asc->max_period;
state->sync_offset = 0;
@@ -1921,7 +1921,7 @@ asc_msg_in(asc, status, ss, ir)
goto done;
default:
- printf("%s: SCSI device %d: rejecting extended message 0x%x\n",
+ kprintf("%s: SCSI device %d: rejecting extended message 0x%x\n",
asc->sc_dev.dv_xname, asc->target,
state->msg_in[0]);
goto reject;
@@ -1931,12 +1931,12 @@ asc_msg_in(asc, status, ss, ir)
/* process first byte of a message */
#ifdef DEBUG
if (asc_debug > 2)
- printf("asc_msg_in: msg %x\n", msg);
+ kprintf("asc_msg_in: msg %x\n", msg);
#endif
switch (msg) {
#if 0
case SCSI_MESSAGE_REJECT:
- printf(" did not like SYNCH xfer "); /* XXX */
+ kprintf(" did not like SYNCH xfer "); /* XXX */
state->flags |= DID_SYNC;
regs->asc_cmd = ASC_CMD_MSG_ACPT;
readback(regs->asc_cmd);
@@ -1988,7 +1988,7 @@ asc_msg_in(asc, status, ss, ir)
return (0);
default:
- printf("%s: SCSI device %d: rejecting message 0x%x\n",
+ kprintf("%s: SCSI device %d: rejecting message 0x%x\n",
asc->sc_dev.dv_xname, asc->target, msg);
reject:
/* request a message out before acknowledging this message */
@@ -2023,7 +2023,7 @@ asc_disconnect(asc, status, ss, ir)
#ifdef DIAGNOSTIC
if (!(state->flags & DISCONN)) {
- printf("asc_disconnect: device %d: DISCONN not set!\n",
+ kprintf("asc_disconnect: device %d: DISCONN not set!\n",
asc->target);
}
#endif /* DIAGNOSTIC */
@@ -2042,12 +2042,12 @@ asc_DumpLog(str)
register struct asc_log *lp;
register u_int status;
- printf("asc: %s: cmd %x bn %d cnt %d\n", str, asc_debug_cmd,
+ kprintf("asc: %s: cmd %x bn %d cnt %d\n", str, asc_debug_cmd,
asc_debug_bn, asc_debug_sz);
lp = asc_logp;
do {
status = lp->status;
- printf("asc%d tgt %d status %x ss %x ir %x cond %d:%x msg %x resid %d\n",
+ kprintf("asc%d tgt %d status %x ss %x ir %x cond %d:%x msg %x resid %d\n",
status >> 24,
lp->target,
(status >> 16) & 0xFF,
diff --git a/sys/arch/pica/dev/com.c b/sys/arch/pica/dev/com.c
index 7aaeeefe578..cfdeb3e0782 100644
--- a/sys/arch/pica/dev/com.c
+++ b/sys/arch/pica/dev/com.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com.c,v 1.2 1996/03/17 01:42:10 thorpej Exp $ */
+/* $NetBSD: com.c,v 1.3 1996/10/10 23:44:53 christos Exp $ */
/*-
* Copyright (c) 1993, 1994, 1995 Charles M. Hannum. All rights reserved.
@@ -217,11 +217,11 @@ comattach(parent, self, aux)
if ((inb(iobase + com_iir) & IIR_FIFO_MASK) == IIR_FIFO_MASK)
if ((inb(iobase + com_fifo) & FIFO_TRIGGER_14) == FIFO_TRIGGER_14) {
sc->sc_hwflags |= COM_HW_FIFO;
- printf(": ns16550a, working fifo\n");
+ kprintf(": ns16550a, working fifo\n");
} else
- printf(": ns16550, broken fifo\n");
+ kprintf(": ns16550, broken fifo\n");
else
- printf(": ns8250 or ns16450, no fifo\n");
+ kprintf(": ns8250 or ns16450, no fifo\n");
outb(iobase + com_fifo, 0);
/* disable interrupts */
@@ -241,10 +241,10 @@ comattach(parent, self, aux)
* Print prefix of device name,
* let kgdb_connect print the rest.
*/
- printf("%s: ", sc->sc_dev.dv_xname);
+ kprintf("%s: ", sc->sc_dev.dv_xname);
kgdb_connect(1);
} else
- printf("%s: kgdb enabled\n",
+ kprintf("%s: kgdb enabled\n",
sc->sc_dev.dv_xname);
}
}
diff --git a/sys/arch/pica/dev/dma.c b/sys/arch/pica/dev/dma.c
index efc56493752..b407753656b 100644
--- a/sys/arch/pica/dev/dma.c
+++ b/sys/arch/pica/dev/dma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dma.c,v 1.4 1996/08/11 22:35:46 jonathan Exp $ */
+/* $NetBSD: dma.c,v 1.5 1996/10/10 23:44:54 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -331,7 +331,7 @@ picaDmaNull(dma_softc_t *sc)
{
pDmaReg regs = sc->dma_reg;
- printf("picaDmaNull called\n");
+ kprintf("picaDmaNull called\n");
}
/*
@@ -342,7 +342,7 @@ picaEnIntrNull(dma_softc_t *sc)
{
pDmaReg regs = sc->dma_reg;
- printf("picaEnIntrNull called\n");
+ kprintf("picaEnIntrNull called\n");
}
diff --git a/sys/arch/pica/dev/fd.c b/sys/arch/pica/dev/fd.c
index 76c11f11a63..8f39f807a06 100644
--- a/sys/arch/pica/dev/fd.c
+++ b/sys/arch/pica/dev/fd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.5 1996/08/27 21:56:37 cgd Exp $ */
+/* $NetBSD: fd.c,v 1.6 1996/10/10 23:44:56 christos Exp $ */
/*-
* Copyright (c) 1993, 1994, 1995 Charles Hannum.
@@ -255,7 +255,7 @@ fdprint(aux, fdc)
register struct fdc_attach_args *fa = aux;
if (!fdc)
- printf(" drive %d", fa->fa_drive);
+ kprintf(" drive %d", fa->fa_drive);
return QUIET;
}
@@ -276,7 +276,7 @@ fdcattach(parent, self, aux)
fdc->dma = &fdc->__dma;
fdc_dma_init(fdc->dma);
- printf("\n");
+ kprintf("\n");
BUS_INTR_ESTABLISH(ca, fdcintr, fdc);
@@ -325,10 +325,10 @@ fdprobe(parent, match, aux)
#ifdef FD_DEBUG
{
int i;
- printf("fdprobe: status");
+ kprintf("fdprobe: status");
for (i = 0; i < n; i++)
- printf(" %x", fdc->sc_status[i]);
- printf("\n");
+ kprintf(" %x", fdc->sc_status[i]);
+ kprintf("\n");
}
#endif
if (n != 2 || (fdc->sc_status[0] & 0xf8) != 0x20)
@@ -356,10 +356,10 @@ fdattach(parent, self, aux)
/* XXX Allow `flags' to override device type? */
if (type)
- printf(": %s %d cyl, %d head, %d sec\n", type->name,
+ kprintf(": %s %d cyl, %d head, %d sec\n", type->name,
type->tracks, type->heads, type->sectrac);
else
- printf(": density unknown\n");
+ kprintf(": density unknown\n");
fd->sc_cylin = -1;
fd->sc_drive = drive;
@@ -402,7 +402,7 @@ fd_nvtotype(fdc, nvraminfo, drive)
case NVRAM_DISKETTE_720K:
return &fd_types[4];
default:
- printf("%s: drive %d: unknown device type 0x%x\n",
+ kprintf("%s: drive %d: unknown device type 0x%x\n",
fdc, drive, type);
return NULL;
}
@@ -466,7 +466,7 @@ fdstrategy(bp)
bp->b_cylin = bp->b_blkno / (FDC_BSIZE / DEV_BSIZE) / fd->sc_type->seccyl;
#ifdef FD_DEBUG
- printf("fdstrategy: b_blkno %d b_bcount %d blkno %d cylin %d sz %d\n",
+ kprintf("fdstrategy: b_blkno %d b_bcount %d blkno %d cylin %d sz %d\n",
bp->b_blkno, bp->b_bcount, fd->sc_blkno, bp->b_cylin, sz);
#endif
@@ -480,7 +480,7 @@ fdstrategy(bp)
else {
struct fdc_softc *fdc = (void *)fd->sc_dev.dv_parent;
if (fdc->sc_state == DEVIDLE) {
- printf("fdstrategy: controller inactive\n");
+ kprintf("fdstrategy: controller inactive\n");
fdcstart(fdc);
}
}
@@ -701,7 +701,7 @@ fdcstart(fdc)
/* only got here if controller's drive queue was inactive; should
be in idle state */
if (fdc->sc_state != DEVIDLE) {
- printf("fdcstart: not idle\n");
+ kprintf("fdcstart: not idle\n");
return;
}
#endif
@@ -723,19 +723,19 @@ fdcstatus(dv, n, s)
n = 2;
}
- printf("%s: %s", dv->dv_xname, s);
+ kprintf("%s: %s", dv->dv_xname, s);
switch (n) {
case 0:
- printf("\n");
+ kprintf("\n");
break;
case 2:
- printf(" (st0 %b cyl %d)\n",
+ kprintf(" (st0 %b cyl %d)\n",
fdc->sc_status[0], NE7_ST0BITS,
fdc->sc_status[1]);
break;
case 7:
- printf(" (st0 %b st1 %b st2 %b cyl %d head %d sec %d)\n",
+ kprintf(" (st0 %b st1 %b st2 %b cyl %d head %d sec %d)\n",
fdc->sc_status[0], NE7_ST0BITS,
fdc->sc_status[1], NE7_ST1BITS,
fdc->sc_status[2], NE7_ST2BITS,
@@ -743,7 +743,7 @@ fdcstatus(dv, n, s)
break;
#ifdef DIAGNOSTIC
default:
- printf("\nfdcstatus: weird size");
+ kprintf("\nfdcstatus: weird size");
break;
#endif
}
@@ -873,7 +873,7 @@ loop:
{int block;
block = (fd->sc_cylin * type->heads + head) * type->sectrac + sec;
if (block != fd->sc_blkno) {
- printf("fdcintr: block %d != blkno %d\n", block, fd->sc_blkno);
+ kprintf("fdcintr: block %d != blkno %d\n", block, fd->sc_blkno);
#ifdef DDB
Debugger();
#endif
@@ -885,7 +885,7 @@ loop:
DMA_START(fdc->dma, bp->b_data + fd->sc_skip, fd->sc_nbytes, read);
outb(iobase + fdctl, type->rate);
#ifdef FD_DEBUG
- printf("fdcintr: %s drive %d track %d head %d sec %d nblks %d\n",
+ kprintf("fdcintr: %s drive %d track %d head %d sec %d nblks %d\n",
read ? "read" : "write", fd->sc_drive, fd->sc_cylin, head,
sec, nblks);
#endif
@@ -943,7 +943,7 @@ loop:
#ifdef FD_DEBUG
fdcstatus(&fd->sc_dev, 7, bp->b_flags & B_READ ?
"read failed" : "write failed");
- printf("blkno %d nblks %d\n",
+ kprintf("blkno %d nblks %d\n",
fd->sc_blkno, fd->sc_nblks);
#endif
fdcretry(fdc);
@@ -954,7 +954,7 @@ loop:
if (fdc->sc_errors) {
diskerr(bp, "fd", "soft error", LOG_PRINTF,
fd->sc_skip / FDC_BSIZE, (struct disklabel *)NULL);
- printf("\n");
+ kprintf("\n");
fdc->sc_errors = 0;
}
fd->sc_blkno += fd->sc_nblks;
@@ -1056,7 +1056,7 @@ fdcretry(fdc)
default:
diskerr(bp, "fd", "hard error", LOG_PRINTF,
fd->sc_skip / FDC_BSIZE, (struct disklabel *)NULL);
- printf(" (st0 %b st1 %b st2 %b cyl %d head %d sec %d)\n",
+ kprintf(" (st0 %b st1 %b st2 %b cyl %d head %d sec %d)\n",
fdc->sc_status[0], NE7_ST0BITS,
fdc->sc_status[1], NE7_ST1BITS,
fdc->sc_status[2], NE7_ST2BITS,
diff --git a/sys/arch/pica/dev/if_sn.c b/sys/arch/pica/dev/if_sn.c
index 7335efe9d6c..9afcde415e3 100644
--- a/sys/arch/pica/dev/if_sn.c
+++ b/sys/arch/pica/dev/if_sn.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sn.c,v 1.6 1996/08/11 22:35:55 jonathan Exp $ */
+/* $NetBSD: if_sn.c,v 1.7 1996/10/10 23:44:59 christos Exp $ */
/*
* National Semiconductor SONIC Driver
@@ -131,7 +131,7 @@ __assert(file, line, failedexpr)
const char *file, *failedexpr;
int line;
{
- (void)printf(
+ kprintf(
"assertion \"%s\" failed: file \"%s\", line %d\n",
failedexpr, file, line);
}
@@ -343,14 +343,14 @@ snattach(parent, self, aux)
camdump(sc);
#endif
sngetaddr(sc);
- printf(" address %s\n", ether_sprintf(sc->sc_enaddr));
+ kprintf(" address %s\n", ether_sprintf(sc->sc_enaddr));
#if 0
-printf("\nsonic buffers: rra=0x%x cda=0x%x rda=0x%x tda=0x%x rba=0x%x\n",
+kprintf("\nsonic buffers: rra=0x%x cda=0x%x rda=0x%x tda=0x%x rba=0x%x\n",
p_rra, p_cda, p_rda, p_tda, p_rba);
-printf("sonic buffers: rra=0x%x cda=0x%x rda=0x%x tda=0x%x rba=0x%x\n",
+kprintf("sonic buffers: rra=0x%x cda=0x%x rda=0x%x tda=0x%x rba=0x%x\n",
v_rra, v_cda, v_rda, v_tda, v_rba);
-printf("mapped to offset 0x%x size 0x%x\n", SONICBUF - pp, p - SONICBUF);
+kprintf("mapped to offset 0x%x size 0x%x\n", SONICBUF - pp, p - SONICBUF);
#endif
BUS_INTR_ESTABLISH(ca, (intr_handler_t)snintr, (void *)sc);
@@ -429,7 +429,7 @@ snioctl(ifp, cmd, data)
if (((ifp->if_flags ^ sc->sc_iflags) & IFF_PROMISC) &&
(ifp->if_flags & IFF_RUNNING)) {
sc->sc_iflags = ifp->if_flags;
- printf("change in flags\n");
+ kprintf("change in flags\n");
temp = sc->sc_if.if_flags & IFF_UP;
snreset(sc);
sc->sc_if.if_flags |= temp;
@@ -521,7 +521,7 @@ void
snreset(sc)
struct sn_softc *sc;
{
- printf("snreset\n");
+ kprintf("snreset\n");
snstop(sc);
sninit(sc);
}
@@ -892,7 +892,7 @@ camprogram(sc)
if (csr->s_isr & ISR_LCD)
csr->s_isr = ISR_LCD;
else
- printf("sonic: CAM initialisation without interrupt\n");
+ kprintf("sonic: CAM initialisation without interrupt\n");
}
#if 0
@@ -903,7 +903,7 @@ camdump(sc)
struct sonic_reg *csr = sc->sc_csr;
int i;
- printf("CAM entries:\n");
+ kprintf("CAM entries:\n");
csr->s_cr = CR_RST;
wbflush();
@@ -914,9 +914,9 @@ camdump(sc)
ap2 = csr->s_cap2;
ap1 = csr->s_cap1;
ap0 = csr->s_cap0;
- printf("%d: ap2=0x%x ap1=0x%x ap0=0x%x\n", i, ap2, ap1, ap0);
+ kprintf("%d: ap2=0x%x ap1=0x%x ap0=0x%x\n", i, ap2, ap1, ap0);
}
- printf("CAM enable 0x%x\n", csr->s_cep);
+ kprintf("CAM enable 0x%x\n", csr->s_cep);
csr->s_cr = 0;
wbflush();
@@ -1014,7 +1014,7 @@ snintr(sc)
wbflush();
if (isr & (ISR_BR | ISR_LCD | ISR_PINT | ISR_TC))
- printf("sonic: unexpected interrupt status 0x%x\n", isr);
+ kprintf("sonic: unexpected interrupt status 0x%x\n", isr);
if (isr & (ISR_TXDN | ISR_TXER))
sonictxint(sc);
@@ -1024,15 +1024,15 @@ snintr(sc)
if (isr & (ISR_HBL | ISR_RDE | ISR_RBE | ISR_RBAE | ISR_RFO)) {
if (isr & ISR_HBL)
- printf("sonic: no heartbeat\n");
+ kprintf("sonic: no heartbeat\n");
if (isr & ISR_RDE)
- printf("sonic: receive descriptors exhausted\n");
+ kprintf("sonic: receive descriptors exhausted\n");
if (isr & ISR_RBE)
- printf("sonic: receive buffers exhausted\n");
+ kprintf("sonic: receive buffers exhausted\n");
if (isr & ISR_RBAE)
- printf("sonic: receive buffer area exhausted\n");
+ kprintf("sonic: receive buffer area exhausted\n");
if (isr & ISR_RFO)
- printf("sonic: receive FIFO overrun\n");
+ kprintf("sonic: receive FIFO overrun\n");
}
if (isr & (ISR_CRC | ISR_FAE | ISR_MP)) {
#ifdef notdef
@@ -1077,12 +1077,12 @@ sonictxint(sc)
if (ethdebug) {
struct ether_header *eh = mtod(m, struct ether_header *);
- printf("xmit status=0x%x len=%d type=0x%x from %s",
+ kprintf("xmit status=0x%x len=%d type=0x%x from %s",
txp->status,
txp->pkt_size,
htons(eh->ether_type),
ether_sprintf(eh->ether_shost));
- printf(" (to %s)\n", ether_sprintf(eh->ether_dhost));
+ kprintf(" (to %s)\n", ether_sprintf(eh->ether_dhost));
}
m_freem(m);
mtd->mtd_mbuf = 0;
@@ -1091,10 +1091,10 @@ sonictxint(sc)
mtd_free(mtd);
if ((SRD(txp->status) & TCR_PTX) == 0) {
- printf("sonic: Tx packet status=0x%x\n", txp->status);
+ kprintf("sonic: Tx packet status=0x%x\n", txp->status);
if (mtdhead != mtdnext) {
- printf("resubmitting remaining packets\n");
+ kprintf("resubmitting remaining packets\n");
csr->s_ctda = LOWER(mtdhead->mtd_txp);
csr->s_cr = CR_TXP;
wbflush();
@@ -1138,7 +1138,7 @@ sonicrxint(sc)
while (SRD(rxp->in_use) == 0) {
unsigned status = SRD(rxp->status);
if ((status & RCR_LPKT) == 0)
- printf("sonic: more than one packet in RBA!\n");
+ kprintf("sonic: more than one packet in RBA!\n");
assert(PSNSEQ(SRD(rxp->seq_no)) == 0);
if (status & RCR_PRX) {
@@ -1160,7 +1160,7 @@ sonicrxint(sc)
assert(SRD(rxp->pkt_ptrhi) == SRD(p_rra[orra].buff_ptrhi));
assert(SRD(rxp->pkt_ptrlo) == SRD(p_rra[orra].buff_ptrlo));
if(SRD(rxp->pkt_ptrlo) != SRD(p_rra[orra].buff_ptrlo))
-printf("%x,%x\n",SRD(rxp->pkt_ptrlo),SRD(p_rra[orra].buff_ptrlo));
+kprintf("%x,%x\n",SRD(rxp->pkt_ptrlo),SRD(p_rra[orra].buff_ptrlo));
assert(SRD(p_rra[orra].buff_wclo));
/*
@@ -1204,7 +1204,6 @@ sonic_read(sc, rxp)
struct RXpkt *rxp;
{
struct ifnet *ifp = &sc->sc_if;
- /*extern char *ether_sprintf();*/
struct ether_header *et;
struct mbuf *m;
int len, off, i;
@@ -1224,13 +1223,13 @@ sonic_read(sc, rxp)
et = (struct ether_header *)pkt;
if (ethdebug) {
- printf("rcvd 0x%x status=0x%x, len=%d type=0x%x from %s",
+ kprintf("rcvd 0x%x status=0x%x, len=%d type=0x%x from %s",
et, rxp->status, len, htons(et->ether_type),
ether_sprintf(et->ether_shost));
- printf(" (to %s)\n", ether_sprintf(et->ether_dhost));
+ kprintf(" (to %s)\n", ether_sprintf(et->ether_dhost));
}
if (len < ETHERMIN || len > ETHERMTU) {
- printf("sonic: invalid packet length %d bytes\n", len);
+ kprintf("sonic: invalid packet length %d bytes\n", len);
return (0);
}
diff --git a/sys/arch/pica/dev/lpt.c b/sys/arch/pica/dev/lpt.c
index 8f4a4bdce91..e67ca388834 100644
--- a/sys/arch/pica/dev/lpt.c
+++ b/sys/arch/pica/dev/lpt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt.c,v 1.2 1996/03/17 01:42:15 thorpej Exp $ */
+/* $NetBSD: lpt.c,v 1.3 1996/10/10 23:45:01 christos Exp $ */
/*
* Copyright (c) 1993, 1994 Charles Hannum.
@@ -79,7 +79,7 @@
#if !defined(DEBUG) || !defined(notdef)
#define lprintf
#else
-#define lprintf if (lptdebug) printf
+#define lprintf if (lptdebug) kprintf
int lptdebug = 1;
#endif
@@ -186,7 +186,7 @@ lptprobe(parent, match, aux)
return (0);
#ifdef DEBUG
-#define ABORT do {printf("lptprobe: mask %x data %x failed\n", mask, data); \
+#define ABORT do {kprintf("lptprobe: mask %x data %x failed\n", mask, data); \
return 0;} while (0)
#else
#define ABORT return 0
@@ -230,7 +230,7 @@ lptattach(parent, self, aux)
struct confargs *ca = aux;
int iobase = (int)BUS_CVTADDR(ca);
- printf("\n");
+ kprintf("\n");
sc->sc_iobase = iobase;
sc->sc_state = 0;
@@ -263,7 +263,7 @@ lptopen(dev, flag)
#ifdef DIAGNOSTIC
if (sc->sc_state)
- printf("%s: stat=0x%x not zero\n", sc->sc_dev.dv_xname,
+ kprintf("%s: stat=0x%x not zero\n", sc->sc_dev.dv_xname,
sc->sc_state);
#endif
diff --git a/sys/arch/pica/dev/pccons.c b/sys/arch/pica/dev/pccons.c
index 05404a27f3a..fa5d0af9d8d 100644
--- a/sys/arch/pica/dev/pccons.c
+++ b/sys/arch/pica/dev/pccons.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pccons.c,v 1.4 1996/08/11 22:35:59 jonathan Exp $ */
+/* $NetBSD: pccons.c,v 1.5 1996/10/10 23:45:04 christos Exp $ */
/*-
* Copyright (c) 1993, 1994, 1995 Charles Hannum. All rights reserved.
@@ -312,7 +312,7 @@ kbd_cmd(val, polling)
break;
}
#ifdef DIAGNOSTIC
- printf("kbd_cmd: input char %x lost\n", c);
+ kprintf("kbd_cmd: input char %x lost\n", c);
#endif
}
}
@@ -368,7 +368,7 @@ do_async_update(poll)
old_lock_state = lock_state;
if (!kbd_cmd(KBC_MODEIND, poll) ||
!kbd_cmd(lock_state, poll)) {
- printf("pc: timeout updating leds\n");
+ kprintf("pc: timeout updating leds\n");
(void) kbd_cmd(KBC_ENABLE, poll);
}
}
@@ -376,7 +376,7 @@ do_async_update(poll)
old_typematic_rate = typematic_rate;
if (!kbd_cmd(KBC_TYPEMATIC, poll) ||
!kbd_cmd(typematic_rate, poll)) {
- printf("pc: timeout updating typematic rate\n");
+ kprintf("pc: timeout updating typematic rate\n");
(void) kbd_cmd(KBC_ENABLE, poll);
}
}
@@ -430,7 +430,7 @@ pcmatch(parent, cfdata, aux)
/* Enable interrupts and keyboard, etc. */
if (!kbc_put8042cmd(CMDBYTE)) {
- printf("pcmatch: command error\n");
+ kprintf("pcmatch: command error\n");
return 0;
}
@@ -439,7 +439,7 @@ pcmatch(parent, cfdata, aux)
kbd_flush_input();
/* Reset the keyboard. */
if (!kbd_cmd(KBC_RESET, 1)) {
- printf("pcmatch: reset error %d\n", 1);
+ kprintf("pcmatch: reset error %d\n", 1);
goto lose;
}
for (i = 600000; i; i--)
@@ -448,7 +448,7 @@ pcmatch(parent, cfdata, aux)
break;
}
if (i == 0 || inb(KBDATAP) != KBR_RSTDONE) {
- printf("pcmatch: reset error %d\n", 2);
+ kprintf("pcmatch: reset error %d\n", 2);
goto lose;
}
/*
@@ -459,7 +459,7 @@ pcmatch(parent, cfdata, aux)
kbd_flush_input();
/* Just to be sure. */
if (!kbd_cmd(KBC_ENABLE, 1)) {
- printf("pcmatch: reset error %d\n", 3);
+ kprintf("pcmatch: reset error %d\n", 3);
goto lose;
}
@@ -479,13 +479,13 @@ pcmatch(parent, cfdata, aux)
if (kbc_get8042cmd() & KC8_TRANS) {
/* The 8042 is translating for us; use AT codes. */
if (!kbd_cmd(KBC_SETTABLE, 1) || !kbd_cmd(2, 1)) {
- printf("pcmatch: reset error %d\n", 4);
+ kprintf("pcmatch: reset error %d\n", 4);
goto lose;
}
} else {
/* Stupid 8042; set keyboard to XT codes. */
if (!kbd_cmd(KBC_SETTABLE, 1) || !kbd_cmd(1, 1)) {
- printf("pcmatch: reset error %d\n", 5);
+ kprintf("pcmatch: reset error %d\n", 5);
goto lose;
}
}
@@ -508,7 +508,7 @@ pcattach(parent, self, aux)
struct confargs *ca = aux;
struct pc_softc *sc = (void *)self;
- printf(": %s\n", vs.color ? "color" : "mono");
+ kprintf(": %s\n", vs.color ? "color" : "mono");
do_async_update(1);
BUS_INTR_ESTABLISH(ca, pcintr, (void *)(long)sc);
@@ -1795,7 +1795,7 @@ top:
extended = 0;
return capchar;
case NONE:
-printf("keycode %d\n",dt);
+kprintf("keycode %d\n",dt);
break;
case FUNC: {
char *more_chars;
@@ -1869,7 +1869,7 @@ pc_xmode_off()
#endif
async_update();
}
-/* $NetBSD: pccons.c,v 1.4 1996/08/11 22:35:59 jonathan Exp $ */
+/* $NetBSD: pccons.c,v 1.5 1996/10/10 23:45:04 christos Exp $ */
#include <machine/mouse.h>
@@ -1960,7 +1960,7 @@ pmsattach(parent, self, aux)
struct pms_softc *sc = (void *)self;
struct confargs *ca = aux;
- printf("\n");
+ kprintf("\n");
/* Other initialization was done by pmsprobe. */
sc->sc_state = 0;
diff --git a/sys/arch/pica/include/asm.h b/sys/arch/pica/include/asm.h
index cdbc12dd80f..f1c90b7a3fd 100644
--- a/sys/arch/pica/include/asm.h
+++ b/sys/arch/pica/include/asm.h
@@ -1,4 +1,4 @@
-/* $NetBSD: asm.h,v 1.2 1996/07/16 23:24:20 thorpej Exp $ */
+/* $NetBSD: asm.h,v 1.3 1996/10/10 23:45:12 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -143,7 +143,7 @@ x: ; \
#define STAND_RA_OFFSET 20
/*
- * Macros to panic and printf from assembly language.
+ * Macros to panic and kprintf from assembly language.
*/
#define PANIC(msg) \
la a0, 9f; \
@@ -152,7 +152,7 @@ x: ; \
#define PRINTF(msg) \
la a0, 9f; \
- jal printf; \
+ jal kprintf; \
MSG(msg)
#define MSG(msg) \
diff --git a/sys/arch/pica/pica/autoconf.c b/sys/arch/pica/pica/autoconf.c
index fdbaba03214..738deb0b635 100644
--- a/sys/arch/pica/pica/autoconf.c
+++ b/sys/arch/pica/pica/autoconf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.3 1996/07/16 23:24:36 thorpej Exp $ */
+/* $NetBSD: autoconf.c,v 1.4 1996/10/10 23:45:16 christos Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -160,7 +160,7 @@ setroot()
if (rootdev == orootdev)
return;
- printf("changing root device to %c%c%d%c\n",
+ kprintf("changing root device to %c%c%d%c\n",
devname[majdev][0], devname[majdev][1],
unit, part + 'a');
diff --git a/sys/arch/pica/pica/clock.c b/sys/arch/pica/pica/clock.c
index 12016fd740d..f759b6177a2 100644
--- a/sys/arch/pica/pica/clock.c
+++ b/sys/arch/pica/pica/clock.c
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.4 1996/08/11 22:36:10 jonathan Exp $ */
+/* $NetBSD: clock.c,v 1.5 1996/10/10 23:45:19 christos Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -129,7 +129,7 @@ clockattach(parent, self, aux)
BUS_INTR_ESTABLISH((struct confargs *)aux,
(intr_handler_t) hardclock, self);
- printf("\n");
+ kprintf("\n");
}
/*
@@ -210,7 +210,7 @@ inittodr(base)
int badbase, s;
if (base < 5*SECYR) {
- printf("WARNING: preposterous time in file system");
+ kprintf("WARNING: preposterous time in file system");
/* read the system clock anyway */
base = 6*SECYR + 186*SECDAY + SECDAY/2;
badbase = 1;
@@ -232,7 +232,7 @@ inittodr(base)
*/
time.tv_sec = base;
if (!badbase) {
- printf("WARNING: preposterous clock chip time\n");
+ kprintf("WARNING: preposterous clock chip time\n");
resettodr();
}
goto bad;
@@ -256,11 +256,11 @@ inittodr(base)
deltat = -deltat;
if (deltat < 2 * SECDAY)
return;
- printf("WARNING: clock %s %d days",
+ kprintf("WARNING: clock %s %d days",
time.tv_sec < base ? "lost" : "gained", deltat / SECDAY);
}
bad:
- printf(" -- CHECK AND RESET THE DATE!\n");
+ kprintf(" -- CHECK AND RESET THE DATE!\n");
}
/*
diff --git a/sys/arch/pica/pica/clock_mc.c b/sys/arch/pica/pica/clock_mc.c
index 72834070916..b27f8593f11 100644
--- a/sys/arch/pica/pica/clock_mc.c
+++ b/sys/arch/pica/pica/clock_mc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: clock_mc.c,v 1.1.1.1 1996/03/13 04:58:10 jonathan Exp $ */
+/* $NetBSD: clock_mc.c,v 1.2 1996/10/10 23:45:21 christos Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -96,7 +96,7 @@ mcclock_attach(parent, self, aux)
register volatile struct chiptime *c;
struct confargs *ca = aux;
- printf(": mc146818 or compatible");
+ kprintf(": mc146818 or compatible");
csc->sc_init = mcclock_init;
csc->sc_get = mcclock_get;
@@ -114,7 +114,7 @@ mcclock_attach(parent, self, aux)
break;
default:
- printf("\n");
+ kprintf("\n");
panic("don't know how to set up for other system types.");
}
diff --git a/sys/arch/pica/pica/cpu.c b/sys/arch/pica/pica/cpu.c
index e04a558e604..95b89f1f9e5 100644
--- a/sys/arch/pica/pica/cpu.c
+++ b/sys/arch/pica/pica/cpu.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.2 1996/03/17 01:42:29 thorpej Exp $ */
+/* $NetBSD: cpu.c,v 1.3 1996/10/10 23:45:22 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -73,116 +73,116 @@ cpuattach(parent, dev, aux)
struct pcs *p;
int needcomma, needrev, i;
- printf(": ");
+ kprintf(": ");
switch(cpu_id.cpu.cp_imp) {
case MIPS_R2000:
- printf("MIPS R2000 CPU");
+ kprintf("MIPS R2000 CPU");
break;
case MIPS_R3000:
- printf("MIPS R3000 CPU");
+ kprintf("MIPS R3000 CPU");
break;
case MIPS_R6000:
- printf("MIPS R6000 CPU");
+ kprintf("MIPS R6000 CPU");
break;
case MIPS_R4000:
if(machPrimaryInstCacheSize == 16384)
- printf("MIPS R4400 CPU");
+ kprintf("MIPS R4400 CPU");
else
- printf("MIPS R4000 CPU");
+ kprintf("MIPS R4000 CPU");
break;
case MIPS_R3LSI:
- printf("LSI Logic R3000 derivate");
+ kprintf("LSI Logic R3000 derivate");
break;
case MIPS_R6000A:
- printf("MIPS R6000A CPU");
+ kprintf("MIPS R6000A CPU");
break;
case MIPS_R3IDT:
- printf("IDT R3000 derivate");
+ kprintf("IDT R3000 derivate");
break;
case MIPS_R10000:
- printf("MIPS R10000/T5 CPU");
+ kprintf("MIPS R10000/T5 CPU");
break;
case MIPS_R4200:
- printf("MIPS R4200 CPU (ICE)");
+ kprintf("MIPS R4200 CPU (ICE)");
break;
case MIPS_R8000:
- printf("MIPS R8000 Blackbird/TFP CPU");
+ kprintf("MIPS R8000 Blackbird/TFP CPU");
break;
case MIPS_R4600:
- printf("QED R4600 Orion CPU");
+ kprintf("QED R4600 Orion CPU");
break;
case MIPS_R3SONY:
- printf("Sony R3000 based CPU");
+ kprintf("Sony R3000 based CPU");
break;
case MIPS_R3TOSH:
- printf("Toshiba R3000 based CPU");
+ kprintf("Toshiba R3000 based CPU");
break;
case MIPS_R3NKK:
- printf("NKK R3000 based CPU");
+ kprintf("NKK R3000 based CPU");
break;
case MIPS_UNKC1:
case MIPS_UNKC2:
default:
- printf("Unknown CPU type (0x%x)",cpu_id.cpu.cp_imp);
+ kprintf("Unknown CPU type (0x%x)",cpu_id.cpu.cp_imp);
break;
}
- printf(" Rev. %d.%d with ", cpu_id.cpu.cp_majrev, cpu_id.cpu.cp_minrev);
+ kprintf(" Rev. %d.%d with ", cpu_id.cpu.cp_majrev, cpu_id.cpu.cp_minrev);
switch(fpu_id.cpu.cp_imp) {
case MIPS_SOFT:
- printf("Software emulation float");
+ kprintf("Software emulation float");
break;
case MIPS_R2360:
- printf("MIPS R2360 FPC");
+ kprintf("MIPS R2360 FPC");
break;
case MIPS_R2010:
- printf("MIPS R2010 FPC");
+ kprintf("MIPS R2010 FPC");
break;
case MIPS_R3010:
- printf("MIPS R3010 FPC");
+ kprintf("MIPS R3010 FPC");
break;
case MIPS_R6010:
- printf("MIPS R6010 FPC");
+ kprintf("MIPS R6010 FPC");
break;
case MIPS_R4010:
- printf("MIPS R4010 FPC");
+ kprintf("MIPS R4010 FPC");
break;
case MIPS_R31LSI:
- printf("FPC");
+ kprintf("FPC");
break;
case MIPS_R10010:
- printf("MIPS R10000/T5 FPU");
+ kprintf("MIPS R10000/T5 FPU");
break;
case MIPS_R4210:
- printf("MIPS R4200 FPC (ICE)");
+ kprintf("MIPS R4200 FPC (ICE)");
case MIPS_R8000:
- printf("MIPS R8000 Blackbird/TFP");
+ kprintf("MIPS R8000 Blackbird/TFP");
break;
case MIPS_R4600:
- printf("QED R4600 Orion FPC");
+ kprintf("QED R4600 Orion FPC");
break;
case MIPS_R3SONY:
- printf("Sony R3000 based FPC");
+ kprintf("Sony R3000 based FPC");
break;
case MIPS_R3TOSH:
- printf("Toshiba R3000 based FPC");
+ kprintf("Toshiba R3000 based FPC");
break;
case MIPS_R3NKK:
- printf("NKK R3000 based FPC");
+ kprintf("NKK R3000 based FPC");
break;
case MIPS_UNKF1:
default:
- printf("Unknown FPU type (0x%x)", fpu_id.cpu.cp_imp);
+ kprintf("Unknown FPU type (0x%x)", fpu_id.cpu.cp_imp);
break;
}
- printf(" Rev. %d.%d", fpu_id.cpu.cp_majrev, fpu_id.cpu.cp_minrev);
- printf("\n");
+ kprintf(" Rev. %d.%d", fpu_id.cpu.cp_majrev, fpu_id.cpu.cp_minrev);
+ kprintf("\n");
- printf(" Primary cache size: %dkb Instruction, %dkb Data.\n",
+ kprintf(" Primary cache size: %dkb Instruction, %dkb Data.\n",
machPrimaryInstCacheSize / 1024,
machPrimaryDataCacheSize / 1024);
}
diff --git a/sys/arch/pica/pica/disksubr.c b/sys/arch/pica/pica/disksubr.c
index dad8da456d2..c97378d5eab 100644
--- a/sys/arch/pica/pica/disksubr.c
+++ b/sys/arch/pica/pica/disksubr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.2 1996/08/11 22:36:13 jonathan Exp $ */
+/* $NetBSD: disksubr.c,v 1.3 1996/10/10 23:45:23 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -56,10 +56,10 @@ dk_establish(dk, dev)
#define CRAZYMAP(v) ((v) == 3 ? 0 : (v) == 0 ? 3 : (v))
if (bp == NULL) {
- printf("no boot path\n");
+ kprintf("no boot path\n");
return;
}
- sprintf(name, "%s%d", bp->name, CRAZYMAP(bp->val[0]));
+ ksprintf(name, "%s%d", bp->name, CRAZYMAP(bp->val[0]));
if (strcmp(name, dev->dv_xname) == 0) {
bootdv = dev; /* got it! */
}
diff --git a/sys/arch/pica/pica/elf.c b/sys/arch/pica/pica/elf.c
index 4594b188089..3c134ba3e66 100644
--- a/sys/arch/pica/pica/elf.c
+++ b/sys/arch/pica/pica/elf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: elf.c,v 1.1.1.1 1996/03/13 04:58:10 jonathan Exp $ */
+/* $NetBSD: elf.c,v 1.2 1996/10/10 23:45:25 christos Exp $ */
/*
* Copyright (c) 1994 Ted Lemon
@@ -66,7 +66,7 @@ pmax_elf_makecmds (p, epp)
if (epp -> ep_hdrvalid < sizeof (struct ehdr)) {
#ifdef DIAGNOSTIC
if (epp -> ep_hdrlen < sizeof (struct ehdr))
- printf ("pmax_elf_makecmds: execsw hdrsize too short!\n");
+ kprintf ("pmax_elf_makecmds: execsw hdrsize too short!\n");
#endif
return ENOEXEC;
}
diff --git a/sys/arch/pica/pica/locore.S b/sys/arch/pica/pica/locore.S
index 64ffd66c56c..c288f35404a 100644
--- a/sys/arch/pica/pica/locore.S
+++ b/sys/arch/pica/pica/locore.S
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.3 1996/03/31 03:38:21 jonathan Exp $ */
+/* $NetBSD: locore.S,v 1.4 1996/10/10 23:45:28 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -2146,7 +2146,7 @@ NLEAF(MachTLBMissException)
sw a3, 20(sp)
sw sp, 24(sp)
move a2, ra
- jal _C_LABEL(printf)
+ jal _C_LABEL(kprintf)
mfc0 a3, MACH_COP_0_BAD_VADDR
.data
1:
@@ -3000,7 +3000,7 @@ sys_stk_chk:
sw a2, 16(sp)
sw a3, 20(sp)
move a2, ra
- jal printf
+ jal kprintf
dmfc0 a3, MACH_COP_0_BAD_VADDR
.data
1:
diff --git a/sys/arch/pica/pica/machdep.c b/sys/arch/pica/pica/machdep.c
index f0f910de57d..5e57128cf26 100644
--- a/sys/arch/pica/pica/machdep.c
+++ b/sys/arch/pica/pica/machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.5 1996/08/09 10:30:23 mrg Exp $ */
+/* $NetBSD: machdep.c,v 1.6 1996/10/10 23:45:31 christos Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -371,7 +371,7 @@ mips_init(argc, argv, code)
break;
default:
- printf("kernel not configured for systype 0x%x\n", i);
+ kprintf("kernel not configured for systype 0x%x\n", i);
boot(RB_HALT | RB_NOSYNC, NULL);
}
@@ -536,8 +536,8 @@ cpu_startup()
/*
* Good {morning,afternoon,evening,night}.
*/
- printf(version);
- printf("real mem = %d\n", ctob(physmem));
+ kprintf(version);
+ kprintf("real mem = %d\n", ctob(physmem));
/*
* Allocate virtual address space for file I/O buffers.
@@ -601,8 +601,8 @@ cpu_startup()
#ifdef DEBUG
pmapdebug = opmapdebug;
#endif
- printf("avail mem = %d\n", ptoa(cnt.v_free_count));
- printf("using %d buffers containing %d bytes of memory\n",
+ kprintf("avail mem = %d\n", ptoa(cnt.v_free_count));
+ kprintf("using %d buffers containing %d bytes of memory\n",
nbuf, bufpages * CLBYTES);
/*
* Set up CPU-specific registers, cache, etc.
@@ -735,7 +735,7 @@ sendsig(catcher, sig, mask, code)
#ifdef DEBUG
if ((sigdebug & SDB_FOLLOW) ||
(sigdebug & SDB_KSTACK) && p->p_pid == sigpid)
- printf("sendsig(%d): sig %d ssp %x usp %x scp %x\n",
+ kprintf("sendsig(%d): sig %d ssp %x usp %x scp %x\n",
p->p_pid, sig, &oonstack, fp, &fp->sf_sc);
#endif
/*
@@ -789,7 +789,7 @@ sendsig(catcher, sig, mask, code)
#ifdef DEBUG
if ((sigdebug & SDB_FOLLOW) ||
(sigdebug & SDB_KSTACK) && p->p_pid == sigpid)
- printf("sendsig(%d): sig %d returns\n",
+ kprintf("sendsig(%d): sig %d returns\n",
p->p_pid, sig);
#endif
}
@@ -821,7 +821,7 @@ sys_sigreturn(p, v, retval)
scp = SCARG(uap, sigcntxp);
#ifdef DEBUG
if (sigdebug & SDB_FOLLOW)
- printf("sigreturn: pid %d, scp %x\n", p->p_pid, scp);
+ kprintf("sigreturn: pid %d, scp %x\n", p->p_pid, scp);
#endif
regs = p->p_md.md_regs;
/*
@@ -832,10 +832,10 @@ sys_sigreturn(p, v, retval)
if (error || ksc.sc_regs[ZERO] != 0xACEDBADE) {
#ifdef DEBUG
if (!(sigdebug & SDB_FOLLOW))
- printf("sigreturn: pid %d, scp %x\n", p->p_pid, scp);
- printf(" old sp %x ra %x pc %x\n",
+ kprintf("sigreturn: pid %d, scp %x\n", p->p_pid, scp);
+ kprintf(" old sp %x ra %x pc %x\n",
regs[SP], regs[RA], regs[PC]);
- printf(" new sp %x ra %x pc %x err %d z %x\n",
+ kprintf(" new sp %x ra %x pc %x err %d z %x\n",
ksc.sc_regs[SP], ksc.sc_regs[RA], ksc.sc_regs[PC],
error, ksc.sc_regs[ZERO]);
#endif
@@ -893,11 +893,11 @@ boot(howto, bootstr)
}
(void) splhigh(); /* extreme priority */
if (howto & RB_HALT)
- printf("System halted.\n");
+ kprintf("System halted.\n");
else {
if (howto & RB_DUMP)
dumpsys();
- printf("System restart.\n");
+ kprintf("System restart.\n");
}
while(1); /* Forever */
/*NOTREACHED*/
@@ -947,32 +947,32 @@ dumpsys()
dumpconf();
if (dumplo < 0)
return;
- printf("\ndumping to dev %x, offset %d\n", dumpdev, dumplo);
- printf("dump ");
+ kprintf("\ndumping to dev %x, offset %d\n", dumpdev, dumplo);
+ kprintf("dump ");
switch (error = (*bdevsw[major(dumpdev)].d_dump)(dumpdev)) {
case ENXIO:
- printf("device bad\n");
+ kprintf("device bad\n");
break;
case EFAULT:
- printf("device not ready\n");
+ kprintf("device not ready\n");
break;
case EINVAL:
- printf("area improper\n");
+ kprintf("area improper\n");
break;
case EIO:
- printf("i/o error\n");
+ kprintf("i/o error\n");
break;
default:
- printf("error %d\n", error);
+ kprintf("error %d\n", error);
break;
case 0:
- printf("succeeded\n");
+ kprintf("succeeded\n");
}
}
diff --git a/sys/arch/pica/pica/mainbus.c b/sys/arch/pica/pica/mainbus.c
index ec9f0ccea84..8229425f907 100644
--- a/sys/arch/pica/pica/mainbus.c
+++ b/sys/arch/pica/pica/mainbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.3 1996/08/27 21:56:41 cgd Exp $ */
+/* $NetBSD: mainbus.c,v 1.4 1996/10/10 23:45:33 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -88,7 +88,7 @@ mbattach(parent, self, aux)
struct confargs nca;
extern int cputype, ncpus;
- printf("\n");
+ kprintf("\n");
sc->sc_bus.ab_dv = (struct device *)sc;
sc->sc_bus.ab_type = BUS_MAIN;
diff --git a/sys/arch/pica/pica/minidebug.c b/sys/arch/pica/pica/minidebug.c
index 2ebd4f082ce..814e15dd822 100644
--- a/sys/arch/pica/pica/minidebug.c
+++ b/sys/arch/pica/pica/minidebug.c
@@ -1,4 +1,4 @@
-/* $NetBSD: minidebug.c,v 1.2 1996/07/16 23:24:51 thorpej Exp $ */
+/* $NetBSD: minidebug.c,v 1.3 1996/10/10 23:45:35 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -163,7 +163,7 @@ int gethex(u_int *val, u_int dotval)
}
else if(c == '\b') {
*val = *val >> 4;
- printf("\b \b");
+ kprintf("\b \b");
}
else if(c == ',') {
cnputc(c);
@@ -186,33 +186,33 @@ void dump(u_int *addr, u_int size)
size = (size + 3) / 4;
while(size--) {
if((cnt++ & 3) == 0)
- printf("\n%08x: ",(int)addr);
- printf("%08x ",*addr++);
+ kprintf("\n%08x: ",(int)addr);
+ kprintf("%08x ",*addr++);
}
}
void print_regs()
{
- printf("\n");
- printf("T0-7 %08x %08x %08x %08x %08x %08x %08x %08x\n",
+ kprintf("\n");
+ kprintf("T0-7 %08x %08x %08x %08x %08x %08x %08x %08x\n",
mdbpcb.pcb_regs[T0],mdbpcb.pcb_regs[T1],
mdbpcb.pcb_regs[T2],mdbpcb.pcb_regs[T3],
mdbpcb.pcb_regs[T4],mdbpcb.pcb_regs[T5],
mdbpcb.pcb_regs[T6],mdbpcb.pcb_regs[T7]);
- printf("T8-9 %08x %08x A0-4 %08x %08x %08x %08x\n",
+ kprintf("T8-9 %08x %08x A0-4 %08x %08x %08x %08x\n",
mdbpcb.pcb_regs[T8],mdbpcb.pcb_regs[T9],
mdbpcb.pcb_regs[A0],mdbpcb.pcb_regs[A1],
mdbpcb.pcb_regs[A2],mdbpcb.pcb_regs[A3]);
- printf("S0-7 %08x %08x %08x %08x %08x %08x %08x %08x\n",
+ kprintf("S0-7 %08x %08x %08x %08x %08x %08x %08x %08x\n",
mdbpcb.pcb_regs[S0],mdbpcb.pcb_regs[S1],
mdbpcb.pcb_regs[S2],mdbpcb.pcb_regs[S3],
mdbpcb.pcb_regs[S4],mdbpcb.pcb_regs[S5],
mdbpcb.pcb_regs[S6],mdbpcb.pcb_regs[S7]);
- printf(" S8 %08x V0-1 %08x %08x GP %08x SP %08x\n",
+ kprintf(" S8 %08x V0-1 %08x %08x GP %08x SP %08x\n",
mdbpcb.pcb_regs[S8],mdbpcb.pcb_regs[V0],
mdbpcb.pcb_regs[V1],mdbpcb.pcb_regs[GP],
mdbpcb.pcb_regs[SP]);
- printf(" AT %08x PC %08x RA %08x SR %08x",
+ kprintf(" AT %08x PC %08x RA %08x SR %08x",
mdbpcb.pcb_regs[AST],mdbpcb.pcb_regs[PC],
mdbpcb.pcb_regs[RA],mdbpcb.pcb_regs[SR]);
}
@@ -229,7 +229,7 @@ set_break(va)
return;
}
}
- printf(" Break table full!!");
+ kprintf(" Break table full!!");
}
del_break(va)
@@ -243,7 +243,7 @@ del_break(va)
return;
}
}
- printf(" Break to remove not found!!");
+ kprintf(" Break to remove not found!!");
}
break_insert()
@@ -291,7 +291,7 @@ prt_break()
for(i = 0; i < MAXBRK; i++) {
if(brk_tab[i].addr != 0) {
- printf("\n %08x\t", brk_tab[i].addr);
+ kprintf("\n %08x\t", brk_tab[i].addr);
mdbprintins(brk_tab[i].inst, brk_tab[i].addr);
}
}
@@ -312,21 +312,21 @@ static int ssandrun; /* Single step and run flag (when cont at brk) */
if(*(int *)newaddr == MACH_BREAK_SOVER) {
break_restore();
mdbpcb.pcb_regs[PC] += 4;
- printf("\nStop break (panic)\n# ");
- printf(" %08x\t",newaddr);
+ kprintf("\nStop break (panic)\n# ");
+ kprintf(" %08x\t",newaddr);
mdbprintins(*(int *)newaddr, newaddr);
- printf("\n# ");
+ kprintf("\n# ");
break;
}
if(*(int *)newaddr == MACH_BREAK_BRKPT) {
break_restore();
- printf("\rBRK %08x\t",newaddr);
+ kprintf("\rBRK %08x\t",newaddr);
if(mdbprintins(*(int *)newaddr, newaddr)) {
newaddr += 4;
- printf("\n %08x\t",newaddr);
+ kprintf("\n %08x\t",newaddr);
mdbprintins(*(int *)newaddr, newaddr);
}
- printf("\n# ");
+ kprintf("\n# ");
break;
}
if(mdbclrsstep(causeReg)) {
@@ -335,18 +335,18 @@ static int ssandrun; /* Single step and run flag (when cont at brk) */
break_insert();
return(TRUE);
}
- printf("\r %08x\t",newaddr);
+ kprintf("\r %08x\t",newaddr);
if(mdbprintins(*(int *)newaddr, newaddr)) {
newaddr += 4;
- printf("\n %08x\t",newaddr);
+ kprintf("\n %08x\t",newaddr);
mdbprintins(*(int *)newaddr, newaddr);
}
- printf("\n# ");
+ kprintf("\n# ");
}
break;
default:
- printf("\n-- %s --\n# ",trap_type[cause]);
+ kprintf("\n-- %s --\n# ",trap_type[cause]);
}
ssandrun = 0;
break_restore();
@@ -357,11 +357,11 @@ static int ssandrun; /* Single step and run flag (when cont at brk) */
trapDump("Debugger");
break;
case 'b':
- printf("break-");
+ kprintf("break-");
c = cngetc();
switch(c) {
case 's':
- printf("set at ");
+ kprintf("set at ");
c = gethex(&newaddr, newaddr);
if(c != '\e') {
set_break(newaddr);
@@ -369,7 +369,7 @@ static int ssandrun; /* Single step and run flag (when cont at brk) */
break;
case 'd':
- printf("delete at ");
+ kprintf("delete at ");
c = gethex(&newaddr, newaddr);
if(c != '\e') {
del_break(newaddr);
@@ -377,7 +377,7 @@ static int ssandrun; /* Single step and run flag (when cont at brk) */
break;
case 'p':
- printf("print");
+ kprintf("print");
prt_break();
break;
}
@@ -388,10 +388,10 @@ static int ssandrun; /* Single step and run flag (when cont at brk) */
break;
case 'I':
- printf("Instruction at ");
+ kprintf("Instruction at ");
c = gethex(&newaddr, newaddr);
while(c != '\e') {
- printf("\n %08x\t",newaddr);
+ kprintf("\n %08x\t",newaddr);
mdbprintins(*(int *)newaddr, newaddr);
newaddr += 4;
c = cngetc();
@@ -399,7 +399,7 @@ static int ssandrun; /* Single step and run flag (when cont at brk) */
break;
case 'c':
- printf("continue");
+ kprintf("continue");
if(break_find((int)(mdbpcb.pcb_regs[PC])) >= 0) {
ssandrun = 1;
mdbsetsstep();
@@ -417,7 +417,7 @@ static int ssandrun; /* Single step and run flag (when cont at brk) */
return(TRUE);
case 'd':
- printf("dump ");
+ kprintf("dump ");
c = gethex(&newaddr, newaddr);
if(c == ',') {
c = gethex(&size,256);
@@ -432,7 +432,7 @@ static int ssandrun; /* Single step and run flag (when cont at brk) */
break;
case 'm':
- printf("mod ");
+ kprintf("mod ");
c = gethex(&newaddr, newaddr);
while(c == ',') {
c = gethex(&size, 0);
@@ -442,30 +442,30 @@ static int ssandrun; /* Single step and run flag (when cont at brk) */
break;
case 'i':
- printf("in-");
+ kprintf("in-");
c = cngetc();
switch(c) {
case 'b':
- printf("byte ");
+ kprintf("byte ");
c = gethex(&newaddr, newaddr);
if(c == '\n') {
- printf("= %02x",
+ kprintf("= %02x",
*(u_char *)newaddr);
}
break;
case 'h':
- printf("halfword ");
+ kprintf("halfword ");
c = gethex(&newaddr, newaddr);
if(c == '\n') {
- printf("= %04x",
+ kprintf("= %04x",
*(u_short *)newaddr);
}
break;
case 'w':
- printf("word ");
+ kprintf("word ");
c = gethex(&newaddr, newaddr);
if(c == '\n') {
- printf("= %08x",
+ kprintf("= %08x",
*(u_int *)newaddr);
}
break;
@@ -473,11 +473,11 @@ static int ssandrun; /* Single step and run flag (when cont at brk) */
break;
case 'o':
- printf("out-");
+ kprintf("out-");
c = cngetc();
switch(c) {
case 'b':
- printf("byte ");
+ kprintf("byte ");
c = gethex(&newaddr, newaddr);
if(c == ',') {
c = gethex(&size, 0);
@@ -487,7 +487,7 @@ static int ssandrun; /* Single step and run flag (when cont at brk) */
}
break;
case 'h':
- printf("halfword ");
+ kprintf("halfword ");
c = gethex(&newaddr, newaddr);
if(c == ',') {
c = gethex(&size, 0);
@@ -497,7 +497,7 @@ static int ssandrun; /* Single step and run flag (when cont at brk) */
}
break;
case 'w':
- printf("word ");
+ kprintf("word ");
c = gethex(&newaddr, newaddr);
if(c == ',') {
c = gethex(&size, 0);
@@ -510,23 +510,23 @@ static int ssandrun; /* Single step and run flag (when cont at brk) */
break;
case 't':
- printf("tlb-dump\n");
+ kprintf("tlb-dump\n");
pica_dump_tlb(0,23);
(void)cngetc();
pica_dump_tlb(24,47);
break;
case 'f':
- printf("flush-");
+ kprintf("flush-");
c = cngetc();
switch(c) {
case 't':
- printf("tlb");
+ kprintf("tlb");
MachTLBFlush();
break;
case 'c':
- printf("cache");
+ kprintf("cache");
MachFlushCache();
break;
}
@@ -536,7 +536,7 @@ static int ssandrun; /* Single step and run flag (when cont at brk) */
cnputc('\a');
break;
}
- printf("\n# ");
+ kprintf("\n# ");
}
}
@@ -557,7 +557,7 @@ mdbsetsstep()
va = locr0[PC] + 4;
}
if (mdb_ss_addr) {
- printf("mdbsetsstep: breakpoint already set at %x (va %x)\n",
+ kprintf("mdbsetsstep: breakpoint already set at %x (va %x)\n",
mdb_ss_addr, va);
return;
}
@@ -603,7 +603,7 @@ mdbclrsstep(cr)
return(TRUE);
}
- printf("can't clear break at %x\n", va);
+ kprintf("can't clear break at %x\n", va);
mdb_ss_addr = 0;
return(FALSE);
}
@@ -640,16 +640,16 @@ mdbprintins(ins, mdbdot)
switch (i.JType.op) {
case OP_SPECIAL:
if (i.word == 0) {
- printf("nop");
+ kprintf("nop");
break;
}
if (i.RType.func == OP_ADDU && i.RType.rt == 0) {
- printf("move\t%s,%s",
+ kprintf("move\t%s,%s",
reg_name[i.RType.rd],
reg_name[i.RType.rs]);
break;
}
- printf("%s", spec_name[i.RType.func]);
+ kprintf("%s", spec_name[i.RType.func]);
switch (i.RType.func) {
case OP_SLL:
case OP_SRL:
@@ -660,7 +660,7 @@ mdbprintins(ins, mdbdot)
case OP_DSLL32:
case OP_DSRL32:
case OP_DSRA32:
- printf("\t%s,%s,%d",
+ kprintf("\t%s,%s,%d",
reg_name[i.RType.rd],
reg_name[i.RType.rt],
i.RType.shamt);
@@ -672,7 +672,7 @@ mdbprintins(ins, mdbdot)
case OP_DSLLV:
case OP_DSRLV:
case OP_DSRAV:
- printf("\t%s,%s,%s",
+ kprintf("\t%s,%s,%s",
reg_name[i.RType.rd],
reg_name[i.RType.rt],
reg_name[i.RType.rs]);
@@ -680,7 +680,7 @@ mdbprintins(ins, mdbdot)
case OP_MFHI:
case OP_MFLO:
- printf("\t%s", reg_name[i.RType.rd]);
+ kprintf("\t%s", reg_name[i.RType.rd]);
break;
case OP_JR:
@@ -689,7 +689,7 @@ mdbprintins(ins, mdbdot)
/* FALLTHROUGH */
case OP_MTLO:
case OP_MTHI:
- printf("\t%s", reg_name[i.RType.rs]);
+ kprintf("\t%s", reg_name[i.RType.rs]);
break;
case OP_MULT:
@@ -700,7 +700,7 @@ mdbprintins(ins, mdbdot)
case OP_DIVU:
case OP_DDIV:
case OP_DDIVU:
- printf("\t%s,%s",
+ kprintf("\t%s,%s",
reg_name[i.RType.rs],
reg_name[i.RType.rt]);
break;
@@ -710,11 +710,11 @@ mdbprintins(ins, mdbdot)
break;
case OP_BREAK:
- printf("\t%d", (i.RType.rs << 5) | i.RType.rt);
+ kprintf("\t%d", (i.RType.rs << 5) | i.RType.rt);
break;
default:
- printf("\t%s,%s,%s",
+ kprintf("\t%s,%s,%s",
reg_name[i.RType.rd],
reg_name[i.RType.rs],
reg_name[i.RType.rt]);
@@ -722,7 +722,7 @@ mdbprintins(ins, mdbdot)
break;
case OP_BCOND:
- printf("%s\t%s,", bcond_name[i.IType.rt],
+ kprintf("%s\t%s,", bcond_name[i.IType.rt],
reg_name[i.IType.rs]);
goto pr_displ;
@@ -730,61 +730,61 @@ mdbprintins(ins, mdbdot)
case OP_BLEZL:
case OP_BGTZ:
case OP_BGTZL:
- printf("%s\t%s,", op_name[i.IType.op],
+ kprintf("%s\t%s,", op_name[i.IType.op],
reg_name[i.IType.rs]);
goto pr_displ;
case OP_BEQ:
case OP_BEQL:
if (i.IType.rs == 0 && i.IType.rt == 0) {
- printf("b\t");
+ kprintf("b\t");
goto pr_displ;
}
/* FALLTHROUGH */
case OP_BNE:
case OP_BNEL:
- printf("%s\t%s,%s,", op_name[i.IType.op],
+ kprintf("%s\t%s,%s,", op_name[i.IType.op],
reg_name[i.IType.rs],
reg_name[i.IType.rt]);
pr_displ:
delay = 1;
- printf("0x%08x", mdbdot + 4 + ((short)i.IType.imm << 2));
+ kprintf("0x%08x", mdbdot + 4 + ((short)i.IType.imm << 2));
break;
case OP_COP0:
switch (i.RType.rs) {
case OP_BCx:
case OP_BCy:
- printf("bc0%c\t",
+ kprintf("bc0%c\t",
"ft"[i.RType.rt & COPz_BC_TF_MASK]);
goto pr_displ;
case OP_MT:
- printf("mtc0\t%s,%s",
+ kprintf("mtc0\t%s,%s",
reg_name[i.RType.rt],
c0_reg[i.RType.rd]);
break;
case OP_DMT:
- printf("dmtc0\t%s,%s",
+ kprintf("dmtc0\t%s,%s",
reg_name[i.RType.rt],
c0_reg[i.RType.rd]);
break;
case OP_MF:
- printf("mfc0\t%s,%s",
+ kprintf("mfc0\t%s,%s",
reg_name[i.RType.rt],
c0_reg[i.RType.rd]);
break;
case OP_DMF:
- printf("dmfc0\t%s,%s",
+ kprintf("dmfc0\t%s,%s",
reg_name[i.RType.rt],
c0_reg[i.RType.rd]);
break;
default:
- printf("%s", c0_opname[i.FRType.func]);
+ kprintf("%s", c0_opname[i.FRType.func]);
};
break;
@@ -792,36 +792,36 @@ mdbprintins(ins, mdbdot)
switch (i.RType.rs) {
case OP_BCx:
case OP_BCy:
- printf("bc1%c\t",
+ kprintf("bc1%c\t",
"ft"[i.RType.rt & COPz_BC_TF_MASK]);
goto pr_displ;
case OP_MT:
- printf("mtc1\t%s,f%d",
+ kprintf("mtc1\t%s,f%d",
reg_name[i.RType.rt],
i.RType.rd);
break;
case OP_MF:
- printf("mfc1\t%s,f%d",
+ kprintf("mfc1\t%s,f%d",
reg_name[i.RType.rt],
i.RType.rd);
break;
case OP_CT:
- printf("ctc1\t%s,f%d",
+ kprintf("ctc1\t%s,f%d",
reg_name[i.RType.rt],
i.RType.rd);
break;
case OP_CF:
- printf("cfc1\t%s,f%d",
+ kprintf("cfc1\t%s,f%d",
reg_name[i.RType.rt],
i.RType.rd);
break;
default:
- printf("%s.%s\tf%d,f%d,f%d",
+ kprintf("%s.%s\tf%d,f%d,f%d",
cop1_name[i.FRType.func],
fmt_name[i.FRType.fmt],
i.FRType.fd, i.FRType.fs, i.FRType.ft);
@@ -830,14 +830,14 @@ mdbprintins(ins, mdbdot)
case OP_J:
case OP_JAL:
- printf("%s\t", op_name[i.JType.op]);
- printf("0x%8x",(mdbdot & 0xF0000000) | (i.JType.target << 2));
+ kprintf("%s\t", op_name[i.JType.op]);
+ kprintf("0x%8x",(mdbdot & 0xF0000000) | (i.JType.target << 2));
delay = 1;
break;
case OP_LWC1:
case OP_SWC1:
- printf("%s\tf%d,", op_name[i.IType.op],
+ kprintf("%s\tf%d,", op_name[i.IType.op],
i.IType.rt);
goto loadstore;
@@ -852,31 +852,31 @@ mdbprintins(ins, mdbdot)
case OP_SH:
case OP_SW:
case OP_SD:
- printf("%s\t%s,", op_name[i.IType.op],
+ kprintf("%s\t%s,", op_name[i.IType.op],
reg_name[i.IType.rt]);
loadstore:
- printf("%d(%s)", (short)i.IType.imm,
+ kprintf("%d(%s)", (short)i.IType.imm,
reg_name[i.IType.rs]);
break;
case OP_ORI:
case OP_XORI:
if (i.IType.rs == 0) {
- printf("li\t%s,0x%x",
+ kprintf("li\t%s,0x%x",
reg_name[i.IType.rt],
i.IType.imm);
break;
}
/* FALLTHROUGH */
case OP_ANDI:
- printf("%s\t%s,%s,0x%x", op_name[i.IType.op],
+ kprintf("%s\t%s,%s,0x%x", op_name[i.IType.op],
reg_name[i.IType.rt],
reg_name[i.IType.rs],
i.IType.imm);
break;
case OP_LUI:
- printf("%s\t%s,0x%x", op_name[i.IType.op],
+ kprintf("%s\t%s,0x%x", op_name[i.IType.op],
reg_name[i.IType.rt],
i.IType.imm);
break;
@@ -886,14 +886,14 @@ mdbprintins(ins, mdbdot)
case OP_ADDIU:
case OP_DADDIU:
if (i.IType.rs == 0) {
- printf("li\t%s,%d",
+ kprintf("li\t%s,%d",
reg_name[i.IType.rt],
(short)i.IType.imm);
break;
}
/* FALLTHROUGH */
default:
- printf("%s\t%s,%s,%d", op_name[i.IType.op],
+ kprintf("%s\t%s,%s,%d", op_name[i.IType.op],
reg_name[i.IType.rt],
reg_name[i.IType.rs],
(short)i.IType.imm);
@@ -935,7 +935,7 @@ loop:
/* check for current PC in the kernel interrupt handler code */
if (pc >= (u_int)MachKernIntr && pc < (u_int)MachUserIntr) {
/* NOTE: the offsets depend on the code in locore.s */
- printf("interupt\n");
+ kprintf("interupt\n");
a0 = mdbchkget(sp + 36, DSP);
a1 = mdbchkget(sp + 40, DSP);
a2 = mdbchkget(sp + 44, DSP);
@@ -1049,8 +1049,8 @@ loop:
}
done:
- printf("%x+%x ", subr, pc - subr); /* XXX */
- printf("(%x,%x,%x,%x)\n", a0, a1, a2, a3);
+ kprintf("%x+%x ", subr, pc - subr); /* XXX */
+ kprintf("(%x,%x,%x,%x)\n", a0, a1, a2, a3);
if (ra) {
pc = ra;
@@ -1091,20 +1091,20 @@ void pica_dump_tlb(int first,int last)
while(tlbno <= last) {
MachTLBRead(tlbno, &tlb);
if(tlb.tlb_lo0 & PG_V || tlb.tlb_lo1 & PG_V) {
- printf("TLB %2d vad 0x%08x ", tlbno, tlb.tlb_hi);
+ kprintf("TLB %2d vad 0x%08x ", tlbno, tlb.tlb_hi);
}
else {
- printf("TLB*%2d vad 0x%08x ", tlbno, tlb.tlb_hi);
+ kprintf("TLB*%2d vad 0x%08x ", tlbno, tlb.tlb_hi);
}
- printf("0=0x%08x ", pfn_to_vad(tlb.tlb_lo0));
- printf("%c", tlb.tlb_lo0 & PG_M ? 'M' : ' ');
- printf("%c", tlb.tlb_lo0 & PG_G ? 'G' : ' ');
- printf(" atr %x ", (tlb.tlb_lo0 >> 3) & 7);
- printf("1=0x%08x ", pfn_to_vad(tlb.tlb_lo1));
- printf("%c", tlb.tlb_lo1 & PG_M ? 'M' : ' ');
- printf("%c", tlb.tlb_lo1 & PG_G ? 'G' : ' ');
- printf(" atr %x ", (tlb.tlb_lo1 >> 3) & 7);
- printf(" sz=%x\n", tlb.tlb_mask);
+ kprintf("0=0x%08x ", pfn_to_vad(tlb.tlb_lo0));
+ kprintf("%c", tlb.tlb_lo0 & PG_M ? 'M' : ' ');
+ kprintf("%c", tlb.tlb_lo0 & PG_G ? 'G' : ' ');
+ kprintf(" atr %x ", (tlb.tlb_lo0 >> 3) & 7);
+ kprintf("1=0x%08x ", pfn_to_vad(tlb.tlb_lo1));
+ kprintf("%c", tlb.tlb_lo1 & PG_M ? 'M' : ' ');
+ kprintf("%c", tlb.tlb_lo1 & PG_G ? 'G' : ' ');
+ kprintf(" atr %x ", (tlb.tlb_lo1 >> 3) & 7);
+ kprintf(" sz=%x\n", tlb.tlb_mask);
tlbno++;
}
diff --git a/sys/arch/pica/pica/pica.c b/sys/arch/pica/pica/pica.c
index 58895c6f5e8..19b2a2ac06b 100644
--- a/sys/arch/pica/pica/pica.c
+++ b/sys/arch/pica/pica/pica.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pica.c,v 1.3 1996/08/27 21:56:43 cgd Exp $ */
+/* $NetBSD: pica.c,v 1.4 1996/10/10 23:45:36 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -165,7 +165,7 @@ picaattach(parent, self, aux)
struct confargs *nca;
int i;
- printf("\n");
+ kprintf("\n");
/* keep our CPU device description handy */
sc->sc_devs = pica_cpu_devs[cputype];
@@ -204,8 +204,8 @@ picaprint(aux, pnp)
struct confargs *ca = aux;
if (pnp)
- printf("%s at %s", ca->ca_name, pnp);
- printf(" slot %ld offset 0x%lx", ca->ca_slot, ca->ca_offset);
+ kprintf("%s at %s", ca->ca_name, pnp);
+ kprintf(" slot %ld offset 0x%lx", ca->ca_slot, ca->ca_offset);
return (UNCONF);
}
diff --git a/sys/arch/pica/pica/pica_trap.c b/sys/arch/pica/pica/pica_trap.c
index 79aea80d3f6..9ad95635d39 100644
--- a/sys/arch/pica/pica/pica_trap.c
+++ b/sys/arch/pica/pica/pica_trap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pica_trap.c,v 1.2 1996/03/28 12:40:41 jonathan Exp $ */
+/* $NetBSD: pica_trap.c,v 1.3 1996/10/10 23:45:38 christos Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -166,7 +166,7 @@ pica_errintr()
csr = *sysCSRPtr;
if (csr & KN01_CSR_MERR) {
- printf("Memory error at 0x%x\n",
+ kprintf("Memory error at 0x%x\n",
*(unsigned *)MACH_PHYS_TO_UNCACHED(KN01_SYS_ERRADR));
panic("Mem error interrupt");
}
diff --git a/sys/arch/pica/pica/pmap.c b/sys/arch/pica/pica/pmap.c
index 10c84f8f4dd..b82d530af06 100644
--- a/sys/arch/pica/pica/pmap.c
+++ b/sys/arch/pica/pica/pmap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.2 1996/07/16 23:25:00 thorpej Exp $ */
+/* $NetBSD: pmap.c,v 1.3 1996/10/10 23:45:40 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -281,7 +281,7 @@ pmap_init(phys_start, phys_end)
#ifdef DEBUG
if (pmapdebug & (PDB_FOLLOW|PDB_INIT))
- printf("pmap_init(%x, %x)\n", phys_start, phys_end);
+ kprintf("pmap_init(%x, %x)\n", phys_start, phys_end);
#endif
}
@@ -305,7 +305,7 @@ pmap_create(size)
#ifdef DEBUG
if (pmapdebug & (PDB_FOLLOW|PDB_CREATE))
- printf("pmap_create(%x)\n", size);
+ kprintf("pmap_create(%x)\n", size);
#endif
/*
* Software use map does not need a pmap
@@ -339,7 +339,7 @@ pmap_pinit(pmap)
#ifdef DEBUG
if (pmapdebug & (PDB_FOLLOW|PDB_CREATE))
- printf("pmap_pinit(%x)\n", pmap);
+ kprintf("pmap_pinit(%x)\n", pmap);
#endif
simple_lock_init(&pmap->pm_lock);
pmap->pm_count = 1;
@@ -399,7 +399,7 @@ pmap_destroy(pmap)
#ifdef DEBUG
if (pmapdebug & (PDB_FOLLOW|PDB_CREATE))
- printf("pmap_destroy(%x)\n", pmap);
+ kprintf("pmap_destroy(%x)\n", pmap);
#endif
if (pmap == NULL)
return;
@@ -425,7 +425,7 @@ pmap_release(pmap)
#ifdef DEBUG
if (pmapdebug & (PDB_FOLLOW|PDB_CREATE))
- printf("pmap_release(%x)\n", pmap);
+ kprintf("pmap_release(%x)\n", pmap);
#endif
if (pmap->pm_segtab) {
@@ -470,7 +470,7 @@ pmap_reference(pmap)
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW)
- printf("pmap_reference(%x)\n", pmap);
+ kprintf("pmap_reference(%x)\n", pmap);
#endif
if (pmap != NULL) {
simple_lock(&pmap->pm_lock);
@@ -497,7 +497,7 @@ pmap_remove(pmap, sva, eva)
#ifdef DEBUG
if (pmapdebug & (PDB_FOLLOW|PDB_REMOVE|PDB_PROTECT))
- printf("pmap_remove(%x, %x, %x)\n", pmap, sva, eva);
+ kprintf("pmap_remove(%x, %x, %x)\n", pmap, sva, eva);
remove_stats.calls++;
#endif
if (pmap == NULL)
@@ -603,7 +603,7 @@ pmap_page_protect(pa, prot)
#ifdef DEBUG
if ((pmapdebug & (PDB_FOLLOW|PDB_PROTECT)) ||
prot == VM_PROT_NONE && (pmapdebug & PDB_REMOVE))
- printf("pmap_page_protect(%x, %x)\n", pa, prot);
+ kprintf("pmap_page_protect(%x, %x)\n", pa, prot);
#endif
if (!IS_VM_PHYSADDR(pa))
return;
@@ -668,7 +668,7 @@ pmap_protect(pmap, sva, eva, prot)
#ifdef DEBUG
if (pmapdebug & (PDB_FOLLOW|PDB_PROTECT))
- printf("pmap_protect(%x, %x, %x, %x)\n", pmap, sva, eva, prot);
+ kprintf("pmap_protect(%x, %x, %x, %x)\n", pmap, sva, eva, prot);
#endif
if (pmap == NULL)
return;
@@ -774,7 +774,7 @@ pmap_page_cache(pa,mode)
#ifdef DEBUG
if (pmapdebug & (PDB_FOLLOW|PDB_ENTER))
- printf("pmap_page_uncache(%x)\n", pa);
+ kprintf("pmap_page_uncache(%x)\n", pa);
#endif
if (!IS_VM_PHYSADDR(pa))
return;
@@ -842,7 +842,7 @@ pmap_enter(pmap, va, pa, prot, wired)
#ifdef DEBUG
if (pmapdebug & (PDB_FOLLOW|PDB_ENTER))
- printf("pmap_enter(%x, %x, %x, %x, %x)\n",
+ kprintf("pmap_enter(%x, %x, %x, %x, %x)\n",
pmap, va, pa, prot, wired);
#endif
#ifdef DIAGNOSTIC
@@ -903,7 +903,7 @@ pmap_enter(pmap, va, pa, prot, wired)
s = splimp();
#ifdef DEBUG
if (pmapdebug & PDB_ENTER)
- printf("pmap_enter: pv %x: was %x/%x/%x\n",
+ kprintf("pmap_enter: pv %x: was %x/%x/%x\n",
pv, pv->pv_va, pv->pv_pmap, pv->pv_next);
#endif
if (pv->pv_pmap == NULL) {
@@ -912,7 +912,7 @@ pmap_enter(pmap, va, pa, prot, wired)
*/
#ifdef DEBUG
if (pmapdebug & PDB_PVENTRY)
- printf("pmap_enter: first pv: pmap %x va %x\n",
+ kprintf("pmap_enter: first pv: pmap %x va %x\n",
pmap, va);
enter_stats.firstpv++;
#endif
@@ -969,7 +969,7 @@ pmap_enter(pmap, va, pa, prot, wired)
}
if (!(entry & PG_V) ||
pfn_to_vad(entry) != pa)
- printf(
+ kprintf(
"pmap_enter: found va %x pa %x in pv_table but != %x\n",
va, pa, entry);
#endif
@@ -978,7 +978,7 @@ pmap_enter(pmap, va, pa, prot, wired)
}
#ifdef DEBUG
if (pmapdebug & PDB_PVENTRY)
- printf("pmap_enter: new pv: pmap %x va %x\n",
+ kprintf("pmap_enter: new pv: pmap %x va %x\n",
pmap, va);
#endif
/* can this cause us to recurse forever? */
@@ -1075,10 +1075,10 @@ pmap_enter(pmap, va, pa, prot, wired)
}
#ifdef DEBUG
if (pmapdebug & PDB_ENTER) {
- printf("pmap_enter: new pte %x", npte);
+ kprintf("pmap_enter: new pte %x", npte);
if (pmap->pm_tlbgen == tlbpid_gen)
- printf(" tlbpid %d", pmap->pm_tlbpid);
- printf("\n");
+ kprintf(" tlbpid %d", pmap->pm_tlbpid);
+ kprintf("\n");
}
#endif
i = picapagesperpage;
@@ -1112,7 +1112,7 @@ pmap_change_wiring(pmap, va, wired)
#ifdef DEBUG
if (pmapdebug & (PDB_FOLLOW|PDB_WIRING))
- printf("pmap_change_wiring(%x, %x, %x)\n", pmap, va, wired);
+ kprintf("pmap_change_wiring(%x, %x, %x)\n", pmap, va, wired);
#endif
if (pmap == NULL)
return;
@@ -1162,7 +1162,7 @@ pmap_extract(pmap, va)
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW)
- printf("pmap_extract(%x, %x) -> ", pmap, va);
+ kprintf("pmap_extract(%x, %x) -> ", pmap, va);
#endif
if (!pmap->pm_segtab) {
@@ -1186,7 +1186,7 @@ pmap_extract(pmap, va)
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW)
- printf("pmap_extract: pa %x\n", pa);
+ kprintf("pmap_extract: pa %x\n", pa);
#endif
return (pa);
}
@@ -1209,7 +1209,7 @@ pmap_copy(dst_pmap, src_pmap, dst_addr, len, src_addr)
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW)
- printf("pmap_copy(%x, %x, %x, %x, %x)\n",
+ kprintf("pmap_copy(%x, %x, %x, %x, %x)\n",
dst_pmap, src_pmap, dst_addr, len, src_addr);
#endif
}
@@ -1228,7 +1228,7 @@ pmap_update()
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW)
- printf("pmap_update()\n");
+ kprintf("pmap_update()\n");
#endif
}
@@ -1250,7 +1250,7 @@ pmap_collect(pmap)
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW)
- printf("pmap_collect(%x)\n", pmap);
+ kprintf("pmap_collect(%x)\n", pmap);
#endif
}
@@ -1266,7 +1266,7 @@ pmap_zero_page(phys)
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW)
- printf("pmap_zero_page(%x)\n", phys);
+ kprintf("pmap_zero_page(%x)\n", phys);
#endif
/*XXX FIXME Not very sophisticated */
MachFlushCache();
@@ -1296,7 +1296,7 @@ pmap_copy_page(src, dst)
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW)
- printf("pmap_copy_page(%x, %x)\n", src, dst);
+ kprintf("pmap_copy_page(%x, %x)\n", src, dst);
#endif
/*XXX FIXME Not very sophisticated */
MachFlushCache();
@@ -1342,7 +1342,7 @@ pmap_pageable(pmap, sva, eva, pageable)
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW)
- printf("pmap_pageable(%x, %x, %x, %x)\n",
+ kprintf("pmap_pageable(%x, %x, %x, %x)\n",
pmap, sva, eva, pageable);
#endif
}
@@ -1357,7 +1357,7 @@ pmap_clear_modify(pa)
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW)
- printf("pmap_clear_modify(%x)\n", pa);
+ kprintf("pmap_clear_modify(%x)\n", pa);
#endif
#ifdef ATTR
pmap_attributes[atop(pa)] &= ~PMAP_ATTR_MOD;
@@ -1376,7 +1376,7 @@ pmap_clear_reference(pa)
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW)
- printf("pmap_clear_reference(%x)\n", pa);
+ kprintf("pmap_clear_reference(%x)\n", pa);
#endif
#ifdef ATTR
pmap_attributes[atop(pa)] &= ~PMAP_ATTR_REF;
@@ -1424,7 +1424,7 @@ pmap_phys_address(ppn)
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW)
- printf("pmap_phys_address(%x)\n", ppn);
+ kprintf("pmap_phys_address(%x)\n", ppn);
#endif
return (pica_ptob(ppn));
}
@@ -1468,11 +1468,11 @@ pmap_alloc_tlbpid(p)
#ifdef DEBUG
if (pmapdebug & (PDB_FOLLOW|PDB_TLBPID)) {
if (curproc)
- printf("pmap_alloc_tlbpid: curproc %d '%s' ",
+ kprintf("pmap_alloc_tlbpid: curproc %d '%s' ",
curproc->p_pid, curproc->p_comm);
else
- printf("pmap_alloc_tlbpid: curproc <none> ");
- printf("segtab %x tlbpid %d pid %d '%s'\n",
+ kprintf("pmap_alloc_tlbpid: curproc <none> ");
+ kprintf("segtab %x tlbpid %d pid %d '%s'\n",
pmap->pm_segtab, id, p->p_pid, p->p_comm);
}
#endif
@@ -1493,7 +1493,7 @@ pmap_remove_pv(pmap, va, pa)
#ifdef DEBUG
if (pmapdebug & (PDB_FOLLOW|PDB_PVENTRY))
- printf("pmap_remove_pv(%x, %x, %x)\n", pmap, va, pa);
+ kprintf("pmap_remove_pv(%x, %x, %x)\n", pmap, va, pa);
#endif
/*
* Remove page from the PV table (raise IPL since we
@@ -1530,7 +1530,7 @@ pmap_remove_pv(pmap, va, pa)
goto fnd;
}
#ifdef DIAGNOSTIC
- printf("pmap_remove_pv(%x, %x, %x) not found\n", pmap, va, pa);
+ kprintf("pmap_remove_pv(%x, %x, %x) not found\n", pmap, va, pa);
panic("pmap_remove_pv");
#endif
fnd:
diff --git a/sys/arch/pica/pica/swapgeneric.c b/sys/arch/pica/pica/swapgeneric.c
index bd768c1c5c3..778fed7a79d 100644
--- a/sys/arch/pica/pica/swapgeneric.c
+++ b/sys/arch/pica/pica/swapgeneric.c
@@ -1,4 +1,4 @@
-/* $NetBSD: swapgeneric.c,v 1.2 1996/08/09 10:30:23 mrg Exp $ */
+/* $NetBSD: swapgeneric.c,v 1.3 1996/10/10 23:45:41 christos Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -102,7 +102,7 @@ setconf()
if (boothowto & RB_ASKNAME) {
char name[128];
retry:
- printf("root device? ");
+ kprintf("root device? ");
gets(name);
if (strcmp(name, "halt") == 0)
@@ -122,24 +122,24 @@ gotit:
unit = name[2] - '0';
goto found;
}
- printf("bad/missing unit number\n");
+ kprintf("bad/missing unit number\n");
bad:
- printf("use:\n");
+ kprintf("use:\n");
for (gc = genericconf; gc->gc_driver; gc++)
- printf("\t%s%%d\n", gc->gc_name);
- printf("\thalt\n");
+ kprintf("\t%s%%d\n", gc->gc_name);
+ kprintf("\thalt\n");
goto retry;
}
unit = 0;
for (gc = genericconf; gc->gc_driver; gc++) {
if (gc->gc_driver->cd_ndevs > unit &&
gc->gc_driver->cd_devs[unit]) {
- printf("root on %s0\n", gc->gc_name);
+ kprintf("root on %s0\n", gc->gc_name);
goto found;
}
}
verybad:
- printf("no suitable root\n");
+ kprintf("no suitable root\n");
boot(RB_HALT, NULL);
found:
@@ -170,7 +170,7 @@ gets(cp)
case '\b':
case '\177':
if (lp > cp) {
- printf("\b \b");
+ kprintf("\b \b");
lp--;
}
continue;
diff --git a/sys/arch/pica/pica/trap.c b/sys/arch/pica/pica/trap.c
index f0366b11ee5..5e58e68c127 100644
--- a/sys/arch/pica/pica/trap.c
+++ b/sys/arch/pica/pica/trap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.4 1996/03/31 03:38:27 jonathan Exp $ */
+/* $NetBSD: trap.c,v 1.5 1996/10/10 23:45:43 christos Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -405,7 +405,7 @@ trap(statusReg, causeReg, vadr, pc, args)
va = trunc_page((vm_offset_t)vadr);
rv = vm_fault(map, va, ftype, FALSE);
#ifdef VMFAULT_TRACE
- printf("vm_fault(%x (pmap %x), %x (%x), %x, %d) -> %x at pc %x\n",
+ kprintf("vm_fault(%x (pmap %x), %x (%x), %x, %d) -> %x at pc %x\n",
map, &vm->vm_pmap, va, vadr, ftype, FALSE, rv, pc);
#endif
/*
@@ -653,7 +653,7 @@ trap(statusReg, causeReg, vadr, pc, args)
/* read break instruction */
instr = fuiword((caddr_t)va);
#if 0
- printf("trap: %s (%d) breakpoint %x at %x: (adr %x ins %x)\n",
+ kprintf("trap: %s (%d) breakpoint %x at %x: (adr %x ins %x)\n",
p->p_comm, p->p_pid, instr, pc,
p->p_md.md_ss_addr, p->p_md.md_ss_instr); /* XXX */
#endif
@@ -678,7 +678,7 @@ trap(statusReg, causeReg, vadr, pc, args)
MachFlushCache();
if (i < 0)
- printf("Warning: can't restore instruction at %x: %x\n",
+ kprintf("Warning: can't restore instruction at %x: %x\n",
p->p_md.md_ss_addr, p->p_md.md_ss_instr);
p->p_md.md_ss_addr = 0;
@@ -705,7 +705,7 @@ trap(statusReg, causeReg, vadr, pc, args)
#ifdef DEBUG
trapDump("fpintr");
#else
- printf("FPU Trap: PC %x CR %x SR %x\n",
+ kprintf("FPU Trap: PC %x CR %x SR %x\n",
pc, causeReg, statusReg);
goto err;
#endif
@@ -957,7 +957,7 @@ trapDump(msg)
int s;
s = splhigh();
- printf("trapDump(%s)\n", msg);
+ kprintf("trapDump(%s)\n", msg);
for (i = 0; i < TRAPSIZE; i++) {
if (trp == trapdebug)
trp = &trapdebug[TRAPSIZE - 1];
@@ -965,11 +965,11 @@ trapDump(msg)
trp--;
if (trp->cause == 0)
break;
- printf("%s: ADR %x PC %x CR %x SR %x\n",
+ kprintf("%s: ADR %x PC %x CR %x SR %x\n",
trap_type[(trp->cause & MACH_CR_EXC_CODE) >>
MACH_CR_EXC_CODE_SHIFT],
trp->vadr, trp->pc, trp->cause, trp->status);
- printf(" RA %x SP %x code %d\n", trp->ra, trp->sp, trp->code);
+ kprintf(" RA %x SP %x code %d\n", trp->ra, trp->sp, trp->code);
}
splx(s);
}
@@ -1001,7 +1001,7 @@ MachEmulateBranch(regsPtr, instPC, fpcCSR, allowNonBranch)
inst = *(InstFmt *)&allowNonBranch;
}
#if 0
- printf("regsPtr=%x PC=%x Inst=%x fpcCsr=%x\n", regsPtr, instPC,
+ kprintf("regsPtr=%x PC=%x Inst=%x fpcCsr=%x\n", regsPtr, instPC,
inst.word, fpcCSR); /* XXX */
#endif
switch ((int)inst.JType.op) {
@@ -1112,7 +1112,7 @@ MachEmulateBranch(regsPtr, instPC, fpcCSR, allowNonBranch)
retAddr = instPC + 4;
}
#if 0
- printf("Target addr=%x\n", retAddr); /* XXX */
+ kprintf("Target addr=%x\n", retAddr); /* XXX */
#endif
return (retAddr);
}
@@ -1156,7 +1156,7 @@ cpu_singlestep(p)
va = locr0[PC] + 4;
}
if (p->p_md.md_ss_addr) {
- printf("SS %s (%d): breakpoint already set at %x (va %x)\n",
+ kprintf("SS %s (%d): breakpoint already set at %x (va %x)\n",
p->p_comm, p->p_pid, p->p_md.md_ss_addr, va); /* XXX */
return (EFAULT);
}
@@ -1194,7 +1194,7 @@ cpu_singlestep(p)
if (i < 0)
return (EFAULT);
#if 0
- printf("SS %s (%d): breakpoint set at %x: %x (pc %x) br %x\n",
+ kprintf("SS %s (%d): breakpoint set at %x: %x (pc %x) br %x\n",
p->p_comm, p->p_pid, p->p_md.md_ss_addr,
p->p_md.md_ss_instr, locr0[PC], curinstr); /* XXX */
#endif
@@ -1206,7 +1206,7 @@ int
kdbpeek(addr)
{
if (addr & 3) {
- printf("kdbpeek: unaligned address %x\n", addr);
+ kprintf("kdbpeek: unaligned address %x\n", addr);
return (-1);
}
return (*(int *)addr);
@@ -1227,7 +1227,7 @@ void
stacktrace(a0, a1, a2, a3)
int a0, a1, a2, a3;
{
- stacktrace_subr(a0, a1, a2, a3, printf);
+ stacktrace_subr(a0, a1, a2, a3, kprintf);
}
void
@@ -1504,7 +1504,7 @@ fn_name(unsigned addr)
for (i = 0; names[i].name; i++)
if (names[i].addr == (void*)addr)
return (names[i].name);
- sprintf(buf, "%x", addr);
+ ksprintf(buf, "%x", addr);
return (buf);
}
diff --git a/sys/dev/dec/mcclock.c b/sys/dev/dec/mcclock.c
index 1a4c48b10eb..68934105698 100644
--- a/sys/dev/dec/mcclock.c
+++ b/sys/dev/dec/mcclock.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclock.c,v 1.2 1996/04/17 22:22:32 cgd Exp $ */
+/* $NetBSD: mcclock.c,v 1.3 1996/10/10 23:50:35 christos Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -59,7 +59,7 @@ mcclock_attach(sc, busfns)
const struct mcclock_busfns *busfns;
{
- printf(": mc146818 or compatible");
+ kprintf(": mc146818 or compatible");
sc->sc_busfns = busfns;