diff --git a/sys/arch/alpha/isa/pckbd.c b/sys/arch/alpha/isa/pckbd.c index 5f3ade0b45d6..c809bce243d8 100644 --- a/sys/arch/alpha/isa/pckbd.c +++ b/sys/arch/alpha/isa/pckbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: pckbd.c,v 1.8 1996/10/10 23:50:55 christos Exp $ */ +/* $NetBSD: pckbd.c,v 1.9 1996/10/13 02:59:56 christos Exp $ */ /*- * Copyright (c) 1993, 1994, 1995 Charles Hannum. All rights reserved. @@ -256,7 +256,7 @@ kbd_cmd(val, polling) break; } #ifdef DIAGNOSTIC - kprintf("kbd_cmd: input char %x lost\n", + printf("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)) { - kprintf("pcprobe: command error\n"); + printf("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)) { - kprintf("pcprobe: reset error %d\n", 1); + printf("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) { - kprintf("pcprobe: reset error %d\n", 2); + printf("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)) { - kprintf("pcprobe: reset error %d\n", 3); + printf("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)) { - kprintf("pcprobe: reset error %d\n", 4); + printf("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)) { - kprintf("pcprobe: reset error %d\n", 5); + printf("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 - kprintf("\n"); + printf("\n"); kbdattach(self, &pckbd_wscons_idev); #else - kprintf(": no wscons driver present; no input possible\n"); + printf(": 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)) { - kprintf("pc: timeout updating leds\n"); + printf("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)) { - kprintf("pc: timeout updating typematic rate\n"); + printf("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 273594ea6d99..4c8f6125d9ea 100644 --- a/sys/arch/alpha/isa/pms.c +++ b/sys/arch/alpha/isa/pms.c @@ -1,4 +1,4 @@ -/* $NetBSD: pms.c,v 1.2 1996/10/10 23:50:56 christos Exp $ */ +/* $NetBSD: pms.c,v 1.3 1996/10/13 02:59:58 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)) { - kprintf(": can't map I/O ports!\n"); + printf(": can't map I/O ports!\n"); return; } msattach(self, &pms_mdev_spec); - kprintf("\n"); + printf("\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 33d87e74797a..c385ada1a56f 100644 --- a/sys/arch/alpha/pci/apecs.c +++ b/sys/arch/alpha/pci/apecs.c @@ -1,4 +1,4 @@ -/* $NetBSD: apecs.c,v 1.11 1996/10/10 23:50:58 christos Exp $ */ +/* $NetBSD: apecs.c,v 1.12 1996/10/13 03:00:00 christos Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -133,16 +133,16 @@ apecsattach(parent, self, aux) /* XXX SGMAP FOO */ - kprintf(": DECchip %s Core Logic chipset\n", + printf(": DECchip %s Core Logic chipset\n", acp->ac_memwidth == 128 ? "21072" : "21071"); - kprintf("%s: DC21071-CA pass %d, %d-bit memory bus\n", + printf("%s: DC21071-CA pass %d, %d-bit memory bus\n", self->dv_xname, acp->ac_comanche_pass2 ? 2 : 1, acp->ac_memwidth); - kprintf("%s: DC21071-DA pass %d\n", self->dv_xname, + printf("%s: DC21071-DA pass %d\n", self->dv_xname, acp->ac_epic_pass2 ? 2 : 1); /* XXX print bcache size */ if (!acp->ac_epic_pass2) - kprintf("WARNING: 21071-DA NOT PASS2... NO BETS...\n"); + printf("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) - kprintf("%s at %s", pba->pba_busname, pnp); - kprintf(" bus %d", pba->pba_bus); + printf("%s at %s", pba->pba_busname, pnp); + printf(" 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 059b58d90aac..59762542d828 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.8 1996/10/10 23:51:00 christos Exp $ */ +/* $NetBSD: apecs_pci.c,v 1.9 1996/10/13 03:00:02 christos Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -140,7 +140,7 @@ apecs_conf_read(cpv, tag, offset) } #if 0 - kprintf("apecs_conf_read: tag 0x%lx, reg 0x%lx -> %x @ %p%s\n", tag, reg, + printf("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 - kprintf("apecs_conf_write: tag 0x%lx, reg 0x%lx -> 0x%x @ %p\n", tag, + printf("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 0ff9efaf56f1..b0046e4204ea 100644 --- a/sys/arch/alpha/pci/cia.c +++ b/sys/arch/alpha/pci/cia.c @@ -1,4 +1,4 @@ -/* $NetBSD: cia.c,v 1.10 1996/10/10 23:51:01 christos Exp $ */ +/* $NetBSD: cia.c,v 1.11 1996/10/13 03:00:03 christos Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -122,7 +122,7 @@ ciaattach(parent, self, aux) cia_init(ccp); /* XXX print chipset information */ - kprintf("\n"); + printf("\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) - kprintf("%s at %s", pba->pba_busname, pnp); - kprintf(" bus %d", pba->pba_bus); + printf("%s at %s", pba->pba_busname, pnp); + printf(" 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 74058d159115..7817bf5c94d7 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.4 1996/10/10 23:51:03 christos Exp $ */ +/* $NetBSD: cia_pci.c,v 1.5 1996/10/13 03:00:04 christos Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -140,7 +140,7 @@ cia_conf_read(cpv, tag, offset) } #if 0 - kprintf("cia_conf_read: tag 0x%lx, reg 0x%lx -> %x @ %p%s\n", tag, reg, + printf("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 - kprintf("cia_conf_write: tag 0x%lx, reg 0x%lx -> 0x%x @ %p\n", tag, + printf("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 842d62c7bc18..a10b4dcb56de 100644 --- a/sys/arch/alpha/pci/lca.c +++ b/sys/arch/alpha/pci/lca.c @@ -1,4 +1,4 @@ -/* $NetBSD: lca.c,v 1.9 1996/10/10 23:51:04 christos Exp $ */ +/* $NetBSD: lca.c,v 1.10 1996/10/13 03:00:07 christos Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -179,7 +179,7 @@ lcaattach(parent, self, aux) #endif /* XXX print chipset information */ - kprintf("\n"); + printf("\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) - kprintf("%s at %s", pba->pba_busname, pnp); - kprintf(" bus %d", pba->pba_bus); + printf("%s at %s", pba->pba_busname, pnp); + printf(" 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 0088a82a3b8b..4342580805fd 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.5 1996/10/10 23:51:05 christos Exp $ */ +/* $NetBSD: lca_pci.c,v 1.6 1996/10/13 03:00:08 christos Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -149,7 +149,7 @@ lca_conf_read(cpv, tag, offset) } #if 0 - kprintf("lca_conf_read: tag 0x%lx, reg 0x%lx -> %x @ %p%s\n", tag, reg, + printf("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 - kprintf("lca_conf_write: tag 0x%lx, reg 0x%lx -> 0x%x @ %p\n", tag, + printf("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 5080d294caef..7499e4d53e59 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.9 1996/10/10 23:51:07 christos Exp $ */ +/* $NetBSD: pci_2100_a50.c,v 1.10 1996/10/13 03:00:09 christos Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -74,7 +74,7 @@ pci_2100_a50_pickintr(acp) sioII = (sioclass & 0xff) >= 3; if (!sioII) - kprintf("WARNING: SIO NOT SIO II... NO BETS...\n"); + printf("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) { - kprintf("pci_map_int: bad interrupt pin %d\n", buspin); + printf("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 - kprintf("pci_2100_a50_map_int: device %d pin %c: pirq %d, reg = %x\n", + printf("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 - kprintf("pci_2100_a50_map_int: device %d pin %c: mapped to line %d\n", + printf("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 2cbbf293543b..be9d033bae48 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.7 1996/10/10 23:51:08 christos Exp $ */ +/* $NetBSD: pci_axppci_33.c,v 1.8 1996/10/13 03:00:11 christos Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -75,7 +75,7 @@ pci_axppci_33_pickintr(lcp) sioII = (sioclass & 0xff) >= 3; if (!sioII) - kprintf("WARNING: SIO NOT SIO II... NO BETS...\n"); + printf("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) { - kprintf("pci_map_int: bad interrupt pin %d\n", buspin); + printf("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: - kprintf("dec_axppci_33_pci_map_int: unknown device %d\n", + printf("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 - kprintf("pci_axppci_33_map_int: device %d pin %c: pirq %d, reg = %x\n", + printf("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 - kprintf("pci_axppci_33_map_int: device %d pin %c: mapped to line %d\n", + printf("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 7b7b036250ad..cf4e01fa50da 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.17 1996/10/10 23:51:10 christos Exp $ */ +/* $NetBSD: pci_kn20aa.c,v 1.18 1996/10/13 03:00:12 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) { - kprintf("pci_map_int: bad interrupt pin %d\n", buspin); + printf("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; - kprintf("\n\n BOGUS INTERRUPT MAPPING: dev %d, pin %d\n", + printf("\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) { - ksprintf(irqstr, "BOGUS"); + sprintf(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); - ksprintf(irqstr, "kn20aa irq %d", ih); + sprintf(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]; - kprintf("dec_kn20aa_intr_establish: BOGUS IRQ\n"); + printf("dec_kn20aa_intr_establish: BOGUS IRQ\n"); do { - kprintf("IRQ to enable? "); + printf("IRQ to enable? "); getstr(chars, 10); i = atoi(chars); } while (i < 0 || i > 32); - kprintf("ENABLING IRQ %d\n", i); + printf("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 74a18db64609..1001ee6bbecc 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.7 1996/10/10 23:51:13 christos Exp $ */ +/* $NetBSD: pci_swiz_bus_io_chipdep.c,v 1.8 1996/10/13 03:00:15 christos Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -134,14 +134,14 @@ __C(CHIP,_io_map)(v, ioaddr, iosize, iohp) } else #endif { - kprintf("\n"); + printf("\n"); #ifdef CHIP_IO_W1_START - kprintf("%s: window[1]=0x%lx-0x%lx\n", + printf("%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 - kprintf("%s: window[2]=0x%lx-0x%lx\n", + printf("%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 d223e77d4cb0..85bcf49f584e 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.8 1996/10/10 23:51:15 christos Exp $ */ +/* $NetBSD: pci_swiz_bus_mem_chipdep.c,v 1.9 1996/10/13 03:00:17 christos Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -110,9 +110,9 @@ __C(CHIP,_mem_map)(v, memaddr, memsize, cacheable, memhp) } else #endif { - kprintf("\n"); + printf("\n"); #ifdef CHIP_D_MEM_W1_START - kprintf("%s: window[1]=0x%lx-0x%lx\n", + printf("%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 { - kprintf("\n"); + printf("\n"); #ifdef CHIP_S_MEM_W1_START - kprintf("%s: window[1]=0x%lx-0x%lx\n", + printf("%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 - kprintf("%s: window[2]=0x%lx-0x%lx\n", + printf("%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 - kprintf("%s: window[3]=0x%lx-0x%lx\n", + printf("%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 17e06782afa8..83152e1300af 100644 --- a/sys/arch/alpha/pci/pcivga.c +++ b/sys/arch/alpha/pci/pcivga.c @@ -1,4 +1,4 @@ -/* $NetBSD: pcivga.c,v 1.10 1996/10/10 23:51:12 christos Exp $ */ +/* $NetBSD: pcivga.c,v 1.11 1996/10/13 03:00:13 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); - kprintf(": %s (rev. 0x%02x)\n", devinfo, + printf(": %s (rev. 0x%02x)\n", devinfo, PCI_REVISION(pa->pa_class)); #if 0 if (sc->sc_dc->dc_tgaconf == NULL) { - kprintf("unknown board configuration\n"); + printf("unknown board configuration\n"); return; } - 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, + 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, 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) - kprintf("%s: WARNING: couldn't map interrupt\n", + printf("%s: WARNING: couldn't map interrupt\n", sc->sc_dev.dv_xname); } #endif @@ -225,7 +225,7 @@ pcivgaprint(aux, pnp) { if (pnp) - kprintf("wscons at %s", pnp); + printf("wscons at %s", pnp); return (UNCONF); } @@ -305,7 +305,7 @@ pcivga_cursor(id, on, row, col) int pos; #if 0 - kprintf("pcivga_cursor: %d %d\n", row, col); + printf("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 c481fd712eea..ef1f5114182c 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.7 1996/10/10 23:51:13 christos Exp $ */ +/* $NetBSD: pcs_bus_io_common.c,v 1.8 1996/10/13 03:00:15 christos Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -134,14 +134,14 @@ __C(CHIP,_io_map)(v, ioaddr, iosize, iohp) } else #endif { - kprintf("\n"); + printf("\n"); #ifdef CHIP_IO_W1_START - kprintf("%s: window[1]=0x%lx-0x%lx\n", + printf("%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 - kprintf("%s: window[2]=0x%lx-0x%lx\n", + printf("%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 1e5876c7b537..74e4609ac464 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.8 1996/10/10 23:51:15 christos Exp $ */ +/* $NetBSD: pcs_bus_mem_common.c,v 1.9 1996/10/13 03:00:17 christos Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -110,9 +110,9 @@ __C(CHIP,_mem_map)(v, memaddr, memsize, cacheable, memhp) } else #endif { - kprintf("\n"); + printf("\n"); #ifdef CHIP_D_MEM_W1_START - kprintf("%s: window[1]=0x%lx-0x%lx\n", + printf("%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 { - kprintf("\n"); + printf("\n"); #ifdef CHIP_S_MEM_W1_START - kprintf("%s: window[1]=0x%lx-0x%lx\n", + printf("%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 - kprintf("%s: window[2]=0x%lx-0x%lx\n", + printf("%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 - kprintf("%s: window[3]=0x%lx-0x%lx\n", + printf("%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 e587f73655f7..178e16764e67 100644 --- a/sys/arch/alpha/pci/sio.c +++ b/sys/arch/alpha/pci/sio.c @@ -1,4 +1,4 @@ -/* $NetBSD: sio.c,v 1.10 1996/10/10 23:51:19 christos Exp $ */ +/* $NetBSD: sio.c,v 1.11 1996/10/13 03:00:18 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); - kprintf(": %s (rev. 0x%02x)\n", devinfo, + printf(": %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) - kprintf("%s: WARNING: SIO I SUPPORT UNTESTED\n", + printf("%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) - kprintf("%s at %s", sa->sa_name, pnp); + printf("%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) { - kprintf("sio_eisa_intr_map: bad IRQ %d\n", irq); + printf("sio_eisa_intr_map: bad IRQ %d\n", irq); *ihp = -1; return 1; } if (irq == 2) { - kprintf("sio_eisa_intr_map: changed IRQ 2 to IRQ 9\n"); + printf("sio_eisa_intr_map: changed IRQ 2 to IRQ 9\n"); irq = 9; } diff --git a/sys/arch/alpha/pci/sio_pic.c b/sys/arch/alpha/pci/sio_pic.c index 1ab299e3603e..b06426055adb 100644 --- a/sys/arch/alpha/pci/sio_pic.c +++ b/sys/arch/alpha/pci/sio_pic.c @@ -1,4 +1,4 @@ -/* $NetBSD: sio_pic.c,v 1.12 1996/10/10 23:51:21 christos Exp $ */ +/* $NetBSD: sio_pic.c,v 1.13 1996/10/13 03:00:20 christos Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -123,7 +123,7 @@ sio_setirqstat(irq, enabled, type) int icu, bit; #if 0 - kprintf("sio_setirqstat: irq %d: %s, %s\n", irq, + printf("sio_setirqstat: irq %d: %s, %s\n", irq, enabled ? "enabled" : "disabled", isa_intr_typename(type)); #endif @@ -170,10 +170,10 @@ sio_setirqstat(irq, enabled, type) (ocw1[1] & ~initial_ocw1[1]) != 0 || (elcr[0] & initial_elcr[0]) != initial_elcr[0] || (elcr[1] & initial_elcr[1]) != initial_elcr[1]) { - kprintf("sio_sis: initial: ocw = (%2x,%2x), elcr = (%2x,%2x)\n", + printf("sio_sis: initial: ocw = (%2x,%2x), elcr = (%2x,%2x)\n", initial_ocw1[0], initial_ocw1[1], initial_elcr[0], initial_elcr[1]); - kprintf(" current: ocw = (%2x,%2x), elcr = (%2x,%2x)\n", + printf(" current: ocw = (%2x,%2x), elcr = (%2x,%2x)\n", ocw1[0], ocw1[1], elcr[0], elcr[1]); panic("sio_setirqstat: hosed"); } @@ -207,10 +207,10 @@ sio_intr_setup(bc) initial_elcr[0] = bus_io_read_1(sio_bc, sio_ioh_elcr, 0); /* XXX */ initial_elcr[1] = bus_io_read_1(sio_bc, sio_ioh_elcr, 1); /* XXX */ #if 0 - kprintf("initial_ocw1[0] = 0x%x\n", initial_ocw1[0]); - kprintf("initial_ocw1[1] = 0x%x\n", initial_ocw1[1]); - kprintf("initial_elcr[0] = 0x%x\n", initial_elcr[0]); - kprintf("initial_elcr[1] = 0x%x\n", initial_elcr[1]); + printf("initial_ocw1[0] = 0x%x\n", initial_ocw1[0]); + printf("initial_ocw1[1] = 0x%x\n", initial_ocw1[1]); + printf("initial_elcr[0] = 0x%x\n", initial_elcr[0]); + printf("initial_elcr[1] = 0x%x\n", initial_elcr[1]); #endif #endif @@ -228,7 +228,7 @@ sio_intr_setup(bc) * edge-triggered. */ if (INITIALLY_LEVEL_TRIGGERED(i)) - kprintf("sio_intr_setup: %d LT!\n", i); + printf("sio_intr_setup: %d LT!\n", i); sio_setirqstat(i, INITIALLY_ENABLED(i), IST_EDGE); break; @@ -238,9 +238,9 @@ sio_intr_setup(bc) * enabled (otherwise IRQs 8-15 are ignored). */ if (INITIALLY_LEVEL_TRIGGERED(i)) - kprintf("sio_intr_setup: %d LT!\n", i); + printf("sio_intr_setup: %d LT!\n", i); if (!INITIALLY_ENABLED(i)) - kprintf("sio_intr_setup: %d not enabled!\n", i); + printf("sio_intr_setup: %d not enabled!\n", i); sio_setirqstat(i, 1, IST_EDGE); break; @@ -267,7 +267,7 @@ sio_intr_string(v, irq) if (irq == 0 || irq >= ICU_LEN || irq == 2) panic("sio_intr_string: bogus IRQ 0x%x\n", irq); - ksprintf(irqstr, "isa irq %d", irq); + sprintf(irqstr, "isa irq %d", irq); return (irqstr); } @@ -298,7 +298,7 @@ sio_intr_establish(v, irq, type, level, ih_fun, ih_arg) case IST_PULSE: if (type != IST_NONE) { if (sio_intrhand[irq] == NULL) { - kprintf("sio_intr_establish: irq %d: warning: using %s on %s\n", + printf("sio_intr_establish: irq %d: warning: using %s on %s\n", irq, isa_intr_typename(type), isa_intr_typename(sio_intrsharetype[irq])); type = sio_intrsharetype[irq]; @@ -341,7 +341,7 @@ sio_intr_disestablish(v, cookie) void *cookie; { - kprintf("sio_intr_disestablish(%lx)\n", cookie); + printf("sio_intr_disestablish(%lx)\n", cookie); /* XXX */ /* XXX NEVER ALLOW AN INITIALLY-ENABLED INTERRUPT TO BE DISABLED */ diff --git a/sys/arch/alpha/pci/tga.c b/sys/arch/alpha/pci/tga.c index c5c52d12dfee..d68732273f7a 100644 --- a/sys/arch/alpha/pci/tga.c +++ b/sys/arch/alpha/pci/tga.c @@ -1,4 +1,4 @@ -/* $NetBSD: tga.c,v 1.9 1996/10/10 23:51:23 christos Exp $ */ +/* $NetBSD: tga.c,v 1.10 1996/10/13 03:00:22 christos Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -235,7 +235,7 @@ tgaattach(parent, self, aux) tga_getdevconfig(pa->pa_bc, pa->pa_pc, pa->pa_tag, sc->sc_dc); } if (sc->sc_dc->dc_vaddr == NULL) { - kprintf(": couldn't map memory space; punt!\n"); + printf(": couldn't map memory space; punt!\n"); return; } @@ -244,17 +244,17 @@ tgaattach(parent, self, aux) if (sc->sc_dc->dc_tgaconf->tgac_ramdac->tgar_intr != NULL) { if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin, pa->pa_intrline, &intrh)) { - kprintf(": couldn't map interrupt"); + printf(": couldn't map interrupt"); return; } intrstr = pci_intr_string(pa->pa_pc, intrh); sc->sc_intr = pci_intr_establish(pa->pa_pc, intrh, IPL_TTY, sc->sc_dc->dc_tgaconf->tgac_ramdac->tgar_intr, sc->sc_dc); if (sc->sc_intr == NULL) { - kprintf(": couldn't establish interrupt"); + printf(": couldn't establish interrupt"); if (intrstr != NULL) - kprintf("at %s", intrstr); - kprintf("\n"); + printf("at %s", intrstr); + printf("\n"); return; } } @@ -266,31 +266,31 @@ tgaattach(parent, self, aux) */ (*sc->sc_dc->dc_tgaconf->tgac_ramdac->tgar_init)(sc->sc_dc, 1); - kprintf(": DC21030 "); + printf(": DC21030 "); rev = PCI_REVISION(pa->pa_class); switch (rev) { case 1: case 2: case 3: - kprintf("step %c", 'A' + rev - 1); + printf("step %c", 'A' + rev - 1); break; default: - kprintf("unknown stepping (0x%x)", rev); + printf("unknown stepping (0x%x)", rev); break; } - kprintf(", "); + printf(", "); if (sc->sc_dc->dc_tgaconf == NULL) { - kprintf("unknown board configuration\n"); + printf("unknown board configuration\n"); return; } - 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, + 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, 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); if (intrstr != NULL) - kprintf("%s: interrupting at %s\n", sc->sc_dev.dv_xname, + printf("%s: interrupting at %s\n", sc->sc_dev.dv_xname, intrstr); waa.waa_isconsole = console; @@ -314,7 +314,7 @@ tgaprint(aux, pnp) { if (pnp) - kprintf("wscons at %s", pnp); + printf("wscons at %s", pnp); return (UNCONF); } diff --git a/sys/arch/alpha/stand/OSFpal.c b/sys/arch/alpha/stand/OSFpal.c index 3bbf2b1716a1..903cb55eae83 100644 --- a/sys/arch/alpha/stand/OSFpal.c +++ b/sys/arch/alpha/stand/OSFpal.c @@ -1,4 +1,4 @@ -/* $NetBSD: OSFpal.c,v 1.3 1996/10/10 23:51:26 christos Exp $ */ +/* $NetBSD: OSFpal.c,v 1.4 1996/10/13 03:00:24 christos Exp $ */ /* * Copyright (c) 1994, 1996 Carnegie-Mellon University. @@ -45,10 +45,10 @@ OSFpal() offset = r->rpb_pcs_size * cpu_number(); p = (struct pcs *)((u_int8_t *)r + r->rpb_pcs_off + offset); - kprintf("VMS PAL revision: 0x%lx\n", + printf("VMS PAL revision: 0x%lx\n", p->pcs_palrevisions[PALvar_OpenVMS]); - kprintf("OSF PAL rev: 0x%lx\n", p->pcs_palrevisions[PALvar_OSF1]); + printf("OSF PAL rev: 0x%lx\n", p->pcs_palrevisions[PALvar_OSF1]); (void)switch_palcode(); - kprintf("Switch to OSF PAL code succeeded.\n"); + printf("Switch to OSF PAL code succeeded.\n"); } diff --git a/sys/arch/alpha/tc/cfb.c b/sys/arch/alpha/tc/cfb.c index 7ba5d9babaf9..5ff84531fe95 100644 --- a/sys/arch/alpha/tc/cfb.c +++ b/sys/arch/alpha/tc/cfb.c @@ -1,4 +1,4 @@ -/* $NetBSD: cfb.c,v 1.4 1996/10/10 23:51:28 christos Exp $ */ +/* $NetBSD: cfb.c,v 1.5 1996/10/13 03:00:27 christos Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -177,10 +177,10 @@ cfbattach(parent, self, aux) cfb_getdevconfig(ta->ta_addr, sc->sc_dc); } if (sc->sc_dc->dc_vaddr == NULL) { - kprintf(": couldn't map memory space; punt!\n"); + printf(": couldn't map memory space; punt!\n"); return; } - kprintf(": %d x %d, %dbpp\n", sc->sc_dc->dc_wid, sc->sc_dc->dc_ht, + printf(": %d x %d, %dbpp\n", sc->sc_dc->dc_wid, sc->sc_dc->dc_ht, sc->sc_dc->dc_depth); /* Establish an interrupt handler, and clear any pending interrupts */ @@ -209,7 +209,7 @@ cfbprint(aux, pnp) { if (pnp) - kprintf("wscons at %s", pnp); + printf("wscons at %s", pnp); return (UNCONF); } diff --git a/sys/arch/alpha/tc/esp.c b/sys/arch/alpha/tc/esp.c index 49117cac7d13..e73050c7835b 100644 --- a/sys/arch/alpha/tc/esp.c +++ b/sys/arch/alpha/tc/esp.c @@ -1,4 +1,4 @@ -/* $NetBSD: esp.c,v 1.20 1996/10/10 23:51:30 christos Exp $ */ +/* $NetBSD: esp.c,v 1.21 1996/10/13 03:00:28 christos Exp $ */ #ifdef __sparc__ #define SPARC_DRIVER @@ -205,12 +205,12 @@ espattach(parent, self, aux) * necessary, but it seem to be in all of Torek's code. */ if (ca->ca_ra.ra_nintr != 1) { - kprintf(": expected 1 interrupt, got %d\n", ca->ca_ra.ra_nintr); + printf(": expected 1 interrupt, got %d\n", ca->ca_ra.ra_nintr); return; } sc->sc_pri = ca->ca_ra.ra_intr[0].int_pri; - kprintf(" pri %d", sc->sc_pri); + printf(" pri %d", sc->sc_pri); /* * Map my registers in, if they aren't already in virtual @@ -227,7 +227,7 @@ espattach(parent, self, aux) sc->sc_cookie = tcdsdev->tcdsda_cookie; sc->sc_dma = tcdsdev->tcdsda_sc; - kprintf(": address %x", sc->sc_reg); + printf(": address %x", sc->sc_reg); tcds_intr_establish(parent, sc->sc_cookie, TC_IPL_BIO, (int (*)(void *))espintr, sc); #endif @@ -301,7 +301,7 @@ espattach(parent, self, aux) ESP_WRITE_REG(sc, ESP_CFG2, sc->sc_cfg2); if ((ESP_READ_REG(sc, ESP_CFG2) & ~ESPCFG2_RSVD) != (ESPCFG2_SCSI2 | ESPCFG2_RPE)) { - kprintf(": ESP100"); + printf(": ESP100"); sc->sc_rev = ESP100; } else { sc->sc_cfg2 = ESPCFG2_SCSI2; @@ -311,21 +311,21 @@ espattach(parent, self, aux) sc->sc_cfg3 = (ESPCFG3_CDB | ESPCFG3_FCLK); ESP_WRITE_REG(sc, ESP_CFG3, sc->sc_cfg3); if (ESP_READ_REG(sc, ESP_CFG3) != (ESPCFG3_CDB | ESPCFG3_FCLK)) { - kprintf(": ESP100A"); + printf(": ESP100A"); sc->sc_rev = ESP100A; } else { /* ESPCFG2_FE enables > 64K transfers */ sc->sc_cfg2 |= ESPCFG2_FE; sc->sc_cfg3 = 0; ESP_WRITE_REG(sc, ESP_CFG3, sc->sc_cfg3); - kprintf(": ESP200"); + printf(": ESP200"); sc->sc_rev = ESP200; } } #else sc->sc_cfg2 = ESPCFG2_SCSI2; sc->sc_cfg3 = 0x4; /* Save residual byte. XXX??? */ - kprintf(": NCR53C94"); + printf(": NCR53C94"); sc->sc_rev = NCR53C94; #endif @@ -389,7 +389,7 @@ espattach(parent, self, aux) sc->sc_state = 0; esp_init(sc, 1); - kprintf(" %dMhz, target %d\n", sc->sc_freq, sc->sc_id); + printf(" %dMhz, target %d\n", sc->sc_freq, sc->sc_id); #ifdef SPARC_DRIVER /* add me to the sbus structures */ @@ -490,7 +490,7 @@ esp_reset(sc) ESP_WRITE_REG(sc, ESP_TIMEOUT, sc->sc_timeout); break; default: - kprintf("%s: unknown revision code, assuming ESP100\n", + printf("%s: unknown revision code, assuming ESP100\n", sc->sc_dev.dv_xname); ESP_WRITE_REG(sc, ESP_CFG1, sc->sc_cfg1); ESP_WRITE_REG(sc, ESP_CCF, sc->sc_ccf); @@ -515,7 +515,7 @@ esp_scsi_reset(sc) */ #endif - kprintf("esp: resetting SCSI bus\n"); + printf("esp: resetting SCSI bus\n"); ESPCMD(sc, ESPCMD_RSTSCSI); } @@ -977,11 +977,11 @@ esp_done(sc, ecb) #ifdef ESP_DEBUG if (esp_debug & ESP_SHOWMISC) { if (xs->resid != 0) - kprintf("resid=%d ", xs->resid); + printf("resid=%d ", xs->resid); if (xs->error == XS_SENSE) - kprintf("sense=0x%02x\n", xs->sense.error_code); + printf("sense=0x%02x\n", xs->sense.error_code); else - kprintf("error=%d\n", xs->error); + printf("error=%d\n", xs->error); } #endif @@ -1049,7 +1049,7 @@ esp_reselect(sc, message) */ selid = sc->sc_selid & ~(1 << sc->sc_id); if (selid & (selid - 1)) { - kprintf("%s: reselect with invalid selid %02x; sending DEVICE RESET\n", + printf("%s: reselect with invalid selid %02x; sending DEVICE RESET\n", sc->sc_dev.dv_xname, selid); goto reset; } @@ -1069,7 +1069,7 @@ esp_reselect(sc, message) break; } if (ecb == NULL) { - kprintf("%s: reselect from target %d lun %d with no nexus; sending ABORT\n", + printf("%s: reselect from target %d lun %d with no nexus; sending ABORT\n", sc->sc_dev.dv_xname, target, lun); goto abort; } @@ -1121,7 +1121,7 @@ esp_msgin(sc) ESP_TRACE(("[esp_msgin(curmsglen:%d)] ", sc->sc_imlen)); if ((ESP_READ_REG(sc, ESP_FFLAG) & ESPFIFO_FF) == 0) { - kprintf("%s: msgin: no msg byte available\n", + printf("%s: msgin: no msg byte available\n", sc->sc_dev.dv_xname); return; } @@ -1160,7 +1160,7 @@ esp_msgin(sc) if ((sc->sc_flags & ESP_DROP_MSGI)) { ESPCMD(sc, ESPCMD_MSGOK); - kprintf("", + printf("", sc->sc_imess[sc->sc_imlen]); return; } @@ -1209,7 +1209,7 @@ gotit: ESP_MSGS(("cmdcomplete ")); if (sc->sc_dleft < 0) { struct scsi_link *sc_link = ecb->xs->sc_link; - kprintf("%s: %d extra bytes from %d:%d\n", + printf("%s: %d extra bytes from %d:%d\n", sc->sc_dev.dv_xname, -sc->sc_dleft, sc_link->target, sc_link->lun); sc->sc_dleft = 0; @@ -1220,7 +1220,7 @@ gotit: case MSG_MESSAGE_REJECT: if (esp_debug & ESP_SHOWMSGS) - kprintf("%s: our msg rejected by target\n", + printf("%s: our msg rejected by target\n", sc->sc_dev.dv_xname); switch (sc->sc_msgout) { case SEND_SDTR: @@ -1271,7 +1271,7 @@ gotit: if (sc->sc_minsync == 0 || ti->offset == 0 || ti->period > 124) { - kprintf("%s:%d: async\n", "esp", + printf("%s:%d: async\n", "esp", ecb->xs->sc_link->target); if ((sc->sc_flags&ESP_SYNCHNEGO) == 0) { /* target initiated negotiation */ @@ -1291,7 +1291,7 @@ gotit: ti->period = esp_cpb2stp(sc, p); #ifdef ESP_DEBUG sc_print_addr(ecb->xs->sc_link); - kprintf("max sync rate %d.%02dMb/s\n", + printf("max sync rate %d.%02dMb/s\n", r, s); #endif if ((sc->sc_flags&ESP_SYNCHNEGO) == 0) { @@ -1312,7 +1312,7 @@ gotit: break; default: - kprintf("%s: unrecognized MESSAGE EXTENDED; sending REJECT\n", + printf("%s: unrecognized MESSAGE EXTENDED; sending REJECT\n", sc->sc_dev.dv_xname); goto reject; } @@ -1320,7 +1320,7 @@ gotit: default: ESP_MSGS(("ident ")); - kprintf("%s: unrecognized MESSAGE; sending REJECT\n", + printf("%s: unrecognized MESSAGE; sending REJECT\n", sc->sc_dev.dv_xname); reject: esp_sched_msgout(SEND_REJECT); @@ -1330,7 +1330,7 @@ gotit: case ESP_RESELECTED: if (!MSG_ISIDENTIFY(sc->sc_imess[0])) { - kprintf("%s: reselect without IDENTIFY; sending DEVICE RESET\n", + printf("%s: reselect without IDENTIFY; sending DEVICE RESET\n", sc->sc_dev.dv_xname); goto reset; } @@ -1339,7 +1339,7 @@ gotit: break; default: - kprintf("%s: unexpected MESSAGE IN; sending DEVICE RESET\n", + printf("%s: unexpected MESSAGE IN; sending DEVICE RESET\n", sc->sc_dev.dv_xname); reset: esp_sched_msgout(SEND_DEV_RESET); @@ -1385,7 +1385,7 @@ esp_msgout(sc) esp_sched_msgout(sc->sc_msgoutq); goto new; } else { - kprintf("esp at line %d: unexpected MESSAGE OUT phase\n", __LINE__); + printf("esp at line %d: unexpected MESSAGE OUT phase\n", __LINE__); } } @@ -1412,7 +1412,7 @@ esp_msgout(sc) break; case SEND_IDENTIFY: if (sc->sc_state != ESP_CONNECTED) { - kprintf("esp at line %d: no nexus\n", __LINE__); + printf("esp at line %d: no nexus\n", __LINE__); } ecb = sc->sc_nexus; sc->sc_omess[0] = MSG_IDENTIFY(ecb->xs->sc_link->lun,0); @@ -1494,7 +1494,7 @@ espintr(sc) /* * I have made some (maybe seriously flawed) assumptions here, - * but basic testing (uncomment the kprintf() below), show that + * but basic testing (uncomment the printf() below), show that * certainly something happens when this loop is here. * * The idea is that many of the SCSI operations take very little @@ -1517,7 +1517,7 @@ espintr(sc) return (loop != 0); #if 0 if (loop) - kprintf("*"); + printf("*"); #endif /* and what do the registers say... */ @@ -1549,13 +1549,13 @@ espintr(sc) DELAY(1); } if (sc->sc_state != ESP_SBR) { - kprintf("%s: SCSI bus reset\n", + printf("%s: SCSI bus reset\n", sc->sc_dev.dv_xname); esp_init(sc, 0); /* Restart everything */ return 1; } #if 0 - /*XXX*/ kprintf("\n", sc->sc_espintr, sc->sc_espstat, sc->sc_espstep); @@ -1588,7 +1588,7 @@ espintr(sc) if (sc->sc_espintr & ESPINTR_ILL) { /* illegal command, out of sync ? */ - kprintf("%s: illegal command: 0x%x (state %d, phase %x, prevphase %x)\n", + printf("%s: illegal command: 0x%x (state %d, phase %x, prevphase %x)\n", sc->sc_dev.dv_xname, sc->sc_lastcmd, sc->sc_state, sc->sc_phase, sc->sc_prevphase); @@ -1616,7 +1616,7 @@ espintr(sc) if (sc->sc_dleft == 0 && (sc->sc_espstat & ESPSTAT_TC) == 0) - kprintf("%s: !TC [intr %x, stat %x, step %d]" + printf("%s: !TC [intr %x, stat %x, step %d]" " prevphase %x, resid %x\n", sc->sc_dev.dv_xname, sc->sc_espintr, @@ -1628,7 +1628,7 @@ espintr(sc) #if 0 /* Unreliable on some ESP revisions? */ if ((sc->sc_espstat & ESPSTAT_INT) == 0) { - kprintf("%s: spurious interrupt\n", sc->sc_dev.dv_xname); + printf("%s: spurious interrupt\n", sc->sc_dev.dv_xname); return 1; } #endif @@ -1637,7 +1637,7 @@ espintr(sc) * check for less serious errors */ if (sc->sc_espstat & ESPSTAT_PE) { - kprintf("%s: SCSI bus parity error\n", + printf("%s: SCSI bus parity error\n", sc->sc_dev.dv_xname); if (sc->sc_prevphase == MESSAGE_IN_PHASE) esp_sched_msgout(SEND_PARITY_ERROR); @@ -1670,7 +1670,7 @@ espintr(sc) #ifdef ESP_DEBUG if (ecb) sc_print_addr(ecb->xs->sc_link); - kprintf("sync nego not completed!\n"); + printf("sync nego not completed!\n"); #endif ti = &sc->sc_tinfo[ecb->xs->sc_link->target]; sc->sc_flags &= ~ESP_SYNCHNEGO; @@ -1688,13 +1688,13 @@ espintr(sc) * disconnecting, and this is necessary * to clean up their state. */ - kprintf("%s: unexpected disconnect; ", + printf("%s: unexpected disconnect; ", sc->sc_dev.dv_xname); if (ecb->flags & ECB_SENSE) { - kprintf("resetting\n"); + printf("resetting\n"); goto reset; } - kprintf("sending REQUEST SENSE\n"); + printf("sending REQUEST SENSE\n"); esp_sense(sc, ecb); goto out; } @@ -1715,7 +1715,7 @@ espintr(sc) switch (sc->sc_state) { case ESP_SBR: - kprintf("%s: waiting for SCSI Bus Reset to happen\n", + printf("%s: waiting for SCSI Bus Reset to happen\n", sc->sc_dev.dv_xname); return 1; @@ -1724,17 +1724,17 @@ espintr(sc) * we must be continuing a message ? */ if (sc->sc_phase != MESSAGE_IN_PHASE) { - kprintf("%s: target didn't identify\n", + printf("%s: target didn't identify\n", sc->sc_dev.dv_xname); esp_init(sc, 1); return 1; } -kprintf("<>"); +printf("<>"); #if XXXX esp_msgin(sc); if (sc->sc_state != ESP_CONNECTED) { /* IDENTIFY fail?! */ - kprintf("%s: identify failed\n", + printf("%s: identify failed\n", sc->sc_dev.dv_xname); esp_init(sc, 1); return 1; @@ -1743,7 +1743,7 @@ kprintf("<>"); break; case ESP_IDLE: -if (sc->sc_flags & ESP_ICCS) kprintf("[[esp: BUMMER]]"); +if (sc->sc_flags & ESP_ICCS) printf("[[esp: BUMMER]]"); case ESP_SELECTING: sc->sc_msgpriq = sc->sc_msgout = sc->sc_msgoutq = 0; sc->sc_flags = 0; @@ -1768,13 +1768,13 @@ if (sc->sc_flags & ESP_ICCS) kprintf("[[esp: BUMMER]]"); * Things are seriously fucked up. * Pull the brakes, i.e. reset */ - kprintf("%s: target didn't identify\n", + printf("%s: target didn't identify\n", sc->sc_dev.dv_xname); esp_init(sc, 1); return 1; } if ((ESP_READ_REG(sc, ESP_FFLAG) & ESPFIFO_FF) != 2) { - kprintf("%s: RESELECT: %d bytes in FIFO!\n", + printf("%s: RESELECT: %d bytes in FIFO!\n", sc->sc_dev.dv_xname, ESP_READ_REG(sc, ESP_FFLAG) & ESPFIFO_FF); @@ -1786,7 +1786,7 @@ if (sc->sc_flags & ESP_ICCS) kprintf("[[esp: BUMMER]]"); esp_msgin(sc); /* Handle identify message */ if (sc->sc_state != ESP_CONNECTED) { /* IDENTIFY fail?! */ - kprintf("%s: identify failed\n", + printf("%s: identify failed\n", sc->sc_dev.dv_xname); esp_init(sc, 1); return 1; @@ -1805,18 +1805,18 @@ if (sc->sc_flags & ESP_ICCS) kprintf("[[esp: BUMMER]]"); switch (sc->sc_espstep) { case 0: - kprintf("%s: select timeout/no disconnect\n", + printf("%s: select timeout/no disconnect\n", sc->sc_dev.dv_xname); ecb->xs->error = XS_SELTIMEOUT; goto finish; case 1: if ((ti->flags & T_NEGOTIATE) == 0) { - kprintf("%s: step 1 & !NEG\n", + printf("%s: step 1 & !NEG\n", sc->sc_dev.dv_xname); goto reset; } if (sc->sc_phase != MESSAGE_OUT_PHASE) { - kprintf("%s: !MSGOUT\n", + printf("%s: !MSGOUT\n", sc->sc_dev.dv_xname); goto reset; } @@ -1840,7 +1840,7 @@ if (sc->sc_flags & ESP_ICCS) kprintf("[[esp: BUMMER]]"); /* Hope for the best.. */ break; } - kprintf("(%s:%d:%d): selection failed;" + printf("(%s:%d:%d): selection failed;" " %d left in FIFO " "[intr %x, stat %x, step %d]\n", sc->sc_dev.dv_xname, @@ -1884,7 +1884,7 @@ if (sc->sc_flags & ESP_ICCS) kprintf("[[esp: BUMMER]]"); sc->sc_state = ESP_CONNECTED; break; } else { - kprintf("%s: unexpected status after select" + printf("%s: unexpected status after select" ": [intr %x, stat %x, step %x]\n", sc->sc_dev.dv_xname, sc->sc_espintr, sc->sc_espstat, @@ -1894,7 +1894,7 @@ if (sc->sc_flags & ESP_ICCS) kprintf("[[esp: BUMMER]]"); goto reset; } if (sc->sc_state == ESP_IDLE) { - kprintf("%s: stray interrupt\n", sc->sc_dev.dv_xname); + printf("%s: stray interrupt\n", sc->sc_dev.dv_xname); return 0; } break; @@ -1906,7 +1906,7 @@ if (sc->sc_flags & ESP_ICCS) kprintf("[[esp: BUMMER]]"); sc->sc_flags &= ~ESP_ICCS; if (!(sc->sc_espintr & ESPINTR_DONE)) { - kprintf("%s: ICCS: " + printf("%s: ICCS: " ": [intr %x, stat %x, step %x]\n", sc->sc_dev.dv_xname, sc->sc_espintr, sc->sc_espstat, @@ -1924,7 +1924,7 @@ if (sc->sc_flags & ESP_ICCS) kprintf("[[esp: BUMMER]]"); ecb->xs->resid = ecb->dleft = sc->sc_dleft; sc->sc_state = ESP_CMDCOMPLETE; } else - kprintf("%s: STATUS_PHASE: msg %d\n", + printf("%s: STATUS_PHASE: msg %d\n", sc->sc_dev.dv_xname, msg); ESPCMD(sc, ESPCMD_MSGOK); continue; /* ie. wait for disconnect */ @@ -1958,7 +1958,7 @@ if (sc->sc_flags & ESP_ICCS) kprintf("[[esp: BUMMER]]"); ESPCMD(sc, ESPCMD_TRANS); } else if (sc->sc_espintr & ESPINTR_FC) { if ((sc->sc_flags & ESP_WAITI) == 0) { - kprintf("%s: MSGIN: unexpected FC bit: " + printf("%s: MSGIN: unexpected FC bit: " "[intr %x, stat %x, step %x]\n", sc->sc_dev.dv_xname, sc->sc_espintr, sc->sc_espstat, @@ -1967,7 +1967,7 @@ if (sc->sc_flags & ESP_ICCS) kprintf("[[esp: BUMMER]]"); sc->sc_flags &= ~ESP_WAITI; esp_msgin(sc); } else { - kprintf("%s: MSGIN: weird bits: " + printf("%s: MSGIN: weird bits: " "[intr %x, stat %x, step %x]\n", sc->sc_dev.dv_xname, sc->sc_espintr, sc->sc_espstat, @@ -2039,7 +2039,7 @@ if (sc->sc_flags & ESP_ICCS) kprintf("[[esp: BUMMER]]"); case INVALID_PHASE: break; default: - kprintf("%s: unexpected bus phase; resetting\n", + printf("%s: unexpected bus phase; resetting\n", sc->sc_dev.dv_xname); goto reset; } @@ -2100,7 +2100,7 @@ esp_timeout(arg) int s; sc_print_addr(sc_link); - kprintf("%s: timed out [ecb %p (flags 0x%x, dleft %x, stat %x)], " + printf("%s: timed out [ecb %p (flags 0x%x, dleft %x, stat %x)], " "", sc->sc_dev.dv_xname, ecb, ecb->flags, ecb->dleft, ecb->stat, @@ -2108,18 +2108,18 @@ esp_timeout(arg) sc->sc_dleft, sc->sc_msgpriq, sc->sc_msgout, DMA_ISACTIVE(sc->sc_dma) ? "DMA active" : ""); #if ESP_DEBUG > 0 - kprintf("TRACE: %s.", ecb->trace); + printf("TRACE: %s.", ecb->trace); #endif s = splbio(); if (ecb->flags & ECB_ABORT) { /* abort timed out */ - kprintf(" AGAIN\n"); + printf(" AGAIN\n"); esp_init(sc, 1); } else { /* abort the operation that has timed out */ - kprintf("\n"); + printf("\n"); xs->error = XS_TIMEOUT; esp_abort(sc, ecb); } diff --git a/sys/arch/alpha/tc/espvar.h b/sys/arch/alpha/tc/espvar.h index 926b1f06d311..eadec1442ac6 100644 --- a/sys/arch/alpha/tc/espvar.h +++ b/sys/arch/alpha/tc/espvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: espvar.h,v 1.8 1996/10/10 23:51:32 christos Exp $ */ +/* $NetBSD: espvar.h,v 1.9 1996/10/13 03:00:30 christos Exp $ */ #if defined(__sparc__) && !defined(SPARC_DRIVER) #define SPARC_DRIVER @@ -79,7 +79,7 @@ struct esp_ecb { const char *f = "[" msg "]"; \ int n = strlen((ecb)->trace); \ if (n < (sizeof((ecb)->trace)-100)) \ - ksprintf((ecb)->trace + n, f, a, b); \ + sprintf((ecb)->trace + n, f, a, b); \ } while(0) #else #define ECB_TRACE(ecb, msg, a, b) @@ -124,15 +124,15 @@ struct esp_tinfo { #ifdef ESP_DEBUG extern int esp_debug; -#define ESP_ECBS(str) do {if (esp_debug & ESP_SHOWECBS) kprintf str;} while (0) -#define ESP_MISC(str) do {if (esp_debug & ESP_SHOWMISC) kprintf str;} while (0) -#define ESP_INTS(str) do {if (esp_debug & ESP_SHOWINTS) kprintf str;} while (0) -#define ESP_TRACE(str) do {if (esp_debug & ESP_SHOWTRAC) kprintf str;} while (0) -#define ESP_CMDS(str) do {if (esp_debug & ESP_SHOWCMDS) kprintf str;} while (0) -#define ESP_START(str) do {if (esp_debug & ESP_SHOWSTART) kprintf str;}while (0) -#define ESP_PHASE(str) do {if (esp_debug & ESP_SHOWPHASE) kprintf str;}while (0) -#define ESP_DMA(str) do {if (esp_debug & ESP_SHOWDMA) kprintf str;}while (0) -#define ESP_MSGS(str) do {if (esp_debug & ESP_SHOWMSGS) kprintf str;}while (0) +#define ESP_ECBS(str) do {if (esp_debug & ESP_SHOWECBS) printf str;} while (0) +#define ESP_MISC(str) do {if (esp_debug & ESP_SHOWMISC) printf str;} while (0) +#define ESP_INTS(str) do {if (esp_debug & ESP_SHOWINTS) printf str;} while (0) +#define ESP_TRACE(str) do {if (esp_debug & ESP_SHOWTRAC) printf str;} while (0) +#define ESP_CMDS(str) do {if (esp_debug & ESP_SHOWCMDS) printf str;} while (0) +#define ESP_START(str) do {if (esp_debug & ESP_SHOWSTART) printf str;}while (0) +#define ESP_PHASE(str) do {if (esp_debug & ESP_SHOWPHASE) printf str;}while (0) +#define ESP_DMA(str) do {if (esp_debug & ESP_SHOWDMA) printf str;}while (0) +#define ESP_MSGS(str) do {if (esp_debug & ESP_SHOWMSGS) printf str;}while (0) #else #define ESP_ECBS(str) #define ESP_MISC(str) @@ -312,7 +312,7 @@ ESP_READ_REG(sc, reg) #ifdef ESP_DEBUG #define ESPCMD(sc, cmd) do { \ if (esp_debug & ESP_SHOWCCMDS) \ - kprintf("", (unsigned)cmd); \ + printf("", (unsigned)cmd); \ sc->sc_lastcmd = cmd; \ ESP_WRITE_REG(sc, ESP_CMD, cmd); \ } while (0) diff --git a/sys/arch/alpha/tc/ioasic.c b/sys/arch/alpha/tc/ioasic.c index c3847c2dc971..8c52b98fcb12 100644 --- a/sys/arch/alpha/tc/ioasic.c +++ b/sys/arch/alpha/tc/ioasic.c @@ -1,4 +1,4 @@ -/* $NetBSD: ioasic.c,v 1.8 1996/10/10 23:51:33 christos Exp $ */ +/* $NetBSD: ioasic.c,v 1.9 1996/10/13 03:00:32 christos Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -147,10 +147,10 @@ ioasicattach(parent, self, aux) *(volatile u_int *)IOASIC_REG_CSR(sc->sc_base) |= IOASIC_CSR_FASTMODE; tc_mb(); - kprintf(": slow mode\n"); + printf(": slow mode\n"); } else #endif - kprintf(": fast mode\n"); + printf(": fast mode\n"); /* * Turn off all device interrupt bits. @@ -194,8 +194,8 @@ ioasicprint(aux, pnp) struct ioasicdev_attach_args *d = aux; if (pnp) - kprintf("%s at %s", d->iada_modname, pnp); - kprintf(" offset 0x%lx", (long)d->iada_offset); + printf("%s at %s", d->iada_modname, pnp); + printf(" offset 0x%lx", (long)d->iada_offset); return (UNCONF); } diff --git a/sys/arch/alpha/tc/scc.c b/sys/arch/alpha/tc/scc.c index 9395dfefd675..693e7b72cde4 100644 --- a/sys/arch/alpha/tc/scc.c +++ b/sys/arch/alpha/tc/scc.c @@ -1,4 +1,4 @@ -/* $NetBSD: scc.c,v 1.21 1996/10/10 23:51:35 christos Exp $ */ +/* $NetBSD: scc.c,v 1.22 1996/10/13 03:00:33 christos Exp $ */ /* * Copyright (c) 1991,1990,1989,1994,1995,1996 Carnegie Mellon University @@ -379,12 +379,12 @@ sccattach(parent, self, aux) cn_tab = &scccons; cn_tab->cn_dev = makedev(SCCDEV, sc->sc_dv.dv_unit * 2); - kprintf(": console\n"); + printf(": console\n"); /* wire carrier for console. */ sc->scc_softCAR |= SCCLINE(cn_tab->cn_dev); } else - kprintf("\n"); + printf("\n"); } /* @@ -1256,7 +1256,7 @@ rr(msg, regs) u_char value; int r0, r1, r2, r3, r10, r15; - kprintf("%s: register: %lx\n", msg, regs); + printf("%s: register: %lx\n", msg, regs); #define L(reg, r) { \ SCC_READ_REG(regs, SCC_CHANNEL_A, reg, value); \ r = value; \ @@ -1267,7 +1267,7 @@ rr(msg, regs) L(ZSRR_IPEND, r3); L(SCC_RR10, r10); L(SCC_RR15, r15); - kprintf("A: 0: %x 1: %x 2(vec): %x 3: %x 10: %x 15: %x\n", + printf("A: 0: %x 1: %x 2(vec): %x 3: %x 10: %x 15: %x\n", r0, r1, r2, r3, r10, r15); #undef L #define L(reg, r) { \ @@ -1279,7 +1279,7 @@ rr(msg, regs) L(ZSRR_IVEC, r2); L(SCC_RR10, r10); L(SCC_RR15, r15); - kprintf("B: 0: %x 1: %x 2(state): %x 10: %x 15: %x\n", + printf("B: 0: %x 1: %x 2(state): %x 10: %x 15: %x\n", r0, r1, r2, r10, r15); } #endif diff --git a/sys/arch/alpha/tc/sfb.c b/sys/arch/alpha/tc/sfb.c index 07c9107dbf05..232f9eff3325 100644 --- a/sys/arch/alpha/tc/sfb.c +++ b/sys/arch/alpha/tc/sfb.c @@ -1,4 +1,4 @@ -/* $NetBSD: sfb.c,v 1.4 1996/10/10 23:51:37 christos Exp $ */ +/* $NetBSD: sfb.c,v 1.5 1996/10/13 03:00:35 christos Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -217,19 +217,19 @@ sfbattach(parent, self, aux) sfb_getdevconfig(ta->ta_addr, sc->sc_dc); } if (sc->sc_dc->dc_vaddr == NULL) { - kprintf(": couldn't map memory space; punt!\n"); + printf(": couldn't map memory space; punt!\n"); return; } - kprintf(": %d x %d, %dbpp\n", sc->sc_dc->dc_wid, sc->sc_dc->dc_ht, + printf(": %d x %d, %dbpp\n", sc->sc_dc->dc_wid, sc->sc_dc->dc_ht, sc->sc_dc->dc_depth); #if 0 x = (char *)ta->ta_addr + SFB_ASIC_OFFSET; - kprintf("%s: Video Base Address = 0x%x\n", self->dv_xname, + printf("%s: Video Base Address = 0x%x\n", self->dv_xname, *(u_int32_t *)(x + SFB_ASIC_VIDEO_BASE)); - kprintf("%s: Horizontal Setup = 0x%x\n", self->dv_xname, + printf("%s: Horizontal Setup = 0x%x\n", self->dv_xname, *(u_int32_t *)(x + SFB_ASIC_VIDEO_HSETUP)); - kprintf("%s: Vertical Setup = 0x%x\n", self->dv_xname, + printf("%s: Vertical Setup = 0x%x\n", self->dv_xname, *(u_int32_t *)(x + SFB_ASIC_VIDEO_VSETUP)); #endif @@ -254,7 +254,7 @@ sfbprint(aux, pnp) { if (pnp) - kprintf("wscons at %s", pnp); + printf("wscons at %s", pnp); return (UNCONF); } diff --git a/sys/arch/alpha/tc/tc_3000_300.c b/sys/arch/alpha/tc/tc_3000_300.c index 25eceaa014ba..1aa2aac55e22 100644 --- a/sys/arch/alpha/tc/tc_3000_300.c +++ b/sys/arch/alpha/tc/tc_3000_300.c @@ -1,4 +1,4 @@ -/* $NetBSD: tc_3000_300.c,v 1.11 1996/10/10 23:51:38 christos Exp $ */ +/* $NetBSD: tc_3000_300.c,v 1.12 1996/10/13 03:00:37 christos Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -251,7 +251,7 @@ tc_3000_300_iointr(framep, vec) #ifdef DIAGNOSTIC #define PRINTINTR(msg, bits) \ if (tcir & bits) \ - kprintf(msg); + printf(msg); PRINTINTR("BCache tag parity error\n", TC_3000_300_IR_BCTAGPARITY); PRINTINTR("TC overrun error\n", TC_3000_300_IR_TCOVERRUN); diff --git a/sys/arch/alpha/tc/tc_3000_500.c b/sys/arch/alpha/tc/tc_3000_500.c index 0459cd835167..2e629a125e38 100644 --- a/sys/arch/alpha/tc/tc_3000_500.c +++ b/sys/arch/alpha/tc/tc_3000_500.c @@ -1,4 +1,4 @@ -/* $NetBSD: tc_3000_500.c,v 1.10 1996/10/10 23:51:40 christos Exp $ */ +/* $NetBSD: tc_3000_500.c,v 1.11 1996/10/13 03:00:38 christos Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -229,7 +229,7 @@ tc_3000_500_iointr(framep, vec) #ifdef DIAGNOSTIC #define PRINTINTR(msg, bits) \ if (ir & bits) \ - kprintf(msg); + printf(msg); PRINTINTR("Second error occurred\n", TC_3000_500_IR_ERR2); PRINTINTR("DMA buffer error\n", TC_3000_500_IR_DMABE); PRINTINTR("DMA cross 2K boundary\n", TC_3000_500_IR_DMA2K); diff --git a/sys/arch/alpha/tc/tcasic.c b/sys/arch/alpha/tc/tcasic.c index d4cc0c83c1b8..3b6905167a13 100644 --- a/sys/arch/alpha/tc/tcasic.c +++ b/sys/arch/alpha/tc/tcasic.c @@ -1,4 +1,4 @@ -/* $NetBSD: tcasic.c,v 1.9 1996/10/10 23:51:41 christos Exp $ */ +/* $NetBSD: tcasic.c,v 1.10 1996/10/13 03:00:39 christos Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -89,7 +89,7 @@ tcasicattach(parent, self, aux) void (*iointr) __P((void *, unsigned long)); struct alpha_bus_chipset bc; - kprintf("\n"); + printf("\n"); tcasicfound = 1; switch (cputype) { @@ -149,6 +149,6 @@ tcasicprint(aux, pnp) /* only TCs can attach to tcasics; easy. */ if (pnp) - kprintf("tc at %s", pnp); + printf("tc at %s", pnp); return (UNCONF); } diff --git a/sys/arch/alpha/tc/tcds.c b/sys/arch/alpha/tc/tcds.c index 5b5406712372..726d59399e0a 100644 --- a/sys/arch/alpha/tc/tcds.c +++ b/sys/arch/alpha/tc/tcds.c @@ -1,4 +1,4 @@ -/* $NetBSD: tcds.c,v 1.14 1996/10/10 23:51:43 christos Exp $ */ +/* $NetBSD: tcds.c,v 1.15 1996/10/13 03:00:41 christos Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -103,7 +103,7 @@ tcdsattach(parent, self, aux) int i; extern int cputype; - kprintf("\n"); + printf("\n"); sc->sc_base = ta->ta_addr; sc->sc_cookie = ta->ta_cookie; @@ -208,8 +208,8 @@ tcdsprint(aux, pnp) struct tc_attach_args *ta = aux; if (pnp) - kprintf("%s at %s", ta->ta_modname, pnp); - kprintf(" slot %d", ta->ta_slot); + printf("%s at %s", ta->ta_modname, pnp); + printf(" slot %d", ta->ta_slot); return (UNCONF); } @@ -386,7 +386,7 @@ tcds_intr(val) */ #define PRINTINTR(msg, bits) \ if (ir & bits) \ - kprintf(msg); + printf(msg); PRINTINTR("SCSI0 DREQ interrupt.\n", TCDS_CIR_SCSI0_DREQ); PRINTINTR("SCSI1 DREQ interrupt.\n", TCDS_CIR_SCSI1_DREQ); PRINTINTR("SCSI0 prefetch interrupt.\n", TCDS_CIR_SCSI0_PREFETCH); diff --git a/sys/arch/alpha/tc/tcds_dma.c b/sys/arch/alpha/tc/tcds_dma.c index d35a0bc1a870..4dabb5e344b1 100644 --- a/sys/arch/alpha/tc/tcds_dma.c +++ b/sys/arch/alpha/tc/tcds_dma.c @@ -1,4 +1,4 @@ -/* $NetBSD: tcds_dma.c,v 1.12 1996/10/10 23:51:45 christos Exp $ */ +/* $NetBSD: tcds_dma.c,v 1.13 1996/10/13 03:00:43 christos Exp $ */ /* * Copyright (c) 1994 Peter Galbavy. All rights reserved. @@ -115,7 +115,7 @@ tcds_dma_intr(sc) if (!sc->sc_iswrite && (resid = (ESP_READ_REG(sc->sc_esp, ESP_FFLAG) & ESPFIFO_FF)) != 0) { - kprintf("empty FIFO of %d ", resid); + printf("empty FIFO of %d ", resid); ESPCMD(sc->sc_esp, ESPCMD_FLUSH); DELAY(1); } @@ -133,7 +133,7 @@ tcds_dma_intr(sc) trans = sc->sc_dmasize - resid; if (trans < 0) { /* transferred < 0 ? */ - kprintf("tcds_dma %d: xfer (%d) > req (%d)\n", + printf("tcds_dma %d: xfer (%d) > req (%d)\n", sc->sc_slot, trans, sc->sc_dmasize); trans = sc->sc_dmasize; } diff --git a/sys/arch/alpha/wscons/wscons.c b/sys/arch/alpha/wscons/wscons.c index fdb0773db9e9..608acbec25b2 100644 --- a/sys/arch/alpha/wscons/wscons.c +++ b/sys/arch/alpha/wscons/wscons.c @@ -1,4 +1,4 @@ -/* $NetBSD: wscons.c,v 1.6 1996/10/10 23:51:49 christos Exp $ */ +/* $NetBSD: wscons.c,v 1.7 1996/10/13 03:00:45 christos Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -147,7 +147,7 @@ wsconsattach(parent, self, aux) console = waa->waa_isconsole; if (console) - kprintf(": console"); + printf(": console"); /* * If output has already been set up, record it now. Otherwise, @@ -183,7 +183,7 @@ wsconsattach(parent, self, aux) sc->sc_ioctl = waa->waa_odev_spec.wo_ioctl; sc->sc_mmap = waa->waa_odev_spec.wo_mmap; - kprintf("\n"); + printf("\n"); } diff --git a/sys/arch/alpha/wscons/wscons_emul.c b/sys/arch/alpha/wscons/wscons_emul.c index dbb0c79be23a..717ddf677712 100644 --- a/sys/arch/alpha/wscons/wscons_emul.c +++ b/sys/arch/alpha/wscons/wscons_emul.c @@ -1,4 +1,4 @@ -/* $NetBSD: wscons_emul.c,v 1.3 1996/10/10 23:51:51 christos Exp $ */ +/* $NetBSD: wscons_emul.c,v 1.4 1996/10/13 03:00:47 christos Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -226,7 +226,7 @@ wscons_emul_docontrol(we, c) int n, m; #if 0 - kprintf("control: %c: %d, %d\n", c, we->ac_args[0], we->ac_args[1]); + printf("control: %c: %d, %d\n", c, we->ac_args[0], we->ac_args[1]); #endif switch (c) { case 'A': /* Cursor Up */ diff --git a/sys/arch/sparc/dev/if_en_sbus.c b/sys/arch/sparc/dev/if_en_sbus.c index 2382e7224381..d04925201cfd 100644 --- a/sys/arch/sparc/dev/if_en_sbus.c +++ b/sys/arch/sparc/dev/if_en_sbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_en_sbus.c,v 1.2 1996/10/11 00:46:42 christos Exp $ */ +/* $NetBSD: if_en_sbus.c,v 1.3 1996/10/13 02:59:55 christos Exp $ */ /* * @@ -131,10 +131,10 @@ void *aux; struct confargs *ca = aux; int lcv, iplcode; - kprintf("\n"); + printf("\n"); if (CPU_ISSUN4M) { - kprintf("%s: sun4m DMA not supported yet\n", sc->sc_dev.dv_xname); + printf("%s: sun4m DMA not supported yet\n", sc->sc_dev.dv_xname); return; } @@ -144,19 +144,19 @@ void *aux; if (ca->ca_ra.ra_nintr == 1) { sc->ipl = ca->ca_ra.ra_intr[0].int_pri; } else { - kprintf("%s: claims to be at the following IPLs: ", sc->sc_dev.dv_xname); + printf("%s: claims to be at the following IPLs: ", sc->sc_dev.dv_xname); iplcode = 0; for (lcv = 0 ; lcv < ca->ca_ra.ra_nintr ; lcv++) { - kprintf("%d ", ca->ca_ra.ra_intr[lcv].int_pri); + printf("%d ", ca->ca_ra.ra_intr[lcv].int_pri); if (EN_IPL == ca->ca_ra.ra_intr[lcv].int_pri) iplcode = lcv; } if (!iplcode) { - kprintf("%s: can't find the IPL we want (%d)\n", sc->sc_dev.dv_xname, + printf("%s: can't find the IPL we want (%d)\n", sc->sc_dev.dv_xname, EN_IPL); return; } - kprintf("\n%s: we choose IPL %d\n", sc->sc_dev.dv_xname, EN_IPL); + printf("\n%s: we choose IPL %d\n", sc->sc_dev.dv_xname, EN_IPL); sc->ipl = iplcode; } scs->sc_ih.ih_fun = en_intr; diff --git a/sys/arch/sparc/dev/if_ie.c b/sys/arch/sparc/dev/if_ie.c index 5d4ec858df56..299f8e681667 100644 --- a/sys/arch/sparc/dev/if_ie.c +++ b/sys/arch/sparc/dev/if_ie.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ie.c,v 1.25 1996/10/11 00:46:44 christos Exp $ */ +/* $NetBSD: if_ie.c,v 1.26 1996/10/13 02:59:57 christos Exp $ */ /*- * Copyright (c) 1993, 1994, 1995 Charles Hannum. @@ -640,14 +640,14 @@ ieattach(parent, self, aux) break; } default: - kprintf("unknown\n"); + printf("unknown\n"); return; } myetheraddr(sc->sc_arpcom.ac_enaddr); if (ie_setupram(sc) == 0) { - kprintf(": RAM CONFIG FAILED!\n"); + printf(": RAM CONFIG FAILED!\n"); /* XXX should reclaim resources? */ return; } @@ -663,7 +663,7 @@ ieattach(parent, self, aux) if_attach(ifp); ether_ifattach(ifp); - kprintf(" pri %d address %s, type %s\n", pri, + printf(" pri %d address %s, type %s\n", pri, ether_sprintf(sc->sc_arpcom.ac_enaddr), ie_hardware_names[sc->hard_type]); @@ -731,7 +731,7 @@ void *v; volatile struct ievme *iev = (volatile struct ievme *)sc->sc_reg ; if (iev->status & IEVME_PERR) { - kprintf("%s: parity error (ctrl %x @ %02x%04x)\n", + printf("%s: parity error (ctrl %x @ %02x%04x)\n", sc->sc_dev.dv_xname, iev->pectrl, iev->pectrl & IEVME_HADDR, iev->peaddr); iev->pectrl = iev->pectrl | IEVME_PARACK; @@ -747,7 +747,7 @@ loop: #ifdef IEDEBUG in_ierint++; if (sc->sc_debug & IED_RINT) - kprintf("%s: rint\n", sc->sc_dev.dv_xname); + printf("%s: rint\n", sc->sc_dev.dv_xname); #endif ierint(sc); #ifdef IEDEBUG @@ -759,7 +759,7 @@ loop: #ifdef IEDEBUG in_ietint++; if (sc->sc_debug & IED_TINT) - kprintf("%s: tint\n", sc->sc_dev.dv_xname); + printf("%s: tint\n", sc->sc_dev.dv_xname); #endif ietint(sc); #ifdef IEDEBUG @@ -768,14 +768,14 @@ loop: } if (status & IE_ST_RNR) { - kprintf("%s: receiver not ready\n", sc->sc_dev.dv_xname); + printf("%s: receiver not ready\n", sc->sc_dev.dv_xname); sc->sc_arpcom.ac_if.if_ierrors++; iereset(sc); } #ifdef IEDEBUG if ((status & IE_ST_ALLDONE) && (sc->sc_debug & IED_CNA)) - kprintf("%s: cna\n", sc->sc_dev.dv_xname); + printf("%s: cna\n", sc->sc_dev.dv_xname); #endif if ((status = sc->scb->ie_status) & IE_ST_WHENCE) @@ -845,26 +845,26 @@ ietint(sc) status = sc->xmit_cmds[sc->xctail]->ie_xmit_status; if (!(status & IE_STAT_COMPL) || (status & IE_STAT_BUSY)) - kprintf("ietint: command still busy!\n"); + printf("ietint: command still busy!\n"); if (status & IE_STAT_OK) { sc->sc_arpcom.ac_if.if_opackets++; sc->sc_arpcom.ac_if.if_collisions += SWAP(status & IE_XS_MAXCOLL); } else if (status & IE_STAT_ABORT) { - kprintf("%s: send aborted\n", sc->sc_dev.dv_xname); + printf("%s: send aborted\n", sc->sc_dev.dv_xname); sc->sc_arpcom.ac_if.if_oerrors++; } else if (status & IE_XS_NOCARRIER) { - kprintf("%s: no carrier\n", sc->sc_dev.dv_xname); + printf("%s: no carrier\n", sc->sc_dev.dv_xname); sc->sc_arpcom.ac_if.if_oerrors++; } else if (status & IE_XS_LOSTCTS) { - kprintf("%s: lost CTS\n", sc->sc_dev.dv_xname); + printf("%s: lost CTS\n", sc->sc_dev.dv_xname); sc->sc_arpcom.ac_if.if_oerrors++; } else if (status & IE_XS_UNDERRUN) { - kprintf("%s: DMA underrun\n", sc->sc_dev.dv_xname); + printf("%s: DMA underrun\n", sc->sc_dev.dv_xname); sc->sc_arpcom.ac_if.if_oerrors++; } else if (status & IE_XS_EXCMAX) { - kprintf("%s: too many collisions\n", sc->sc_dev.dv_xname); + printf("%s: too many collisions\n", sc->sc_dev.dv_xname); sc->sc_arpcom.ac_if.if_collisions += 16; sc->sc_arpcom.ac_if.if_oerrors++; } @@ -1317,7 +1317,7 @@ ie_readframe(sc, num) #ifdef IEDEBUG if (sc->sc_debug & IED_READFRAME) - kprintf("%s: frame from ether %s type %x\n", sc->sc_dev.dv_xname, + printf("%s: frame from ether %s type %x\n", sc->sc_dev.dv_xname, ether_sprintf(eh.ether_shost), (u_int)eh.ether_type); #endif @@ -1441,7 +1441,7 @@ iestart(ifp) len += m->m_len; } if (m) - kprintf("%s: tbuf overflow\n", sc->sc_dev.dv_xname); + printf("%s: tbuf overflow\n", sc->sc_dev.dv_xname); m_freem(m0); len = max(len, ETHER_MIN_LEN); @@ -1512,7 +1512,7 @@ iereset(sc) { int s = splnet(); - kprintf("%s: reset\n", sc->sc_dev.dv_xname); + printf("%s: reset\n", sc->sc_dev.dv_xname); /* Clear OACTIVE in case we're called from watchdog (frozen xmit). */ sc->sc_arpcom.ac_if.if_flags &= ~(IFF_UP | IFF_OACTIVE); @@ -1522,10 +1522,10 @@ iereset(sc) * Stop i82586 dead in its tracks. */ if (command_and_wait(sc, IE_RU_ABORT | IE_CU_ABORT, 0, 0)) - kprintf("%s: abort commands timed out\n", sc->sc_dev.dv_xname); + printf("%s: abort commands timed out\n", sc->sc_dev.dv_xname); if (command_and_wait(sc, IE_RU_DISABLE | IE_CU_STOP, 0, 0)) - kprintf("%s: disable commands timed out\n", sc->sc_dev.dv_xname); + printf("%s: disable commands timed out\n", sc->sc_dev.dv_xname); #ifdef notdef if (!check_ie_present(sc, sc->sc_maddr, sc->sc_msize)) @@ -1644,17 +1644,17 @@ run_tdr(sc, cmd) return; if (result & 0x10000) - kprintf("%s: TDR command failed\n", sc->sc_dev.dv_xname); + printf("%s: TDR command failed\n", sc->sc_dev.dv_xname); else if (result & IE_TDR_XCVR) - kprintf("%s: transceiver problem\n", sc->sc_dev.dv_xname); + printf("%s: transceiver problem\n", sc->sc_dev.dv_xname); else if (result & IE_TDR_OPEN) - kprintf("%s: TDR detected an open %d clocks away\n", + printf("%s: TDR detected an open %d clocks away\n", sc->sc_dev.dv_xname, result & IE_TDR_TIME); else if (result & IE_TDR_SHORT) - kprintf("%s: TDR detected a short %d clocks away\n", + printf("%s: TDR detected a short %d clocks away\n", sc->sc_dev.dv_xname, result & IE_TDR_TIME); else - kprintf("%s: TDR returned unknown status %x\n", + printf("%s: TDR returned unknown status %x\n", sc->sc_dev.dv_xname, result); } @@ -1722,7 +1722,7 @@ setup_bufs(sc) sc->nrxbuf = sc->nframes * B_PER_F; #ifdef IEDEBUG - kprintf("IEDEBUG: %d frames %d bufs\n", sc->nframes, sc->nrxbuf); + printf("IEDEBUG: %d frames %d bufs\n", sc->nframes, sc->nrxbuf); #endif /* @@ -1807,7 +1807,7 @@ setup_bufs(sc) sc->rframes[0]->ie_fd_buf_desc = MK_16(sc->sc_maddr, sc->rbuffs[0]); #ifdef IEDEBUG - kprintf("IE_DEBUG: reserved %d bytes\n", ptr - sc->buf_area); + printf("IE_DEBUG: reserved %d bytes\n", ptr - sc->buf_area); #endif } @@ -1835,7 +1835,7 @@ mc_setup(sc, ptr) sc->scb->ie_command_list = MK_16(sc->sc_maddr, cmd); if (command_and_wait(sc, IE_CU_START, cmd, IE_STAT_COMPL) || !(cmd->com.ie_cmd_status & IE_STAT_OK)) { - kprintf("%s: multicast address setup command failed\n", + printf("%s: multicast address setup command failed\n", sc->sc_dev.dv_xname); return 0; } @@ -1874,7 +1874,7 @@ ieinit(sc) if (command_and_wait(sc, IE_CU_START, cmd, IE_STAT_COMPL) || !(cmd->com.ie_cmd_status & IE_STAT_OK)) { - kprintf("%s: configure command failed\n", + printf("%s: configure command failed\n", sc->sc_dev.dv_xname); return 0; } @@ -1896,7 +1896,7 @@ ieinit(sc) if (command_and_wait(sc, IE_CU_START, cmd, IE_STAT_COMPL) || !(cmd->com.ie_cmd_status & IE_STAT_OK)) { - kprintf("%s: individual address setup command failed\n", + printf("%s: individual address setup command failed\n", sc->sc_dev.dv_xname); return 0; } @@ -2077,7 +2077,7 @@ print_rbd(rbd) volatile struct ie_recv_buf_desc *rbd; { - kprintf("RBD at %08lx:\nactual %04x, next %04x, buffer %08x\n" + printf("RBD at %08lx:\nactual %04x, next %04x, buffer %08x\n" "length %04x, mbz %04x\n", (u_long)rbd, rbd->ie_rbd_actual, rbd->ie_rbd_next, rbd->ie_rbd_buffer, rbd->ie_rbd_length, rbd->mbz); diff --git a/sys/arch/sparc/dev/if_le.c b/sys/arch/sparc/dev/if_le.c index 32151d56dbf3..043b9f4ed06b 100644 --- a/sys/arch/sparc/dev/if_le.c +++ b/sys/arch/sparc/dev/if_le.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_le.c,v 1.39 1996/10/11 00:46:46 christos Exp $ */ +/* $NetBSD: if_le.c,v 1.40 1996/10/13 02:59:59 christos Exp $ */ /*- * Copyright (c) 1996 @@ -173,10 +173,10 @@ lenocarrier(sc) * if so, honor that request. */ if (ifp->if_flags & IFF_LINK0) - kprintf("%s: lost carrier on UTP port\n", + printf("%s: lost carrier on UTP port\n", sc->sc_dev.dv_xname); else if (ifp->if_flags & IFF_LINK1) - kprintf("%s: lost carrier on AUI port\n", + printf("%s: lost carrier on AUI port\n", sc->sc_dev.dv_xname); else { /* @@ -184,12 +184,12 @@ lenocarrier(sc) * we have done so */ if (lesc->sc_dma->sc_regs->csr & DE_AUI_TP) { - kprintf("%s: no carrier on UTP port, " + printf("%s: no carrier on UTP port, " "switching to AUI port\n", sc->sc_dev.dv_xname); lesc->sc_dma->sc_regs->csr &= ~DE_AUI_TP; } else { - kprintf("%s: no carrier on AUI port, " + printf("%s: no carrier on AUI port, " "switching to UTP port\n", sc->sc_dev.dv_xname); lesc->sc_dma->sc_regs->csr |= DE_AUI_TP; @@ -198,7 +198,7 @@ lenocarrier(sc) } } else #endif - kprintf("%s: lost carrier\n",sc->sc_dev.dv_xname); + printf("%s: lost carrier\n",sc->sc_dev.dv_xname); } int @@ -237,11 +237,11 @@ leattach(parent, self, aux) extern void myetheraddr __P((u_char *)); if (ca->ca_ra.ra_nintr != 1) { - kprintf(": expected 1 interrupt, got %d\n", ca->ca_ra.ra_nintr); + printf(": expected 1 interrupt, got %d\n", ca->ca_ra.ra_nintr); return; } pri = ca->ca_ra.ra_intr[0].int_pri; - kprintf(" pri %d", pri); + printf(" pri %d", pri); lesc->sc_r1 = (struct lereg1 *)mapiodev(ca->ca_ra.ra_reg, 0, sizeof(struct lereg1), diff --git a/sys/arch/sparc/dev/kbd.c b/sys/arch/sparc/dev/kbd.c index 8dad5ae3f90f..1db426876954 100644 --- a/sys/arch/sparc/dev/kbd.c +++ b/sys/arch/sparc/dev/kbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: kbd.c,v 1.26 1996/10/11 00:46:48 christos Exp $ */ +/* $NetBSD: kbd.c,v 1.27 1996/10/13 03:00:01 christos Exp $ */ /* * Copyright (c) 1992, 1993 @@ -324,7 +324,7 @@ kbd_reset(ks) (void) kbd_docmd(KBD_CMD_CLICK, 0); break; default: - kprintf("Unknown keyboard type %d\n", ks->kbd_id); + printf("Unknown keyboard type %d\n", ks->kbd_id); } ks->kbd_leds = 0; @@ -427,11 +427,11 @@ kbd_rint(c) /* * Reset keyboard after serial port overrun, so we can resynch. - * The kprintf below should be shortened and/or replaced with a + * The printf below should be shortened and/or replaced with a * call to log() after this is tested (and how will we test it?!). */ if (c & (TTY_FE|TTY_PE)) { - kprintf("keyboard input parity or framing error (0x%x)\n", c); + printf("keyboard input parity or framing error (0x%x)\n", c); (void) ttyoutput(KBD_CMD_RESET, k->k_kbd); (*k->k_kbd->t_oproc)(k->k_kbd); return; diff --git a/sys/arch/sparc/dev/md_root.c b/sys/arch/sparc/dev/md_root.c index 288eed00acc1..6ac73fa8f2dc 100644 --- a/sys/arch/sparc/dev/md_root.c +++ b/sys/arch/sparc/dev/md_root.c @@ -1,4 +1,4 @@ -/* $NetBSD: md_root.c,v 1.2 1996/10/11 00:46:49 christos Exp $ */ +/* $NetBSD: md_root.c,v 1.3 1996/10/13 03:00:02 christos Exp $ */ /* * Copyright (c) 1995 Gordon W. Ross @@ -54,7 +54,7 @@ rd_attach_hook(unit, rd) if ((*rd_read_image)(&rd->rd_size, &rd->rd_addr) != 0) panic("rd_attach"); rd->rd_type = RD_KMEM_FIXED; - kprintf("rd0: fixed, %d blocks", rd->rd_size >> DEV_BSHIFT); + printf("rd0: fixed, %d blocks", rd->rd_size >> DEV_BSHIFT); } } diff --git a/sys/arch/sparc/dev/obio.c b/sys/arch/sparc/dev/obio.c index 637e5bd96724..e058558b1979 100644 --- a/sys/arch/sparc/dev/obio.c +++ b/sys/arch/sparc/dev/obio.c @@ -1,4 +1,4 @@ -/* $NetBSD: obio.c,v 1.26 1996/10/11 00:46:51 christos Exp $ */ +/* $NetBSD: obio.c,v 1.27 1996/10/13 03:00:04 christos Exp $ */ /* * Copyright (c) 1993, 1994 Theo de Raadt @@ -130,12 +130,12 @@ busprint(args, obio) ca->ca_ra.ra_name = ""; if (obio) - kprintf("[%s at %s]", ca->ca_ra.ra_name, obio); + printf("[%s at %s]", ca->ca_ra.ra_name, obio); - kprintf(" addr %p", ca->ca_ra.ra_paddr); + printf(" addr %p", ca->ca_ra.ra_paddr); if (CPU_ISSUN4 && ca->ca_ra.ra_intr[0].int_vec != -1) - kprintf(" vec 0x%x", ca->ca_ra.ra_intr[0].int_vec); + printf(" vec 0x%x", ca->ca_ra.ra_intr[0].int_vec); return (UNCONF); } @@ -170,10 +170,10 @@ obioattach(parent, self, args) if (CPU_ISSUN4) { if (self->dv_unit > 0) { - kprintf(" unsupported\n"); + printf(" unsupported\n"); return; } - kprintf("\n"); + printf("\n"); (void)config_search(obio_scan, self, args); bus_untmp(); @@ -188,11 +188,11 @@ obioattach(parent, self, args) * How about VME? */ if (sc->sc_dev.dv_unit > 0) { - kprintf(" unsupported\n"); + printf(" unsupported\n"); return; } - kprintf("\n"); + printf("\n"); if (ra->ra_bp != NULL && strcmp(ra->ra_bp->name, "obio") == 0) oca.ca_ra.ra_bp = ra->ra_bp + 1; @@ -210,7 +210,7 @@ obioattach(parent, self, args) node0 = firstchild(ra->ra_node); for (ssp = special4m ; *(sp = *ssp) != 0; ssp++) { if ((node = findnode(node0, sp)) == 0) { - kprintf("could not find %s amongst obio devices\n", sp); + printf("could not find %s amongst obio devices\n", sp); panic(sp); } if (!romprop(&oca.ca_ra, sp, node)) @@ -248,10 +248,10 @@ vmesattach(parent, self, args) void *args; { if (CPU_ISSUN4M || self->dv_unit > 0) { - kprintf(" unsupported\n"); + printf(" unsupported\n"); return; } - kprintf("\n"); + printf("\n"); if (vmeints == NULL) { vmeints = (struct intrhand **)malloc(256 * @@ -268,10 +268,10 @@ vmelattach(parent, self, args) void *args; { if (CPU_ISSUN4M || self->dv_unit > 0) { - kprintf(" unsupported\n"); + printf(" unsupported\n"); return; } - kprintf("\n"); + printf("\n"); if (vmeints == NULL) { vmeints = (struct intrhand **)malloc(256 * @@ -316,7 +316,7 @@ busattach(parent, child, args, bustype) } if (parent->dv_cfdata->cf_driver->cd_indirect) { - kprintf(" indirect devices not supported\n"); + printf(" indirect devices not supported\n"); return 0; } @@ -434,7 +434,7 @@ vmeintr(arg) vec = ldcontrolb((caddr_t) (AC_VMEINTVEC | (pil_to_vme[level] << 1) | 1)); if (vec == -1) { - kprintf("vme: spurious interrupt\n"); + printf("vme: spurious interrupt\n"); return 0; } diff --git a/sys/arch/sparc/dev/power.c b/sys/arch/sparc/dev/power.c index 4141b9566f3a..28e60d0cc25d 100644 --- a/sys/arch/sparc/dev/power.c +++ b/sys/arch/sparc/dev/power.c @@ -1,4 +1,4 @@ -/* $NetBSD: power.c,v 1.4 1996/10/11 00:46:52 christos Exp $ */ +/* $NetBSD: power.c,v 1.5 1996/10/13 03:00:06 christos Exp $ */ /* * Copyright (c) 1996 @@ -91,7 +91,7 @@ powerattach(parent, self, aux) power_reg = mapdev(ra->ra_reg, 0, 0, sizeof(long), ca->ca_bustype); - kprintf("\n"); + printf("\n"); } void diff --git a/sys/arch/sparc/dev/sbus.c b/sys/arch/sparc/dev/sbus.c index c06a8062eca0..c3063b0a75fd 100644 --- a/sys/arch/sparc/dev/sbus.c +++ b/sys/arch/sparc/dev/sbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: sbus.c,v 1.12 1996/10/11 00:46:53 christos Exp $ */ +/* $NetBSD: sbus.c,v 1.13 1996/10/13 03:00:08 christos Exp $ */ /* * Copyright (c) 1992, 1993 @@ -86,8 +86,8 @@ sbus_print(args, sbus) register struct confargs *ca = args; if (sbus) - kprintf("%s at %s", ca->ca_ra.ra_name, sbus); - kprintf(" slot %d offset 0x%x", ca->ca_slot, ca->ca_offset); + printf("%s at %s", ca->ca_ra.ra_name, sbus); + printf(" slot %d offset 0x%x", ca->ca_slot, ca->ca_offset); return (UNCONF); } @@ -127,7 +127,7 @@ sbus_attach(parent, self, aux) * address children on others */ if (sc->sc_dev.dv_unit > 0) { - kprintf(" unsupported\n"); + printf(" unsupported\n"); return; } @@ -137,7 +137,7 @@ sbus_attach(parent, self, aux) */ node = ra->ra_node; sc->sc_clockfreq = getpropint(node, "clock-frequency", 25*1000*1000); - kprintf(": clock = %s MHz\n", clockfreq(sc->sc_clockfreq)); + printf(": clock = %s MHz\n", clockfreq(sc->sc_clockfreq)); /* * Get the SBus burst transfer size if burst transfers are supported @@ -262,12 +262,12 @@ sbusreset(sbus) struct sbus_softc *sc = sbus_cd.cd_devs[sbus]; struct device *dev; - kprintf("reset %s:", sc->sc_dev.dv_xname); + printf("reset %s:", sc->sc_dev.dv_xname); for (sd = sc->sc_sbdev; sd != NULL; sd = sd->sd_bchain) { if (sd->sd_reset) { dev = sd->sd_dev; (*sd->sd_reset)(dev); - kprintf(" %s", dev->dv_xname); + printf(" %s", dev->dv_xname); } } } diff --git a/sys/arch/sparc/dev/si.c b/sys/arch/sparc/dev/si.c index 22b3a5bee9dd..daab698c00b1 100644 --- a/sys/arch/sparc/dev/si.c +++ b/sys/arch/sparc/dev/si.c @@ -1,4 +1,4 @@ -/* $NetBSD: si.c,v 1.27 1996/10/11 00:46:54 christos Exp $ */ +/* $NetBSD: si.c,v 1.28 1996/10/13 03:00:09 christos Exp $ */ /* * Copyright (c) 1995 Jason R. Thorpe @@ -455,14 +455,14 @@ si_attach(parent, self, args) /* Impossible case handled above. */ break; } - kprintf(" pri %d\n", ra->ra_intr[0].int_pri); + printf(" pri %d\n", ra->ra_intr[0].int_pri); if (sc->sc_options) { - kprintf("%s: options=%b\n", ncr_sc->sc_dev.dv_xname, + printf("%s: options=%b\n", ncr_sc->sc_dev.dv_xname, sc->sc_options, SI_OPTIONS_BITS); } #ifdef DEBUG if (si_debug) - kprintf("si: Set TheSoftC=%p TheRegs=%p\n", sc, regs); + printf("si: Set TheSoftC=%p TheRegs=%p\n", sc, regs); ncr_sc->sc_link.flags |= si_link_flags; #endif @@ -495,7 +495,7 @@ si_minphys(struct buf *bp) if (bp->b_bcount > MAX_DMA_LEN) { #ifdef DEBUG if (si_debug) { - kprintf("si_minphys len = %x.\n", MAX_DMA_LEN); + printf("si_minphys len = %x.\n", MAX_DMA_LEN); Debugger(); } #endif @@ -527,11 +527,11 @@ si_intr(void *arg) if (csr & SI_CSR_DMA_CONFLICT) { dma_error |= SI_CSR_DMA_CONFLICT; - kprintf("si_intr: DMA conflict\n"); + printf("si_intr: DMA conflict\n"); } if (csr & SI_CSR_DMA_BUS_ERR) { dma_error |= SI_CSR_DMA_BUS_ERR; - kprintf("si_intr: DMA bus error\n"); + printf("si_intr: DMA bus error\n"); } if (dma_error) { if (sc->ncr_sc.sc_state & NCR_DOINGDMA) @@ -544,7 +544,7 @@ si_intr(void *arg) claimed = ncr5380_intr(&sc->ncr_sc); #ifdef DEBUG if (!claimed) { - kprintf("si_intr: spurious from SBC\n"); + printf("si_intr: spurious from SBC\n"); if (si_debug & 4) { Debugger(); /* XXX */ } @@ -564,7 +564,7 @@ si_reset_adapter(struct ncr5380_softc *ncr_sc) #ifdef DEBUG if (si_debug) { - kprintf("si_reset_adapter\n"); + printf("si_reset_adapter\n"); } #endif @@ -640,7 +640,7 @@ si_dma_alloc(ncr_sc) /* If the DMA start addr is misaligned then do PIO */ if ((addr & 1) || (xlen & 1)) { - kprintf("si_dma_alloc: misaligned.\n"); + printf("si_dma_alloc: misaligned.\n"); return; } @@ -656,7 +656,7 @@ si_dma_alloc(ncr_sc) * XXX - Should just segment these... */ if (xlen > MAX_DMA_LEN) { - kprintf("si_dma_alloc: excessive xlen=0x%x\n", xlen); + printf("si_dma_alloc: excessive xlen=0x%x\n", xlen); #ifdef DEBUG Debugger(); #endif @@ -691,7 +691,7 @@ found: dh->dh_dvma = (long)kdvma_mapin((caddr_t)addr, xlen, 0); if (dh->dh_dvma == 0) { /* Can't remap segment */ - kprintf("si_dma_alloc: can't remap %p/%x, doing PIO\n", + printf("si_dma_alloc: can't remap %p/%x, doing PIO\n", dh->dh_addr, dh->dh_maplen); dh->dh_flags = 0; return; @@ -764,7 +764,7 @@ si_dma_poll(ncr_sc) if (csr & csr_mask) break; if (--tmo <= 0) { - kprintf("%s: DMA timeout (while polling)\n", + printf("%s: DMA timeout (while polling)\n", ncr_sc->sc_dev.dv_xname); /* Indicate timeout as MI code would. */ sr->sr_flags |= SR_OVERDUE; @@ -775,7 +775,7 @@ si_dma_poll(ncr_sc) #ifdef DEBUG if (si_debug) { - kprintf("si_dma_poll: done, csr=0x%x\n", csr); + printf("si_dma_poll: done, csr=0x%x\n", csr); } #endif } @@ -882,7 +882,7 @@ si_vme_dma_start(ncr_sc) #ifdef DEBUG if (si_debug & 2) { - kprintf("si_dma_start: dh=%p, pa=0x%lx, xlen=%d\n", + printf("si_dma_start: dh=%p, pa=0x%lx, xlen=%d\n", dh, data_pa, xlen); } #endif @@ -921,7 +921,7 @@ si_vme_dma_start(ncr_sc) #ifdef DEBUG if (si->fifo_count != xlen) { - kprintf("si_dma_start: Fifo_count=0x%x, xlen=0x%x\n", + printf("si_dma_start: Fifo_count=0x%x, xlen=0x%x\n", si->fifo_count, xlen); Debugger(); } @@ -952,7 +952,7 @@ si_vme_dma_start(ncr_sc) #ifdef DEBUG if (si_debug & 2) { - kprintf("si_dma_start: started, flags=0x%x\n", + printf("si_dma_start: started, flags=0x%x\n", ncr_sc->sc_state); } #endif @@ -980,7 +980,7 @@ si_vme_dma_stop(ncr_sc) if ((ncr_sc->sc_state & NCR_DOINGDMA) == 0) { #ifdef DEBUG - kprintf("si_dma_stop: dma not running\n"); + printf("si_dma_stop: dma not running\n"); #endif return; } @@ -990,7 +990,7 @@ si_vme_dma_stop(ncr_sc) si->si_csr &= ~SI_CSR_DMA_EN; /* VME only */ if (si->si_csr & (SI_CSR_DMA_CONFLICT | SI_CSR_DMA_BUS_ERR)) { - kprintf("si: DMA error, csr=0x%x, reset\n", si->si_csr); + printf("si: DMA error, csr=0x%x, reset\n", si->si_csr); sr->sr_xs->error = XS_DRIVER_STUFFUP; ncr_sc->sc_state |= NCR_ABORTING; si_reset_adapter(ncr_sc); @@ -1021,12 +1021,12 @@ si_vme_dma_stop(ncr_sc) #ifdef DEBUG if (si_debug & 2) { - kprintf("si_dma_stop: resid=0x%x ntrans=0x%x\n", + printf("si_dma_stop: resid=0x%x ntrans=0x%x\n", resid, ntrans); } #endif if (ntrans < MIN_DMA_LEN) { - kprintf("si: fifo count: 0x%x\n", resid); + printf("si: fifo count: 0x%x\n", resid); ncr_sc->sc_state |= NCR_ABORTING; goto out; } @@ -1039,7 +1039,7 @@ si_vme_dma_stop(ncr_sc) #ifdef DEBUG if (si_debug & 2) { - kprintf("si_dma_stop: ntrans=0x%x\n", ntrans); + printf("si_dma_stop: ntrans=0x%x\n", ntrans); } #endif @@ -1052,7 +1052,7 @@ si_vme_dma_stop(ncr_sc) { char *cp = ncr_sc->sc_dataptr; #ifdef DEBUG - kprintf("si: Got Left-over bytes!\n"); + printf("si: Got Left-over bytes!\n"); #endif if (si->si_csr & SI_CSR_BPCON) { /* have SI_CSR_BPCON */ @@ -1183,7 +1183,7 @@ si_obio_dma_start(ncr_sc) #ifdef DEBUG if (si_debug & 2) { - kprintf("si_dma_start: dh=%p, pa=0x%lx, xlen=%d\n", + printf("si_dma_start: dh=%p, pa=0x%lx, xlen=%d\n", dh, data_pa, xlen); } #endif @@ -1211,7 +1211,7 @@ si_obio_dma_start(ncr_sc) adj = 2; #ifdef DEBUG if (si_debug & 2) - kprintf("si_dma_start: adjusted up %d bytes\n", adj); + printf("si_dma_start: adjusted up %d bytes\n", adj); #endif } @@ -1230,7 +1230,7 @@ si_obio_dma_start(ncr_sc) adjlen = ncr5380_pio_out(ncr_sc, PHASE_DATA_OUT, adj, dh->dh_addr); if (adjlen != adj) - kprintf("%s: bad outgoing adj, %d != %d\n", + printf("%s: bad outgoing adj, %d != %d\n", ncr_sc->sc_dev.dv_xname, adjlen, adj); } SCI_CLR_INTR(ncr_sc); @@ -1243,7 +1243,7 @@ si_obio_dma_start(ncr_sc) adjlen = ncr5380_pio_in(ncr_sc, PHASE_DATA_IN, adj, dh->dh_addr); if (adjlen != adj) - kprintf("%s: bad incoming adj, %d != %d\n", + printf("%s: bad incoming adj, %d != %d\n", ncr_sc->sc_dev.dv_xname, adjlen, adj); } SCI_CLR_INTR(ncr_sc); @@ -1259,7 +1259,7 @@ si_obio_dma_start(ncr_sc) #ifdef DEBUG if (si_debug & 2) { - kprintf("si_dma_start: started, flags=0x%x\n", + printf("si_dma_start: started, flags=0x%x\n", ncr_sc->sc_state); } #endif @@ -1300,7 +1300,7 @@ si_obio_dma_stop(ncr_sc) if ((ncr_sc->sc_state & NCR_DOINGDMA) == 0) { #ifdef DEBUG - kprintf("si_dma_stop: dma not running\n"); + printf("si_dma_stop: dma not running\n"); #endif return; } @@ -1326,7 +1326,7 @@ si_obio_dma_stop(ncr_sc) #else if (si->sw_csr & (SI_CSR_DMA_CONFLICT)) { #endif - kprintf("sw: DMA error, csr=0x%x, reset\n", si->sw_csr); + printf("sw: DMA error, csr=0x%x, reset\n", si->sw_csr); sr->sr_xs->error = XS_DRIVER_STUFFUP; ncr_sc->sc_state |= NCR_ABORTING; si_reset_adapter(ncr_sc); @@ -1349,12 +1349,12 @@ si_obio_dma_stop(ncr_sc) #ifdef DEBUG if (si_debug & 2) { - kprintf("si_dma_stop: ntrans=0x%x\n", ntrans); + printf("si_dma_stop: ntrans=0x%x\n", ntrans); } #endif if (ntrans < MIN_DMA_LEN) { - kprintf("sw: short transfer\n"); + printf("sw: short transfer\n"); ncr_sc->sc_state |= NCR_ABORTING; goto out; } @@ -1418,7 +1418,7 @@ si_obio_dma_stop(ncr_sc) #ifdef DEBUG if (si_debug & 2) { - kprintf("si_dma_stop: ntrans=0x%x\n", ntrans); + printf("si_dma_stop: ntrans=0x%x\n", ntrans); } #endif } diff --git a/sys/arch/sparc/dev/tcx.c b/sys/arch/sparc/dev/tcx.c index dcd201d8eebe..57575d5f2e45 100644 --- a/sys/arch/sparc/dev/tcx.c +++ b/sys/arch/sparc/dev/tcx.c @@ -1,4 +1,4 @@ -/* $NetBSD: tcx.c,v 1.4 1996/10/11 00:46:56 christos Exp $ */ +/* $NetBSD: tcx.c,v 1.5 1996/10/13 03:00:11 christos Exp $ */ /* * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -207,7 +207,7 @@ tcxattach(parent, self, args) case BUS_OBIO: default: - kprintf("TCX on bus %x?\n", ca->ca_bustype); + printf("TCX on bus %x?\n", ca->ca_bustype); return; } @@ -223,13 +223,13 @@ tcxattach(parent, self, args) ramsize = fb->fb_type.fb_height * fb->fb_linebytes; fb->fb_type.fb_cmsize = 256; fb->fb_type.fb_size = ramsize; - kprintf(": %s, %d x %d", OBPNAME, + printf(": %s, %d x %d", OBPNAME, fb->fb_type.fb_width, fb->fb_type.fb_height); isconsole = node == fbnode && fbconstty != NULL; - kprintf(", id %d, rev %d, sense %d", + printf(", id %d, rev %d, sense %d", (sc->sc_thc->thc_config & THC_CFG_FBID) >> THC_CFG_FBID_SHIFT, (sc->sc_thc->thc_config & THC_CFG_REV) >> THC_CFG_REV_SHIFT, (sc->sc_thc->thc_config & THC_CFG_SENSE) >> THC_CFG_SENSE_SHIFT @@ -247,9 +247,9 @@ tcxattach(parent, self, args) sc->sc_thc->thc_hcmisc |= THC_MISC_VIDEN; if (isconsole) { - kprintf(" (console)\n"); + printf(" (console)\n"); } else - kprintf("\n"); + printf("\n"); if (sbus) sbus_establish(&sc->sc_sd, &sc->sc_dev); diff --git a/sys/arch/sparc/dev/xd.c b/sys/arch/sparc/dev/xd.c index 84872e2f10b6..c7b659231c75 100644 --- a/sys/arch/sparc/dev/xd.c +++ b/sys/arch/sparc/dev/xd.c @@ -1,4 +1,4 @@ -/* $NetBSD: xd.c,v 1.27 1996/10/11 00:46:58 christos Exp $ */ +/* $NetBSD: xd.c,v 1.28 1996/10/13 03:00:13 christos Exp $ */ /* * @@ -36,7 +36,7 @@ * x d . c x y l o g i c s 7 5 3 / 7 0 5 3 v m e / s m d d r i v e r * * author: Chuck Cranor - * id: $NetBSD: xd.c,v 1.27 1996/10/11 00:46:58 christos Exp $ + * id: $NetBSD: xd.c,v 1.28 1996/10/13 03:00:13 christos Exp $ * started: 27-Feb-95 * references: [1] Xylogics Model 753 User's Manual * part number: 166-753-001, Revision B, May 21, 1988. @@ -306,7 +306,7 @@ xdgetdisklabel(xd, b) xddummystrat, xd->sc_dk.dk_label, xd->sc_dk.dk_cpulabel); if (err) { - kprintf("%s: %s\n", xd->sc_dev.dv_xname, err); + printf("%s: %s\n", xd->sc_dev.dv_xname, err); return(XD_ERR_FAIL); } @@ -315,11 +315,11 @@ xdgetdisklabel(xd, b) if (sdl->sl_magic == SUN_DKMAGIC) xd->pcyl = sdl->sl_pcylinders; else { - kprintf("%s: WARNING: no `pcyl' in disk label.\n", + printf("%s: WARNING: no `pcyl' in disk label.\n", xd->sc_dev.dv_xname); xd->pcyl = xd->sc_dk.dk_label->d_ncylinders + xd->sc_dk.dk_label->d_acylinders; - kprintf("%s: WARNING: guessing pcyl=%d (ncyl+acyl)\n", + printf("%s: WARNING: guessing pcyl=%d (ncyl+acyl)\n", xd->sc_dev.dv_xname, xd->pcyl); } @@ -396,7 +396,7 @@ xdcattach(parent, self, aux) pri = ca->ca_ra.ra_intr[0].int_pri; xdc->ipl = pil_to_vme[pri]; xdc->vector = ca->ca_ra.ra_intr[0].int_vec; - kprintf(" pri %d", pri); + printf(" pri %d", pri); for (lcv = 0; lcv < XDC_MAXDEV; lcv++) xdc->sc_drives[lcv] = (struct xd_softc *) 0; @@ -452,18 +452,18 @@ xdcattach(parent, self, aux) rqno = xdc_cmd(xdc, XDCMD_RDP, XDFUN_CTL, 0, 0, 0, 0, XD_SUB_POLL); if (rqno == XD_ERR_FAIL) { - kprintf(": couldn't read controller params\n"); + printf(": couldn't read controller params\n"); return; /* shouldn't ever happen */ } ctl = (struct xd_iopb_ctrl *) & xdc->iopbase[rqno]; if (ctl->ctype != XDCT_753) { if (xdc->reqs[rqno].errno) - kprintf(": %s: ", xdc_e2str(xdc->reqs[rqno].errno)); - kprintf(": doesn't identify as a 753/7053\n"); + printf(": %s: ", xdc_e2str(xdc->reqs[rqno].errno)); + printf(": doesn't identify as a 753/7053\n"); XDC_DONE(xdc, rqno, err); return; } - kprintf(": Xylogics 753/7053, PROM=%x.%02x.%02x\n", + printf(": Xylogics 753/7053, PROM=%x.%02x.%02x\n", ctl->eprom_partno, ctl->eprom_lvl, ctl->eprom_rev); XDC_DONE(xdc, rqno, err); @@ -472,7 +472,7 @@ xdcattach(parent, self, aux) rqno = xdc_cmd(xdc, XDCMD_WRP, XDFUN_CTL, 0, 0, 0, 0, XD_SUB_POLL); XDC_DONE(xdc, rqno, err); if (err) { - kprintf("%s: controller config error: %s\n", + printf("%s: controller config error: %s\n", xdc->sc_dev.dv_xname, xdc_e2str(err)); return; } @@ -579,7 +579,7 @@ xdattach(parent, self, aux) return; } } - kprintf("%s at %s", + printf("%s at %s", xd->sc_dev.dv_xname, xd->parent->sc_dev.dv_xname); } /* we now have control */ @@ -592,21 +592,21 @@ xdattach(parent, self, aux) rqno = xdc_cmd(xdc, XDCMD_RST, 0, xd->xd_drive, 0, 0, 0, fmode); XDC_DONE(xdc, rqno, err); if (err == XD_ERR_NRDY) { - kprintf(" drive %d: off-line\n", xa->driveno); + printf(" drive %d: off-line\n", xa->driveno); goto done; } if (err) { - kprintf(": ERROR 0x%02x (%s)\n", err, xdc_e2str(err)); + printf(": ERROR 0x%02x (%s)\n", err, xdc_e2str(err)); goto done; } - kprintf(" drive %d: ready\n", xa->driveno); + printf(" drive %d: ready\n", xa->driveno); /* now set format parameters */ rqno = xdc_cmd(xdc, XDCMD_WRP, XDFUN_FMT, xd->xd_drive, 0, 0, 0, fmode); XDC_DONE(xdc, rqno, err); if (err) { - kprintf("%s: write format parameters failed: %s\n", + printf("%s: write format parameters failed: %s\n", xd->sc_dev.dv_xname, xdc_e2str(err)); goto done; } @@ -619,7 +619,7 @@ xdattach(parent, self, aux) } XDC_DONE(xdc, rqno, err); if (err) { - kprintf("%s: read drive parameters failed: %s\n", + printf("%s: read drive parameters failed: %s\n", xd->sc_dev.dv_xname, xdc_e2str(err)); goto done; } @@ -638,7 +638,7 @@ xdattach(parent, self, aux) rqno = xdc_cmd(xdc, XDCMD_WRP, XDFUN_DRV, xd->xd_drive, 0, 0, 0, fmode); XDC_DONE(xdc, rqno, err); if (err) { - kprintf("%s: write drive parameters failed: %s\n", + printf("%s: write drive parameters failed: %s\n", xd->sc_dev.dv_xname, xdc_e2str(err)); goto done; } @@ -647,7 +647,7 @@ xdattach(parent, self, aux) rqno = xdc_cmd(xdc, XDCMD_RD, 0, xd->xd_drive, 0, 1, xa->dvmabuf, fmode); XDC_DONE(xdc, rqno, err); if (err) { - kprintf("%s: reading disk label failed: %s\n", + printf("%s: reading disk label failed: %s\n", xd->sc_dev.dv_xname, xdc_e2str(err)); goto done; } @@ -661,10 +661,10 @@ xdattach(parent, self, aux) goto done; /* inform the user of what is up */ - kprintf("%s: <%s>, pcyl %d, hw_spt %d\n", xd->sc_dev.dv_xname, + printf("%s: <%s>, pcyl %d, hw_spt %d\n", xd->sc_dev.dv_xname, xa->buf, xd->pcyl, spt); mb = xd->ncyl * (xd->nhead * xd->nsect) / (1048576 / XDFM_BPS); - kprintf("%s: %dMB, %d cyl, %d head, %d sec, %d bytes/sec\n", + printf("%s: %dMB, %d cyl, %d head, %d sec, %d bytes/sec\n", xd->sc_dev.dv_xname, mb, xd->ncyl, xd->nhead, xd->nsect, XDFM_BPS); @@ -673,7 +673,7 @@ xdattach(parent, self, aux) rqno = xdc_cmd(xdc, XDCMD_WRP, XDFUN_DRV, xd->xd_drive, 0, 0, 0, fmode); XDC_DONE(xdc, rqno, err); if (err) { - kprintf("%s: write real drive parameters failed: %s\n", + printf("%s: write real drive parameters failed: %s\n", xd->sc_dev.dv_xname, xdc_e2str(err)); goto done; } @@ -689,7 +689,7 @@ xdattach(parent, self, aux) rqno = xdc_cmd(xdc, XDCMD_RD, 0, xd->xd_drive, blk, 1, xa->dvmabuf, fmode); XDC_DONE(xdc, rqno, err); if (err) { - kprintf("%s: reading bad144 failed: %s\n", + printf("%s: reading bad144 failed: %s\n", xd->sc_dev.dv_xname, xdc_e2str(err)); goto done; } @@ -709,7 +709,7 @@ xdattach(parent, self, aux) break; } if (lcv != 126) { - kprintf("%s: warning: invalid bad144 sector!\n", + printf("%s: warning: invalid bad144 sector!\n", xd->sc_dev.dv_xname); } else { bcopy(xa->buf, &xd->dkb, XDFM_BPS); @@ -788,7 +788,7 @@ xddump(dev, blkno, va, size) xd = xd_cd.cd_devs[unit]; - kprintf("%s%c: crash dump not supported (yet)\n", xd->sc_dev.dv_xname, + printf("%s%c: crash dump not supported (yet)\n", xd->sc_dev.dv_xname, 'a' + part); return ENXIO; @@ -1402,9 +1402,9 @@ xdc_startbuf(xdcsc, xdsc, bp) } partno = DISKPART(bp->b_dev); #ifdef XDC_DEBUG - kprintf("xdc_startbuf: %s%c: %s block %d\n", xdsc->sc_dev.dv_xname, + printf("xdc_startbuf: %s%c: %s block %d\n", xdsc->sc_dev.dv_xname, 'a' + partno, (bp->b_flags & B_READ) ? "read" : "write", bp->b_blkno); - kprintf("xdc_startbuf: b_bcount %d, b_data 0x%x\n", + printf("xdc_startbuf: b_bcount %d, b_data 0x%x\n", bp->b_bcount, bp->b_data); #endif @@ -1421,7 +1421,7 @@ xdc_startbuf(xdcsc, xdsc, bp) dbuf = kdvma_mapin(bp->b_data, bp->b_bcount, 0); if (dbuf == NULL) { /* out of DVMA space */ - kprintf("%s: warning: out of DVMA space\n", + printf("%s: warning: out of DVMA space\n", xdcsc->sc_dev.dv_xname); XDC_FREE(xdcsc, rqno); wq = &xdcsc->sc_wq; /* put at end of queue */ @@ -1492,14 +1492,14 @@ xdc_submit_iorq(xdcsc, iorqno, type) struct xd_iorq *iorq = &xdcsc->reqs[iorqno]; #ifdef XDC_DEBUG - kprintf("xdc_submit_iorq(%s, no=%d, type=%d)\n", xdcsc->sc_dev.dv_xname, + printf("xdc_submit_iorq(%s, no=%d, type=%d)\n", xdcsc->sc_dev.dv_xname, iorqno, type); #endif /* first check and see if controller is busy */ if (xdcsc->xdc->xdc_csr & XDC_ADDING) { #ifdef XDC_DEBUG - kprintf("xdc_submit_iorq: XDC not ready (ADDING)\n"); + printf("xdc_submit_iorq: XDC not ready (ADDING)\n"); #endif if (type == XD_SUB_NOQ) return (XD_ERR_FAIL); /* failed */ @@ -1522,11 +1522,11 @@ xdc_submit_iorq(xdcsc, iorqno, type) { u_char *rio = (u_char *) iorq->iopb; int sz = sizeof(struct xd_iopb), lcv; - kprintf("%s: aio #%d [", + printf("%s: aio #%d [", xdcsc->sc_dev.dv_xname, iorq - xdcsc->reqs); for (lcv = 0; lcv < sz; lcv++) - kprintf(" %02x", rio[lcv]); - kprintf("]\n"); + printf(" %02x", rio[lcv]); + printf("]\n"); } #endif /* XDC_DEBUG */ @@ -1574,24 +1574,24 @@ xdc_piodriver(xdcsc, iorqno, freeone) u_long count; struct xdc *xdc = xdcsc->xdc; #ifdef XDC_DEBUG - kprintf("xdc_piodriver(%s, %d, freeone=%d)\n", xdcsc->sc_dev.dv_xname, + printf("xdc_piodriver(%s, %d, freeone=%d)\n", xdcsc->sc_dev.dv_xname, iorqno, freeone); #endif while (xdcsc->nwait || xdcsc->nrun) { #ifdef XDC_DEBUG - kprintf("xdc_piodriver: wait=%d, run=%d\n", + printf("xdc_piodriver: wait=%d, run=%d\n", xdcsc->nwait, xdcsc->nrun); #endif XDC_WAIT(xdc, count, XDC_MAXTIME, (XDC_REMIOPB | XDC_F_ERROR)); #ifdef XDC_DEBUG - kprintf("xdc_piodriver: done wait with count = %d\n", count); + printf("xdc_piodriver: done wait with count = %d\n", count); #endif /* we expect some progress soon */ if (count == 0 && nreset >= 2) { xdc_reset(xdcsc, 0, XD_RSET_ALL, XD_ERR_FAIL, 0); #ifdef XDC_DEBUG - kprintf("xdc_piodriver: timeout\n"); + printf("xdc_piodriver: timeout\n"); #endif return (XD_ERR_FAIL); } @@ -1608,7 +1608,7 @@ xdc_piodriver(xdcsc, iorqno, freeone) if (freeone) { if (xdcsc->nrun < XDC_MAXIOPB) { #ifdef XDC_DEBUG - kprintf("xdc_piodriver: done: one free\n"); + printf("xdc_piodriver: done: one free\n"); #endif return (XD_ERR_AOK); } @@ -1622,7 +1622,7 @@ xdc_piodriver(xdcsc, iorqno, freeone) retval = xdcsc->reqs[iorqno].errno; #ifdef XDC_DEBUG - kprintf("xdc_piodriver: done, retval = 0x%x (%s)\n", + printf("xdc_piodriver: done, retval = 0x%x (%s)\n", xdcsc->reqs[iorqno].errno, xdc_e2str(xdcsc->reqs[iorqno].errno)); #endif @@ -1657,7 +1657,7 @@ xdc_xdreset(xdcsc, xdsc) XDC_GO(xdcsc->xdc, addr); /* go! */ XDC_WAIT(xdcsc->xdc, del, XDC_RESETUSEC, XDC_REMIOPB); if (del <= 0 || xdcsc->iopbase->errs) { - kprintf("%s: off-line: %s\n", xdcsc->sc_dev.dv_xname, + printf("%s: off-line: %s\n", xdcsc->sc_dev.dv_xname, xdc_e2str(xdcsc->iopbase->errno)); xdcsc->xdc->xdc_csr = XDC_RESET; XDC_WAIT(xdcsc->xdc, del, XDC_RESETUSEC, XDC_RESET); @@ -1687,7 +1687,7 @@ xdc_reset(xdcsc, quiet, blastmode, error, xdsc) /* soft reset hardware */ if (!quiet) - kprintf("%s: soft reset\n", xdcsc->sc_dev.dv_xname); + printf("%s: soft reset\n", xdcsc->sc_dev.dv_xname); xdcsc->xdc->xdc_csr = XDC_RESET; XDC_WAIT(xdcsc->xdc, del, XDC_RESETUSEC, XDC_RESET); if (del <= 0) { @@ -1758,14 +1758,14 @@ xdc_reset(xdcsc, quiet, blastmode, error, xdsc) #ifdef XDC_DIAG del = xdcsc->nwait + xdcsc->nrun + xdcsc->nfree + xdcsc->ndone; if (del != XDC_MAXIOPB) - kprintf("%s: diag: xdc_reset miscount (%d should be %d)!\n", + printf("%s: diag: xdc_reset miscount (%d should be %d)!\n", xdcsc->sc_dev.dv_xname, del, XDC_MAXIOPB); else if (xdcsc->ndone > XDC_MAXIOPB - XDC_SUBWAITLIM) - kprintf("%s: diag: lots of done jobs (%d)\n", + printf("%s: diag: lots of done jobs (%d)\n", xdcsc->sc_dev.dv_xname, xdcsc->ndone); #endif - kprintf("RESET DONE\n"); + printf("RESET DONE\n"); return (retval); } /* @@ -1810,10 +1810,10 @@ xdc_remove_iorq(xdcsc) * we dump them all. */ errno = xdc->xdc_f_err; - kprintf("%s: fatal error 0x%02x: %s\n", xdcsc->sc_dev.dv_xname, + printf("%s: fatal error 0x%02x: %s\n", xdcsc->sc_dev.dv_xname, errno, xdc_e2str(errno)); if (xdc_reset(xdcsc, 0, XD_RSET_ALL, errno, 0) != XD_ERR_AOK) { - kprintf("%s: soft reset failed!\n", + printf("%s: soft reset failed!\n", xdcsc->sc_dev.dv_xname); panic("xdc_remove_iorq: controller DEAD"); } @@ -1849,10 +1849,10 @@ xdc_remove_iorq(xdcsc) { u_char *rio = (u_char *) iopb; int sz = sizeof(struct xd_iopb), lcv; - kprintf("%s: rio #%d [", xdcsc->sc_dev.dv_xname, rqno); + printf("%s: rio #%d [", xdcsc->sc_dev.dv_xname, rqno); for (lcv = 0; lcv < sz; lcv++) - kprintf(" %02x", rio[lcv]); - kprintf("]\n"); + printf(" %02x", rio[lcv]); + printf("]\n"); } #endif /* XDC_DEBUG */ @@ -1968,23 +1968,23 @@ xdc_perror(iorq, iopb, still_trying) int error = iorq->lasterror; - kprintf("%s", (iorq->xd) ? iorq->xd->sc_dev.dv_xname + printf("%s", (iorq->xd) ? iorq->xd->sc_dev.dv_xname : iorq->xdc->sc_dev.dv_xname); if (iorq->buf) - kprintf("%c: ", 'a' + DISKPART(iorq->buf->b_dev)); + printf("%c: ", 'a' + DISKPART(iorq->buf->b_dev)); if (iopb->comm == XDCMD_RD || iopb->comm == XDCMD_WR) - kprintf("%s %d/%d/%d: ", + printf("%s %d/%d/%d: ", (iopb->comm == XDCMD_RD) ? "read" : "write", iopb->cylno, iopb->headno, iopb->sectno); - kprintf("%s", xdc_e2str(error)); + printf("%s", xdc_e2str(error)); if (still_trying) - kprintf(" [still trying, new error=%s]", xdc_e2str(iorq->errno)); + printf(" [still trying, new error=%s]", xdc_e2str(iorq->errno)); else if (iorq->errno == 0) - kprintf(" [recovered in %d tries]", iorq->tries); + printf(" [recovered in %d tries]", iorq->tries); - kprintf("\n"); + printf("\n"); } /* @@ -2082,26 +2082,26 @@ xdc_tick(arg) bcopy(xdcsc->freereq, fqc, sizeof(fqc)); splx(s); if (wait + run + free + done != XDC_MAXIOPB) { - kprintf("%s: diag: IOPB miscount (got w/f/r/d %d/%d/%d/%d, wanted %d)\n", + printf("%s: diag: IOPB miscount (got w/f/r/d %d/%d/%d/%d, wanted %d)\n", xdcsc->sc_dev.dv_xname, wait, free, run, done, XDC_MAXIOPB); bzero(mark, sizeof(mark)); - kprintf("FREE: "); + printf("FREE: "); for (lcv = free; lcv > 0; lcv--) { - kprintf("%d ", fqc[lcv - 1]); + printf("%d ", fqc[lcv - 1]); mark[fqc[lcv - 1]] = 1; } - kprintf("\nWAIT: "); + printf("\nWAIT: "); lcv = wait; while (lcv > 0) { - kprintf("%d ", wqc[whd]); + printf("%d ", wqc[whd]); mark[wqc[whd]] = 1; whd = (whd + 1) % XDC_MAXIOPB; lcv--; } - kprintf("\n"); + printf("\n"); for (lcv = 0; lcv < XDC_MAXIOPB; lcv++) { if (mark[lcv] == 0) - kprintf("MARK: running %d: mode %d done %d errs %d errno 0x%x ttl %d buf %p\n", + printf("MARK: running %d: mode %d done %d errs %d errno 0x%x ttl %d buf %p\n", lcv, xdcsc->reqs[lcv].mode, xdcsc->iopbase[lcv].done, xdcsc->iopbase[lcv].errs, @@ -2110,18 +2110,18 @@ xdc_tick(arg) } } else if (done > XDC_MAXIOPB - XDC_SUBWAITLIM) - kprintf("%s: diag: lots of done jobs (%d)\n", + printf("%s: diag: lots of done jobs (%d)\n", xdcsc->sc_dev.dv_xname, done); #endif #ifdef XDC_DEBUG - kprintf("%s: tick: csr 0x%x, w/f/r/d %d/%d/%d/%d\n", + printf("%s: tick: csr 0x%x, w/f/r/d %d/%d/%d/%d\n", xdcsc->sc_dev.dv_xname, xdcsc->xdc->xdc_csr, xdcsc->nwait, xdcsc->nfree, xdcsc->nrun, xdcsc->ndone); for (lcv = 0; lcv < XDC_MAXIOPB; lcv++) { if (xdcsc->reqs[lcv].mode) - kprintf("running %d: mode %d done %d errs %d errno 0x%x\n", + printf("running %d: mode %d done %d errs %d errno 0x%x\n", lcv, xdcsc->reqs[lcv].mode, xdcsc->iopbase[lcv].done, xdcsc->iopbase[lcv].errs, xdcsc->iopbase[lcv].errno); @@ -2139,7 +2139,7 @@ xdc_tick(arg) reset = 1; } if (reset) { - kprintf("%s: watchdog timeout\n", xdcsc->sc_dev.dv_xname); + printf("%s: watchdog timeout\n", xdcsc->sc_dev.dv_xname); xdc_reset(xdcsc, 0, XD_RSET_NONE, XD_ERR_FAIL, NULL); } splx(s); diff --git a/sys/arch/sparc/dev/xy.c b/sys/arch/sparc/dev/xy.c index 10b9002b116f..60857682049e 100644 --- a/sys/arch/sparc/dev/xy.c +++ b/sys/arch/sparc/dev/xy.c @@ -1,4 +1,4 @@ -/* $NetBSD: xy.c,v 1.18 1996/10/11 00:47:02 christos Exp $ */ +/* $NetBSD: xy.c,v 1.19 1996/10/13 03:00:15 christos Exp $ */ /* * @@ -36,7 +36,7 @@ * x y . c x y l o g i c s 4 5 0 / 4 5 1 s m d d r i v e r * * author: Chuck Cranor - * id: $NetBSD: xy.c,v 1.18 1996/10/11 00:47:02 christos Exp $ + * id: $NetBSD: xy.c,v 1.19 1996/10/13 03:00:15 christos Exp $ * started: 14-Sep-95 * references: [1] Xylogics Model 753 User's Manual * part number: 166-753-001, Revision B, May 21, 1988. @@ -247,7 +247,7 @@ xygetdisklabel(xy, b) xydummystrat, xy->sc_dk.dk_label, xy->sc_dk.dk_cpulabel); if (err) { - kprintf("%s: %s\n", xy->sc_dev.dv_xname, err); + printf("%s: %s\n", xy->sc_dev.dv_xname, err); return(XY_ERR_FAIL); } @@ -256,11 +256,11 @@ xygetdisklabel(xy, b) if (sdl->sl_magic == SUN_DKMAGIC) xy->pcyl = sdl->sl_pcylinders; else { - kprintf("%s: WARNING: no `pcyl' in disk label.\n", + printf("%s: WARNING: no `pcyl' in disk label.\n", xy->sc_dev.dv_xname); xy->pcyl = xy->sc_dk.dk_label->d_ncylinders + xy->sc_dk.dk_label->d_acylinders; - kprintf("%s: WARNING: guessing pcyl=%d (ncyl+acyl)\n", + printf("%s: WARNING: guessing pcyl=%d (ncyl+acyl)\n", xy->sc_dev.dv_xname, xy->pcyl); } @@ -336,7 +336,7 @@ xycattach(parent, self, aux) pri = ca->ca_ra.ra_intr[0].int_pri; xyc->ipl = pil_to_vme[pri]; xyc->vector = ca->ca_ra.ra_intr[0].int_vec; - kprintf(" pri %d", pri); + printf(" pri %d", pri); xyc->no_ols = 0; /* XXX should be from config */ for (lcv = 0; lcv < XYC_MAXDEV; lcv++) @@ -358,7 +358,7 @@ xycattach(parent, self, aux) dvma_free(dtmp2, pbsz, &tmp2); ultmp = (u_long) dtmp; if ((ultmp & 0xffff0000) != ((ultmp + pbsz) & 0xffff0000)) { - kprintf("%s: can't alloc IOPB mem in 64K\n", + printf("%s: can't alloc IOPB mem in 64K\n", xyc->sc_dev.dv_xname); return; } @@ -399,24 +399,24 @@ xycattach(parent, self, aux) XYC_DONE(xyc, err); if (res != XYCT_450) { if (err) - kprintf(": %s: ", xyc_e2str(err)); - kprintf(": doesn't identify as a 450/451\n"); + printf(": %s: ", xyc_e2str(err)); + printf(": doesn't identify as a 450/451\n"); return; } - kprintf(": Xylogics 450/451"); + printf(": Xylogics 450/451"); if (xyc->no_ols) - kprintf(" [OLS disabled]"); /* 450 doesn't overlap seek right */ - kprintf("\n"); + printf(" [OLS disabled]"); /* 450 doesn't overlap seek right */ + printf("\n"); if (err) { - kprintf("%s: error: %s\n", xyc->sc_dev.dv_xname, + printf("%s: error: %s\n", xyc->sc_dev.dv_xname, xyc_e2str(err)); return; } if ((xyc->xyc->xyc_csr & XYC_ADRM) == 0) { - kprintf("%s: 24 bit addressing turned off\n", + printf("%s: 24 bit addressing turned off\n", xyc->sc_dev.dv_xname); - kprintf("please set hardware jumpers JM1-JM2=in, JM3-JM4=out\n"); - kprintf("to enable 24 bit mode and this driver\n"); + printf("please set hardware jumpers JM1-JM2=in, JM3-JM4=out\n"); + printf("to enable 24 bit mode and this driver\n"); return; } @@ -531,7 +531,7 @@ xyattach(parent, self, aux) return; } } - kprintf("%s at %s", + printf("%s at %s", xy->sc_dev.dv_xname, xy->parent->sc_dev.dv_xname); } /* we now have control */ @@ -544,14 +544,14 @@ xyattach(parent, self, aux) err = xyc_cmd(xyc, XYCMD_RST, 0, xy->xy_drive, 0, 0, 0, fmode); XYC_DONE(xyc, err); if (err == XY_ERR_DNRY) { - kprintf(" drive %d: off-line\n", xa->driveno); + printf(" drive %d: off-line\n", xa->driveno); goto done; } if (err) { - kprintf(": ERROR 0x%02x (%s)\n", err, xyc_e2str(err)); + printf(": ERROR 0x%02x (%s)\n", err, xyc_e2str(err)); goto done; } - kprintf(" drive %d: ready", xa->driveno); + printf(" drive %d: ready", xa->driveno); /* * now set drive parameters (to semi-bogus values) so we can read the @@ -576,11 +576,11 @@ xyattach(parent, self, aux) } if (err != XY_ERR_AOK) { - kprintf("\n%s: reading disk label failed: %s\n", + printf("\n%s: reading disk label failed: %s\n", xy->sc_dev.dv_xname, xyc_e2str(err)); goto done; } - kprintf(" (drive type %d)\n", xy->drive_type); + printf(" (drive type %d)\n", xy->drive_type); newstate = XY_DRIVE_NOLABEL; @@ -592,10 +592,10 @@ xyattach(parent, self, aux) goto done; /* inform the user of what is up */ - kprintf("%s: <%s>, pcyl %d\n", xy->sc_dev.dv_xname, + printf("%s: <%s>, pcyl %d\n", xy->sc_dev.dv_xname, xa->buf, xy->pcyl); mb = xy->ncyl * (xy->nhead * xy->nsect) / (1048576 / XYFM_BPS); - kprintf("%s: %dMB, %d cyl, %d head, %d sec, %d bytes/sec\n", + printf("%s: %dMB, %d cyl, %d head, %d sec, %d bytes/sec\n", xy->sc_dev.dv_xname, mb, xy->ncyl, xy->nhead, xy->nsect, XYFM_BPS); @@ -616,7 +616,7 @@ xyattach(parent, self, aux) if (oxy->drive_type != xy->drive_type) continue; if (xy->nsect != oxy->nsect || xy->pcyl != oxy->pcyl || xy->nhead != oxy->nhead) { - kprintf("%s: %s and %s must be the same size!\n", + printf("%s: %s and %s must be the same size!\n", xyc->sc_dev.dv_xname, xy->sc_dev.dv_xname, oxy->sc_dev.dv_xname); panic("xy drive size mismatch"); @@ -632,7 +632,7 @@ xyattach(parent, self, aux) err = xyc_cmd(xyc, XYCMD_SDS, 0, xy->xy_drive, blk, 0, 0, fmode); XYC_DONE(xyc, err); if (err) { - kprintf("%s: write drive size failed: %s\n", + printf("%s: write drive size failed: %s\n", xy->sc_dev.dv_xname, xyc_e2str(err)); goto done; } @@ -650,7 +650,7 @@ xyattach(parent, self, aux) xa->dvmabuf, fmode); XYC_DONE(xyc, err); if (err) { - kprintf("%s: reading bad144 failed: %s\n", + printf("%s: reading bad144 failed: %s\n", xy->sc_dev.dv_xname, xyc_e2str(err)); goto done; } @@ -670,7 +670,7 @@ xyattach(parent, self, aux) break; } if (lcv != 126) { - kprintf("%s: warning: invalid bad144 sector!\n", + printf("%s: warning: invalid bad144 sector!\n", xy->sc_dev.dv_xname); } else { bcopy(xa->buf, &xy->dkb, XYFM_BPS); @@ -750,7 +750,7 @@ xydump(dev, blkno, va, size) xy = xy_cd.cd_devs[unit]; - kprintf("%s%c: crash dump not supported (yet)\n", xy->sc_dev.dv_xname, + printf("%s%c: crash dump not supported (yet)\n", xy->sc_dev.dv_xname, 'a' + part); return ENXIO; @@ -1214,7 +1214,7 @@ start: if (XY_STATE(iorq->mode) != XY_SUB_FREE) { DELAY(1000000); /* XY_SUB_POLL: steal the iorq */ iorq->mode = XY_SUB_FREE; - kprintf("%s: stole control iopb\n", xycsc->sc_dev.dv_xname); + printf("%s: stole control iopb\n", xycsc->sc_dev.dv_xname); } /* init iorq/iopb */ @@ -1262,9 +1262,9 @@ xyc_startbuf(xycsc, xysc, bp) partno = DISKPART(bp->b_dev); #ifdef XYC_DEBUG - kprintf("xyc_startbuf: %s%c: %s block %d\n", xysc->sc_dev.dv_xname, + printf("xyc_startbuf: %s%c: %s block %d\n", xysc->sc_dev.dv_xname, 'a' + partno, (bp->b_flags & B_READ) ? "read" : "write", bp->b_blkno); - kprintf("xyc_startbuf: b_bcount %d, b_data 0x%x\n", + printf("xyc_startbuf: b_bcount %d, b_data 0x%x\n", bp->b_bcount, bp->b_data); #endif @@ -1281,7 +1281,7 @@ xyc_startbuf(xycsc, xysc, bp) dbuf = kdvma_mapin(bp->b_data, bp->b_bcount, 0); if (dbuf == NULL) { /* out of DVMA space */ - kprintf("%s: warning: out of DVMA space\n", + printf("%s: warning: out of DVMA space\n", xycsc->sc_dev.dv_xname); return (XY_ERR_FAIL); /* XXX: need some sort of * call-back scheme here? */ @@ -1346,14 +1346,14 @@ xyc_submit_iorq(xycsc, iorq, type) u_long iopbaddr; #ifdef XYC_DEBUG - kprintf("xyc_submit_iorq(%s, addr=0x%x, type=%d)\n", + printf("xyc_submit_iorq(%s, addr=0x%x, type=%d)\n", xycsc->sc_dev.dv_xname, iorq, type); #endif /* first check and see if controller is busy */ if ((xycsc->xyc->xyc_csr & XYC_GBSY) != 0) { #ifdef XYC_DEBUG - kprintf("xyc_submit_iorq: XYC not ready (BUSY)\n"); + printf("xyc_submit_iorq: XYC not ready (BUSY)\n"); #endif if (type == XY_SUB_NOQ) return (XY_ERR_FAIL); /* failed */ @@ -1369,7 +1369,7 @@ xyc_submit_iorq(xycsc, iorq, type) iopbaddr = xycsc->xyc->xyc_rsetup; /* RESET */ if (xyc_unbusy(xycsc->xyc,XYC_RESETUSEC) == XY_ERR_FAIL) panic("xyc_submit_iorq: stuck xyc"); - kprintf("%s: stole controller\n", + printf("%s: stole controller\n", xycsc->sc_dev.dv_xname); break; default: @@ -1489,7 +1489,7 @@ xyc_piodriver(xycsc, iorq) int retval = 0; u_long res; #ifdef XYC_DEBUG - kprintf("xyc_piodriver(%s, 0x%x)\n", xycsc->sc_dev.dv_xname, iorq); + printf("xyc_piodriver(%s, 0x%x)\n", xycsc->sc_dev.dv_xname, iorq); #endif while (iorq->iopb->done == 0) { @@ -1500,7 +1500,7 @@ xyc_piodriver(xycsc, iorq) if (res == XY_ERR_FAIL && nreset >= 2) { xyc_reset(xycsc, 0, XY_RSET_ALL, XY_ERR_FAIL, 0); #ifdef XYC_DEBUG - kprintf("xyc_piodriver: timeout\n"); + printf("xyc_piodriver: timeout\n"); #endif return (XY_ERR_FAIL); } @@ -1525,7 +1525,7 @@ xyc_piodriver(xycsc, iorq) retval = iorq->errno; #ifdef XYC_DEBUG - kprintf("xyc_piodriver: done, retval = 0x%x (%s)\n", + printf("xyc_piodriver: done, retval = 0x%x (%s)\n", iorq->errno, xyc_e2str(iorq->errno)); #endif @@ -1566,7 +1566,7 @@ xyc_xyreset(xycsc, xysc) } if (del <= 0 || xycsc->ciopb->errs) { - kprintf("%s: off-line: %s\n", xycsc->sc_dev.dv_xname, + printf("%s: off-line: %s\n", xycsc->sc_dev.dv_xname, xyc_e2str(xycsc->ciopb->errno)); del = xycsc->xyc->xyc_rsetup; if (xyc_unbusy(xycsc->xyc, XYC_RESETUSEC) == XY_ERR_FAIL) @@ -1595,7 +1595,7 @@ xyc_reset(xycsc, quiet, blastmode, error, xysc) /* soft reset hardware */ if (!quiet) - kprintf("%s: soft reset\n", xycsc->sc_dev.dv_xname); + printf("%s: soft reset\n", xycsc->sc_dev.dv_xname); del = xycsc->xyc->xyc_rsetup; del = xyc_unbusy(xycsc->xyc, XYC_RESETUSEC); if (del == XY_ERR_FAIL) { @@ -1706,9 +1706,9 @@ xyc_remove_iorq(xycsc) * we dump them all. */ errno = XY_ERR_DERR; - kprintf("%s: DOUBLE ERROR!\n", xycsc->sc_dev.dv_xname); + printf("%s: DOUBLE ERROR!\n", xycsc->sc_dev.dv_xname); if (xyc_reset(xycsc, 0, XY_RSET_ALL, errno, 0) != XY_ERR_AOK) { - kprintf("%s: soft reset failed!\n", + printf("%s: soft reset failed!\n", xycsc->sc_dev.dv_xname); panic("xyc_remove_iorq: controller DEAD"); } @@ -1845,23 +1845,23 @@ xyc_perror(iorq, iopb, still_trying) int error = iorq->lasterror; - kprintf("%s", (iorq->xy) ? iorq->xy->sc_dev.dv_xname + printf("%s", (iorq->xy) ? iorq->xy->sc_dev.dv_xname : iorq->xyc->sc_dev.dv_xname); if (iorq->buf) - kprintf("%c: ", 'a' + DISKPART(iorq->buf->b_dev)); + printf("%c: ", 'a' + DISKPART(iorq->buf->b_dev)); if (iopb->com == XYCMD_RD || iopb->com == XYCMD_WR) - kprintf("%s %d/%d/%d: ", + printf("%s %d/%d/%d: ", (iopb->com == XYCMD_RD) ? "read" : "write", iopb->cyl, iopb->head, iopb->sect); - kprintf("%s", xyc_e2str(error)); + printf("%s", xyc_e2str(error)); if (still_trying) - kprintf(" [still trying, new error=%s]", xyc_e2str(iorq->errno)); + printf(" [still trying, new error=%s]", xyc_e2str(iorq->errno)); else if (iorq->errno == 0) - kprintf(" [recovered in %d tries]", iorq->tries); + printf(" [recovered in %d tries]", iorq->tries); - kprintf("\n"); + printf("\n"); } /* @@ -1955,7 +1955,7 @@ xyc_tick(arg) reset = 1; } if (reset) { - kprintf("%s: watchdog timeout\n", xycsc->sc_dev.dv_xname); + printf("%s: watchdog timeout\n", xycsc->sc_dev.dv_xname); xyc_reset(xycsc, 0, XY_RSET_NONE, XY_ERR_FAIL, NULL); } splx(s); diff --git a/sys/arch/sparc/dev/zs.c b/sys/arch/sparc/dev/zs.c index 7c5595d0637f..dd6a2cc9c35b 100644 --- a/sys/arch/sparc/dev/zs.c +++ b/sys/arch/sparc/dev/zs.c @@ -1,4 +1,4 @@ -/* $NetBSD: zs.c,v 1.43 1996/10/11 00:47:03 christos Exp $ */ +/* $NetBSD: zs.c,v 1.44 1996/10/13 03:00:18 christos Exp $ */ /* * Copyright (c) 1992, 1993 @@ -271,11 +271,11 @@ zsattach(parent, dev, aux) if ((void *)addr != ra->ra_vaddr) panic("zsattach"); if (ra->ra_nintr != 1) { - kprintf(": expected 1 interrupt, got %d\n", ra->ra_nintr); + printf(": expected 1 interrupt, got %d\n", ra->ra_nintr); return; } pri = ra->ra_intr[0].int_pri; - kprintf(" pri %d, softpri %d\n", pri, PIL_TTY); + printf(" pri %d, softpri %d\n", pri, PIL_TTY); if (!didintr) { didintr = 1; prevpri = pri; @@ -506,7 +506,7 @@ zs_checkcons(sc, unit, cs) if (o) { tp->t_oproc = zsstart; } - kprintf("%s%c: console %s\n", + printf("%s%c: console %s\n", sc->sc_dev.dv_xname, (unit & 1) + 'a', i ? (o ? "i/o" : i) : o); cs->cs_consio = 1; cs->cs_brkabort = 1; @@ -986,7 +986,7 @@ zsabort() #ifdef DDB Debugger(); #else - kprintf("stopping on keyboard abort\n"); + printf("stopping on keyboard abort\n"); callrom(); #endif } @@ -1001,7 +1001,7 @@ zskgdb(unit) int unit; { - kprintf("zs%d%c: kgdb interrupt\n", unit >> 1, (unit & 1) + 'a'); + printf("zs%d%c: kgdb interrupt\n", unit >> 1, (unit & 1) + 'a'); kgdb_connect(1); } #endif @@ -1583,7 +1583,7 @@ zs_kgdb_init() * Unit must be 0 or 1 (zs0). */ if ((unsigned)unit >= ZS_KBD) { - kprintf("zs_kgdb_init: bad minor dev %d\n", unit); + printf("zs_kgdb_init: bad minor dev %d\n", unit); return; } zs = unit >> 1; @@ -1592,7 +1592,7 @@ zs_kgdb_init() unit &= 1; zc = unit == 0 ? &addr->zs_chan[ZS_CHAN_A] : &addr->zs_chan[ZS_CHAN_B]; zs_kgdb_savedspeed = zs_getspeed(zc); - kprintf("zs_kgdb_init: attaching zs%d%c at %d baud\n", + printf("zs_kgdb_init: attaching zs%d%c at %d baud\n", zs, unit + 'a', kgdb_rate); zs_reset(zc, 1, kgdb_rate); kgdb_attach(zs_kgdb_getc, zs_kgdb_putc, (void *)zc); diff --git a/sys/arch/sparc/fpu/fpu.c b/sys/arch/sparc/fpu/fpu.c index bde6f744de9b..d6852566550e 100644 --- a/sys/arch/sparc/fpu/fpu.c +++ b/sys/arch/sparc/fpu/fpu.c @@ -1,4 +1,4 @@ -/* $NetBSD: fpu.c,v 1.4 1996/10/11 00:47:07 christos Exp $ */ +/* $NetBSD: fpu.c,v 1.5 1996/10/13 03:00:21 christos Exp $ */ /* * Copyright (c) 1992, 1993 @@ -135,7 +135,7 @@ fpu_cleanup(p, fs) goto out; default: - kprintf("fsr=%x\n", fsr); + printf("fsr=%x\n", fsr); panic("fpu error"); } diff --git a/sys/arch/sparc/sparc/autoconf.c b/sys/arch/sparc/sparc/autoconf.c index a2cb6789a2f1..9cfb2fb056f0 100644 --- a/sys/arch/sparc/sparc/autoconf.c +++ b/sys/arch/sparc/sparc/autoconf.c @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.62 1996/10/11 00:47:09 christos Exp $ */ +/* $NetBSD: autoconf.c,v 1.63 1996/10/13 03:00:24 christos Exp $ */ /* * Copyright (c) 1996 @@ -148,8 +148,8 @@ matchbyname(parent, vcf, aux) struct confargs *ca = aux; if (CPU_ISSUN4) { - kprintf("WARNING: matchbyname not valid on sun4!"); - kprintf("%s\n", cf->cf_driver->cd_name); + printf("WARNING: matchbyname not valid on sun4!"); + printf("%s\n", cf->cf_driver->cd_name); return (0); } return (strcmp(cf->cf_driver->cd_name, ca->ca_ra.ra_name) == 0); @@ -263,7 +263,7 @@ bootstrap() mmu_3l = 1; break; default: - kprintf("bootstrap: sun4 machine type %2x unknown!\n", + printf("bootstrap: sun4 machine type %2x unknown!\n", idprom.id_machine); callrom(); } @@ -393,7 +393,7 @@ bootstrap() *((u_int *)ICR_ITR) = 0; #ifdef DEBUG -/* kprintf("SINTR: mask: 0x%x, pend: 0x%x\n", *(int*)ICR_SI_MASK, +/* printf("SINTR: mask: 0x%x, pend: 0x%x\n", *(int*)ICR_SI_MASK, *(int*)ICR_SI_PEND); */ #endif @@ -526,7 +526,7 @@ bootpath_build() kgdb_debug_panic = 1; kgdb_connect(1); #else - kprintf("kernel not compiled with KGDB\n"); + printf("kernel not compiled with KGDB\n"); #endif break; @@ -561,7 +561,7 @@ bootpath_fake(bp, cp) #if defined(SUN4) if (CPU_ISSUN4M) { - kprintf("twas brillig..\n"); + printf("twas brillig..\n"); return; } #endif @@ -587,9 +587,9 @@ bootpath_fake(bp, cp) } else { BP_APPEND(bp, "vmes", -1, 0, 0); } - ksprintf(tmpname,"x%cc", cp[1]); /* e.g. xdc */ + sprintf(tmpname,"x%cc", cp[1]); /* e.g. xdc */ BP_APPEND(bp, tmpname,-1, v0val[0], 0); - ksprintf(tmpname,"%c%c", cp[0], cp[1]); + sprintf(tmpname,"%c%c", cp[0], cp[1]); BP_APPEND(bp, tmpname,v0val[1], v0val[2], 0); /* e.g. xd */ return; } @@ -600,7 +600,7 @@ bootpath_fake(bp, cp) */ if ((cp[0] == 'i' || cp[0] == 'l') && cp[1] == 'e') { BP_APPEND(bp, "obio", -1, 0, 0); - ksprintf(tmpname,"%c%c", cp[0], cp[1]); + sprintf(tmpname,"%c%c", cp[0], cp[1]); BP_APPEND(bp, tmpname, -1, 0, 0); return; } @@ -646,7 +646,7 @@ bootpath_fake(bp, cp) target = v0val[1] >> 2; /* old format */ lun = v0val[1] & 0x3; } - ksprintf(tmpname, "%c%c", cp[0], cp[1]); + sprintf(tmpname, "%c%c", cp[0], cp[1]); BP_APPEND(bp, tmpname, target, lun, v0val[2]); return; } @@ -694,9 +694,9 @@ bootpath_fake(bp, cp) BP_APPEND(bp, "sbus", -1, 0, 0); BP_APPEND(bp, "esp", -1, v0val[0], 0); if (cp[1] == 'r') - ksprintf(tmpname, "cd"); /* netbsd uses 'cd', not 'sr'*/ + sprintf(tmpname, "cd"); /* netbsd uses 'cd', not 'sr'*/ else - ksprintf(tmpname,"%c%c", cp[0], cp[1]); + sprintf(tmpname,"%c%c", cp[0], cp[1]); /* XXX - is TARGET/LUN encoded in v0val[1]? */ target = v0val[1]; lun = 0; @@ -721,17 +721,17 @@ static void bootpath_print(bp) struct bootpath *bp; { - kprintf("bootpath: "); + printf("bootpath: "); while (bp->name[0]) { if (bp->val[0] == -1) - kprintf("/%s%x", bp->name, bp->val[1]); + printf("/%s%x", bp->name, bp->val[1]); else - kprintf("/%s@%x,%x", bp->name, bp->val[0], bp->val[1]); + printf("/%s@%x,%x", bp->name, bp->val[0], bp->val[1]); if (bp->val[2] != 0) - kprintf(":%c", bp->val[2] + 'a'); + printf(":%c", bp->val[2] + 'a'); bp++; } - kprintf("\n"); + printf("\n"); } @@ -780,7 +780,7 @@ crazymap(prop, map) propval = getpropstring(optionsnode, prop); if (propval == NULL || strlen(propval) != 8) { build_default_map: - kprintf("WARNING: %s map is bogus, using default\n", + printf("WARNING: %s map is bogus, using default\n", prop); for (i = 0; i < 8; ++i) map[i] = i; @@ -941,12 +941,12 @@ clockfreq(freq) static char buf[10]; freq /= 1000; - ksprintf(buf, "%d", freq / 1000); + sprintf(buf, "%d", freq / 1000); freq %= 1000; if (freq) { freq += 1000; /* now in 1000..1999 */ p = buf + strlen(buf); - ksprintf(p, "%d", freq); + sprintf(p, "%d", freq); *p = '.'; /* now buf = %d.%3d */ } return (buf); @@ -961,9 +961,9 @@ mbprint(aux, name) register struct confargs *ca = aux; if (name) - kprintf("%s at %s", ca->ca_ra.ra_name, name); + printf("%s at %s", ca->ca_ra.ra_name, name); if (ca->ca_ra.ra_paddr) - kprintf(" %saddr 0x%x", ca->ca_ra.ra_iospace ? "io" : "", + printf(" %saddr 0x%x", ca->ca_ra.ra_iospace ? "io" : "", (int)ca->ca_ra.ra_paddr); return (UNCONF); } @@ -1017,12 +1017,12 @@ romprop(rp, cp, node) strcmp(getpropstring(node, "device_type"), "hierarchical") == 0) len = 0; if (len % sizeof(struct rom_reg)) { - kprintf("%s \"reg\" %s = %d (need multiple of %d)\n", + printf("%s \"reg\" %s = %d (need multiple of %d)\n", cp, pl, len, sizeof(struct rom_reg)); return (0); } if (len > RA_MAXREG * sizeof(struct rom_reg)) - kprintf("warning: %s \"reg\" %s %d > %d, excess ignored\n", + printf("warning: %s \"reg\" %s %d > %d, excess ignored\n", cp, pl, len, RA_MAXREG * sizeof(struct rom_reg)); rp->ra_node = node; rp->ra_name = cp; @@ -1036,7 +1036,7 @@ romprop(rp, cp, node) len = 0; } if (len & 3) { - kprintf("%s \"address\" %s = %d (need multiple of 4)\n", + printf("%s \"address\" %s = %d (need multiple of 4)\n", cp, pl, len); len = 0; } @@ -1046,7 +1046,7 @@ romprop(rp, cp, node) if (len == -1) len = 0; if (len & 7) { - kprintf("%s \"intr\" %s = %d (need multiple of 8)\n", + printf("%s \"intr\" %s = %d (need multiple of 8)\n", cp, pl, len); len = 0; } @@ -1054,7 +1054,7 @@ romprop(rp, cp, node) /* SPARCstation interrupts are not hardware-vectored */ while (--len >= 0) { if (rp->ra_intr[len].int_vec) { - kprintf("WARNING: %s interrupt %d has nonzero vector\n", + printf("WARNING: %s interrupt %d has nonzero vector\n", cp, len); break; } @@ -1177,9 +1177,9 @@ mainbus_attach(parent, dev, aux) #if defined(SUN4M) if (CPU_ISSUN4M) - kprintf(": %s", getpropstring(ca->ca_ra.ra_node, "name")); + printf(": %s", getpropstring(ca->ca_ra.ra_node, "name")); #endif - kprintf("\n"); + printf("\n"); /* * Locate and configure the ``early'' devices. These must be @@ -1263,7 +1263,7 @@ mainbus_attach(parent, dev, aux) for (ssp = openboot_special; *(sp = *ssp) != 0; ssp++) { if ((node = findnode(node0, sp)) == 0) { - kprintf("could not find %s in OPENPROM\n", sp); + printf("could not find %s in OPENPROM\n", sp); panic(sp); } oca.ca_bustype = BUS_MAIN; @@ -1417,7 +1417,7 @@ makememarr(ap, max, which) ap[0].len = *oldpvec->memorySize; break; default: - kprintf("pre_panic: makememarr"); + printf("pre_panic: makememarr"); break; } return (1); @@ -1454,7 +1454,7 @@ makememarr(ap, max, which) break; default: - kprintf("makememarr: hope version %d PROM is like version 2\n", + printf("makememarr: hope version %d PROM is like version 2\n", i); /* FALLTHROUGH */ @@ -1464,7 +1464,7 @@ makememarr(ap, max, which) * Version 2 PROMs use a property array to describe them. */ if (max > MAXMEMINFO) { - kprintf("makememarr: limited to %d\n", MAXMEMINFO); + printf("makememarr: limited to %d\n", MAXMEMINFO); max = MAXMEMINFO; } if ((node = findnode(firstchild(findroot()), "memory")) == 0) @@ -1506,7 +1506,7 @@ overflow: * Oops, there are more things in the PROM than our caller * provided space for. Truncate any extras. */ - kprintf("makememarr: WARNING: lost some memory\n"); + printf("makememarr: WARNING: lost some memory\n"); return (i); #endif } @@ -1528,7 +1528,7 @@ getprop(node, name, buf, bufsiz) #if defined(SUN4) if (CPU_ISSUN4) { - kprintf("WARNING: getprop not valid on sun4! %s\n", name); + printf("WARNING: getprop not valid on sun4! %s\n", name); return (0); } #endif @@ -1537,7 +1537,7 @@ getprop(node, name, buf, bufsiz) no = promvec->pv_nodeops; len = no->no_proplen(node, name); if (len > bufsiz) { - kprintf("node %x property %s length %d > %d\n", + printf("node %x property %s length %d > %d\n", node, name, len, bufsiz); #ifdef DEBUG panic("getprop"); @@ -1652,7 +1652,7 @@ opennode(path) /* translate phys. device path to node */ register int fd; if (promvec->pv_romvec_vers < 2) { - kprintf("WARNING: opennode not valid on sun4! %s\n", path); + printf("WARNING: opennode not valid on sun4! %s\n", path); return (0); } fd = promvec->pv_v2devops.v2_open(path); @@ -1699,11 +1699,11 @@ romgetcursoraddr(rowp, colp) * correct cutoff point is unknown, as yet; we use 2.9 here. */ if (promvec->pv_romvec_vers < 2 || promvec->pv_printrev < 0x00020009) - ksprintf(buf, + sprintf(buf, "' line# >body >user %lx ! ' column# >body >user %lx !", (u_long)rowp, (u_long)colp); else - ksprintf(buf, + sprintf(buf, "stdout @ is my-self addr line# %lx ! addr column# %lx !", (u_long)rowp, (u_long)colp); *rowp = *colp = NULL; @@ -1806,17 +1806,17 @@ getdisk(str, len, defpart, devp) register struct device *dv; if ((dv = parsedisk(str, len, defpart, devp)) == NULL) { - kprintf("use one of:"); + printf("use one of:"); for (dv = alldevs.tqh_first; dv != NULL; dv = dv->dv_list.tqe_next) { if (dv->dv_class == DV_DISK) - kprintf(" %s[a-h]", dv->dv_xname); + printf(" %s[a-h]", dv->dv_xname); #ifdef NFSCLIENT if (dv->dv_class == DV_IFNET) - kprintf(" %s", dv->dv_xname); + printf(" %s", dv->dv_xname); #endif } - kprintf("\n"); + printf("\n"); } return (dv); } @@ -1924,13 +1924,13 @@ setroot() if (boothowto & RB_ASKNAME) { for (;;) { - kprintf("root device "); + printf("root device "); if (bootdv != NULL) - kprintf("(default %s%c)", + printf("(default %s%c)", bootdv->dv_xname, bootdv->dv_class == DV_DISK ? bp->val[2]+'a' : ' '); - kprintf(": "); + printf(": "); len = getstr(buf, sizeof(buf)); if (len == 0 && bootdv != NULL) { strcpy(buf, bootdv->dv_xname); @@ -1960,12 +1960,12 @@ setroot() goto gotswap; } for (;;) { - kprintf("swap device "); + printf("swap device "); if (bootdv != NULL) - kprintf("(default %s%c)", + printf("(default %s%c)", bootdv->dv_xname, bootdv->dv_class == DV_DISK?'b':' '); - kprintf(": "); + printf(": "); len = getstr(buf, sizeof(buf)); if (len == 0 && bootdv != NULL) { switch (bootdv->dv_class) { @@ -2046,12 +2046,12 @@ gotswap: mountroot = ffs_mountroot; majdev = major(rootdev); mindev = minor(rootdev); - kprintf("root on %s%c\n", bootdv->dv_xname, + printf("root on %s%c\n", bootdv->dv_xname, (mindev & PARTITIONMASK) + 'a'); break; #endif default: - kprintf("can't figure root, hope your kernel is right\n"); + printf("can't figure root, hope your kernel is right\n"); return; } @@ -2107,7 +2107,7 @@ getstr(cp, size) switch (c) { case '\n': case '\r': - kprintf("\n"); + printf("\n"); *lp++ = '\0'; return (len); case '\b': @@ -2116,21 +2116,21 @@ getstr(cp, size) if (len) { --len; --lp; - kprintf("\b \b"); + printf("\b \b"); } continue; case '@': case 'u'&037: len = 0; lp = cp; - kprintf("\n"); + printf("\n"); continue; default: if (len + 1 >= size || c < ' ') { - kprintf("\007"); + printf("\007"); continue; } - kprintf("%c", c); + printf("%c", c); ++len; *lp++ = c; } @@ -2151,7 +2151,7 @@ getdevunit(name, unit) int lunit; /* compute length of name and decimal expansion of unit number */ - ksprintf(num, "%d", unit); + sprintf(num, "%d", unit); lunit = strlen(num); if (strlen(name) + lunit >= sizeof(fullname) - 1) panic("config_attach: device name too long"); diff --git a/sys/arch/sparc/sparc/auxreg.c b/sys/arch/sparc/sparc/auxreg.c index 7c050004dd11..cdf9722d3167 100644 --- a/sys/arch/sparc/sparc/auxreg.c +++ b/sys/arch/sparc/sparc/auxreg.c @@ -1,4 +1,4 @@ -/* $NetBSD: auxreg.c,v 1.15 1996/10/11 00:47:11 christos Exp $ */ +/* $NetBSD: auxreg.c,v 1.16 1996/10/13 03:00:26 christos Exp $ */ /* * Copyright (c) 1992, 1993 @@ -122,7 +122,7 @@ auxregattach(parent, self, aux) (void)mapdev(ra->ra_reg, AUXREG_VA, 0, sizeof(long), ca->ca_bustype); auxio_reg = AUXIO_REG; - kprintf("\n"); + printf("\n"); #ifdef BLINK blink((caddr_t)0); #endif diff --git a/sys/arch/sparc/sparc/cache.c b/sys/arch/sparc/sparc/cache.c index 1938c312ea08..0d83d28dff39 100644 --- a/sys/arch/sparc/sparc/cache.c +++ b/sys/arch/sparc/sparc/cache.c @@ -1,4 +1,4 @@ -/* $NetBSD: cache.c,v 1.11 1996/10/11 00:47:12 christos Exp $ */ +/* $NetBSD: cache.c,v 1.12 1996/10/13 03:00:27 christos Exp $ */ /* * Copyright (c) 1996 @@ -152,12 +152,12 @@ cache_enable() if (cacheinfo.c_hwflush) panic("cache_enable: can't handle 4M with hw-flush cache"); - kprintf("cache enabled\n"); + printf("cache enabled\n"); break; case SUN4M_MMU_SS: /* SuperSPARC */ if ((cpumod & 0xf0) != (SUN4M_SS & 0xf0)) { - kprintf( + printf( "cache NOT enabled for %x/%x cpu/mmu combination\n", cpumod, mmumod); break; /* ugh, SS and MS have same MMU # */ @@ -186,7 +186,7 @@ cache_enable() (u_int64_t)MXCC_ENABLE_BIT); cacheinfo.ec_enabled = 1; } - kprintf("cache enabled\n"); + printf("cache enabled\n"); break; case SUN4M_MMU_MS1: /* MicroSPARC */ /* We "flash-clear" the I/D caches. */ @@ -199,11 +199,11 @@ cache_enable() SRMMU_PCR_ICE); cacheinfo.c_enabled = cacheinfo.dc_enabled = 1; - kprintf("cache enabled\n"); + printf("cache enabled\n"); break; default: - kprintf("Unknown MMU architecture...cache disabled.\n"); + printf("Unknown MMU architecture...cache disabled.\n"); /* XXX: not HyperSPARC -- guess for now */ cache_alias_bits = GUESS_CACHE_ALIAS_BITS; cache_alias_dist = GUESS_CACHE_ALIAS_DIST; @@ -218,13 +218,13 @@ cache_enable() lduba(AC_SYSENABLE, ASI_CONTROL) | SYSEN_CACHE); cacheinfo.c_enabled = 1; - kprintf("cache enabled\n"); + printf("cache enabled\n"); #ifdef notyet if (cpumod == SUN4_400) { stba(AC_SYSENABLE, ASI_CONTROL, lduba(AC_SYSENABLE, ASI_CONTROL) | SYSEN_IOCACHE); - kprintf("iocache enabled\n"); + printf("iocache enabled\n"); } #endif } diff --git a/sys/arch/sparc/sparc/clock.c b/sys/arch/sparc/sparc/clock.c index b31a2730ca94..c13e7a99e958 100644 --- a/sys/arch/sparc/sparc/clock.c +++ b/sys/arch/sparc/sparc/clock.c @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.46 1996/10/11 00:47:14 christos Exp $ */ +/* $NetBSD: clock.c,v 1.47 1996/10/13 03:00:29 christos Exp $ */ /* * Copyright (c) 1992, 1993 @@ -267,12 +267,12 @@ oclockattach(parent, self, aux) ival = *ireg; /* clear, save value */ intersil_disable(i7); /* disable clock */ if (ival & INTERSIL_INTER_PENDING) { - kprintf(" delay constant %d%s\n", timerblurb, + printf(" delay constant %d%s\n", timerblurb, (timerblurb == 1) ? " [TOO SMALL?]" : ""); break; } if (timerblurb > 10) { - kprintf("\noclock: calibration failing; clamped at %d\n", + printf("\noclock: calibration failing; clamped at %d\n", timerblurb); break; } @@ -324,7 +324,7 @@ eeprom_attach(parent, self, aux) struct confargs *ca = aux; struct romaux *ra = &ca->ca_ra; - kprintf("\n"); + printf("\n"); eeprom_va = (char *)mapiodev(ra->ra_reg, 0, EEPROM_SIZE, ca->ca_bustype); @@ -384,7 +384,7 @@ clockattach(parent, self, aux) if (prop == NULL) panic("no prop"); #endif - kprintf(": %s (eeprom)\n", prop); + printf(": %s (eeprom)\n", prop); /* * We ignore any existing virtual address as we need to map @@ -539,7 +539,7 @@ timerattach(parent, self, aux) } - kprintf(" delay constant %d\n", timerblurb); + printf(" delay constant %d\n", timerblurb); /* should link interrupt handlers here, rather than compiled-in? */ } @@ -622,14 +622,14 @@ cpu_initclocks() #endif /* SUN4 */ if (1000000 % hz) { - kprintf("cannot get %d Hz clock; using 100 Hz\n", hz); + printf("cannot get %d Hz clock; using 100 Hz\n", hz); hz = 100; tick = 1000000 / hz; } if (stathz == 0) stathz = hz; if (1000000 % stathz) { - kprintf("cannot get %d Hz statclock; using 100 Hz\n", stathz); + printf("cannot get %d Hz statclock; using 100 Hz\n", stathz); stathz = 100; } profhz = stathz; /* always */ @@ -897,7 +897,7 @@ inittodr(base) * in stead of preposterous. Don't bark. */ if (base != 0) - kprintf("WARNING: preposterous time in file system\n"); + printf("WARNING: preposterous time in file system\n"); /* not going to use it anyway, if the chip is readable */ base = 21*SECYR + 186*SECDAY + SECDAY/2; badbase = 1; @@ -924,7 +924,7 @@ inittodr(base) forward: #endif if (time.tv_sec == 0) { - kprintf("WARNING: bad date in battery clock"); + printf("WARNING: bad date in battery clock"); /* * Believe the time in the file system for lack of * anything better, resetting the clock. @@ -939,10 +939,10 @@ forward: deltat = -deltat; if (waszero || deltat < 2 * SECDAY) return; - kprintf("WARNING: clock %s %d days", + printf("WARNING: clock %s %d days", time.tv_sec < base ? "lost" : "gained", deltat / SECDAY); } - kprintf(" -- CHECK AND RESET THE DATE!\n"); + printf(" -- CHECK AND RESET THE DATE!\n"); } /* diff --git a/sys/arch/sparc/sparc/cpu.c b/sys/arch/sparc/sparc/cpu.c index ae9d95220dc3..1236f606913f 100644 --- a/sys/arch/sparc/sparc/cpu.c +++ b/sys/arch/sparc/sparc/cpu.c @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.c,v 1.25 1996/10/11 00:47:15 christos Exp $ */ +/* $NetBSD: cpu.c,v 1.26 1996/10/13 03:00:31 christos Exp $ */ /* * Copyright (c) 1996 @@ -201,7 +201,7 @@ cpu_attach(parent, dev, aux) vactype = VAC_WRITEBACK; switch (cpumod) { case SUN4_100: - ksprintf(cpu_model, "SUN-4/100 series (%s FPU)", fpuname); + sprintf(cpu_model, "SUN-4/100 series (%s FPU)", fpuname); vactype = VAC_NONE; cacheinfo.c_totalsize = 0; cacheinfo.c_hwflush = 0; @@ -209,14 +209,14 @@ cpu_attach(parent, dev, aux) cacheinfo.c_l2linesize = 0; break; case SUN4_200: - ksprintf(cpu_model, "SUN-4/200 series (%s FPU)", fpuname); + sprintf(cpu_model, "SUN-4/200 series (%s FPU)", fpuname); cacheinfo.c_totalsize = 128*1024; cacheinfo.c_hwflush = 0; cacheinfo.c_linesize = 16; cacheinfo.c_l2linesize = 4; break; case SUN4_300: - ksprintf(cpu_model, "SUN-4/300 series (%s FPU)", fpuname); + sprintf(cpu_model, "SUN-4/300 series (%s FPU)", fpuname); bug = 1; cacheinfo.c_totalsize = 128*1024; cacheinfo.c_hwflush = 0; @@ -224,14 +224,14 @@ cpu_attach(parent, dev, aux) cacheinfo.c_l2linesize = 4; break; case SUN4_400: - ksprintf(cpu_model, "SUN-4/400 series (%s FPU)", fpuname); + sprintf(cpu_model, "SUN-4/400 series (%s FPU)", fpuname); cacheinfo.c_totalsize = 128 * 1024; cacheinfo.c_hwflush = 0; cacheinfo.c_linesize = 32; cacheinfo.c_l2linesize = 5; break; } - kprintf(": %s\n", cpu_model); + printf(": %s\n", cpu_model); } #endif /* SUN4 */ @@ -245,16 +245,16 @@ cpu_attach(parent, dev, aux) clk = getpropint(findroot(), "clock-frequency", 0); } if (CPU_ISSUN4C) - ksprintf(cpu_model, "%s (%s @ %s MHz, %s FPU)", + sprintf(cpu_model, "%s (%s @ %s MHz, %s FPU)", getpropstring(node, "name"), psrtoname(impl, vers, fver, iubuf), clockfreq(clk), fpuname); else /* On sun4m, the "name" property identifies CPU */ - ksprintf(cpu_model, "%s @ %s MHz, %s FPU", + sprintf(cpu_model, "%s @ %s MHz, %s FPU", getpropstring(node, "name"), clockfreq(clk), fpuname); - kprintf(": %s\n", cpu_model); + printf(": %s\n", cpu_model); /* * Fill in the cache info. Note, vac-hwflush is spelled @@ -325,7 +325,7 @@ cpu_attach(parent, dev, aux) cacheinfo.dc_totalsize; break; case SUN4M_MMU_HS: - kprintf("Warning, guessing on HyperSPARC cache...\n"); + printf("Warning, guessing on HyperSPARC cache...\n"); cacheinfo.c_split = 0; i = lda(SRMMU_PCR, ASI_SRMMU); if (i & SRMMU_PCR_CS) @@ -342,7 +342,7 @@ cpu_attach(parent, dev, aux) cacheinfo.c_l2linesize = i; break; default: - kprintf("warning: couldn't identify cache\n"); + printf("warning: couldn't identify cache\n"); cacheinfo.c_totalsize = 0; } } else @@ -375,7 +375,7 @@ cpu_attach(parent, dev, aux) if (bug) { kvm_uncache((caddr_t)trapbase, 1); - kprintf("%s: cache chip bug; trap page uncached\n", + printf("%s: cache chip bug; trap page uncached\n", dev->dv_xname); } @@ -383,7 +383,7 @@ cpu_attach(parent, dev, aux) return; if (!cacheinfo.c_physical) { - kprintf("%s: %d byte write-%s, %d bytes/line, %cw flush ", + printf("%s: %d byte write-%s, %d bytes/line, %cw flush ", dev->dv_xname, cacheinfo.c_totalsize, (vactype == VAC_WRITETHROUGH) ? "through" : "back", cacheinfo.c_linesize, @@ -392,27 +392,27 @@ cpu_attach(parent, dev, aux) } else { sep = " "; if (cacheinfo.c_split) { - kprintf("%s: physical", dev->dv_xname); + printf("%s: physical", dev->dv_xname); if (cacheinfo.ic_totalsize > 0) { - kprintf("%s%dK instruction (%d b/l)", sep, + printf("%s%dK instruction (%d b/l)", sep, cacheinfo.ic_totalsize/1024, cacheinfo.ic_linesize); sep = ", "; } if (cacheinfo.dc_totalsize > 0) { - kprintf("%s%dK data (%d b/l)", sep, + printf("%s%dK data (%d b/l)", sep, cacheinfo.dc_totalsize/1024, cacheinfo.dc_linesize); sep = ", "; } if (cacheinfo.ec_totalsize > 0) { - kprintf("%s%dK external (%d b/l)", sep, + printf("%s%dK external (%d b/l)", sep, cacheinfo.ec_totalsize/1024, cacheinfo.ec_linesize); } - kprintf(" "); + printf(" "); } else - kprintf("%s: physical %dK combined cache (%d bytes/" + printf("%s: physical %dK combined cache (%d bytes/" "line) ", dev->dv_xname, cacheinfo.c_totalsize/1024, cacheinfo.c_linesize); @@ -469,7 +469,7 @@ psrtoname(impl, vers, fver, buf) return (p->name); /* Not found. */ - ksprintf(buf, "IU impl 0x%x vers 0x%x", impl, vers); + sprintf(buf, "IU impl 0x%x vers 0x%x", impl, vers); return (buf); } #endif /* SUN4C || SUN4M */ @@ -531,6 +531,6 @@ fsrtoname(impl, vers, fver, buf) (p->iu_vers == vers || p->iu_vers == ANY) && (p->fpu_vers == fver)) return (p->name); - ksprintf(buf, "version %x", fver); + sprintf(buf, "version %x", fver); return (buf); } diff --git a/sys/arch/sparc/sparc/db_interface.c b/sys/arch/sparc/sparc/db_interface.c index 1023dd238d61..4cc77c1affe5 100644 --- a/sys/arch/sparc/sparc/db_interface.c +++ b/sys/arch/sparc/sparc/db_interface.c @@ -1,4 +1,4 @@ -/* $NetBSD: db_interface.c,v 1.13 1996/10/11 00:47:18 christos Exp $ */ +/* $NetBSD: db_interface.c,v 1.14 1996/10/13 03:00:32 christos Exp $ */ /* * Mach Operating System @@ -112,7 +112,7 @@ kdb_kbd_trap(tf) struct trapframe *tf; { if (db_active == 0 && (boothowto & RB_KDB)) { - kprintf("\n\nkernel: keyboard interrupt\n"); + printf("\n\nkernel: keyboard interrupt\n"); kdb_trap(-1, tf); } } @@ -133,7 +133,7 @@ kdb_trap(type, tf) case -1: /* keyboard interrupt */ break; default: - kprintf("kernel: %s trap", trap_type[type & 0xff]); + printf("kernel: %s trap", trap_type[type & 0xff]); if (db_recover != 0) { db_error("Faulted in DDB; continuing...\n"); /*NOTREACHED*/ diff --git a/sys/arch/sparc/sparc/intr.c b/sys/arch/sparc/sparc/intr.c index 0c649126613c..8e51ff149224 100644 --- a/sys/arch/sparc/sparc/intr.c +++ b/sys/arch/sparc/sparc/intr.c @@ -1,4 +1,4 @@ -/* $NetBSD: intr.c,v 1.15 1996/10/11 00:47:19 christos Exp $ */ +/* $NetBSD: intr.c,v 1.16 1996/10/13 03:00:33 christos Exp $ */ /* * Copyright (c) 1992, 1993 @@ -95,7 +95,7 @@ strayintr(fp) static int straytime, nstray; int timesince; - kprintf("stray interrupt ipl %x pc=%x npc=%x psr=%b\n", + printf("stray interrupt ipl %x pc=%x npc=%x psr=%b\n", fp->ipl, fp->pc, fp->npc, fp->psr, PSR_BITS); timesince = time.tv_sec - straytime; if (timesince <= 10) { diff --git a/sys/arch/sparc/sparc/iommu.c b/sys/arch/sparc/sparc/iommu.c index 7b906d861e43..dc175f2ac0e7 100644 --- a/sys/arch/sparc/sparc/iommu.c +++ b/sys/arch/sparc/sparc/iommu.c @@ -1,4 +1,4 @@ -/* $NetBSD: iommu.c,v 1.6 1996/10/11 00:47:20 christos Exp $ */ +/* $NetBSD: iommu.c,v 1.7 1996/10/13 03:00:35 christos Exp $ */ /* * Copyright (c) 1996 @@ -87,7 +87,7 @@ iommu_print(args, iommu) register struct confargs *ca = args; if (iommu) - kprintf("%s at %s", ca->ca_ra.ra_name, iommu); + printf("%s at %s", ca->ca_ra.ra_name, iommu); return (UNCONF); } @@ -133,7 +133,7 @@ iommu_attach(parent, self, aux) * address children on others */ if (sc->sc_dev.dv_unit > 0) { - kprintf(" unsupported\n"); + printf(" unsupported\n"); return; } node = ra->ra_node; @@ -232,7 +232,7 @@ iommu_attach(parent, self, aux) IOMMU_FLUSHALL(sc); splx(s); - kprintf(": version %x/%x, page-size %d, range %dMB\n", + printf(": version %x/%x, page-size %d, range %dMB\n", (sc->sc_reg->io_cr & IOMMU_CTL_VER) >> 24, (sc->sc_reg->io_cr & IOMMU_CTL_IMPL) >> 28, sc->sc_pagesize, @@ -313,8 +313,8 @@ iommu_error() struct iommu_softc *sc = X; struct iommureg *iop = sc->sc_reg; - kprintf("iommu: afsr %x, afar %x\n", iop->io_afsr, iop->io_afar); - kprintf("iommu: mfsr %x, mfar %x\n", iop->io_mfsr, iop->io_mfar); + printf("iommu: afsr %x, afar %x\n", iop->io_afsr, iop->io_afar); + printf("iommu: mfsr %x, mfar %x\n", iop->io_mfsr, iop->io_mfar); } int iommu_alloc(va, len) diff --git a/sys/arch/sparc/sparc/kgdb_stub.c b/sys/arch/sparc/sparc/kgdb_stub.c index b535b63a1125..554601dd97d0 100644 --- a/sys/arch/sparc/sparc/kgdb_stub.c +++ b/sys/arch/sparc/sparc/kgdb_stub.c @@ -1,4 +1,4 @@ -/* $NetBSD: kgdb_stub.c,v 1.9 1996/10/11 00:47:22 christos Exp $ */ +/* $NetBSD: kgdb_stub.c,v 1.10 1996/10/13 03:00:36 christos Exp $ */ /* * Copyright (c) 1992, 1993 @@ -313,7 +313,7 @@ kgdb_connect(verbose) return; fb_unblank(); if (verbose) - kprintf("kgdb waiting..."); + printf("kgdb waiting..."); __asm("ta %0" :: "n" (T_KGDB_EXEC)); /* trap into kgdb */ } @@ -453,11 +453,11 @@ kgdb_trap(type, tf) while (GETC() != FRAME_END) continue; /* - * Do the kprintf *before* we ack the message. This way + * Do the printf *before* we ack the message. This way * we won't drop any inbound characters while we're - * doing the polling kprintf. + * doing the polling printf. */ - kprintf("kgdb started from device %x\n", kgdb_dev); + printf("kgdb started from device %x\n", kgdb_dev); kgdb_send(in | KGDB_ACK, (u_char *)0, 0); kgdb_active = 1; } @@ -573,7 +573,7 @@ kgdb_trap(type, tf) case KGDB_KILL: kgdb_active = 0; - kprintf("kgdb detached\n"); + printf("kgdb detached\n"); /* FALLTHROUGH */ case KGDB_CONT: diff --git a/sys/arch/sparc/sparc/machdep.c b/sys/arch/sparc/sparc/machdep.c index 6dc030fa7e30..e76e5d8198a6 100644 --- a/sys/arch/sparc/sparc/machdep.c +++ b/sys/arch/sparc/sparc/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.69 1996/10/11 00:47:27 christos Exp $ */ +/* $NetBSD: machdep.c,v 1.70 1996/10/13 03:00:38 christos Exp $ */ /* * Copyright (c) 1992, 1993 @@ -159,12 +159,12 @@ cpu_startup() /* * Good {morning,afternoon,evening,night}. */ - kprintf(version); + printf(version); /*identifycpu();*/ #ifndef MACHINE_NONCONTIG physmem = btoc(avail_end); #endif - kprintf("real mem = %d\n", ctob(physmem)); + printf("real mem = %d\n", ctob(physmem)); /* * Find out how much space we need, allocate it, @@ -264,8 +264,8 @@ cpu_startup() #ifdef DEBUG pmapdebug = opmapdebug; #endif - kprintf("avail mem = %ld\n", ptoa(cnt.v_free_count)); - kprintf("using %d buffers containing %d bytes of memory\n", + printf("avail mem = %ld\n", ptoa(cnt.v_free_count)); + printf("using %d buffers containing %d bytes of memory\n", nbuf, bufpages * CLBYTES); /* @@ -486,7 +486,7 @@ sendsig(catcher, sig, mask, code) #ifdef DEBUG if ((sigdebug & SDB_KSTACK) && p->p_pid == sigpid) - kprintf("sendsig: %s[%d] sig %d newusp %p scp %p\n", + printf("sendsig: %s[%d] sig %d newusp %p scp %p\n", p->p_comm, p->p_pid, sig, fp, &fp->sf_sc); #endif /* @@ -532,14 +532,14 @@ sendsig(catcher, sig, mask, code) */ #ifdef DEBUG if ((sigdebug & SDB_KSTACK) && p->p_pid == sigpid) - kprintf("sendsig: window save or copyout error\n"); + printf("sendsig: window save or copyout error\n"); #endif sigexit(p, SIGILL); /* NOTREACHED */ } #ifdef DEBUG if (sigdebug & SDB_FOLLOW) - kprintf("sendsig: %s[%d] sig %d scp %p\n", + printf("sendsig: %s[%d] sig %d scp %p\n", p->p_comm, p->p_pid, sig, &fp->sf_sc); #endif /* @@ -560,7 +560,7 @@ sendsig(catcher, sig, mask, code) tf->tf_out[6] = newsp; #ifdef DEBUG if ((sigdebug & SDB_KSTACK) && p->p_pid == sigpid) - kprintf("sendsig: about to return to catcher\n"); + printf("sendsig: about to return to catcher\n"); #endif } @@ -592,7 +592,7 @@ sys_sigreturn(p, v, retval) sigexit(p, SIGILL); #ifdef DEBUG if (sigdebug & SDB_FOLLOW) - kprintf("sigreturn: %s[%d], sigcntxp %p\n", + printf("sigreturn: %s[%d], sigcntxp %p\n", p->p_comm, p->p_pid, SCARG(uap, sigcntxp)); #endif scp = SCARG(uap, sigcntxp); @@ -633,7 +633,7 @@ boot(howto, user_boot_string) extern int cold; if (cold) { - kprintf("halted\n\n"); + printf("halted\n\n"); romhalt(); } @@ -657,14 +657,14 @@ boot(howto, user_boot_string) (void) splhigh(); /* ??? */ if (howto & RB_HALT) { doshutdownhooks(); - kprintf("halted\n\n"); + printf("halted\n\n"); romhalt(); } if (howto & RB_DUMP) dumpsys(); doshutdownhooks(); - kprintf("rebooting\n\n"); + printf("rebooting\n\n"); if (user_boot_string && *user_boot_string) { i = strlen(user_boot_string); if (i > sizeof(str)) @@ -775,12 +775,12 @@ dumpsys() dumpconf(); if (dumplo < 0) return; - kprintf("\ndumping to dev %x, offset %ld\n", dumpdev, dumplo); + printf("\ndumping to dev %x, offset %ld\n", dumpdev, dumplo); psize = (*bdevsw[major(dumpdev)].d_psize)(dumpdev); - kprintf("dump "); + printf("dump "); if (psize == -1) { - kprintf("area unavailable\n"); + printf("area unavailable\n"); return; } blkno = dumplo; @@ -804,7 +804,7 @@ dumpsys() /* print out how many MBs we have dumped */ if (i && (i % (1024*1024)) == 0) - kprintf("%d ", i / (1024*1024)); + printf("%d ", i / (1024*1024)); (void) pmap_map(dumpspace, maddr, maddr + n, VM_PROT_READ); @@ -823,27 +823,27 @@ dumpsys() switch (error) { case ENXIO: - kprintf("device bad\n"); + printf("device bad\n"); break; case EFAULT: - kprintf("device not ready\n"); + printf("device not ready\n"); break; case EINVAL: - kprintf("area improper\n"); + printf("area improper\n"); break; case EIO: - kprintf("i/o error\n"); + printf("i/o error\n"); break; case 0: - kprintf("succeeded\n"); + printf("succeeded\n"); break; default: - kprintf("error %d\n", error); + printf("error %d\n", error); break; } } @@ -858,10 +858,10 @@ stackdump() struct frame *fp = getfp(), *sfp; sfp = fp; - kprintf("Frame pointer is at %p\n", fp); - kprintf("Call traceback:\n"); + printf("Frame pointer is at %p\n", fp); + printf("Call traceback:\n"); while (fp && ((u_long)fp >> PGSHIFT) == ((u_long)sfp >> PGSHIFT)) { - kprintf(" pc = %x args = (%x, %x, %x, %x, %x, %x, %x) fp = %p\n", + printf(" pc = %x args = (%x, %x, %x, %x, %x, %x, %x) fp = %p\n", fp->fr_pc, fp->fr_arg[0], fp->fr_arg[1], fp->fr_arg[2], fp->fr_arg[3], fp->fr_arg[4], fp->fr_arg[5], fp->fr_arg[6], fp->fr_fp); @@ -952,30 +952,30 @@ oldmon_w_trace(va) struct frame *fp; if (curproc) - kprintf("curproc = %p, pid %d\n", curproc, curproc->p_pid); + printf("curproc = %p, pid %d\n", curproc, curproc->p_pid); else - kprintf("no curproc\n"); + printf("no curproc\n"); - kprintf("cnt: swtch %d, trap %d, sys %d, intr %d, soft %d, faults %d\n", + printf("cnt: swtch %d, trap %d, sys %d, intr %d, soft %d, faults %d\n", cnt.v_swtch, cnt.v_trap, cnt.v_syscall, cnt.v_intr, cnt.v_soft, cnt.v_faults); write_user_windows(); #define round_up(x) (( (x) + (NBPG-1) ) & (~(NBPG-1)) ) - kprintf("\nstack trace with sp = %lx\n", va); + printf("\nstack trace with sp = %lx\n", va); stop = round_up(va); - kprintf("stop at %lx\n", stop); + printf("stop at %lx\n", stop); fp = (struct frame *) va; while (round_up((u_long) fp) == stop) { - kprintf(" %x(%x, %x, %x, %x, %x, %x, %x) fp %p\n", fp->fr_pc, + printf(" %x(%x, %x, %x, %x, %x, %x, %x) fp %p\n", fp->fr_pc, fp->fr_arg[0], fp->fr_arg[1], fp->fr_arg[2], fp->fr_arg[3], fp->fr_arg[4], fp->fr_arg[5], fp->fr_arg[6], fp->fr_fp); fp = fp->fr_fp; if (fp == NULL) break; } - kprintf("end of stack trace\n"); + printf("end of stack trace\n"); } void @@ -989,10 +989,10 @@ oldmon_w_cmd(va, ar) case 0: panic("g0 panic"); case 4: - kprintf("w: case 4\n"); + printf("w: case 4\n"); break; default: - kprintf("w: unknown case %ld\n", va); + printf("w: unknown case %ld\n", va); break; } break; @@ -1000,7 +1000,7 @@ oldmon_w_cmd(va, ar) oldmon_w_trace(va); break; default: - kprintf("w: arg not allowed\n"); + printf("w: arg not allowed\n"); } } #endif /* SUN4 */ @@ -1016,7 +1016,7 @@ caddr_t addr; int s; if (CPU_ISSUN4M) { - kprintf("warning: ldcontrolb called in sun4m\n"); + printf("warning: ldcontrolb called in sun4m\n"); return 0; } diff --git a/sys/arch/sparc/sparc/memreg.c b/sys/arch/sparc/sparc/memreg.c index 0732695a4fde..59a3758d9caf 100644 --- a/sys/arch/sparc/sparc/memreg.c +++ b/sys/arch/sparc/sparc/memreg.c @@ -1,4 +1,4 @@ -/* $NetBSD: memreg.c,v 1.14 1996/10/11 00:47:29 christos Exp $ */ +/* $NetBSD: memreg.c,v 1.15 1996/10/13 03:00:39 christos Exp $ */ /* * Copyright (c) 1992, 1993 @@ -114,7 +114,7 @@ memregattach(parent, self, aux) (volatile u_int *)mapiodev(ra->ra_reg, 0, sizeof(int), ca->ca_bustype); } - kprintf("\n"); + printf("\n"); } /* @@ -135,12 +135,12 @@ memerr(issync, ser, sva, aer, ava) #if defined(SUN4) case CPU_SUN4: if (par_err_reg) { - kprintf("mem err: ser=%b sva=%x\n", ser, SER_BITS, sva); - kprintf("parity error register = %b\n", + printf("mem err: ser=%b sva=%x\n", ser, SER_BITS, sva); + printf("parity error register = %b\n", *par_err_reg, PER_BITS); } else { - kprintf("mem err: ser=? sva=?\n"); - kprintf("parity error register not mapped yet!\n"); /* XXX */ + printf("mem err: ser=? sva=?\n"); + printf("parity error register not mapped yet!\n"); /* XXX */ } #ifdef DEBUG callrom(); @@ -152,11 +152,11 @@ memerr(issync, ser, sva, aer, ava) #if defined(SUN4C) case CPU_SUN4C: - kprintf("%ssync mem err: ser=%b sva=%x aer=%b ava=%x\n", + printf("%ssync mem err: ser=%b sva=%x aer=%b ava=%x\n", issync ? "" : "a", ser, SER_BITS, sva, aer & 0xff, AER_BITS, ava); if (par_err_reg) - kprintf("parity error register = %b\n", + printf("parity error register = %b\n", *par_err_reg, PER_BITS); #ifdef DEBUG callrom(); @@ -236,7 +236,7 @@ memerr4m(type, sfsr, sfva, afsr, afva, tf) { if ((afsr & AFSR_AFO) != 0) { /* HS async fault! */ - kprintf("HyperSPARC async cache memory failure at phys 0x%x%x. " + printf("HyperSPARC async cache memory failure at phys 0x%x%x. " "Ignoring.\n", (afsr & AFSR_AFA) >> AFSR_AFA_RSHIFT, afva); @@ -251,7 +251,7 @@ memerr4m(type, sfsr, sfva, afsr, afva, tf) } else if (type == T_STOREBUFFAULT) { /* We try to reenable the store buffers to force a retry */ - kprintf("store buffer copy-back failure at 0x%x. Retrying...\n", + printf("store buffer copy-back failure at 0x%x. Retrying...\n", sfva); if (oldtype == T_STOREBUFFAULT || addrold == sfva) @@ -267,7 +267,7 @@ memerr4m(type, sfsr, sfva, afsr, afva, tf) } else if (type == T_DATAFAULT && !(sfsr & SFSR_FAV)) { /* bizarre */ /* XXX: Should handle better. See SuperSPARC manual pg. 9-35 */ - kprintf("warning: got data fault with no faulting address." + printf("warning: got data fault with no faulting address." " Ignoring.\n"); if (oldtype == T_DATAFAULT) @@ -276,7 +276,7 @@ memerr4m(type, sfsr, sfva, afsr, afva, tf) oldtype = T_DATAFAULT; } else if (type == 0) { /* NMI */ - kprintf("ERROR: got NMI with sfsr=0x%b, sfva=0x%x, afsr=0x%b, " + printf("ERROR: got NMI with sfsr=0x%b, sfva=0x%x, afsr=0x%b, " "afaddr=0x%x. Retrying...\n", sfsr,SFSR_BITS,sfva,afsr, AFSR_BITS,afva); if (oldtype == 0 || addrold == sfva) diff --git a/sys/arch/sparc/sparc/pmap.c b/sys/arch/sparc/sparc/pmap.c index 73d7d2891a9b..4e03c5affd82 100644 --- a/sys/arch/sparc/sparc/pmap.c +++ b/sys/arch/sparc/sparc/pmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.65 1996/10/11 00:47:31 christos Exp $ */ +/* $NetBSD: pmap.c,v 1.66 1996/10/13 03:00:42 christos Exp $ */ /* * Copyright (c) 1996 @@ -1021,7 +1021,7 @@ mmu_reservemon4m(kpmap, kmemtop) break; case SRMMU_TEPTE: #ifdef DEBUG - kprintf("mmu_reservemon4m: trying to remap 4G segment!\n"); + printf("mmu_reservemon4m: trying to remap 4G segment!\n"); #endif panic("mmu_reservemon4m: can't handle ROM 4G page size"); /* XXX: Should make this work, however stupid it is */ @@ -1081,7 +1081,7 @@ mmu_setup4m_L1(regtblptd, newtableptr, kpmap, kmemtop) break; case SRMMU_TEPTE: #ifdef DEBUG - kprintf("mmu_reservemon4m: converting region 0x%x from L1->L3\n",i); + printf("mmu_reservemon4m: converting region 0x%x from L1->L3\n",i); #endif /* We must build segment and page tables, then * fill them in @@ -1169,7 +1169,7 @@ mmu_setup4m_L2(segtblptd, newtableptr, pregmap, kmemtop, segmaps) break; case SRMMU_TEPTE: #ifdef DEBUG - kprintf("mmu_reservemon4m: converting L2 entry at segment 0x%x to L3\n",i); + printf("mmu_reservemon4m: converting L2 entry at segment 0x%x to L3\n",i); #endif pregmap->rg_nsegmap++; /* We must build page tables and fill them in */ @@ -1305,7 +1305,7 @@ me_alloc(mh, newpm, newvreg, newvseg) if (me->me_pmap != NULL) panic("me_alloc: freelist entry has pmap"); if (pmapdebug & PDB_MMU_ALLOC) - kprintf("me_alloc: got pmeg %d\n", me->me_cookie); + printf("me_alloc: got pmeg %d\n", me->me_cookie); #endif TAILQ_INSERT_TAIL(mh, me, me_list); @@ -1332,7 +1332,7 @@ me_alloc(mh, newpm, newvreg, newvseg) panic("me_alloc: stealing from kernel"); #ifdef DEBUG if (pmapdebug & (PDB_MMU_ALLOC | PDB_MMU_STEAL)) - kprintf("me_alloc: stealing pmeg %x from pmap %p\n", + printf("me_alloc: stealing pmeg %x from pmap %p\n", me->me_cookie, pm); #endif /* @@ -1445,7 +1445,7 @@ me_free(pm, pmeg) #ifdef DEBUG if (pmapdebug & PDB_MMU_ALLOC) - kprintf("me_free: freeing pmeg %d from pmap %p\n", + printf("me_free: freeing pmeg %d from pmap %p\n", me->me_cookie, pm); if (me->me_cookie != pmeg) panic("me_free: wrong mmuentry"); @@ -1521,7 +1521,7 @@ region_alloc(mh, newpm, newvr) if (me->me_pmap != NULL) panic("region_alloc: freelist entry has pmap"); if (pmapdebug & PDB_MMUREG_ALLOC) - kprintf("region_alloc: got smeg %x\n", me->me_cookie); + printf("region_alloc: got smeg %x\n", me->me_cookie); #endif TAILQ_INSERT_TAIL(mh, me, me_list); @@ -1547,7 +1547,7 @@ region_alloc(mh, newpm, newvr) panic("region_alloc: stealing from kernel"); #ifdef DEBUG if (pmapdebug & (PDB_MMUREG_ALLOC | PDB_MMUREG_STEAL)) - kprintf("region_alloc: stealing smeg %x from pmap %p\n", + printf("region_alloc: stealing smeg %x from pmap %p\n", me->me_cookie, pm); #endif /* @@ -1605,7 +1605,7 @@ region_free(pm, smeg) #ifdef DEBUG if (pmapdebug & PDB_MMUREG_ALLOC) - kprintf("region_free: freeing smeg %x from pmap %p\n", + printf("region_free: freeing smeg %x from pmap %p\n", me->me_cookie, pm); if (me->me_cookie != smeg) panic("region_free: wrong mmuentry"); @@ -1662,7 +1662,7 @@ mmu_pagein(pm, va, prot) rp = &pm->pm_regmap[vr]; #ifdef DEBUG if (pm == pmap_kernel()) -kprintf("mmu_pagein: kernel wants map at va %x, vr %d, vs %d\n", va, vr, vs); +printf("mmu_pagein: kernel wants map at va %x, vr %d, vs %d\n", va, vr, vs); #endif /* return 0 if we have no PMEGs to load */ @@ -1751,7 +1751,7 @@ mmu_pagein4m(pm, va, prot) bits |= PPROT_S; */ if (bits && (pte & bits) == bits) { - kprintf("pagein4m(%s[%d]): OOPS: prot=%x, va=%x, pte=%x, bits=%x\n", + printf("pagein4m(%s[%d]): OOPS: prot=%x, va=%x, pte=%x, bits=%x\n", curproc->p_comm, curproc->p_pid, prot, va, pte, bits); return -1; } @@ -1781,7 +1781,7 @@ ctx_alloc(pm) if (pm->pm_ctx) panic("ctx_alloc pm_ctx"); if (pmapdebug & PDB_CTX_ALLOC) - kprintf("ctx_alloc(%p)\n", pm); + printf("ctx_alloc(%p)\n", pm); #endif if (CPU_ISSUN4OR4C) { gap_start = pm->pm_gap_start; @@ -1806,7 +1806,7 @@ ctx_alloc(pm) if (c->c_pmap == NULL) panic("ctx_alloc cu_pmap"); if (pmapdebug & (PDB_CTX_ALLOC | PDB_CTX_STEAL)) - kprintf("ctx_alloc: steal context %d from %p\n", + printf("ctx_alloc: steal context %d from %p\n", cnum, c->c_pmap); #endif c->c_pmap->pm_ctx = NULL; @@ -2261,7 +2261,7 @@ pv_link4_4c(pv, pm, va) for (npv = pv; npv != NULL; npv = npv->pv_next) { if (BADALIAS(va, npv->pv_va)) { #ifdef DEBUG - if (pmapdebug) kprintf( + if (pmapdebug) printf( "pv_link: badalias: pid %d, %lx<=>%x, pa %lx\n", curproc?curproc->p_pid:-1, va, npv->pv_va, vm_first_phys + (pv-pv_table)*NBPG); @@ -2519,7 +2519,7 @@ pv_link4m(pv, pm, va) for (npv = pv; npv != NULL; npv = npv->pv_next) { if (BADALIAS(va, npv->pv_va)) { #ifdef DEBUG - if (pmapdebug & PDB_CACHESTUFF) kprintf( + if (pmapdebug & PDB_CACHESTUFF) printf( "pv_link: badalias: pid %d, %lx<=>%x, pa %lx\n", curproc?curproc->p_pid:-1, va, npv->pv_va, vm_first_phys + (pv-pv_table)*NBPG); @@ -2670,7 +2670,7 @@ pmap_bootstrap4_4c(nctx, nregion, nsegment) segfixmask = nsegment - 1; /* assume nsegment is a power of 2 */ #ifdef DIAGNOSTIC if (((nsegment & segfixmask) | (nsegment & ~segfixmask)) != nsegment) { - kprintf("pmap_bootstrap: unsuitable number of segments (%d)\n", + printf("pmap_bootstrap: unsuitable number of segments (%d)\n", nsegment); callrom(); } @@ -2790,7 +2790,7 @@ pmap_bootstrap4_4c(nctx, nregion, nsegment) npmemarr = makememarr(pmemarr, MA_SIZE, MEMARR_AVAILPHYS); sortm(pmemarr, npmemarr); if (pmemarr[0].addr != 0) { - kprintf("pmap_bootstrap: no kernel memory?!\n"); + printf("pmap_bootstrap: no kernel memory?!\n"); callrom(); } avail_end = pmemarr[npmemarr-1].addr + pmemarr[npmemarr-1].len; @@ -2869,7 +2869,7 @@ pmap_bootstrap4_4c(nctx, nregion, nsegment) /* Entering a new region */ if (VA_VREG(p) > vr) { #ifdef DEBUG - kprintf("note: giant kernel!\n"); + printf("note: giant kernel!\n"); #endif vr++, rp++; } @@ -3129,7 +3129,7 @@ pmap_bootstrap4m(void) deadspace -= (int)(p - (caddr_t) kernel_regtable_store); } if (deadspace < 0) - kprintf("pmap_bootstrap4m: botch in memory-saver\n"); + printf("pmap_bootstrap4m: botch in memory-saver\n"); p = (caddr_t) roundup((u_int)p, (0 - DVMA4M_BASE) / 1024); kernel_iopte_table = (u_int *)p; @@ -3219,7 +3219,7 @@ pmap_bootstrap4m(void) npmemarr = makememarr(pmemarr, MA_SIZE, MEMARR_AVAILPHYS); sortm(pmemarr, npmemarr); if (pmemarr[0].addr != 0) { - kprintf("pmap_bootstrap: no kernel memory?!\n"); + printf("pmap_bootstrap: no kernel memory?!\n"); callrom(); } avail_end = pmemarr[npmemarr-1].addr + pmemarr[npmemarr-1].len; @@ -3270,7 +3270,7 @@ pmap_bootstrap4m(void) #endif if (pmap_kernel()->pm_reg_ptps == NULL) { #ifdef DEBUG - kprintf("pmap_bootstrap4m: no kernel regiontable; creating.\n"); + printf("pmap_bootstrap4m: no kernel regiontable; creating.\n"); #endif pmap_kernel()->pm_reg_ptps = (int *) kernel_regtable_store; pmap_kernel()->pm_reg_ptps_pa = @@ -3412,7 +3412,7 @@ pmap_bootstrap4m(void) * Now switch to kernel pagetables (finally!) */ #ifdef DEBUG - kprintf("pmap_bootstrap: installing kernel page tables..."); + printf("pmap_bootstrap: installing kernel page tables..."); #endif setcontext(0); /* paranoia? %%%: Make 0x3 a define! below */ @@ -3425,16 +3425,16 @@ pmap_bootstrap4m(void) if ((cpumod & 0xf0) == (SUN4M_SS & 0xf0)) sta(SRMMU_PCR, ASI_SRMMU, (i | SRMMU_PCR_TC)); else /* microsparc */ - kprintf("(if this doesn't work, " + printf("(if this doesn't work, " "fix pmap_bootstrap4m in pmap.c)"); break; case SUN4M_MMU_HS: - kprintf("(if this doesn't work, fix pmap_bootstrap4m in pmap.c)"); + printf("(if this doesn't work, fix pmap_bootstrap4m in pmap.c)"); sta(SRMMU_PCR, ASI_SRMMU, (i | SRMMU_PCR_C) & ~SRMMU_PCR_CE); /* above: CHECKFIX %%% below: add microsparc*/ break; case SUN4M_MMU_MS1: - kprintf("(if this doesn't work, fix pmap_bootstrap4m in pmap.c)"); + printf("(if this doesn't work, fix pmap_bootstrap4m in pmap.c)"); break; default: panic("Unimplemented MMU architecture %d",mmumod); @@ -3448,7 +3448,7 @@ pmap_bootstrap4m(void) tlb_flush_all(); #ifdef DEBUG - kprintf("done.\n"); + printf("done.\n"); #endif /* @@ -3468,21 +3468,21 @@ pmap_bootstrap4m(void) DO_THE_MATH(SRMMU_L3SIZE * sizeof(long) * NKREG * NSEGRG); #ifdef DEBUG - kprintf("pmap_bootstrap4m: uncaching %d PT pages at 0x%lx\n", + printf("pmap_bootstrap4m: uncaching %d PT pages at 0x%lx\n", numpages, (long)kernel_pagtable_store); #endif kvm_uncache((caddr_t)kernel_pagtable_store, numpages); DO_THE_MATH(SRMMU_L2SIZE * sizeof(long) * NKREG); #ifdef DEBUG - kprintf("pmap_bootstrap4m: uncaching %d ST pages at 0x%lx\n", + printf("pmap_bootstrap4m: uncaching %d ST pages at 0x%lx\n", numpages, (long)kernel_segtable_store); #endif kvm_uncache((caddr_t)kernel_segtable_store, numpages); DO_THE_MATH(SRMMU_L1SIZE * sizeof(long)); #ifdef DEBUG - kprintf("pmap_bootstrap4m: uncaching %d RT pages at 0x%lx\n", + printf("pmap_bootstrap4m: uncaching %d RT pages at 0x%lx\n", numpages, (long)kernel_regtable_store); #endif kvm_uncache((caddr_t)kernel_regtable_store, numpages); @@ -3491,7 +3491,7 @@ pmap_bootstrap4m(void) } #ifdef DEBUG - kprintf("\n"); /* Might as well make it pretty... */ + printf("\n"); /* Might as well make it pretty... */ #endif /* All done! */ @@ -3548,7 +3548,7 @@ pass2: * crowded chunks are normal on SS20s; don't clutter * screen with messages */ - kprintf("note: crowded chunk at 0x%x\n", mp->addr); + printf("note: crowded chunk at 0x%x\n", mp->addr); #endif sva += PAGE_SIZE; if (sva < eva) @@ -3616,7 +3616,7 @@ pmap_create(size) pm = (struct pmap *)malloc(sizeof *pm, M_VMPMAP, M_WAITOK); #ifdef DEBUG if (pmapdebug & PDB_CREATE) - kprintf("pmap_create: created %p\n", pm); + printf("pmap_create: created %p\n", pm); #endif bzero((caddr_t)pm, sizeof *pm); pmap_pinit(pm); @@ -3636,7 +3636,7 @@ pmap_pinit(pm) #ifdef DEBUG if (pmapdebug & PDB_CREATE) - kprintf("pmap_pinit(%p)\n", pm); + printf("pmap_pinit(%p)\n", pm); #endif size = NUREG * sizeof(struct regmap); @@ -3704,7 +3704,7 @@ pmap_destroy(pm) return; #ifdef DEBUG if (pmapdebug & PDB_DESTROY) - kprintf("pmap_destroy(%p)\n", pm); + printf("pmap_destroy(%p)\n", pm); #endif simple_lock(&pm->pm_lock); count = --pm->pm_refcount; @@ -3728,7 +3728,7 @@ pmap_release(pm) #ifdef DEBUG if (pmapdebug & PDB_DESTROY) - kprintf("pmap_release(%p)\n", pm); + printf("pmap_release(%p)\n", pm); #endif if (CPU_ISSUN4OR4C) { @@ -3753,19 +3753,19 @@ if (pmapdebug) { for (vr = 0; vr < NUREG; vr++) { struct regmap *rp = &pm->pm_regmap[vr]; if (rp->rg_nsegmap != 0) - kprintf("pmap_release: %d segments remain in " + printf("pmap_release: %d segments remain in " "region %d\n", rp->rg_nsegmap, vr); if (rp->rg_segmap != NULL) { - kprintf("pmap_release: segments still " + printf("pmap_release: segments still " "allocated in region %d\n", vr); for (vs = 0; vs < NSEGRG; vs++) { struct segmap *sp = &rp->rg_segmap[vs]; if (sp->sg_npte != 0) - kprintf("pmap_release: %d ptes " + printf("pmap_release: %d ptes " "remain in segment %d\n", sp->sg_npte, vs); if (sp->sg_pte != NULL) { - kprintf("pmap_release: ptes still " + printf("pmap_release: ptes still " "allocated in segment %d\n", vs); } } @@ -3823,7 +3823,7 @@ pmap_remove(pm, va, endva) #ifdef DEBUG if (pmapdebug & PDB_REMOVE) - kprintf("pmap_remove(%p, %lx, %lx)\n", pm, va, endva); + printf("pmap_remove(%p, %lx, %lx)\n", pm, va, endva); #endif if (pm == pmap_kernel()) { @@ -4067,7 +4067,7 @@ pmap_rmk4m(pm, va, endva, vr, vs) */ if (va < virtual_avail) { #ifdef DEBUG - kprintf("pmap_rmk4m: attempt to free base kernel alloc\n"); + printf("pmap_rmk4m: attempt to free base kernel alloc\n"); #endif /* sp->sg_pte = NULL; */ sp->sg_npte = 0; @@ -4218,7 +4218,7 @@ pmap_rmu4_4c(pm, va, endva, vr, vs) if ((sp->sg_npte = nleft) == 0 /* ??? && pm->pm_ctx != NULL*/) { #ifdef DEBUG if (pm->pm_ctx == NULL) { - kprintf("pmap_rmu: no context here..."); + printf("pmap_rmu: no context here..."); } #endif va = VSTOVA(vr,vs); /* retract */ @@ -4335,7 +4335,7 @@ pmap_rmu4m(pm, va, endva, vr, vs) if ((sp->sg_npte = nleft) == 0 /* ??? && pm->pm_ctx != NULL*/) { #ifdef DEBUG if (pm->pm_ctx == NULL) { - kprintf("pmap_rmu: no context here..."); + printf("pmap_rmu: no context here..."); } #endif va = VSTOVA(vr,vs); /* retract */ @@ -4383,7 +4383,7 @@ pmap_page_protect4_4c(pa, prot) panic("pmap_page_protect: no such address: %lx", pa); if ((pmapdebug & PDB_CHANGEPROT) || (pmapdebug & PDB_REMOVE && prot == VM_PROT_NONE)) - kprintf("pmap_page_protect(%lx, %x)\n", pa, prot); + printf("pmap_page_protect(%lx, %x)\n", pa, prot); #endif /* * Skip unmanaged pages, or operations that do not take @@ -4671,7 +4671,7 @@ pmap_changeprot4_4c(pm, va, prot, wired) #ifdef DEBUG if (pmapdebug & PDB_CHANGEPROT) - kprintf("pmap_changeprot(%p, %lx, %x, %x)\n", + printf("pmap_changeprot(%p, %lx, %x, %x)\n", pm, va, prot, wired); #endif @@ -4687,11 +4687,11 @@ pmap_changeprot4_4c(pm, va, prot, wired) s = splpmap(); /* conservative */ rp = &pm->pm_regmap[vr]; if (rp->rg_nsegmap == 0) { - kprintf("pmap_changeprot: no segments in %d\n", vr); + printf("pmap_changeprot: no segments in %d\n", vr); return; } if (rp->rg_segmap == NULL) { - kprintf("pmap_changeprot: no segments in %d!\n", vr); + printf("pmap_changeprot: no segments in %d!\n", vr); return; } sp = &rp->rg_segmap[vs]; @@ -4781,7 +4781,7 @@ pmap_page_protect4m(pa, prot) panic("pmap_page_protect: no such address: 0x%lx", pa); if ((pmapdebug & PDB_CHANGEPROT) || (pmapdebug & PDB_REMOVE && prot == VM_PROT_NONE)) - kprintf("pmap_page_protect(%lx, %x)\n", pa, prot); + printf("pmap_page_protect(%lx, %x)\n", pa, prot); #endif /* * Skip unmanaged pages, or operations that do not take @@ -4844,7 +4844,7 @@ pmap_page_protect4m(pa, prot) tlb_flush_segment(vr, vs); /* Paranoid? */ if (va < virtual_avail) { #ifdef DEBUG - kprintf("pmap_rmk4m: attempt to free " + printf("pmap_rmk4m: attempt to free " "base kernel allocation\n"); #endif goto nextpv; @@ -4998,7 +4998,7 @@ pmap_changeprot4m(pm, va, prot, wired) #ifdef DEBUG if (pmapdebug & PDB_CHANGEPROT) - kprintf("pmap_changeprot(%p, %lx, %x, %x)\n", + printf("pmap_changeprot(%p, %lx, %x, %x)\n", pm, va, prot, wired); #endif @@ -5072,7 +5072,7 @@ pmap_enter4_4c(pm, va, pa, prot, wired) if (VA_INHOLE(va)) { #ifdef DEBUG - kprintf("pmap_enter: pm %p, va %lx, pa %lx: in MMU hole\n", + printf("pmap_enter: pm %p, va %lx, pa %lx: in MMU hole\n", pm, va, pa); #endif return; @@ -5080,7 +5080,7 @@ pmap_enter4_4c(pm, va, pa, prot, wired) #ifdef DEBUG if (pmapdebug & PDB_ENTER) - kprintf("pmap_enter(%p, %lx, %lx, %x, %x)\n", + printf("pmap_enter(%p, %lx, %lx, %x, %x)\n", pm, va, pa, prot, wired); #endif @@ -5164,7 +5164,7 @@ pmap_enk4_4c(pm, va, prot, wired, pv, pteproto) if ((tpte & PG_TYPE) == PG_OBMEM) { #ifdef DEBUG -kprintf("pmap_enk: changing existing va=>pa entry: va %lx, pteproto %x\n", +printf("pmap_enk: changing existing va=>pa entry: va %lx, pteproto %x\n", va, pteproto); #endif /* @@ -5270,7 +5270,7 @@ pmap_enu4_4c(pm, va, prot, wired, pv, pteproto) #ifdef DEBUG if (pm->pm_gap_end < pm->pm_gap_start) { - kprintf("pmap_enu: gap_start %x, gap_end %x", + printf("pmap_enu: gap_start %x, gap_end %x", pm->pm_gap_start, pm->pm_gap_end); panic("pmap_enu: gap botch"); } @@ -5284,7 +5284,7 @@ rretry: sp = (struct segmap *)malloc((u_long)size, M_VMPMAP, M_WAITOK); if (rp->rg_segmap != NULL) { -kprintf("pmap_enter: segment filled during sleep\n"); /* can this happen? */ +printf("pmap_enter: segment filled during sleep\n"); /* can this happen? */ free(sp, M_VMPMAP); goto rretry; } @@ -5304,7 +5304,7 @@ sretry: pte = (int *)malloc((u_long)size, M_VMPMAP, M_WAITOK); if (sp->sg_pte != NULL) { -kprintf("pmap_enter: pte filled during sleep\n"); /* can this happen? */ +printf("pmap_enter: pte filled during sleep\n"); /* can this happen? */ free(pte, M_VMPMAP); goto sretry; } @@ -5361,7 +5361,7 @@ kprintf("pmap_enter: pte filled during sleep\n"); /* can this happen? */ * If old page was cached, flush cache. */ #if 0 -kprintf("%s[%d]: pmap_enu: changing existing va(%x)=>pa entry\n", +printf("%s[%d]: pmap_enu: changing existing va(%x)=>pa entry\n", curproc->p_comm, curproc->p_pid, va); #endif if ((tpte & PG_TYPE) == PG_OBMEM) { @@ -5444,7 +5444,7 @@ pmap_enter4m(pm, va, pa, prot, wired) #ifdef DEBUG if (pmapdebug & PDB_ENTER) - kprintf("pmap_enter(%p, %lx, %lx, %x, %x)\n", + printf("pmap_enter(%p, %lx, %lx, %x, %x)\n", pm, va, pa, prot, wired); #endif @@ -5533,7 +5533,7 @@ pmap_enk4m(pm, va, prot, wired, pv, pteproto) if ((tpte & SRMMU_PGTYPE) == PG_SUN4M_OBMEM) { #ifdef DEBUG -kprintf("pmap_enk4m: changing existing va=>pa entry: va %lx, pteproto %x, " +printf("pmap_enk4m: changing existing va=>pa entry: va %lx, pteproto %x, " "oldpte %x\n", va, pteproto, tpte); #endif /* @@ -5594,7 +5594,7 @@ pmap_enu4m(pm, va, prot, wired, pv, pteproto) #ifdef DEBUG if (pm->pm_gap_end < pm->pm_gap_start) { - kprintf("pmap_enu: gap_start %x, gap_end %x", + printf("pmap_enu: gap_start %x, gap_end %x", pm->pm_gap_start, pm->pm_gap_end); panic("pmap_enu: gap botch"); } @@ -5608,7 +5608,7 @@ rretry: sp = (struct segmap *)malloc((u_long)size, M_VMPMAP, M_WAITOK); if (rp->rg_segmap != NULL) { #ifdef DEBUG -kprintf("pmap_enu4m: segment filled during sleep\n"); /* can this happen? */ +printf("pmap_enu4m: segment filled during sleep\n"); /* can this happen? */ #endif free(sp, M_VMPMAP); goto rretry; @@ -5627,7 +5627,7 @@ rgretry: tblp = malloc(size, M_VMPMAP, M_WAITOK); if (rp->rg_seg_ptps != NULL) { #ifdef DEBUG -kprintf("pmap_enu4m: bizarre segment table fill during sleep\n"); +printf("pmap_enu4m: bizarre segment table fill during sleep\n"); #endif free(tblp,M_VMPMAP); goto rgretry; @@ -5650,7 +5650,7 @@ sretry: pte = (int *)malloc((u_long)size, M_VMPMAP, M_WAITOK); if (sp->sg_pte != NULL) { -kprintf("pmap_enter: pte filled during sleep\n"); /* can this happen? */ +printf("pmap_enter: pte filled during sleep\n"); /* can this happen? */ free(pte, M_VMPMAP); goto sretry; } @@ -5697,7 +5697,7 @@ kprintf("pmap_enter: pte filled during sleep\n"); /* can this happen? */ */ #ifdef DEBUG if (pmapdebug & PDB_ENTER) -kprintf("%s[%d]: pmap_enu: changing existing va(%x)=>pa(pte=%x) entry\n", +printf("%s[%d]: pmap_enu: changing existing va(%x)=>pa(pte=%x) entry\n", curproc->p_comm, curproc->p_pid, (int)va, (int)pte); #endif if ((tpte & SRMMU_PGTYPE) == PG_SUN4M_OBMEM) { @@ -5769,14 +5769,14 @@ pmap_extract4_4c(pm, va) struct segmap *sp; if (pm == NULL) { - kprintf("pmap_extract: null pmap\n"); + printf("pmap_extract: null pmap\n"); return (0); } vr = VA_VREG(va); vs = VA_VSEG(va); rp = &pm->pm_regmap[vr]; if (rp->rg_segmap == NULL) { - kprintf("pmap_extract: invalid segment (%d)\n", vr); + printf("pmap_extract: invalid segment (%d)\n", vr); return (0); } sp = &rp->rg_segmap[vs]; @@ -5801,13 +5801,13 @@ pmap_extract4_4c(pm, va) register int *pte = sp->sg_pte; if (pte == NULL) { - kprintf("pmap_extract: invalid segment\n"); + printf("pmap_extract: invalid segment\n"); return (0); } tpte = pte[VA_VPG(va)]; } if ((tpte & PG_V) == 0) { - kprintf("pmap_extract: invalid pte\n"); + printf("pmap_extract: invalid pte\n"); return (0); } tpte &= PG_PFNUM; @@ -5830,7 +5830,7 @@ pmap_extract4m(pm, va) register int tpte, ctx; if (pm == NULL) { - kprintf("pmap_extract: null pmap\n"); + printf("pmap_extract: null pmap\n"); return (0); } @@ -5840,7 +5840,7 @@ pmap_extract4m(pm, va) tpte = getpte4m(va); #ifdef DEBUG if ((tpte & SRMMU_TETYPE) != SRMMU_TEPTE) { - kprintf("pmap_extract: invalid pte of type %d\n", + printf("pmap_extract: invalid pte of type %d\n", tpte & SRMMU_TETYPE); return (0); } @@ -6464,7 +6464,7 @@ pm_check_u(s, pm) m++; if (m != sp->sg_npte) /*if (pmapdebug & 0x10000)*/ - kprintf("%s: user CHK(vr %d, vs %d): " + printf("%s: user CHK(vr %d, vs %d): " "npte(%d) != # valid(%d)\n", s, vr, vs, sp->sg_npte, m); } @@ -6523,7 +6523,7 @@ pm_check_k(s, pm) /* Note: not as extensive as pm_check_u. */ n++; } if (n != rp->rg_nsegmap) - kprintf("%s: kernel CHK(vr %d): inconsistent " + printf("%s: kernel CHK(vr %d): inconsistent " "# of pte's: %d, should be %d\n", s, vr, rp->rg_nsegmap, n); } @@ -6657,24 +6657,24 @@ debug_pagetables() register int *regtbl; register int te; - kprintf("\nncontext=%d. ",ncontext); - kprintf("Context table is at va 0x%x. Level 0 PTP: 0x%x\n", + printf("\nncontext=%d. ",ncontext); + printf("Context table is at va 0x%x. Level 0 PTP: 0x%x\n", ctx_phys_tbl, ctx_phys_tbl[0]); - kprintf("Context 0 region table is at va 0x%x, pa 0x%x. Contents:\n", + printf("Context 0 region table is at va 0x%x, pa 0x%x. Contents:\n", pmap_kernel()->pm_reg_ptps, pmap_kernel()->pm_reg_ptps_pa); regtbl = pmap_kernel()->pm_reg_ptps; - kprintf("PROM vector is at 0x%x\n",promvec); - kprintf("PROM reboot routine is at 0x%x\n",promvec->pv_reboot); - kprintf("PROM abort routine is at 0x%x\n",promvec->pv_abort); - kprintf("PROM halt routine is at 0x%x\n",promvec->pv_halt); + printf("PROM vector is at 0x%x\n",promvec); + printf("PROM reboot routine is at 0x%x\n",promvec->pv_reboot); + printf("PROM abort routine is at 0x%x\n",promvec->pv_abort); + printf("PROM halt routine is at 0x%x\n",promvec->pv_halt); - kprintf("Testing region 0xfe: "); + printf("Testing region 0xfe: "); test_region(0xfe,0,16*1024*1024); - kprintf("Testing region 0xff: "); + printf("Testing region 0xff: "); test_region(0xff,0,16*1024*1024); - kprintf("Testing kernel region 0xf8: "); + printf("Testing kernel region 0xf8: "); test_region(0xf8, 4096, avail_start); cngetc(); @@ -6682,7 +6682,7 @@ debug_pagetables() te = regtbl[i]; if ((te & SRMMU_TETYPE) == SRMMU_TEINVALID) continue; - kprintf("Region 0x%x: PTE=0x%x <%s> L2PA=0x%x kernL2VA=0x%x\n", + printf("Region 0x%x: PTE=0x%x <%s> L2PA=0x%x kernL2VA=0x%x\n", i, te, ((te & SRMMU_TETYPE) == SRMMU_TEPTE ? "pte" : ((te & SRMMU_TETYPE) == SRMMU_TEPTD ? "ptd" : ((te & SRMMU_TETYPE) == SRMMU_TEINVALID ? @@ -6690,7 +6690,7 @@ debug_pagetables() (te & ~0x3) << SRMMU_PPNPASHIFT, pmap_kernel()->pm_regmap[i].rg_seg_ptps); } - kprintf("Press q to halt...\n"); + printf("Press q to halt...\n"); if (cngetc()=='q') callrom(); } @@ -6705,19 +6705,19 @@ VA2PAsw(ctx, addr, pte) register int curpte; #ifdef EXTREME_EXTREME_DEBUG - kprintf("Looking up addr 0x%x in context 0x%x\n",addr,ctx); + printf("Looking up addr 0x%x in context 0x%x\n",addr,ctx); #endif /* L0 */ *pte = curpte = ctx_phys_tbl[ctx]; #ifdef EXTREME_EXTREME_DEBUG - kprintf("Got L0 pte 0x%x\n",pte); + printf("Got L0 pte 0x%x\n",pte); #endif if ((curpte & SRMMU_TETYPE) == SRMMU_TEPTE) { return (((curpte & SRMMU_PPNMASK) << SRMMU_PPNPASHIFT) | ((u_int)addr & 0xffffffff)); } if ((curpte & SRMMU_TETYPE) != SRMMU_TEPTD) { - kprintf("Bad context table entry 0x%x for context 0x%x\n", + printf("Bad context table entry 0x%x for context 0x%x\n", curpte, ctx); return 0; } @@ -6725,13 +6725,13 @@ VA2PAsw(ctx, addr, pte) curtbl = ((curpte & ~0x3) << 4) | (0xf8 << RGSHIFT); /* correct for krn*/ *pte = curpte = curtbl[VA_VREG(addr)]; #ifdef EXTREME_EXTREME_DEBUG - kprintf("L1 table at 0x%x.\nGot L1 pte 0x%x\n",curtbl,curpte); + printf("L1 table at 0x%x.\nGot L1 pte 0x%x\n",curtbl,curpte); #endif if ((curpte & SRMMU_TETYPE) == SRMMU_TEPTE) return (((curpte & SRMMU_PPNMASK) << SRMMU_PPNPASHIFT) | ((u_int)addr & 0xffffff)); if ((curpte & SRMMU_TETYPE) != SRMMU_TEPTD) { - kprintf("Bad region table entry 0x%x for region 0x%x\n", + printf("Bad region table entry 0x%x for region 0x%x\n", curpte, VA_VREG(addr)); return 0; } @@ -6739,13 +6739,13 @@ VA2PAsw(ctx, addr, pte) curtbl = ((curpte & ~0x3) << 4) | (0xf8 << RGSHIFT); /* correct for krn*/ *pte = curpte = curtbl[VA_VSEG(addr)]; #ifdef EXTREME_EXTREME_DEBUG - kprintf("L2 table at 0x%x.\nGot L2 pte 0x%x\n",curtbl,curpte); + printf("L2 table at 0x%x.\nGot L2 pte 0x%x\n",curtbl,curpte); #endif if ((curpte & SRMMU_TETYPE) == SRMMU_TEPTE) return (((curpte & SRMMU_PPNMASK) << SRMMU_PPNPASHIFT) | ((u_int)addr & 0x3ffff)); if ((curpte & SRMMU_TETYPE) != SRMMU_TEPTD) { - kprintf("Bad segment table entry 0x%x for reg 0x%x, seg 0x%x\n", + printf("Bad segment table entry 0x%x for reg 0x%x, seg 0x%x\n", curpte, VA_VREG(addr), VA_VSEG(addr)); return 0; } @@ -6753,17 +6753,17 @@ VA2PAsw(ctx, addr, pte) curtbl = ((curpte & ~0x3) << 4) | (0xf8 << RGSHIFT); /* correct for krn*/ *pte = curpte = curtbl[VA_VPG(addr)]; #ifdef EXTREME_EXTREME_DEBUG - kprintf("L3 table at 0x%x.\nGot L3 pte 0x%x\n",curtbl,curpte); + printf("L3 table at 0x%x.\nGot L3 pte 0x%x\n",curtbl,curpte); #endif if ((curpte & SRMMU_TETYPE) == SRMMU_TEPTE) return (((curpte & SRMMU_PPNMASK) << SRMMU_PPNPASHIFT) | ((u_int)addr & 0xfff)); else { - kprintf("Bad L3 pte 0x%x for reg 0x%x, seg 0x%x, pg 0x%x\n", + printf("Bad L3 pte 0x%x for reg 0x%x, seg 0x%x, pg 0x%x\n", curpte, VA_VREG(addr), VA_VSEG(addr), VA_VPG(addr)); return 0; } - kprintf("Bizarreness with address 0x%x!\n",addr); + printf("Bizarreness with address 0x%x!\n",addr); } void test_region(reg, start, stop) @@ -6781,27 +6781,27 @@ void test_region(reg, start, stop) addr = (reg << RGSHIFT) | i; pte=lda(((u_int)(addr)) | ASI_SRMMUFP_LN, ASI_SRMMUFP); if (pte) { -/* kprintf("Valid address 0x%x\n",addr); +/* printf("Valid address 0x%x\n",addr); if (++cnt == 20) { cngetc(); cnt=0; } */ if (VA2PA(addr) != VA2PAsw(0,addr,&ptesw)) { - kprintf("Mismatch at address 0x%x.\n",addr); + printf("Mismatch at address 0x%x.\n",addr); if (cngetc()=='q') break; } if (reg == 0xf8) /* kernel permissions are different */ continue; if ((pte&SRMMU_PROT_MASK)!=(ptesw&SRMMU_PROT_MASK)) { - kprintf("Mismatched protections at address " + printf("Mismatched protections at address " "0x%x; pte=0x%x, ptesw=0x%x\n", addr,pte,ptesw); if (cngetc()=='q') break; } } } - kprintf("done.\n"); + printf("done.\n"); } @@ -6809,14 +6809,14 @@ void print_fe_map(void) { u_int i, pte; - kprintf("map of region 0xfe:\n"); + printf("map of region 0xfe:\n"); for (i = 0xfe000000; i < 0xff000000; i+=4096) { if (((pte = getpte4m(i)) & SRMMU_TETYPE) != SRMMU_TEPTE) continue; - kprintf("0x%x -> 0x%x%x (pte %x)\n", i, pte >> 28, + printf("0x%x -> 0x%x%x (pte %x)\n", i, pte >> 28, (pte & ~0xff) << 4, pte); } - kprintf("done\n"); + printf("done\n"); } #endif diff --git a/sys/arch/sparc/sparc/svr4_machdep.c b/sys/arch/sparc/sparc/svr4_machdep.c index 9d1b0f8b8246..f6d85f6d01f2 100644 --- a/sys/arch/sparc/sparc/svr4_machdep.c +++ b/sys/arch/sparc/sparc/svr4_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_machdep.c,v 1.19 1996/10/11 00:47:33 christos Exp $ */ +/* $NetBSD: svr4_machdep.c,v 1.20 1996/10/13 03:00:46 christos Exp $ */ /* * Copyright (c) 1994 Christos Zoulas @@ -40,6 +40,7 @@ #include #include #include +#include #include #include @@ -74,34 +75,34 @@ svr4_printcontext(fun, uc) svr4_greg_t *r = uc->uc_mcontext.greg; struct svr4_sigaltstack *s = &uc->uc_stack; - kprintf("%s at %p\n", fun, uc); + printf("%s at %p\n", fun, uc); - kprintf("Regs: "); - kprintf("PSR = %x ", r[SVR4_SPARC_PSR]); - kprintf("PC = %x ", r[SVR4_SPARC_PC]); - kprintf("nPC = %x ", r[SVR4_SPARC_nPC]); - kprintf("Y = %x ", r[SVR4_SPARC_Y]); - kprintf("G1 = %x ", r[SVR4_SPARC_G1]); - kprintf("G2 = %x ", r[SVR4_SPARC_G2]); - kprintf("G3 = %x ", r[SVR4_SPARC_G3]); - kprintf("G4 = %x ", r[SVR4_SPARC_G4]); - kprintf("G5 = %x ", r[SVR4_SPARC_G5]); - kprintf("G6 = %x ", r[SVR4_SPARC_G6]); - kprintf("G7 = %x ", r[SVR4_SPARC_G7]); - kprintf("O0 = %x ", r[SVR4_SPARC_O0]); - kprintf("O1 = %x ", r[SVR4_SPARC_O1]); - kprintf("O2 = %x ", r[SVR4_SPARC_O2]); - kprintf("O3 = %x ", r[SVR4_SPARC_O3]); - kprintf("O4 = %x ", r[SVR4_SPARC_O4]); - kprintf("O5 = %x ", r[SVR4_SPARC_O5]); - kprintf("O6 = %x ", r[SVR4_SPARC_O6]); - kprintf("O7 = %x ", r[SVR4_SPARC_O7]); - kprintf("\n"); + printf("Regs: "); + printf("PSR = %x ", r[SVR4_SPARC_PSR]); + printf("PC = %x ", r[SVR4_SPARC_PC]); + printf("nPC = %x ", r[SVR4_SPARC_nPC]); + printf("Y = %x ", r[SVR4_SPARC_Y]); + printf("G1 = %x ", r[SVR4_SPARC_G1]); + printf("G2 = %x ", r[SVR4_SPARC_G2]); + printf("G3 = %x ", r[SVR4_SPARC_G3]); + printf("G4 = %x ", r[SVR4_SPARC_G4]); + printf("G5 = %x ", r[SVR4_SPARC_G5]); + printf("G6 = %x ", r[SVR4_SPARC_G6]); + printf("G7 = %x ", r[SVR4_SPARC_G7]); + printf("O0 = %x ", r[SVR4_SPARC_O0]); + printf("O1 = %x ", r[SVR4_SPARC_O1]); + printf("O2 = %x ", r[SVR4_SPARC_O2]); + printf("O3 = %x ", r[SVR4_SPARC_O3]); + printf("O4 = %x ", r[SVR4_SPARC_O4]); + printf("O5 = %x ", r[SVR4_SPARC_O5]); + printf("O6 = %x ", r[SVR4_SPARC_O6]); + printf("O7 = %x ", r[SVR4_SPARC_O7]); + printf("\n"); - kprintf("Signal Stack: sp %p, size %d, flags %x\n", + printf("Signal Stack: sp %p, size %d, flags %x\n", s->ss_sp, s->ss_size, s->ss_flags); - kprintf("Flags: %lx\n", uc->uc_flags); + printf("Flags: %lx\n", uc->uc_flags); } #endif @@ -160,13 +161,13 @@ svr4_getcontext(p, uc, mask, oonstack) size_t sz = f->fp_nqel * f->fp_nqsize; if (sz > sizeof(fps->fs_queue)) { #ifdef DIAGNOSTIC - kprintf("getcontext: fp_queue too large\n"); + printf("getcontext: fp_queue too large\n"); #endif return; } if (copyout(fps->fs_queue, f->fp_q, sz) != 0) { #ifdef DIAGNOSTIC - kprintf("getcontext: copy of fp_queue failed %d\n", + printf("getcontext: copy of fp_queue failed %d\n", error); #endif return; @@ -236,7 +237,7 @@ svr4_setcontext(p, uc) #ifdef DEBUG if (sigdebug & SDB_FOLLOW) - kprintf("svr4_setcontext: %s[%d], svr4_ucontext %p\n", + printf("svr4_setcontext: %s[%d], svr4_ucontext %p\n", p->p_comm, p->p_pid, uc); #endif @@ -252,7 +253,7 @@ svr4_setcontext(p, uc) * that is required; if it holds, just do it. */ if (((r[SVR4_SPARC_PC] | r[SVR4_SPARC_nPC]) & 3) != 0) { - kprintf("pc or npc are not multiples of 4!\n"); + printf("pc or npc are not multiples of 4!\n"); return EINVAL; } @@ -292,7 +293,7 @@ svr4_setcontext(p, uc) size_t sz = f->fp_nqel * f->fp_nqsize; if (sz > sizeof(fps->fs_queue)) { #ifdef DIAGNOSTIC - kprintf("setcontext: fp_queue too large\n"); + printf("setcontext: fp_queue too large\n"); #endif return EINVAL; } @@ -303,7 +304,7 @@ svr4_setcontext(p, uc) if ((error = copyin(f->fp_q, fps->fs_queue, f->fp_nqel * f->fp_nqsize)) != 0) { #ifdef DIAGNOSTIC - kprintf("setcontext: copy of fp_queue failed\n"); + printf("setcontext: copy of fp_queue failed\n"); #endif return error; } @@ -445,7 +446,7 @@ svr4_getsiginfo(si, sig, code, addr) default: si->si_code = 0; #ifdef DIAGNOSTIC - kprintf("sig %d code %ld\n", sig, code); + printf("sig %d code %ld\n", sig, code); panic("svr4_getsiginfo"); #endif break; @@ -525,7 +526,7 @@ svr4_sendsig(catcher, sig, mask, code) */ #ifdef DEBUG if ((sigdebug & SDB_KSTACK) && p->p_pid == sigpid) - kprintf("svr4_sendsig: window save or copyout error\n"); + printf("svr4_sendsig: window save or copyout error\n"); #endif sigexit(p, SIGILL); /* NOTREACHED */ @@ -626,7 +627,7 @@ svr4_sys_sysarch(p, v, retval) switch (SCARG(uap, op)) { default: - kprintf("(sparc) svr4_sysarch(%d)\n", SCARG(uap, op)); + printf("(sparc) svr4_sysarch(%d)\n", SCARG(uap, op)); return EINVAL; } } diff --git a/sys/arch/sparc/sparc/trap.c b/sys/arch/sparc/sparc/trap.c index 9e8470e2800e..317c98892cc0 100644 --- a/sys/arch/sparc/sparc/trap.c +++ b/sys/arch/sparc/sparc/trap.c @@ -1,4 +1,4 @@ -/* $NetBSD: trap.c,v 1.46 1996/10/11 00:47:34 christos Exp $ */ +/* $NetBSD: trap.c,v 1.47 1996/10/13 03:00:48 christos Exp $ */ /* * Copyright (c) 1996 @@ -326,7 +326,7 @@ trap(type, psr, pc, tf) #endif if (type < 0x80) { dopanic: - kprintf("trap type 0x%x: pc=%x npc=%x psr=%b\n", + printf("trap type 0x%x: pc=%x npc=%x psr=%b\n", type, pc, tf->tf_npc, psr, PSR_BITS); panic(type < N_TRAP_TYPES ? trap_type[type] : T); /* NOTREACHED */ @@ -336,7 +336,7 @@ badtrap: #endif /* the following message is gratuitous */ /* ... but leave it in until we find anything */ - kprintf("%s[%d]: unimplemented software trap 0x%x\n", + printf("%s[%d]: unimplemented software trap 0x%x\n", p->p_comm, p->p_pid, type); trapsignal(p, SIGILL, type); break; @@ -425,7 +425,7 @@ badtrap: panic("trap T_RWRET 1"); #ifdef DEBUG if (rwindow_debug) - kprintf("%s[%d]: rwindow: pcb<-stack: %x\n", + printf("%s[%d]: rwindow: pcb<-stack: %x\n", p->p_comm, p->p_pid, tf->tf_out[6]); #endif if (read_rw(tf->tf_out[6], &pcb->pcb_rw[0])) @@ -447,7 +447,7 @@ badtrap: */ #ifdef DEBUG if (rwindow_debug) - kprintf("%s[%d]: rwindow: T_WINUF 0: pcb<-stack: %x\n", + printf("%s[%d]: rwindow: T_WINUF 0: pcb<-stack: %x\n", p->p_comm, p->p_pid, tf->tf_out[6]); #endif write_user_windows(); @@ -455,7 +455,7 @@ badtrap: sigexit(p, SIGILL); #ifdef DEBUG if (rwindow_debug) - kprintf("%s[%d]: rwindow: T_WINUF 1: pcb<-stack: %x\n", + printf("%s[%d]: rwindow: T_WINUF 1: pcb<-stack: %x\n", p->p_comm, p->p_pid, pcb->pcb_rw[0].rw_in[6]); #endif if (read_rw(pcb->pcb_rw[0].rw_in[6], &pcb->pcb_rw[1])) @@ -579,12 +579,12 @@ rwindow_save(p) return (0); #ifdef DEBUG if (rwindow_debug) - kprintf("%s[%d]: rwindow: pcb->stack:", p->p_comm, p->p_pid); + printf("%s[%d]: rwindow: pcb->stack:", p->p_comm, p->p_pid); #endif do { #ifdef DEBUG if (rwindow_debug) - kprintf(" %x", rw[1].rw_in[6]); + printf(" %x", rw[1].rw_in[6]); #endif if (copyout((caddr_t)rw, (caddr_t)rw[1].rw_in[6], sizeof *rw)) @@ -593,7 +593,7 @@ rwindow_save(p) } while (--i > 0); #ifdef DEBUG if (rwindow_debug) - kprintf("\n"); + printf("\n"); #endif pcb->pcb_nsaved = 0; return (0); @@ -665,7 +665,7 @@ mem_access_fault(type, ser, v, pc, psr, tf) extern char Lfsbail[]; if (type == T_TEXTFAULT) { (void) splhigh(); - kprintf("text fault: pc=%x ser=%b\n", pc, + printf("text fault: pc=%x ser=%b\n", pc, ser, SER_BITS); panic("kernel fault"); /* NOTREACHED */ @@ -744,7 +744,7 @@ kfault: (int)p->p_addr->u_pcb.pcb_onfault : 0; if (!onfault) { (void) splhigh(); - kprintf("data fault: pc=%x addr=%x ser=%b\n", + printf("data fault: pc=%x addr=%x ser=%b\n", pc, v, ser, SER_BITS); panic("kernel fault"); /* NOTREACHED */ @@ -862,9 +862,9 @@ static int lastdouble; } else if (!(sfsr & SFSR_FAV)) { #ifdef DEBUG if (type != T_TEXTFAULT) - kprintf("mem_access_fault: got fault without valid SFVA\n"); + printf("mem_access_fault: got fault without valid SFVA\n"); if (mmumod == SUN4M_MMU_HS) - kprintf("mem_access_fault: got fault without valid SFVA on " + printf("mem_access_fault: got fault without valid SFVA on " "HyperSPARC!\n"); #endif if (type == T_TEXTFAULT) @@ -890,12 +890,12 @@ static int lastdouble; #ifdef DEBUG if (lastdouble) { - kprintf("stacked tfault @ %x (pc %x); sfsr %x", sfva, pc, sfsr); + printf("stacked tfault @ %x (pc %x); sfsr %x", sfva, pc, sfsr); lastdouble = 0; if (curproc == NULL) - kprintf("NULL proc\n"); + printf("NULL proc\n"); else - kprintf("pid %d(%s); sigmask %x, sigcatch %x\n", + printf("pid %d(%s); sigmask %x, sigcatch %x\n", curproc->p_pid, curproc->p_comm, curproc->p_sigmask, curproc->p_sigcatch); } @@ -913,12 +913,12 @@ static int lastdouble; #ifdef DEBUG if (dfdebug) { lastdouble = 1; - kprintf("mem_access_fault: double text fault @ %x (pc %x); sfsr %x", + printf("mem_access_fault: double text fault @ %x (pc %x); sfsr %x", sfva, pc, sfsr); if (curproc == NULL) - kprintf("NULL proc\n"); + printf("NULL proc\n"); else - kprintf(" pid %d(%s); sigmask %x, sigcatch %x\n", + printf(" pid %d(%s); sigmask %x, sigcatch %x\n", curproc->p_pid, curproc->p_comm, curproc->p_sigmask, curproc->p_sigcatch); } @@ -927,7 +927,7 @@ static int lastdouble; if (vm_fault(kernel_map, trunc_page(pc), VM_PROT_READ, 0) != KERN_SUCCESS) #ifdef DEBUG - kprintf("mem_access_fault: " + printf("mem_access_fault: " "can't pagein 1st text fault.\n") #endif ; @@ -941,7 +941,7 @@ static int lastdouble; extern char Lfsbail[]; if (sfsr & SFSR_AT_TEXT || type == T_TEXTFAULT) { (void) splhigh(); - kprintf("text fault: pc=%x sfsr=%b sfva=%x\n", pc, + printf("text fault: pc=%x sfsr=%b sfva=%x\n", pc, sfsr, SFSR_BITS, sfva); panic("kernel fault"); /* NOTREACHED */ @@ -978,7 +978,7 @@ static int lastdouble; rv = mmu_pagein4m(&vm->vm_pmap, va, sfsr & SFSR_AT_STORE ? VM_PROT_WRITE : VM_PROT_READ); if (rv < 0) - kprintf(" sfsr=%x(FT=%x,AT=%x,LVL=%x), sfva=%x, pc=%x, psr=%x\n", + printf(" sfsr=%x(FT=%x,AT=%x,LVL=%x), sfva=%x, pc=%x, psr=%x\n", sfsr, (sfsr >> 2) & 7, (sfsr >> 5) & 7, (sfsr >> 8) & 3, sfva, pc, psr); if (rv > 0) @@ -1016,7 +1016,7 @@ kfault: (int)p->p_addr->u_pcb.pcb_onfault : 0; if (!onfault) { (void) splhigh(); - kprintf("data fault: pc=%x addr=%x sfsr=%b\n", + printf("data fault: pc=%x addr=%x sfsr=%b\n", pc, sfva, sfsr, SFSR_BITS); panic("kernel fault"); /* NOTREACHED */ diff --git a/sys/dev/sbus/if_en.c b/sys/dev/sbus/if_en.c index 968f207976bf..0522f5ca2fb4 100644 --- a/sys/dev/sbus/if_en.c +++ b/sys/dev/sbus/if_en.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_en.c,v 1.2 1996/10/11 00:46:42 christos Exp $ */ +/* $NetBSD: if_en.c,v 1.3 1996/10/13 02:59:55 christos Exp $ */ /* * @@ -131,10 +131,10 @@ void *aux; struct confargs *ca = aux; int lcv, iplcode; - kprintf("\n"); + printf("\n"); if (CPU_ISSUN4M) { - kprintf("%s: sun4m DMA not supported yet\n", sc->sc_dev.dv_xname); + printf("%s: sun4m DMA not supported yet\n", sc->sc_dev.dv_xname); return; } @@ -144,19 +144,19 @@ void *aux; if (ca->ca_ra.ra_nintr == 1) { sc->ipl = ca->ca_ra.ra_intr[0].int_pri; } else { - kprintf("%s: claims to be at the following IPLs: ", sc->sc_dev.dv_xname); + printf("%s: claims to be at the following IPLs: ", sc->sc_dev.dv_xname); iplcode = 0; for (lcv = 0 ; lcv < ca->ca_ra.ra_nintr ; lcv++) { - kprintf("%d ", ca->ca_ra.ra_intr[lcv].int_pri); + printf("%d ", ca->ca_ra.ra_intr[lcv].int_pri); if (EN_IPL == ca->ca_ra.ra_intr[lcv].int_pri) iplcode = lcv; } if (!iplcode) { - kprintf("%s: can't find the IPL we want (%d)\n", sc->sc_dev.dv_xname, + printf("%s: can't find the IPL we want (%d)\n", sc->sc_dev.dv_xname, EN_IPL); return; } - kprintf("\n%s: we choose IPL %d\n", sc->sc_dev.dv_xname, EN_IPL); + printf("\n%s: we choose IPL %d\n", sc->sc_dev.dv_xname, EN_IPL); sc->ipl = iplcode; } scs->sc_ih.ih_fun = en_intr;