diff options
| author | christos <christos@NetBSD.org> | 1996-10-10 19:58:18 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 1996-10-10 19:58:18 +0000 |
| commit | 95e30eafe783ed808ced4581005c58f6aceaf154 (patch) | |
| tree | af8752069d2aafd0976f894a82e29c0acd16293d /sys/dev | |
| parent | bf78c76b40ac651cc572bf62a42589915a6b1234 (diff) | |
printf -> kprintf, sprintf -> ksprintf
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/if_de.c | 78 | ||||
| -rw-r--r-- | sys/dev/pci/if_en_pci.c | 16 | ||||
| -rw-r--r-- | sys/dev/pci/if_ep_pci.c | 18 | ||||
| -rw-r--r-- | sys/dev/pci/if_fpa.c | 26 | ||||
| -rw-r--r-- | sys/dev/pci/if_le_pci.c | 22 | ||||
| -rw-r--r-- | sys/dev/pci/ncr.c | 296 | ||||
| -rw-r--r-- | sys/dev/pci/pci.c | 12 | ||||
| -rw-r--r-- | sys/dev/pci/pci_subr.c | 22 | ||||
| -rw-r--r-- | sys/dev/pci/ppb.c | 10 |
9 files changed, 250 insertions, 250 deletions
diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c index 6097d640552..96cbf5c84cf 100644 --- a/sys/dev/pci/if_de.c +++ b/sys/dev/pci/if_de.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_de.c,v 1.24 1996/07/15 16:40:40 cgd Exp $ */ +/* $NetBSD: if_de.c,v 1.25 1996/10/10 19:58:18 christos Exp $ */ /*- * Copyright (c) 1994, 1995 Matt Thomas (matt@lkg.dec.com) @@ -454,12 +454,12 @@ tulip_dc21040_media_select( TULIP_WRITE_CSR(sc, csr_sia_connectivity, TULIP_SIACONN_RESET); if (sc->tulip_if.if_flags & IFF_ALTPHYS) { if ((sc->tulip_flags & TULIP_ALTPHYS) == 0) - printf("%s: enabling Thinwire/AUI port\n", sc->tulip_xname); + kprintf("%s: enabling Thinwire/AUI port\n", sc->tulip_xname); TULIP_WRITE_CSR(sc, csr_sia_connectivity, TULIP_SIACONN_AUI); sc->tulip_flags |= TULIP_ALTPHYS; } else { if (sc->tulip_flags & TULIP_ALTPHYS) - printf("%s: enabling 10baseT/UTP port\n", sc->tulip_xname); + kprintf("%s: enabling 10baseT/UTP port\n", sc->tulip_xname); TULIP_WRITE_CSR(sc, csr_sia_connectivity, TULIP_SIACONN_10BASET); sc->tulip_flags &= ~TULIP_ALTPHYS; sc->tulip_media = TULIP_MEDIA_10BASET; @@ -490,7 +490,7 @@ tulip_zx314_media_select( |TULIP_CMD_BACKOFFCTR; TULIP_WRITE_CSR(sc, csr_sia_connectivity, TULIP_SIACONN_RESET); if (sc->tulip_flags & TULIP_ALTPHYS) - printf("%s: enabling 10baseT/UTP port\n", sc->tulip_xname); + kprintf("%s: enabling 10baseT/UTP port\n", sc->tulip_xname); TULIP_WRITE_CSR(sc, csr_sia_connectivity, TULIP_SIACONN_10BASET); sc->tulip_flags &= ~TULIP_ALTPHYS; sc->tulip_media = TULIP_MEDIA_10BASET; @@ -536,7 +536,7 @@ tulip_dc21140_evalboard_media_select( TULIP_WRITE_CSR(sc, csr_gp, TULIP_GP_EB_INIT); if (sc->tulip_if.if_flags & IFF_ALTPHYS) { if ((sc->tulip_flags & TULIP_ALTPHYS) == 0) - printf("%s: enabling 100baseTX UTP port\n", sc->tulip_xname); + kprintf("%s: enabling 100baseTX UTP port\n", sc->tulip_xname); sc->tulip_cmdmode |= TULIP_CMD_PORTSELECT |TULIP_CMD_PCSFUNCTION|TULIP_CMD_SCRAMBLER; sc->tulip_cmdmode &= ~TULIP_CMD_TXTHRSHLDCTL; @@ -544,7 +544,7 @@ tulip_dc21140_evalboard_media_select( sc->tulip_media = TULIP_MEDIA_100BASET; } else { if (sc->tulip_flags & TULIP_ALTPHYS) - printf("%s: enabling 10baseT UTP port\n", sc->tulip_xname); + kprintf("%s: enabling 10baseT UTP port\n", sc->tulip_xname); sc->tulip_cmdmode &= ~(TULIP_CMD_PORTSELECT |TULIP_CMD_PCSFUNCTION|TULIP_CMD_SCRAMBLER); sc->tulip_cmdmode |= TULIP_CMD_TXTHRSHLDCTL; @@ -588,7 +588,7 @@ tulip_dc21140_cogent_em100_media_select( TULIP_WRITE_CSR(sc, csr_gp, TULIP_GP_EM100_PINS); TULIP_WRITE_CSR(sc, csr_gp, TULIP_GP_EM100_INIT); if ((sc->tulip_flags & TULIP_ALTPHYS) == 0) - printf("%s: enabling 100baseTX UTP port\n", sc->tulip_xname); + kprintf("%s: enabling 100baseTX UTP port\n", sc->tulip_xname); sc->tulip_cmdmode |= TULIP_CMD_PORTSELECT |TULIP_CMD_PCSFUNCTION|TULIP_CMD_SCRAMBLER; sc->tulip_cmdmode &= ~TULIP_CMD_TXTHRSHLDCTL; @@ -635,7 +635,7 @@ tulip_dc21140_znyx_zx34x_media_select( TULIP_WRITE_CSR(sc, csr_gp, TULIP_GP_ZX34X_INIT); if (sc->tulip_if.if_flags & IFF_ALTPHYS) { if ((sc->tulip_flags & TULIP_ALTPHYS) == 0) - printf("%s: enabling 100baseTX UTP port\n", sc->tulip_xname); + kprintf("%s: enabling 100baseTX UTP port\n", sc->tulip_xname); sc->tulip_cmdmode |= TULIP_CMD_PORTSELECT |TULIP_CMD_PCSFUNCTION|TULIP_CMD_SCRAMBLER; sc->tulip_cmdmode &= ~TULIP_CMD_TXTHRSHLDCTL; @@ -643,7 +643,7 @@ tulip_dc21140_znyx_zx34x_media_select( sc->tulip_media = TULIP_MEDIA_100BASET; } else { if (sc->tulip_flags & TULIP_ALTPHYS) - printf("%s: enabling 10baseT UTP port\n", sc->tulip_xname); + kprintf("%s: enabling 10baseT UTP port\n", sc->tulip_xname); sc->tulip_cmdmode &= ~(TULIP_CMD_PORTSELECT |TULIP_CMD_PCSFUNCTION|TULIP_CMD_SCRAMBLER); sc->tulip_cmdmode |= TULIP_CMD_TXTHRSHLDCTL; @@ -695,7 +695,7 @@ tulip_dc21140_de500_media_select( TULIP_WRITE_CSR(sc, csr_gp, TULIP_GP_DE500_PINS); if (sc->tulip_if.if_flags & IFF_ALTPHYS) { if ((sc->tulip_flags & TULIP_ALTPHYS) == 0) - printf("%s: enabling 100baseTX UTP port\n", sc->tulip_xname); + kprintf("%s: enabling 100baseTX UTP port\n", sc->tulip_xname); sc->tulip_cmdmode |= TULIP_CMD_PORTSELECT |TULIP_CMD_PCSFUNCTION|TULIP_CMD_SCRAMBLER; sc->tulip_cmdmode &= ~TULIP_CMD_TXTHRSHLDCTL; @@ -705,7 +705,7 @@ tulip_dc21140_de500_media_select( TULIP_GP_DE500_HALFDUPLEX|TULIP_GP_DE500_FORCE_100); } else { if (sc->tulip_flags & TULIP_ALTPHYS) - printf("%s: enabling 10baseT UTP port\n", sc->tulip_xname); + kprintf("%s: enabling 10baseT UTP port\n", sc->tulip_xname); sc->tulip_cmdmode &= ~(TULIP_CMD_PORTSELECT |TULIP_CMD_PCSFUNCTION|TULIP_CMD_SCRAMBLER); sc->tulip_cmdmode |= TULIP_CMD_TXTHRSHLDCTL; @@ -831,7 +831,7 @@ tulip_dc21041_media_select( && sc->tulip_media != TULIP_MEDIA_AUI) || (sc->tulip_probe_state == TULIP_PROBE_BNC && sc->tulip_media != TULIP_MEDIA_AUI)) { - printf("%s: enabling %s port\n", sc->tulip_xname, + kprintf("%s: enabling %s port\n", sc->tulip_xname, sc->tulip_probe_state == TULIP_PROBE_BNC ? "Thinwire/BNC" : "AUI"); if (sc->tulip_probe_state == TULIP_PROBE_AUI) @@ -891,7 +891,7 @@ tulip_dc21041_media_select( sc->tulip_flags &= ~TULIP_WANTRXACT; sc->tulip_gpticks = 4; } else { - printf("%s: autosense failed: cable problem?\n", + kprintf("%s: autosense failed: cable problem?\n", sc->tulip_xname); } } @@ -923,7 +923,7 @@ tulip_dc21041_media_select( * proper media to use. */ if (sc->tulip_media != TULIP_MEDIA_10BASET) - printf("%s: enabling 10baseT/UTP port\n", sc->tulip_xname); + kprintf("%s: enabling 10baseT/UTP port\n", sc->tulip_xname); if (sc->tulip_media != TULIP_MEDIA_10BASET || (sc->tulip_flags & TULIP_INRESET)) { sc->tulip_media = TULIP_MEDIA_10BASET; @@ -1516,7 +1516,7 @@ tulip_intr( } } if (csr & TULIP_STS_ABNRMLINTR) { - printf("%s: abnormal interrupt: 0x%05x [0x%05x]\n", + kprintf("%s: abnormal interrupt: 0x%05x [0x%05x]\n", sc->tulip_xname, csr, csr & sc->tulip_intrmask); TULIP_WRITE_CSR(sc, csr_command, sc->tulip_cmdmode); } @@ -2065,14 +2065,14 @@ tulip_attach( ifp->if_start = tulip_start; #if defined(__FreeBSD__) - printf("%s", sc->tulip_xname); + kprintf("%s", sc->tulip_xname); #elif defined(__bsdi__) - printf("\n%s", sc->tulip_xname); + kprintf("\n%s", sc->tulip_xname); #endif #if defined(__NetBSD__) - printf(": %s%s pass %d.%d\n%s: Ethernet address %s\n", + kprintf(": %s%s pass %d.%d\n%s: Ethernet address %s\n", #else - printf(": %s%s pass %d.%d Ethernet address %s\n", + kprintf(": %s%s pass %d.%d Ethernet address %s\n", #endif sc->tulip_boardsw->bd_description, tulip_chipdescs[sc->tulip_chipid], @@ -2262,7 +2262,7 @@ tulip_pci_match( return 0; irq = pci_inl(pa, PCI_I_LINE) & 0xFF; if (irq == 0 || irq >= 16) { - printf("de?: invalid IRQ %d; skipping\n", irq); + kprintf("de?: invalid IRQ %d; skipping\n", irq); return 0; } return 1; @@ -2348,7 +2348,7 @@ tulip_probe( ia->ia_drq = DRQNONE; if (ia->ia_irq != IRQUNK && irq != ia->ia_irq) { - printf("de%d: error: desired IRQ of %d does not match device's " + kprintf("de%d: error: desired IRQ of %d does not match device's " "actual IRQ of %d,\n", cf->cf_unit, ffs(ia->ia_irq) - 1, ffs(irq) - 1); @@ -2463,7 +2463,7 @@ tulip_pci_attach( #if defined(__FreeBSD__) if (unit >= NDE) { - printf("de%d: not configured; kernel is built for only %d device%s.\n", + kprintf("de%d: not configured; kernel is built for only %d device%s.\n", unit, NDE, NDE == 1 ? "" : "s"); return; } @@ -2500,16 +2500,16 @@ tulip_pci_attach( if ((chipid == TULIP_DC21040 || chipid == TULIP_DE425) && revinfo < 0x20) { #ifdef __FreeBSD__ - printf("de%d", unit); + kprintf("de%d", unit); #endif - printf(": not configured; DC21040 pass 2.0 required (%d.%d found)\n", + kprintf(": not configured; DC21040 pass 2.0 required (%d.%d found)\n", revinfo >> 4, revinfo & 0x0f); return; } else if (chipid == TULIP_DC21140 && revinfo < 0x11) { #ifdef __FreeBSD__ - printf("de%d", unit); + kprintf("de%d", unit); #endif - printf(": not configured; DC21140 pass 1.1 required (%d.%d found)\n", + kprintf(": not configured; DC21140 pass 1.1 required (%d.%d found)\n", revinfo >> 4, revinfo & 0x0f); return; } @@ -2552,7 +2552,7 @@ tulip_pci_attach( /* Set up human-readable name. */ bzero(sc->tulip_xname, sizeof(sc->tulip_xname)); - sprintf(sc->tulip_xname, "%s%d", sc->tulip_name, sc->tulip_unit); + ksprintf(sc->tulip_xname, "%s%d", sc->tulip_name, sc->tulip_unit); #if defined(__FreeBSD__) #if defined(TULIP_IOMAPPED) @@ -2603,13 +2603,13 @@ tulip_pci_attach( tulip_initring(sc, &sc->tulip_txinfo, txdescs, TULIP_TXDESCS); if ((retval = tulip_read_macaddr(sc)) < 0) { #ifdef __FreeBSD__ - printf("%s", sc->tulip_xname); + kprintf("%s", sc->tulip_xname); #endif - printf(": can't read ENET ROM (why=%d) (", retval); + kprintf(": can't read ENET ROM (why=%d) (", retval); for (idx = 0; idx < 32; idx++) - printf("%02x", sc->tulip_rombuf[idx]); - printf("\n"); - printf("%s: %s%s pass %d.%d Ethernet address %s\n", + kprintf("%02x", sc->tulip_rombuf[idx]); + kprintf("\n"); + kprintf("%s: %s%s pass %d.%d Ethernet address %s\n", sc->tulip_xname, (sc->tulip_boardsw != NULL ? sc->tulip_boardsw->bd_description : ""), tulip_chipdescs[sc->tulip_chipid], @@ -2629,29 +2629,29 @@ tulip_pci_attach( if (pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin, pa->pa_intrline, &intrhandle)) { - printf(": couldn't map interrupt\n"); + kprintf(": couldn't map interrupt\n"); return; } intrstr = pci_intr_string(pc, intrhandle); sc->tulip_ih = pci_intr_establish(pc, intrhandle, IPL_NET, tulip_intr, sc); if (sc->tulip_ih == NULL) { - printf(": couldn't establish interrupt"); + kprintf(": couldn't establish interrupt"); if (intrstr != NULL) - printf(" at %s", intrstr); - printf("\n"); + kprintf(" at %s", intrstr); + kprintf("\n"); return; } } sc->tulip_ats = shutdownhook_establish(tulip_pci_shutdown, sc); if (sc->tulip_ats == NULL) - printf("\n%s: warning: couldn't establish shutdown hook", + kprintf("\n%s: warning: couldn't establish shutdown hook", sc->tulip_xname); #endif #if defined(__FreeBSD__) if (sc->tulip_boardsw->bd_type != TULIP_DC21040_ZX314_SLAVE) { if (!pci_map_int (config_id, tulip_intr, (void*) sc, &net_imask)) { - printf("%s: couldn't map interrupt\n", sc->tulip_xname); + kprintf("%s: couldn't map interrupt\n", sc->tulip_xname); return; } } @@ -2673,7 +2673,7 @@ tulip_pci_attach( tulip_attach(sc); #if defined(__NetBSD__) if (intrstr != NULL) - printf("%s: interrupting at %s\n", self->dv_xname, intrstr); + kprintf("%s: interrupting at %s\n", self->dv_xname, intrstr); #endif } } diff --git a/sys/dev/pci/if_en_pci.c b/sys/dev/pci/if_en_pci.c index 87cea6773e1..cafa403e972 100644 --- a/sys/dev/pci/if_en_pci.c +++ b/sys/dev/pci/if_en_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_en_pci.c,v 1.2 1996/08/27 16:24:18 cgd Exp $ */ +/* $NetBSD: if_en_pci.c,v 1.3 1996/10/10 19:58:19 christos Exp $ */ /* * @@ -148,7 +148,7 @@ void *aux; const char *intrstr; int retval; - printf("\n"); + kprintf("\n"); sc->en_bc = pa->pa_bc; scp->en_pc = pa->pa_pc; @@ -159,19 +159,19 @@ void *aux; if (pci_intr_map(scp->en_pc, pa->pa_intrtag, pa->pa_intrpin, pa->pa_intrline, &ih)) { - printf("%s: couldn't map interrupt\n", sc->sc_dev.dv_xname); + kprintf("%s: couldn't map interrupt\n", sc->sc_dev.dv_xname); return; } intrstr = pci_intr_string(scp->en_pc, ih); scp->sc_ih = pci_intr_establish(scp->en_pc, ih, IPL_NET, en_intr, sc); if (scp->sc_ih == NULL) { - printf("%s: couldn't establish interrupt\n", sc->sc_dev.dv_xname); + kprintf("%s: couldn't establish interrupt\n", sc->sc_dev.dv_xname); if (intrstr != NULL) - printf(" at %s", intrstr); - printf("\n"); + kprintf(" at %s", intrstr); + kprintf("\n"); return; } - printf("%s: interrupting at %s\n", sc->sc_dev.dv_xname, intrstr); + kprintf("%s: interrupting at %s\n", sc->sc_dev.dv_xname, intrstr); sc->ipl = 1; /* XXX */ /* @@ -184,7 +184,7 @@ void *aux; retval = bus_mem_map(sc->en_bc, membase, sc->en_obmemsz, 0, &sc->en_base); if (retval) { - printf("%s: couldn't map memory\n", sc->sc_dev.dv_xname); + kprintf("%s: couldn't map memory\n", sc->sc_dev.dv_xname); return; } diff --git a/sys/dev/pci/if_ep_pci.c b/sys/dev/pci/if_ep_pci.c index 1622a57f9d7..4d21e60cb12 100644 --- a/sys/dev/pci/if_ep_pci.c +++ b/sys/dev/pci/if_ep_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ep_pci.c,v 1.8 1996/09/29 11:20:32 christos Exp $ */ +/* $NetBSD: if_ep_pci.c,v 1.9 1996/10/10 19:58:20 christos Exp $ */ /* * Copyright (c) 1994 Herb Peyerl <hpeyerl@beer.org> @@ -128,12 +128,12 @@ ep_pci_attach(parent, self, aux) const char *intrstr = NULL; if (pci_io_find(pc, pa->pa_tag, PCI_CBIO, &iobase, &iosize)) { - printf(": can't find i/o space\n"); + kprintf(": can't find i/o space\n"); return; } if (bus_io_map(bc, iobase, iosize, &sc->sc_ioh)) { - printf(": can't map i/o space\n"); + kprintf(": can't map i/o space\n"); return; } @@ -167,7 +167,7 @@ ep_pci_attach(parent, self, aux) model = "unknown model!"; } - printf(": %s\n", model); + kprintf(": %s\n", model); epconfig(sc, conn); @@ -179,18 +179,18 @@ ep_pci_attach(parent, self, aux) /* Map and establish the interrupt. */ if (pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin, pa->pa_intrline, &ih)) { - printf("%s: couldn't map interrupt\n", sc->sc_dev.dv_xname); + kprintf("%s: couldn't map interrupt\n", sc->sc_dev.dv_xname); return; } intrstr = pci_intr_string(pc, ih); sc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, epintr, sc); if (sc->sc_ih == NULL) { - printf("%s: couldn't establish interrupt", + kprintf("%s: couldn't establish interrupt", sc->sc_dev.dv_xname); if (intrstr != NULL) - printf(" at %s", intrstr); - printf("\n"); + kprintf(" at %s", intrstr); + kprintf("\n"); return; } - printf("%s: interrupting at %s\n", sc->sc_dev.dv_xname, intrstr); + kprintf("%s: interrupting at %s\n", sc->sc_dev.dv_xname, intrstr); } diff --git a/sys/dev/pci/if_fpa.c b/sys/dev/pci/if_fpa.c index 05250c46ac0..27c55d26767 100644 --- a/sys/dev/pci/if_fpa.c +++ b/sys/dev/pci/if_fpa.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_fpa.c,v 1.12 1996/06/17 18:29:18 cgd Exp $ */ +/* $NetBSD: if_fpa.c,v 1.13 1996/10/10 19:58:21 christos Exp $ */ /*- * Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com> @@ -175,7 +175,7 @@ pdq_pci_attach( pdq_uint32_t data; if (unit > NFPA) { - printf("fpa%d: not configured; kernel is built for only %d device%s.\n", + kprintf("fpa%d: not configured; kernel is built for only %d device%s.\n", unit, NFPA, NFPA == 1 ? "" : "s"); return; } @@ -274,7 +274,7 @@ pdq_pci_probe( irq = (1 << (pci_inl(pa, PCI_I_LINE) & 0xFF)); if (ia->ia_irq != IRQUNK && irq != ia->ia_irq) { - printf("fpa%d: error: desired IRQ of %d does not match device's actual IRQ of %d\n", + kprintf("fpa%d: error: desired IRQ of %d does not match device's actual IRQ of %d\n", cf->cf_unit, ffs(ia->ia_irq) - 1, ffs(irq) - 1); return 0; @@ -330,7 +330,7 @@ pdq_pci_attach( sc->sc_if.if_nme, sc->sc_if.if_unit, (void *) sc, PDQ_DEFPA); if (sc->sc_pdq == NULL) { - printf("fpa%d: initialization failed\n", sc->sc_if.if_unit); + kprintf("fpa%d: initialization failed\n", sc->sc_if.if_unit); return; } @@ -409,13 +409,13 @@ pdq_pci_attach( #ifdef PDQ_IOMAPPED if (pci_io_find(pa->pa_pc, pa->pa_tag, PCI_CBIO, &iobase, &iosize) || bus_io_map(pa->pa_bc, iobase, iosize, &sc->sc_iobase)){ - printf("\n%s: can't map I/O space!\n", sc->sc_dev.dv_xname); + kprintf("\n%s: can't map I/O space!\n", sc->sc_dev.dv_xname); return; } #else if (pci_mem_find(pa->pa_pc, pa->pa_tag, PCI_CBMA, &membase, &memsize, NULL) || bus_mem_map(pa->pa_bc, membase, memsize, 0, &sc->sc_membase)) { - printf("\n%s: can't map memory space!\n", sc->sc_dev.dv_xname); + kprintf("\n%s: can't map memory space!\n", sc->sc_dev.dv_xname); return; } #endif @@ -424,7 +424,7 @@ pdq_pci_attach( sc->sc_if.if_xname, 0, (void *) sc, PDQ_DEFPA); if (sc->sc_pdq == NULL) { - printf("%s: initialization failed\n", sc->sc_dev.dv_xname); + kprintf("%s: initialization failed\n", sc->sc_dev.dv_xname); return; } @@ -433,24 +433,24 @@ pdq_pci_attach( if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin, pa->pa_intrline, &intrhandle)) { - printf("%s: couldn't map interrupt\n", self->dv_xname); + kprintf("%s: couldn't map interrupt\n", self->dv_xname); return; } intrstr = pci_intr_string(pa->pa_pc, intrhandle); sc->sc_ih = pci_intr_establish(pa->pa_pc, intrhandle, IPL_NET, pdq_pci_ifintr, sc); if (sc->sc_ih == NULL) { - printf("%s: couldn't establish interrupt", self->dv_xname); + kprintf("%s: couldn't establish interrupt", self->dv_xname); if (intrstr != NULL) - printf(" at %s", intrstr); - printf("\n"); + kprintf(" at %s", intrstr); + kprintf("\n"); return; } sc->sc_ats = shutdownhook_establish((void (*)(void *)) pdq_hwreset, sc->sc_pdq); if (sc->sc_ats == NULL) - printf("%s: warning: couldn't establish shutdown hook\n", self->dv_xname); + kprintf("%s: warning: couldn't establish shutdown hook\n", self->dv_xname); if (intrstr != NULL) - printf("%s: interrupting at %s\n", self->dv_xname, intrstr); + kprintf("%s: interrupting at %s\n", self->dv_xname, intrstr); } struct cfattach fpa_ca = { diff --git a/sys/dev/pci/if_le_pci.c b/sys/dev/pci/if_le_pci.c index 19a0a74426f..327c90af8ab 100644 --- a/sys/dev/pci/if_le_pci.c +++ b/sys/dev/pci/if_le_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_le_pci.c,v 1.8 1996/07/15 16:40:46 cgd Exp $ */ +/* $NetBSD: if_le_pci.c,v 1.9 1996/10/10 19:58:22 christos Exp $ */ /*- * Copyright (c) 1995 Charles M. Hannum. All rights reserved. @@ -171,14 +171,14 @@ le_pci_attach(parent, self, aux) model = "unknown model!"; } - printf(": %s\n", model); + kprintf(": %s\n", model); if (pci_io_find(pc, pa->pa_tag, PCI_CBIO, &iobase, &iosize)) { - printf("%s: can't find I/O base\n", sc->sc_dev.dv_xname); + kprintf("%s: can't find I/O base\n", sc->sc_dev.dv_xname); return; } if (bus_io_map(bc, iobase, iosize, &ioh)) { - printf("%s: can't map I/O space\n", sc->sc_dev.dv_xname); + kprintf("%s: can't map I/O space\n", sc->sc_dev.dv_xname); return; } @@ -190,7 +190,7 @@ le_pci_attach(parent, self, aux) sc->sc_mem = malloc(16384, M_DEVBUF, M_NOWAIT); if (sc->sc_mem == 0) { - printf("%s: couldn't allocate memory for card\n", + kprintf("%s: couldn't allocate memory for card\n", sc->sc_dev.dv_xname); return; } @@ -212,7 +212,7 @@ le_pci_attach(parent, self, aux) sc->sc_wrcsr = le_pci_wrcsr; sc->sc_hwinit = NULL; - printf("%s", sc->sc_dev.dv_xname); + kprintf("%s", sc->sc_dev.dv_xname); am7990_config(sc); /* Enable the card. */ @@ -224,18 +224,18 @@ le_pci_attach(parent, self, aux) /* Map and establish the interrupt. */ if (pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin, pa->pa_intrline, &ih)) { - printf("%s: couldn't map interrupt\n", sc->sc_dev.dv_xname); + kprintf("%s: couldn't map interrupt\n", sc->sc_dev.dv_xname); return; } intrstr = pci_intr_string(pc, ih); lesc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, am7990_intr, sc); if (lesc->sc_ih == NULL) { - printf("%s: couldn't establish interrupt", + kprintf("%s: couldn't establish interrupt", sc->sc_dev.dv_xname); if (intrstr != NULL) - printf(" at %s", intrstr); - printf("\n"); + kprintf(" at %s", intrstr); + kprintf("\n"); return; } - printf("%s: interrupting at %s\n", sc->sc_dev.dv_xname, intrstr); + kprintf("%s: interrupting at %s\n", sc->sc_dev.dv_xname, intrstr); } diff --git a/sys/dev/pci/ncr.c b/sys/dev/pci/ncr.c index 2f039aa7f21..72421911cc5 100644 --- a/sys/dev/pci/ncr.c +++ b/sys/dev/pci/ncr.c @@ -1,4 +1,4 @@ -/* $NetBSD: ncr.c,v 1.42 1996/09/20 22:38:37 cgd Exp $ */ +/* $NetBSD: ncr.c,v 1.43 1996/10/10 19:58:23 christos Exp $ */ /************************************************************************** ** @@ -265,7 +265,7 @@ extern PRINT_ADDR(); #undef assert #define assert(expression) { \ if (!(expression)) { \ - (void)printf(\ + (void)kprintf(\ "assertion \"%s\" failed: file \"%s\", line %d\n", \ #expression, \ __FILE__, __LINE__); \ @@ -1332,7 +1332,7 @@ static void ncr_attach (pcici_t tag, int unit); #if 0 static char ident[] = - "\n$NetBSD: ncr.c,v 1.42 1996/09/20 22:38:37 cgd Exp $\n"; + "\n$NetBSD: ncr.c,v 1.43 1996/10/10 19:58:23 christos Exp $\n"; #endif u_long ncr_version = NCR_VERSION * 11 @@ -1430,7 +1430,7 @@ struct scsi_device ncr_dev = static char *ncr_name (ncb_p np) { static char name[10]; - sprintf(name, "ncr%d", np->unit); + ksprintf(name, "ncr%d", np->unit); return (name); } #endif @@ -3111,13 +3111,13 @@ static void ncr_script_copy_and_bind (struct script *script, ncb_p np) */ if (opcode == 0) { - printf ("%s: ERROR0 IN SCRIPT at %d.\n", + kprintf ("%s: ERROR0 IN SCRIPT at %d.\n", ncr_name(np), src-start-1); DELAY (1000000); }; if (DEBUG_FLAGS & DEBUG_SCRIPT) - printf ("%p: <%x>\n", (src-1), (unsigned)opcode); + kprintf ("%p: <%x>\n", (src-1), (unsigned)opcode); /* ** We don't have to decode ALL commands @@ -3136,7 +3136,7 @@ static void ncr_script_copy_and_bind (struct script *script, ncb_p np) if ((tmp2 & RELOC_MASK) == RELOC_KVAR) tmp2 = 0; if ((tmp1 ^ tmp2) & 3) { - printf ("%s: ERROR1 IN SCRIPT at %d.\n", + kprintf ("%s: ERROR1 IN SCRIPT at %d.\n", ncr_name(np), src-start-1); DELAY (1000000); }; @@ -3357,28 +3357,28 @@ ncr_attach(parent, self, aux) const char *intrstr; ncb_p np = (void *)self; - printf(": NCR "); + kprintf(": NCR "); switch (pa->pa_id) { case NCR_810_ID: - printf("53c810"); + kprintf("53c810"); break; case NCR_810AP_ID: - printf("53c810ap"); + kprintf("53c810ap"); break; case NCR_815_ID: - printf("53c815"); + kprintf("53c815"); break; case NCR_825_ID: - printf("53c825 Wide"); + kprintf("53c825 Wide"); break; case NCR_860_ID: - printf("53c860"); + kprintf("53c860"); break; case NCR_875_ID: - printf("53c875 Wide"); + kprintf("53c875 Wide"); break; } - printf(" SCSI\n"); + kprintf(" SCSI\n"); np->sc_bc = bc; np->sc_pc = pc; @@ -3391,14 +3391,14 @@ ncr_attach(parent, self, aux) retval = pci_mem_find(pc, pa->pa_tag, 0x14, &np->paddr, &memsize, &cacheable); if (retval) { - printf("%s: couldn't find memory region\n", self->dv_xname); + kprintf("%s: couldn't find memory region\n", self->dv_xname); return; } /* Map the memory. Note that we never want it to be cacheable. */ retval = bus_mem_map(pa->pa_bc, np->paddr, memsize, 0, &np->sc_memh); if (retval) { - printf("%s: couldn't map memory region\n", self->dv_xname); + kprintf("%s: couldn't map memory region\n", self->dv_xname); return; } @@ -3408,21 +3408,21 @@ ncr_attach(parent, self, aux) retval = pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin, pa->pa_intrline, &intrhandle); if (retval) { - printf("%s: couldn't map interrupt\n", self->dv_xname); + kprintf("%s: couldn't map interrupt\n", self->dv_xname); return; } intrstr = pci_intr_string(pc, intrhandle); np->sc_ih = pci_intr_establish(pc, intrhandle, IPL_BIO, ncr_intr, np); if (np->sc_ih == NULL) { - printf("%s: couldn't establish interrupt", self->dv_xname); + kprintf("%s: couldn't establish interrupt", self->dv_xname); if (intrstr != NULL) - printf(" at %s", intrstr); - printf("\n"); + kprintf(" at %s", intrstr); + kprintf("\n"); return; } if (intrstr != NULL) - printf("%s: interrupting at %s\n", self->dv_xname, intrstr); + kprintf("%s: interrupting at %s\n", self->dv_xname, intrstr); #else /* !__NetBSD__ */ @@ -3548,9 +3548,9 @@ static void ncr_attach (pcici_t config_id, int unit) u_long config_id = pa->pa_tag; #endif /* __NetBSD__ */ for (reg=0; reg<256; reg+=4) { - if (reg%16==0) printf ("reg[%2x]", reg); - printf (" %08x", (int)pci_conf_read (config_id, reg)); - if (reg%16==12) printf ("\n"); + if (reg%16==0) kprintf ("reg[%2x]", reg); + kprintf (" %08x", (int)pci_conf_read (config_id, reg)); + if (reg%16==12) kprintf ("\n"); } } @@ -3569,7 +3569,7 @@ static void ncr_attach (pcici_t config_id, int unit) */ if (ncr_snooptest (np)) { - printf ("CACHE INCORRECTLY CONFIGURED.\n"); + kprintf ("CACHE INCORRECTLY CONFIGURED.\n"); return; }; @@ -3579,7 +3579,7 @@ static void ncr_attach (pcici_t config_id, int unit) */ if (!pci_map_int (config_id, ncr_intr, np, &bio_imask)) - printf ("\tinterruptless mode: reduced performance.\n"); + kprintf ("\tinterruptless mode: reduced performance.\n"); #endif /* __NetBSD__ */ /* @@ -3636,14 +3636,14 @@ static void ncr_attach (pcici_t config_id, int unit) unsigned myaddr = np->myaddr; char *txt_and = ""; - printf ("%s scanning for targets ", ncr_name (np)); + kprintf ("%s scanning for targets ", ncr_name (np)); if (t_from < myaddr) { - printf ("%d..%d ", t_from, myaddr -1); + kprintf ("%d..%d ", t_from, myaddr -1); txt_and = "and "; } if (myaddr < t_to) - printf ("%s%d..%d ", txt_and, myaddr +1, t_to); - printf ("(V%d " NCR_DATE ")\n", NCR_VERSION); + kprintf ("%s%d..%d ", txt_and, myaddr +1, t_to); + kprintf ("(V%d " NCR_DATE ")\n", NCR_VERSION); } scsi_attachdevs (scbus); @@ -3690,7 +3690,7 @@ ncr_intr(np) int n = 0; int oldspl = splbio(); - if (DEBUG_FLAGS & DEBUG_TINY) printf ("["); + if (DEBUG_FLAGS & DEBUG_TINY) kprintf ("["); if (INB(nc_istat) & (INTF|SIP|DIP)) { /* @@ -3704,7 +3704,7 @@ ncr_intr(np) np->ticks = 100; }; - if (DEBUG_FLAGS & DEBUG_TINY) printf ("]\n"); + if (DEBUG_FLAGS & DEBUG_TINY) kprintf ("]\n"); splx (oldspl); return (n); @@ -3783,7 +3783,7 @@ static INT32 ncr_start (struct scsi_xfer * xp) case 0x2a: /* WRITE_BIG (10) */ case 0xaa: /* WRITE_HUGE(12) */ PRINT_ADDR(xp); - printf ("access to partial disk block refused.\n"); + kprintf ("access to partial disk block refused.\n"); xp->error = XS_DRIVER_STUFFUP; return(COMPLETE); }; @@ -3791,7 +3791,7 @@ static INT32 ncr_start (struct scsi_xfer * xp) if (DEBUG_FLAGS & DEBUG_TINY) { PRINT_ADDR(xp); - printf ("CMD=%x F=%x L=%x ", cmd->opcode, + kprintf ("CMD=%x F=%x L=%x ", cmd->opcode, (unsigned)xp->flags, (unsigned) xp->datalen); } @@ -3805,12 +3805,12 @@ static INT32 ncr_start (struct scsi_xfer * xp) flags = xp->flags; if (!(flags & INUSE)) { - printf("%s: ?INUSE?\n", ncr_name (np)); + kprintf("%s: ?INUSE?\n", ncr_name (np)); xp->flags |= INUSE; }; if(flags & ITSDONE) { - printf("%s: ?ITSDONE?\n", ncr_name (np)); + kprintf("%s: ?ITSDONE?\n", ncr_name (np)); xp->flags &= ~ITSDONE; }; @@ -3827,7 +3827,7 @@ static INT32 ncr_start (struct scsi_xfer * xp) oldspl = splbio(); if (!(cp=ncr_get_ccb (np, flags, xp->sc_link->target, xp->sc_link->lun))) { - printf ("%s: no ccb.\n", ncr_name (np)); + kprintf ("%s: no ccb.\n", ncr_name (np)); xp->error = XS_DRIVER_STUFFUP; splx(oldspl); return(TRY_AGAIN_LATER); @@ -3864,7 +3864,7 @@ static INT32 ncr_start (struct scsi_xfer * xp) #ifndef NCR_GETCC_WITHMSG if (tp->quirks) { PRINT_ADDR(xp); - printf ("quirks=%x.\n", tp->quirks); + kprintf ("quirks=%x.\n", tp->quirks); }; #endif }; @@ -3894,7 +3894,7 @@ static INT32 ncr_start (struct scsi_xfer * xp) tp->period =0xffff; tp->sval = 0xe0; PRINT_ADDR(xp); - printf ("asynchronous.\n"); + kprintf ("asynchronous.\n"); }; }; @@ -3930,7 +3930,7 @@ static INT32 ncr_start (struct scsi_xfer * xp) cp->tag=lp->lasttag; if (DEBUG_FLAGS & DEBUG_TAGS) { PRINT_ADDR(xp); - printf ("using tag #%d.\n", cp->tag); + kprintf ("using tag #%d.\n", cp->tag); }; }; } else { @@ -3998,9 +3998,9 @@ static INT32 ncr_start (struct scsi_xfer * xp) cp -> scsi_smsg [msglen++] = tp->maxoffs; if (DEBUG_FLAGS & DEBUG_NEGO) { PRINT_ADDR(cp->xfer); - printf ("sync msgout: "); + kprintf ("sync msgout: "); ncr_show_msg (&cp->scsi_smsg [msglen-5]); - printf (".\n"); + kprintf (".\n"); }; break; case NS_WIDE: @@ -4010,9 +4010,9 @@ static INT32 ncr_start (struct scsi_xfer * xp) cp -> scsi_smsg [msglen++] = tp->usrwide; if (DEBUG_FLAGS & DEBUG_NEGO) { PRINT_ADDR(cp->xfer); - printf ("wide msgout: "); + kprintf ("wide msgout: "); ncr_show_msg (&cp->scsi_smsg [msglen-4]); - printf (".\n"); + kprintf (".\n"); }; break; }; @@ -4159,7 +4159,7 @@ static INT32 ncr_start (struct scsi_xfer * xp) np->squeueput = ptr; if(DEBUG_FLAGS & DEBUG_QUEUE) - printf ("%s: queuepos=%d tryoffset=%d.\n", ncr_name (np), + kprintf ("%s: queuepos=%d tryoffset=%d.\n", ncr_name (np), np->squeueput, (unsigned)(np->script->startpos[0]- (NCB_SCRIPT_PHYS (np, tryloop)))); @@ -4186,7 +4186,7 @@ static INT32 ncr_start (struct scsi_xfer * xp) if (!(flags & SCSI_NOMASK)) { #endif /* __NetBSD__ */ if (np->lasttime) { - if(DEBUG_FLAGS & DEBUG_TINY) printf ("Q"); + if(DEBUG_FLAGS & DEBUG_TINY) kprintf ("Q"); return(SUCCESSFULLY_QUEUED); }; }; @@ -4198,11 +4198,11 @@ static INT32 ncr_start (struct scsi_xfer * xp) **---------------------------------------------------- */ - if (DEBUG_FLAGS & DEBUG_POLL) printf("P"); + if (DEBUG_FLAGS & DEBUG_POLL) kprintf("P"); for (i=xp->timeout; i && !(xp->flags & ITSDONE);i--) { if ((DEBUG_FLAGS & DEBUG_POLL) && (cp->host_status)) - printf ("%c", (cp->host_status & 0xf) + '0'); + kprintf ("%c", (cp->host_status & 0xf) + '0'); DELAY (1000); ncr_exception (np); }; @@ -4211,7 +4211,7 @@ static INT32 ncr_start (struct scsi_xfer * xp) ** Abort if command not done. */ if (!(xp->flags & ITSDONE)) { - printf ("%s: aborting job ...\n", ncr_name (np)); + kprintf ("%s: aborting job ...\n", ncr_name (np)); OUTB (nc_istat, CABRT); DELAY (100000); OUTB (nc_istat, SIGP); @@ -4219,7 +4219,7 @@ static INT32 ncr_start (struct scsi_xfer * xp) }; if (!(xp->flags & ITSDONE)) { - printf ("%s: abortion failed at %x.\n", + kprintf ("%s: abortion failed at %x.\n", ncr_name (np), (unsigned) INL(nc_dsp)); ncr_init (np, "timeout", HS_TIMEOUT); }; @@ -4230,7 +4230,7 @@ static INT32 ncr_start (struct scsi_xfer * xp) }; if (DEBUG_FLAGS & DEBUG_RESULT) { - printf ("%s: result: %x %x.\n", + kprintf ("%s: result: %x %x.\n", ncr_name (np), cp->host_status, cp->scsi_status); }; #ifdef __NetBSD__ @@ -4286,7 +4286,7 @@ void ncr_complete (ncb_p np, ccb_p cp) ncb_profile (np, cp); if (DEBUG_FLAGS & DEBUG_TINY) - printf ("CCB=%lx STAT=%x/%x\n", (unsigned long)cp & 0xfff, + kprintf ("CCB=%lx STAT=%x/%x\n", (unsigned long)cp & 0xfff, cp->host_status,cp->scsi_status); xp = cp->xfer; @@ -4300,7 +4300,7 @@ void ncr_complete (ncb_p np, ccb_p cp) if (cp->parity_status) { PRINT_ADDR(xp); - printf ("%d parity error(s), fallback.\n", cp->parity_status); + kprintf ("%d parity error(s), fallback.\n", cp->parity_status); /* ** fallback to asynch transfer. */ @@ -4316,13 +4316,13 @@ void ncr_complete (ncb_p np, ccb_p cp) PRINT_ADDR(xp); switch (cp->xerr_status) { case XE_EXTRA_DATA: - printf ("extraneous data discarded.\n"); + kprintf ("extraneous data discarded.\n"); break; case XE_BAD_PHASE: - printf ("illegal scsi phase (4/5).\n"); + kprintf ("illegal scsi phase (4/5).\n"); break; default: - printf ("extended error %d.\n", cp->xerr_status); + kprintf ("extended error %d.\n", cp->xerr_status); break; }; if (cp->host_status==HS_COMPLETE) @@ -4418,9 +4418,9 @@ void ncr_complete (ncb_p np, ccb_p cp) if (DEBUG_FLAGS & (DEBUG_RESULT|DEBUG_TINY)) { u_char * p = (u_char*) & xp->sense; int i; - printf ("\n%s: sense data:", ncr_name (np)); - for (i=0; i<14; i++) printf (" %x", *p++); - printf (".\n"); + kprintf ("\n%s: sense data:", ncr_name (np)); + for (i=0; i<14; i++) kprintf (" %x", *p++); + kprintf (".\n"); }; } else if ((cp->host_status == HS_COMPLETE) @@ -4445,7 +4445,7 @@ void ncr_complete (ncb_p np, ccb_p cp) ** Other protocol messes */ PRINT_ADDR(xp); - printf ("COMMAND FAILED (%x %x) @%p.\n", + kprintf ("COMMAND FAILED (%x %x) @%p.\n", cp->host_status, cp->scsi_status, cp); xp->error = XS_TIMEOUT; @@ -4461,27 +4461,27 @@ void ncr_complete (ncb_p np, ccb_p cp) u_char * p; int i; PRINT_ADDR(xp); - printf (" CMD:"); + kprintf (" CMD:"); p = (u_char*) &xp->cmd->opcode; - for (i=0; i<xp->cmdlen; i++) printf (" %x", *p++); + for (i=0; i<xp->cmdlen; i++) kprintf (" %x", *p++); if (cp->host_status==HS_COMPLETE) { switch (cp->scsi_status) { case S_GOOD: - printf (" GOOD"); + kprintf (" GOOD"); break; case S_CHECK_COND: - printf (" SENSE:"); + kprintf (" SENSE:"); p = (u_char*) &xp->sense; for (i=0; i<xp->req_sense_length; i++) - printf (" %x", *p++); + kprintf (" %x", *p++); break; default: - printf (" STAT: %x\n", cp->scsi_status); + kprintf (" STAT: %x\n", cp->scsi_status); break; }; - } else printf (" HOSTERROR: %x", cp->host_status); - printf ("\n"); + } else kprintf (" HOSTERROR: %x", cp->host_status); + kprintf ("\n"); }; /* @@ -4523,7 +4523,7 @@ void ncr_wakeup (ncb_p np, u_long code) break; case HS_DISCONNECT: - if(DEBUG_FLAGS & DEBUG_TINY) printf ("D"); + if(DEBUG_FLAGS & DEBUG_TINY) kprintf ("D"); /* fall through */ case HS_BUSY: @@ -4568,7 +4568,7 @@ void ncr_init (ncb_p np, char * msg, u_long code) ** Message. */ - if (msg) printf ("%s: restart (%s).\n", ncr_name (np), msg); + if (msg) kprintf ("%s: restart (%s).\n", ncr_name (np), msg); /* ** Clear Start Queue @@ -4770,11 +4770,11 @@ static void ncr_setsync (ncb_p np, ccb_p cp, u_char sxfer) ** Disable extended Sreq/Sack filtering */ if (tp->period <= 200) OUTB (nc_stest2, 0); - printf ("%s%dns (%d Mb/sec) offset %d.\n", + kprintf ("%s%dns (%d Mb/sec) offset %d.\n", tp->period<200 ? "FAST SCSI-2 ":"", tp->period, (1000+tp->period/2)/tp->period, sxfer & 0x0f); - } else printf ("asynchronous.\n"); + } else kprintf ("asynchronous.\n"); /* ** set actual value and sync_status @@ -4824,9 +4824,9 @@ static void ncr_setwide (ncb_p np, ccb_p cp, u_char wide) */ PRINT_ADDR(xp); if (scntl3 & EWS) - printf ("WIDE SCSI (16 bit) enabled.\n"); + kprintf ("WIDE SCSI (16 bit) enabled.\n"); else - printf ("WIDE SCSI disabled.\n"); + kprintf ("WIDE SCSI disabled.\n"); /* ** set actual value and sync_status @@ -5065,7 +5065,7 @@ static void ncr_timeout (ncb_p np) cp->jump_ccb.l_cmd = (SCR_JUMP); if (cp->phys.header.launch.l_paddr == NCB_SCRIPT_PHYS (np, select)) { - printf ("%s: timeout ccb=%p (skip)\n", + kprintf ("%s: timeout ccb=%p (skip)\n", ncr_name (np), cp); cp->phys.header.launch.l_paddr = NCB_SCRIPT_PHYS (np, skip); @@ -5105,9 +5105,9 @@ static void ncr_timeout (ncb_p np) */ int oldspl = splbio (); - if (DEBUG_FLAGS & DEBUG_TINY) printf ("{"); + if (DEBUG_FLAGS & DEBUG_TINY) kprintf ("{"); ncr_exception (np); - if (DEBUG_FLAGS & DEBUG_TINY) printf ("}"); + if (DEBUG_FLAGS & DEBUG_TINY) kprintf ("}"); splx (oldspl); }; } @@ -5132,7 +5132,7 @@ void ncr_exception (ncb_p np) ** interrupt on the fly ? */ while ((istat = INB (nc_istat)) & INTF) { - if (DEBUG_FLAGS & DEBUG_TINY) printf ("F"); + if (DEBUG_FLAGS & DEBUG_TINY) kprintf ("F"); OUTB (nc_istat, INTF); np->profile.num_fly++; ncr_wakeup (np, 0); @@ -5150,7 +5150,7 @@ void ncr_exception (ncb_p np) np->profile.num_int++; if (DEBUG_FLAGS & DEBUG_TINY) - printf ("<%d|%x:%x|%x:%x>", + kprintf ("<%d|%x:%x|%x:%x>", INB(nc_scr0), dstat,sist, (unsigned)INL(nc_dsp), @@ -5279,7 +5279,7 @@ void ncr_exception (ncb_p np) script_ofs = dsp - np->p_script; - printf ("%s:%d: ERROR (%x:%x) (%x-%x-%x) (%x/%x) @ (%x:%08x).\n", + kprintf ("%s:%d: ERROR (%x:%x) (%x-%x-%x) (%x/%x) @ (%x:%08x).\n", ncr_name (np), INB (nc_ctest0)&0x0f, dstat, sist, INB (nc_socl), INB (nc_sbcl), INB (nc_sbdl), INB (nc_sxfer),INB (nc_scntl3), script_ofs, @@ -5287,14 +5287,14 @@ void ncr_exception (ncb_p np) if (((script_ofs & 3) == 0) && (unsigned)script_ofs < sizeof(struct script)) { - printf ("\tscript cmd = %08x\n", + kprintf ("\tscript cmd = %08x\n", *(ncrcmd *)((char*)np->script +script_ofs)); } - printf ("\treg:\t"); + kprintf ("\treg:\t"); for (i=0; i<16;i++) - printf (" %02x", INB_OFF(i)); - printf (".\n"); + kprintf (" %02x", INB_OFF(i)); + kprintf (".\n"); /*---------------------------------------- ** clean up the dma fifo @@ -5305,7 +5305,7 @@ void ncr_exception (ncb_p np) (INB(nc_sstat1) & (FF3210) ) || (INB(nc_sstat2) & (ILF1|ORF1|OLF1)) || /* wide .. */ !(dstat & DFE)) { - printf ("%s: have to clear fifos.\n", ncr_name (np)); + kprintf ("%s: have to clear fifos.\n", ncr_name (np)); OUTB (nc_stest3, TE|CSF); /* clear scsi fifo */ OUTB (nc_ctest3, CLF); /* clear dma fifo */ } @@ -5316,7 +5316,7 @@ void ncr_exception (ncb_p np) */ if (sist & HTH) { - printf ("%s: handshake timeout\n", ncr_name(np)); + kprintf ("%s: handshake timeout\n", ncr_name(np)); OUTB (nc_scntl1, CRST); DELAY (1000); OUTB (nc_scntl1, 0x00); @@ -5359,11 +5359,11 @@ void ncr_exception (ncb_p np) /* ** info message */ - printf ("%s: INFO: LDSC while IID.\n", + kprintf ("%s: INFO: LDSC while IID.\n", ncr_name (np)); return; }; - printf ("%s: target %d doesn't release the bus.\n", + kprintf ("%s: target %d doesn't release the bus.\n", ncr_name (np), INB (nc_ctest0)&0x0f); /* ** return without restarting the NCR. @@ -5407,23 +5407,23 @@ void ncr_exception (ncb_p np) switch (i%16) { case 0: - printf ("%s: reg[%d0]: ", + kprintf ("%s: reg[%d0]: ", ncr_name(np),i/16); break; case 4: case 8: case 12: - printf (" "); + kprintf (" "); break; }; val = INB_OFF(i); - printf (" %x%x", val/16, val%16); - if (i%16==15) printf (".\n"); + kprintf (" %x%x", val/16, val%16); + if (i%16==15) kprintf (".\n"); }; untimeout (TIMEOUT ncr_timeout, (caddr_t) np); - printf ("%s: halted!\n", ncr_name(np)); + kprintf ("%s: halted!\n", ncr_name(np)); /* ** don't restart controller ... */ @@ -5435,7 +5435,7 @@ void ncr_exception (ncb_p np) /* ** Freeze system to be able to read the messages. */ - printf ("ncr: fatal error: system halted - press reset to reboot ..."); + kprintf ("ncr: fatal error: system halted - press reset to reboot ..."); (void) splhigh(); for (;;); #endif @@ -5467,7 +5467,7 @@ void ncr_int_sto (ncb_p np) { u_long dsa, scratcha, diff; ccb_p cp; - if (DEBUG_FLAGS & DEBUG_TINY) printf ("T"); + if (DEBUG_FLAGS & DEBUG_TINY) kprintf ("T"); /* ** look for ccb and set the status. @@ -5565,12 +5565,12 @@ static void ncr_int_ma (ncb_p np) cp = cp->link_ccb; if (!cp) { - printf ("%s: SCSI phase error fixup: CCB already dequeued (0x%08lx)\n", + kprintf ("%s: SCSI phase error fixup: CCB already dequeued (0x%08lx)\n", ncr_name (np), (u_long) np->header.cp); return; } if (cp != np->header.cp) { - printf ("%s: SCSI phase error fixup: CCB address mismatch (0x%08lx != 0x%08lx)\n", + kprintf ("%s: SCSI phase error fixup: CCB address mismatch (0x%08lx != 0x%08lx)\n", ncr_name (np), (u_long) cp, (u_long) np->header.cp); return; } @@ -5595,12 +5595,12 @@ static void ncr_int_ma (ncb_p np) ** log the information */ if (DEBUG_FLAGS & (DEBUG_TINY|DEBUG_PHASE)) { - printf ("P%x%x ",cmd&7, sbcl&7); - printf ("RL=%d D=%d SS0=%x ", + kprintf ("P%x%x ",cmd&7, sbcl&7); + kprintf ("RL=%d D=%d SS0=%x ", (unsigned) rest, (unsigned) delta, ss0); }; if (DEBUG_FLAGS & DEBUG_PHASE) { - printf ("\nCP=%p CP2=%p DSP=%x NXT=%x VDSP=%p CMD=%x ", + kprintf ("\nCP=%p CP2=%p DSP=%x NXT=%x VDSP=%p CMD=%x ", cp, np->header.cp, (unsigned)dsp, (unsigned)nxtdsp, vdsp, cmd); }; @@ -5621,7 +5621,7 @@ static void ncr_int_ma (ncb_p np) }; if (DEBUG_FLAGS & DEBUG_PHASE) { - printf ("OCMD=%x\nTBLP=%p OLEN=%x OADR=%x\n", + kprintf ("OCMD=%x\nTBLP=%p OLEN=%x OADR=%x\n", (unsigned) (vdsp[0] >> 24), tblp, (unsigned) olen, @@ -5634,14 +5634,14 @@ static void ncr_int_ma (ncb_p np) if (cmd != (vdsp[0] >> 24)) { PRINT_ADDR(cp->xfer); - printf ("internal error: cmd=%02x != %02x=(vdsp[0] >> 24)\n", + kprintf ("internal error: cmd=%02x != %02x=(vdsp[0] >> 24)\n", (unsigned)cmd, (unsigned)vdsp[0] >> 24); return; } if (cmd & 0x06) { PRINT_ADDR(cp->xfer); - printf ("phase change %x-%x %d@%08x resid=%d.\n", + kprintf ("phase change %x-%x %d@%08x resid=%d.\n", cmd&7, sbcl&7, (unsigned)olen, (unsigned)oadr, (unsigned)rest); @@ -5668,7 +5668,7 @@ static void ncr_int_ma (ncb_p np) if (DEBUG_FLAGS & DEBUG_PHASE) { PRINT_ADDR(cp->xfer); - printf ("newcmd[%d] %x %x %x %x.\n", + kprintf ("newcmd[%d] %x %x %x %x.\n", newcmd - cp->patch, (unsigned)newcmd[0], (unsigned)newcmd[1], @@ -5696,15 +5696,15 @@ static void ncr_int_ma (ncb_p np) static int ncr_show_msg (u_char * msg) { u_char i; - printf ("%x",*msg); + kprintf ("%x",*msg); if (*msg==M_EXTENDED) { for (i=1;i<8;i++) { if (i-1>msg[1]) break; - printf ("-%x",msg[i]); + kprintf ("-%x",msg[i]); }; return (i+1); } else if ((*msg & 0xf0) == 0x20) { - printf ("-%x",msg[1]); + kprintf ("-%x",msg[1]); return (2); }; return (1); @@ -5719,7 +5719,7 @@ void ncr_int_sir (ncb_p np) u_char target = INB (nc_ctest0) & 7; tcb_p tp = &np->target[target]; int i; - if (DEBUG_FLAGS & DEBUG_TINY) printf ("I#%d", num); + if (DEBUG_FLAGS & DEBUG_TINY) kprintf ("I#%d", num); switch (num) { case SIR_SENSE_RESTART: @@ -5760,25 +5760,25 @@ void ncr_int_sir (ncb_p np) */ if (DEBUG_FLAGS & DEBUG_RESTART) - printf ("%s: int#%d",ncr_name (np),num); + kprintf ("%s: int#%d",ncr_name (np),num); cp = (ccb_p) 0; for (i=0; i<MAX_TARGET; i++) { - if (DEBUG_FLAGS & DEBUG_RESTART) printf (" t%d", i); + if (DEBUG_FLAGS & DEBUG_RESTART) kprintf (" t%d", i); tp = &np->target[i]; - if (DEBUG_FLAGS & DEBUG_RESTART) printf ("+"); + if (DEBUG_FLAGS & DEBUG_RESTART) kprintf ("+"); cp = tp->hold_cp; if (!cp) continue; - if (DEBUG_FLAGS & DEBUG_RESTART) printf ("+"); + if (DEBUG_FLAGS & DEBUG_RESTART) kprintf ("+"); if ((cp->host_status==HS_BUSY) && (cp->scsi_status==S_CHECK_COND)) break; - if (DEBUG_FLAGS & DEBUG_RESTART) printf ("- (remove)"); + if (DEBUG_FLAGS & DEBUG_RESTART) kprintf ("- (remove)"); tp->hold_cp = cp = (ccb_p) 0; }; if (cp) { if (DEBUG_FLAGS & DEBUG_RESTART) - printf ("+ restart job ..\n"); + kprintf ("+ restart job ..\n"); OUTL (nc_dsa, CCB_PHYS (cp, phys)); OUTL (nc_dsp, NCB_SCRIPT_PHYS (np, getcc)); return; @@ -5787,7 +5787,7 @@ void ncr_int_sir (ncb_p np) /* ** no job, resume normal processing */ - if (DEBUG_FLAGS & DEBUG_RESTART) printf (" -- remove trap\n"); + if (DEBUG_FLAGS & DEBUG_RESTART) kprintf (" -- remove trap\n"); np->script->start0[0] = SCR_INT ^ IFFALSE (0); break; @@ -5800,7 +5800,7 @@ void ncr_int_sir (ncb_p np) */ if (DEBUG_FLAGS & DEBUG_RESTART) { PRINT_ADDR(cp->xfer); - printf ("in getcc reselect by t%d.\n", + kprintf ("in getcc reselect by t%d.\n", INB(nc_ssid) & 0x0f); } @@ -5900,7 +5900,7 @@ void ncr_int_sir (ncb_p np) if (DEBUG_FLAGS & DEBUG_NEGO) { PRINT_ADDR(cp->xfer); - printf ("negotiation failed sir=%x status=%x.\n", + kprintf ("negotiation failed sir=%x status=%x.\n", num, cp->nego_status); }; @@ -5932,9 +5932,9 @@ void ncr_int_sir (ncb_p np) if (DEBUG_FLAGS & DEBUG_NEGO) { PRINT_ADDR(cp->xfer); - printf ("sync msgin: "); + kprintf ("sync msgin: "); (void) ncr_show_msg (np->msgin); - printf (".\n"); + kprintf (".\n"); }; /* @@ -5974,7 +5974,7 @@ void ncr_int_sir (ncb_p np) if (DEBUG_FLAGS & DEBUG_NEGO) { PRINT_ADDR(cp->xfer); - printf ("sync: per=%d ofs=%d fak=%d chg=%d.\n", + kprintf ("sync: per=%d ofs=%d fak=%d chg=%d.\n", per, ofs, fak, chg); } @@ -6024,9 +6024,9 @@ void ncr_int_sir (ncb_p np) if (DEBUG_FLAGS & DEBUG_NEGO) { PRINT_ADDR(cp->xfer); - printf ("sync msgout: "); + kprintf ("sync msgout: "); (void) ncr_show_msg (np->msgin); - printf (".\n"); + kprintf (".\n"); } if (!ofs) { @@ -6043,9 +6043,9 @@ void ncr_int_sir (ncb_p np) */ if (DEBUG_FLAGS & DEBUG_NEGO) { PRINT_ADDR(cp->xfer); - printf ("wide msgin: "); + kprintf ("wide msgin: "); (void) ncr_show_msg (np->msgin); - printf (".\n"); + kprintf (".\n"); }; /* @@ -6072,7 +6072,7 @@ void ncr_int_sir (ncb_p np) if (DEBUG_FLAGS & DEBUG_NEGO) { PRINT_ADDR(cp->xfer); - printf ("wide: wide=%d chg=%d.\n", wide, chg); + kprintf ("wide: wide=%d chg=%d.\n", wide, chg); } if (INB (HS_PRT) == HS_NEGOTIATE) { @@ -6122,9 +6122,9 @@ void ncr_int_sir (ncb_p np) if (DEBUG_FLAGS & DEBUG_NEGO) { PRINT_ADDR(cp->xfer); - printf ("wide msgout: "); + kprintf ("wide msgout: "); (void) ncr_show_msg (np->msgin); - printf (".\n"); + kprintf (".\n"); } break; @@ -6144,7 +6144,7 @@ void ncr_int_sir (ncb_p np) */ PRINT_ADDR(cp->xfer); - printf ("M_REJECT received (%x:%x).\n", + kprintf ("M_REJECT received (%x:%x).\n", (unsigned)np->lastmsg, np->msgout[0]); break; @@ -6157,9 +6157,9 @@ void ncr_int_sir (ncb_p np) */ PRINT_ADDR(cp->xfer); - printf ("M_REJECT sent for "); + kprintf ("M_REJECT sent for "); (void) ncr_show_msg (np->msgin); - printf (".\n"); + kprintf (".\n"); break; /*-------------------------------------------------------------------- @@ -6179,7 +6179,7 @@ void ncr_int_sir (ncb_p np) */ PRINT_ADDR(cp->xfer); - printf ("M_IGN_RESIDUE received, but not yet implemented.\n"); + kprintf ("M_IGN_RESIDUE received, but not yet implemented.\n"); break; case SIR_MISSING_SAVE: @@ -6192,7 +6192,7 @@ void ncr_int_sir (ncb_p np) */ PRINT_ADDR(cp->xfer); - printf ("M_DISCONNECT received, but datapointer not saved:\n" + kprintf ("M_DISCONNECT received, but datapointer not saved:\n" "\tdata=%x save=%x goal=%x.\n", (unsigned) INL (nc_temp), (unsigned) np->header.savep, @@ -6224,7 +6224,7 @@ void ncr_int_sir (ncb_p np) **----------------------------------------------- */ PRINT_ADDR(cp->xfer); - printf ("queue full.\n"); + kprintf ("queue full.\n"); np->script->start1[0] = SCR_INT; @@ -6273,7 +6273,7 @@ void ncr_int_sir (ncb_p np) ** else remove the interrupt. */ - printf ("%s: queue empty.\n", ncr_name (np)); + kprintf ("%s: queue empty.\n", ncr_name (np)); np->script->start1[0] = SCR_INT ^ IFFALSE (0); break; }; @@ -6472,7 +6472,7 @@ static void ncr_alloc_ccb (ncb_p np, struct scsi_xfer * xp) if (DEBUG_FLAGS & DEBUG_ALLOC) { PRINT_ADDR(xp); - printf ("new ccb @%p.\n", cp); + kprintf ("new ccb @%p.\n", cp); } /* @@ -6551,7 +6551,7 @@ static void ncr_opennings (ncb_p np, lcb_p lp, struct scsi_xfer * xp) #endif /* __NetBSD__ */ lp->actlink -= diff; if (DEBUG_FLAGS & DEBUG_TAGS) - printf ("%s: actlink: diff=%d, new=%d, req=%d\n", + kprintf ("%s: actlink: diff=%d, new=%d, req=%d\n", ncr_name(np), diff, lp->actlink, lp->reqlink); return; }; @@ -6570,7 +6570,7 @@ static void ncr_opennings (ncb_p np, lcb_p lp, struct scsi_xfer * xp) lp->actlink += diff; wakeup ((caddr_t) xp->sc_link); if (DEBUG_FLAGS & DEBUG_TAGS) - printf ("%s: actlink: diff=%d, new=%d, req=%d\n", + kprintf ("%s: actlink: diff=%d, new=%d, req=%d\n", ncr_name(np), diff, lp->actlink, lp->reqlink); }; } @@ -6627,7 +6627,7 @@ static int ncr_scatter chunk /= 2; if(DEBUG_FLAGS & DEBUG_SCATTER) - printf("ncr?:\tscattering virtual=0x%x size=%d chunk=%d.\n", + kprintf("ncr?:\tscattering virtual=0x%x size=%d chunk=%d.\n", (unsigned) vaddr, (unsigned) datalen, (unsigned) chunk); /* @@ -6667,7 +6667,7 @@ static int ncr_scatter }; if(DEBUG_FLAGS & DEBUG_SCATTER) - printf ("\tseg #%d addr=%x size=%d (rest=%d).\n", + kprintf ("\tseg #%d addr=%x size=%d (rest=%d).\n", segment, (unsigned) segaddr, (unsigned) segsize, @@ -6679,7 +6679,7 @@ static int ncr_scatter } if (datalen) { - printf("ncr?: scatter/gather failed (residue=%d).\n", + kprintf("ncr?: scatter/gather failed (residue=%d).\n", (unsigned) datalen); return (-1); }; @@ -6715,7 +6715,7 @@ static int ncr_regtest (struct ncb* np) #else if ((data & 0xe2f0fffd) != 0x02000080) { #endif - printf ("CACHE TEST FAILED: reg dstat-sstat2 readback %x.\n", + kprintf ("CACHE TEST FAILED: reg dstat-sstat2 readback %x.\n", (unsigned) data); return (0x10); }; @@ -6772,31 +6772,31 @@ static int ncr_snooptest (struct ncb* np) ** check for timeout */ if (i>=NCR_SNOOP_TIMEOUT) { - printf ("CACHE TEST FAILED: timeout.\n"); + kprintf ("CACHE TEST FAILED: timeout.\n"); return (0x20); }; /* ** Check termination position. */ if (pc != NCB_SCRIPT_PHYS (np, snoopend)+8) { - printf ("CACHE TEST FAILED: script execution failed.\n"); + kprintf ("CACHE TEST FAILED: script execution failed.\n"); return (0x40); }; /* ** Show results. */ if (host_wr != ncr_rd) { - printf ("CACHE TEST FAILED: host wrote %d, ncr read %d.\n", + kprintf ("CACHE TEST FAILED: host wrote %d, ncr read %d.\n", (int) host_wr, (int) ncr_rd); err |= 1; }; if (host_rd != ncr_wr) { - printf ("CACHE TEST FAILED: ncr wrote %d, host read %d.\n", + kprintf ("CACHE TEST FAILED: ncr wrote %d, host read %d.\n", (int) ncr_wr, (int) host_rd); err |= 2; }; if (ncr_bk != ncr_wr) { - printf ("CACHE TEST FAILED: ncr wrote %d, read back %d.\n", + kprintf ("CACHE TEST FAILED: ncr wrote %d, read back %d.\n", (int) ncr_wr, (int) ncr_bk); err |= 4; }; @@ -6974,7 +6974,7 @@ static void ncr_getclock (ncb_p np) np -> ns_async = (ns_clock * tbl[f]) / 2; np -> rv_scntl3 |= f; if (DEBUG_FLAGS & DEBUG_TIMING) - printf ("%s: sclk=%d async=%d sync=%d (ns) scntl3=0x%x\n", + kprintf ("%s: sclk=%d async=%d sync=%d (ns) scntl3=0x%x\n", ncr_name (np), ns_clock, np->ns_async, np->ns_sync, np->rv_scntl3); } diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 0210dc25380..015f5101772 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: pci.c,v 1.21 1996/08/27 21:59:51 cgd Exp $ */ +/* $NetBSD: pci.c,v 1.22 1996/10/10 19:58:25 christos Exp $ */ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou. All rights reserved. @@ -93,7 +93,7 @@ pciattach(parent, self, aux) int bus, device, maxndevs, function, nfunctions; pci_attach_hook(parent, self, pba); - printf("\n"); + kprintf("\n"); bc = pba->pba_bc; pc = pba->pba_pc; @@ -167,9 +167,9 @@ pciprint(aux, pnp) if (pnp) { pci_devinfo(pa->pa_id, pa->pa_class, 1, devinfo); - printf("%s at %s", devinfo, pnp); + kprintf("%s at %s", devinfo, pnp); } - printf(" dev %d function %d", pa->pa_device, pa->pa_function); + kprintf(" dev %d function %d", pa->pa_device, pa->pa_function); return (UNCONF); } @@ -274,10 +274,10 @@ pci_mem_find(pc, pcitag, reg, membasep, memsizep, cacheablep) case PCI_MAPREG_MEM_TYPE_32BIT_1M: break; case PCI_MAPREG_MEM_TYPE_64BIT: -/* XXX */ printf("pci_find_mem: 64-bit region\n"); +/* XXX */ kprintf("pci_find_mem: 64-bit region\n"); /* XXX */ return (1); default: - printf("pci_find_mem: reserved region type\n"); + kprintf("pci_find_mem: reserved region type\n"); return (1); } diff --git a/sys/dev/pci/pci_subr.c b/sys/dev/pci/pci_subr.c index 7931959b3b8..dc6fc769804 100644 --- a/sys/dev/pci/pci_subr.c +++ b/sys/dev/pci/pci_subr.c @@ -1,4 +1,4 @@ -/* $NetBSD: pci_subr.c,v 1.17 1996/03/02 02:28:48 cgd Exp $ */ +/* $NetBSD: pci_subr.c,v 1.18 1996/10/10 19:58:26 christos Exp $ */ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou. All rights reserved. @@ -209,31 +209,31 @@ pci_devinfo(id_reg, class_reg, showclass, cp) } if (vendor_namep == NULL) - cp += sprintf(cp, "%svendor 0x%04x product 0x%04x", + cp += ksprintf(cp, "%svendor 0x%04x product 0x%04x", unmatched, vendor, product); else if (product_namep != NULL) - cp += sprintf(cp, "%s %s", vendor_namep, product_namep); + cp += ksprintf(cp, "%s %s", vendor_namep, product_namep); else - cp += sprintf(cp, "vendor %s, unknown product 0x%x", + cp += ksprintf(cp, "vendor %s, unknown product 0x%x", vendor_namep, product); if (showclass) { - cp += sprintf(cp, " ("); + cp += ksprintf(cp, " ("); if (classp->name == NULL) - cp += sprintf(cp, + cp += ksprintf(cp, "unknown class 0x%2x, subclass 0x%02x", class, subclass); else { - cp += sprintf(cp, "class %s, ", classp->name); + cp += ksprintf(cp, "class %s, ", classp->name); if (subclassp == NULL || subclassp->name == NULL) - cp += sprintf(cp, "unknown subclass 0x%02x", + cp += ksprintf(cp, "unknown subclass 0x%02x", subclass); else - cp += sprintf(cp, "subclass %s", + cp += ksprintf(cp, "subclass %s", subclassp->name); } #if 0 /* not very useful */ - cp += sprintf(cp, ", interface 0x%02x", interface); + cp += ksprintf(cp, ", interface 0x%02x", interface); #endif - cp += sprintf(cp, ", revision 0x%02x)", revision); + cp += ksprintf(cp, ", revision 0x%02x)", revision); } } diff --git a/sys/dev/pci/ppb.c b/sys/dev/pci/ppb.c index 7fae57cf5e7..1be431ba08a 100644 --- a/sys/dev/pci/ppb.c +++ b/sys/dev/pci/ppb.c @@ -1,4 +1,4 @@ -/* $NetBSD: ppb.c,v 1.9 1996/08/27 21:59:53 cgd Exp $ */ +/* $NetBSD: ppb.c,v 1.10 1996/10/10 19:58:27 christos Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. @@ -93,12 +93,12 @@ ppbattach(parent, self, aux) char devinfo[256]; pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo); - printf(": %s (rev. 0x%02x)\n", devinfo, PCI_REVISION(pa->pa_class)); + kprintf(": %s (rev. 0x%02x)\n", devinfo, PCI_REVISION(pa->pa_class)); busdata = pci_conf_read(pc, pa->pa_tag, PPB_REG_BUSINFO); if (PPB_BUSINFO_SECONDARY(busdata) == 0) { - printf("%s: not configured by system firmware\n", + kprintf("%s: not configured by system firmware\n", self->dv_xname); return; } @@ -137,7 +137,7 @@ ppbprint(aux, pnp) /* only PCIs can attach to PPBs; easy. */ if (pnp) - printf("pci at %s", pnp); - printf(" bus %d", pba->pba_bus); + kprintf("pci at %s", pnp); + kprintf(" bus %d", pba->pba_bus); return (UNCONF); } |
