diff options
106 files changed, 364 insertions, 364 deletions
diff --git a/sys/arch/alpha/tc/cfb.c b/sys/arch/alpha/tc/cfb.c index 05b37899b62..1afc6e26334 100644 --- a/sys/arch/alpha/tc/cfb.c +++ b/sys/arch/alpha/tc/cfb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cfb.c,v 1.20 2008/08/09 16:42:29 miod Exp $ */ +/* $OpenBSD: cfb.c,v 1.21 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: cfb.c,v 1.7 1996/12/05 01:39:39 cgd Exp $ */ /* @@ -212,7 +212,7 @@ cfbattach(parent, self, aux) cfb_getdevconfig(ta->ta_addr, sc->sc_dc); } if (sc->sc_dc->dc_vaddr == NULL) { - printf(": couldn't map memory space; punt!\n"); + printf(": can't map mem space\n"); return; } printf(": %d x %d, %dbpp\n", sc->sc_dc->dc_wid, sc->sc_dc->dc_ht, diff --git a/sys/arch/alpha/tc/sfb.c b/sys/arch/alpha/tc/sfb.c index cd4d937d40d..e8af2efe73c 100644 --- a/sys/arch/alpha/tc/sfb.c +++ b/sys/arch/alpha/tc/sfb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sfb.c,v 1.18 2006/11/29 12:13:51 miod Exp $ */ +/* $OpenBSD: sfb.c,v 1.19 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: sfb.c,v 1.7 1996/12/05 01:39:44 cgd Exp $ */ /* @@ -252,7 +252,7 @@ sfbattach(parent, self, aux) sfb_getdevconfig(ta->ta_addr, sc->sc_dc); } if (sc->sc_dc->dc_vaddr == NULL) { - printf(": couldn't map memory space; punt!\n"); + printf(": can't map mem space\n"); return; } printf(": %d x %d, %dbpp\n", sc->sc_dc->dc_wid, sc->sc_dc->dc_ht, diff --git a/sys/arch/aviion/dev/if_le_syscon.c b/sys/arch/aviion/dev/if_le_syscon.c index 19f310dd593..77cc9069dd7 100644 --- a/sys/arch/aviion/dev/if_le_syscon.c +++ b/sys/arch/aviion/dev/if_le_syscon.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le_syscon.c,v 1.5 2008/06/26 05:42:10 ray Exp $ */ +/* $OpenBSD: if_le_syscon.c,v 1.6 2009/03/29 21:53:52 sthen Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -162,7 +162,7 @@ le_syscon_attach(parent, self, aux) va = uvm_km_valloc(kernel_map, ptoa(etherpages)); if (va == NULL) { - printf(": could not map descriptor memory\n"); + printf(": can't map descriptor memory\n"); uvm_pglistfree(&pglist); return; } diff --git a/sys/arch/i386/i386/esm.c b/sys/arch/i386/i386/esm.c index a8baa8e4b49..e2c912556c5 100644 --- a/sys/arch/i386/i386/esm.c +++ b/sys/arch/i386/i386/esm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: esm.c,v 1.48 2008/09/10 14:01:22 blambert Exp $ */ +/* $OpenBSD: esm.c,v 1.49 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org> @@ -230,7 +230,7 @@ esm_attach(struct device *parent, struct device *self, void *aux) TAILQ_INIT(&sc->sc_sensors); if (bus_space_map(sc->sc_iot, ESM2_BASE_PORT, 8, 0, &sc->sc_ioh) != 0) { - printf(": unable to map memory\n"); + printf(": can't map mem space\n"); return; } diff --git a/sys/arch/i386/isa/ahc_isa.c b/sys/arch/i386/isa/ahc_isa.c index 64ebbf2e258..0d19efed64b 100644 --- a/sys/arch/i386/isa/ahc_isa.c +++ b/sys/arch/i386/isa/ahc_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ahc_isa.c,v 1.17 2007/11/25 16:40:04 jmc Exp $ */ +/* $OpenBSD: ahc_isa.c,v 1.18 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: ahc_isa.c,v 1.5 1996/10/21 22:27:39 thorpej Exp $ */ /* @@ -243,7 +243,7 @@ ahc_isa_match(struct isa_attach_args *ia, bus_addr_t iobase) * be common on machines configured to look for * ahc_eisa and ahc_isa. */ - printf("ahc_isa_match: can't map I/O space for 0x%x\n", + printf("ahc_isa_match: can't map i/o space for 0x%x\n", iobase); #endif return (0); @@ -351,7 +351,7 @@ ahc_isa_attach(struct device *parent, struct device *self, void *aux) ahc->chip = AHC_VL; /* We are a VL Bus Controller */ if (bus_space_map(iot, ia->ia_iobase, ia->ia_iosize, 0, &ioh)) - panic("ahc_isa_attach: could not map slot I/O addresses"); + panic("ahc_isa_attach: can't map slot i/o addresses"); if (!ahc_isa_idstring(iot, ioh, idstring)) panic("ahc_isa_attach: could not read ID string"); if ((irq = ahc_isa_irq(iot, ioh)) < 0) diff --git a/sys/arch/i386/pci/gscpcib.c b/sys/arch/i386/pci/gscpcib.c index 9a4f538f19a..80eadb2f260 100644 --- a/sys/arch/i386/pci/gscpcib.c +++ b/sys/arch/i386/pci/gscpcib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gscpcib.c,v 1.5 2006/12/11 20:57:40 deraadt Exp $ */ +/* $OpenBSD: gscpcib.c,v 1.6 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 2004 Alexander Yurchenko <grange@openbsd.org> * @@ -100,7 +100,7 @@ gscpcib_attach(struct device *parent, struct device *self, void *aux) if (PCI_MAPREG_IO_ADDR(gpiobase) == 0 || bus_space_map(sc->sc_gpio_iot, PCI_MAPREG_IO_ADDR(gpiobase), GSCGPIO_SIZE, 0, &sc->sc_gpio_ioh)) { - printf(": failed to map GPIO I/O space"); + printf(": can't map GPIO i/o space"); goto corepcib; } diff --git a/sys/arch/mac68k/dev/asc.c b/sys/arch/mac68k/dev/asc.c index 8c6faccb7a3..cc4e9a16728 100644 --- a/sys/arch/mac68k/dev/asc.c +++ b/sys/arch/mac68k/dev/asc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asc.c,v 1.25 2006/09/16 10:42:23 miod Exp $ */ +/* $OpenBSD: asc.c,v 1.26 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: asc.c,v 1.20 1997/02/24 05:47:33 scottr Exp $ */ /* @@ -157,7 +157,7 @@ ascattach(parent, self, aux) addr = (bus_addr_t)MAC68K_ASC_BASE; if (bus_space_map(sc->sc_tag, addr, MAC68K_ASC_LEN, 0, &sc->sc_handle)) { - printf(": can't map memory space\n"); + printf(": can't map mem space\n"); return; } sc->sc_open = 0; diff --git a/sys/arch/mac68k/dev/if_ae_nubus.c b/sys/arch/mac68k/dev/if_ae_nubus.c index 39664052df3..46353b65501 100644 --- a/sys/arch/mac68k/dev/if_ae_nubus.c +++ b/sys/arch/mac68k/dev/if_ae_nubus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ae_nubus.c,v 1.18 2007/09/10 20:29:46 miod Exp $ */ +/* $OpenBSD: if_ae_nubus.c,v 1.19 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: if_ae_nubus.c,v 1.17 1997/05/01 18:17:16 briggs Exp $ */ /* @@ -143,7 +143,7 @@ ae_nubus_attach(parent, self, aux) bst = na->na_tag; if (bus_space_map(bst, NUBUS_SLOT2PA(na->slot), NBMEMSIZE, 0, &bsh)) { - printf(": can't map memory space\n"); + printf(": can't map mem space\n"); return; } diff --git a/sys/arch/mac68k/dev/if_mc_obio.c b/sys/arch/mac68k/dev/if_mc_obio.c index dd38e5e2055..7d0f1664a6e 100644 --- a/sys/arch/mac68k/dev/if_mc_obio.c +++ b/sys/arch/mac68k/dev/if_mc_obio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mc_obio.c,v 1.6 2006/06/24 13:23:27 miod Exp $ */ +/* $OpenBSD: if_mc_obio.c,v 1.7 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: if_mc_obio.c,v 1.13 2004/03/26 12:15:46 wiz Exp $ */ /*- @@ -145,7 +145,7 @@ mc_obio_attach(parent, self, aux) } sc->sc_txbuf = (u_char *)uvm_km_valloc(kernel_map, PAGE_SIZE); if (sc->sc_txbuf == NULL) { - printf(": could not map transmit buffer memory\n"); + printf(": can't map transmit buffer memory\n"); goto out2; } pg = TAILQ_FIRST(&txlist); @@ -166,7 +166,7 @@ mc_obio_attach(parent, self, aux) sc->sc_rxbuf = (u_char *)(va = uvm_km_valloc(kernel_map, MC_NPAGES * PAGE_SIZE)); if (sc->sc_rxbuf == NULL) { - printf(": could not map receive buffer memory\n"); + printf(": can't map receive buffer memory\n"); goto out4; } pg = TAILQ_FIRST(&rxlist); diff --git a/sys/arch/mac68k/dev/if_sm_nubus.c b/sys/arch/mac68k/dev/if_sm_nubus.c index 16b47774682..447c814ce9a 100644 --- a/sys/arch/mac68k/dev/if_sm_nubus.c +++ b/sys/arch/mac68k/dev/if_sm_nubus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sm_nubus.c,v 1.2 2007/09/10 20:29:46 miod Exp $ */ +/* $OpenBSD: if_sm_nubus.c,v 1.3 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: if_sm_nubus.c,v 1.2 2000/08/01 13:08:39 briggs Exp $ */ /* @@ -115,7 +115,7 @@ sm_nubus_attach(parent, self, aux) bst = na->na_tag; if (bus_space_map(bst, NUBUS_SLOT2PA(na->slot), NBMEMSIZE, 0, &bsh)) { - printf(": failed to map memory space.\n"); + printf(": can't map mem space.\n"); return; } @@ -131,7 +131,7 @@ sm_nubus_attach(parent, self, aux) switch (na->drsw) { case NUBUS_DRSW_FOCUS: if (bus_space_subregion(bst, bsh, 0xFF8000, 0x20, &prom_bsh)) { - printf(": failed to map EEPROM space.\n"); + printf(": can't map EEPROM space\n"); break; } @@ -139,7 +139,7 @@ sm_nubus_attach(parent, self, aux) break; case NUBUS_DRSW_ASANTEF: if (bus_space_subregion(bst, bsh, 0xFE0000, 0x20, &prom_bsh)) { - printf(": failed to map EEPROM space.\n"); + printf(": can't map EEPROM space\n"); break; } diff --git a/sys/arch/mac68k/dev/if_sn.c b/sys/arch/mac68k/dev/if_sn.c index 3a9bca02128..c9eb7a0c297 100644 --- a/sys/arch/mac68k/dev/if_sn.c +++ b/sys/arch/mac68k/dev/if_sn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sn.c,v 1.51 2009/03/15 20:40:25 miod Exp $ */ +/* $OpenBSD: if_sn.c,v 1.52 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: if_sn.c,v 1.13 1997/04/25 03:40:10 briggs Exp $ */ /* @@ -125,7 +125,7 @@ snsetup(struct sn_softc *sc, u_int8_t *lladdr) */ sc->space = uvm_km_valloc(kernel_map, SN_NPAGES * PAGE_SIZE); if (sc->space == NULL) { - printf(": could not map descriptor memory\n"); + printf(": can't map descriptor memory\n"); uvm_pglistfree(&pglist); return (ENOMEM); } diff --git a/sys/arch/mac68k/dev/if_sn_nubus.c b/sys/arch/mac68k/dev/if_sn_nubus.c index 5a2f6698961..5da3bcd0714 100644 --- a/sys/arch/mac68k/dev/if_sn_nubus.c +++ b/sys/arch/mac68k/dev/if_sn_nubus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sn_nubus.c,v 1.19 2007/09/10 20:29:46 miod Exp $ */ +/* $OpenBSD: if_sn_nubus.c,v 1.20 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: if_sn_nubus.c,v 1.13 1997/05/11 19:11:34 scottr Exp $ */ /* * Copyright (C) 1997 Allen Briggs @@ -115,7 +115,7 @@ sn_nubus_attach(struct device *parent, struct device *self, void *aux) bst = na->na_tag; if (bus_space_map(bst, NUBUS_SLOT2PA(na->slot), NBMEMSIZE, 0, &bsh)) { - printf(": failed to map memory space.\n"); + printf(": can't map mem space\n"); return; } @@ -137,13 +137,13 @@ sn_nubus_attach(struct device *parent, struct device *self, void *aux) if (bus_space_subregion(bst, bsh, 0x00180000, SN_REGSIZE, &sc->sc_regh)) { - printf(": failed to map register space.\n"); + printf(": can't map register space\n"); break; } if (bus_space_subregion(bst, bsh, 0x00ffe004, ETHER_ADDR_LEN, &tmp_bsh)) { - printf(": failed to map ROM space.\n"); + printf(": can't map ROM space\n"); break; } diff --git a/sys/arch/macppc/pci/vgafb.c b/sys/arch/macppc/pci/vgafb.c index 7b8573ed282..3e69b85827e 100644 --- a/sys/arch/macppc/pci/vgafb.c +++ b/sys/arch/macppc/pci/vgafb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vgafb.c,v 1.35 2008/09/23 20:45:27 miod Exp $ */ +/* $OpenBSD: vgafb.c,v 1.36 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: vga.c,v 1.3 1996/12/02 22:24:54 cgd Exp $ */ /* @@ -177,7 +177,7 @@ vgafb_common_setup(bus_space_tag_t iot, bus_space_tag_t memt, memsize = cons_height * cons_linebytes; if (bus_space_map(vc->vc_memt, membase, memsize, /* XXX */ppc_proc_is_64b ? 0 : 1, &vc->vc_memh)) - panic("vgafb_common_setup: couldn't map memory"); + panic("vgafb_common_setup: can't map mem space"); cons_display_mem_h = vc->vc_memh; vc->vc_ofh = cons_display_ofh; diff --git a/sys/arch/mvme88k/dev/nvram.c b/sys/arch/mvme88k/dev/nvram.c index e8d239014c9..03f0c16edf2 100644 --- a/sys/arch/mvme88k/dev/nvram.c +++ b/sys/arch/mvme88k/dev/nvram.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nvram.c,v 1.31 2009/03/09 19:51:16 miod Exp $ */ +/* $OpenBSD: nvram.c,v 1.32 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -123,7 +123,7 @@ nvramattach(parent, self, args) if (bus_space_map(sc->sc_iot, sc->sc_base, round_page(maplen), BUS_SPACE_MAP_LINEAR, &ioh) != 0) { - printf(": can't map memory!\n"); + printf(": can't map mem space\n"); return; } diff --git a/sys/arch/mvme88k/dev/sram.c b/sys/arch/mvme88k/dev/sram.c index d02aba3aca9..1a4b752395a 100644 --- a/sys/arch/mvme88k/dev/sram.c +++ b/sys/arch/mvme88k/dev/sram.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sram.c,v 1.19 2007/12/20 05:19:38 miod Exp $ */ +/* $OpenBSD: sram.c,v 1.20 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -87,7 +87,7 @@ sramattach(parent, self, args) if (bus_space_map(sc->sc_iot, sc->sc_base, sc->sc_len, BUS_SPACE_MAP_LINEAR, &ioh) != 0) { - printf(": can't map memory!\n"); + printf(": can't map mem space\n"); return; } diff --git a/sys/arch/sgi/localbus/com_lbus.c b/sys/arch/sgi/localbus/com_lbus.c index 0d0b19364c9..ff2e444bcb0 100644 --- a/sys/arch/sgi/localbus/com_lbus.c +++ b/sys/arch/sgi/localbus/com_lbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: com_lbus.c,v 1.8 2008/05/18 07:36:10 jsing Exp $ */ +/* $OpenBSD: com_lbus.c,v 1.9 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -91,7 +91,7 @@ com_macebus_attach(struct device *parent, struct device *self, void *aux) } else { if (bus_space_map(sc->sc_iot, ca->ca_baseaddr, COM_NPORTS, 0, &sc->sc_ioh)) { - printf(": failed to map I/O space!\n"); + printf(": can't map i/o space\n"); return; } } diff --git a/sys/arch/sgi/pci/ioc.c b/sys/arch/sgi/pci/ioc.c index f4dfc901d33..b02d4abb9ea 100644 --- a/sys/arch/sgi/pci/ioc.c +++ b/sys/arch/sgi/pci/ioc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ioc.c,v 1.1 2008/04/07 22:53:00 miod Exp $ */ +/* $OpenBSD: ioc.c,v 1.2 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 2008 Joel Sing. @@ -119,7 +119,7 @@ ioc_attach(struct device *parent, struct device *self, void *aux) if (pci_mapreg_map(pa, PCI_MAPREG_START, PCI_MAPREG_TYPE_MEM, 0, &memt, &memh, NULL, &memsize, 0)) { - printf(": cannot map memory space!\n"); + printf(": can't map mem space\n"); return; } @@ -138,7 +138,7 @@ ioc_attach(struct device *parent, struct device *self, void *aux) M_DEVBUF, M_NOWAIT); if (sc->sc_mem_bus_space == NULL) { bus_space_unmap(memt, memh, memsize); - printf(": cannot allocate bus_space\n"); + printf(": can't allocate bus_space\n"); return; } diff --git a/sys/arch/sparc/dev/esp.c b/sys/arch/sparc/dev/esp.c index 9d15d968b3b..7ed4df74607 100644 --- a/sys/arch/sparc/dev/esp.c +++ b/sys/arch/sparc/dev/esp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: esp.c,v 1.26 2009/02/16 21:19:06 miod Exp $ */ +/* $OpenBSD: esp.c,v 1.27 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: esp.c,v 1.69 1997/08/27 11:24:18 bouyer Exp $ */ /* @@ -297,7 +297,7 @@ espattach(parent, self, aux) dsc->sc_regs = (struct dma_regs *)mapiodev(&ca->ca_ra.ra_reg[0], 0, ca->ca_ra.ra_reg[0].rr_len); if (dsc->sc_regs == NULL) { - printf(": could not map DMA registers\n"); + printf(": can't map DMA registers\n"); return; } dsc->sc_rev = dsc->sc_regs->csr & D_DEV_ID; @@ -336,7 +336,7 @@ espattach(parent, self, aux) esc->sc_reg = (volatile u_char *)mapiodev(&ca->ca_ra.ra_reg[1], 0, ca->ca_ra.ra_reg[1].rr_len); if (esc->sc_reg == NULL) { - printf(": could not map SCSI core registers\n"); + printf(": can't map SCSI core registers\n"); return; } diff --git a/sys/arch/sparc/dev/isp_sbus.c b/sys/arch/sparc/dev/isp_sbus.c index 5b70de874bf..41f6214d48d 100644 --- a/sys/arch/sparc/dev/isp_sbus.c +++ b/sys/arch/sparc/dev/isp_sbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isp_sbus.c,v 1.25 2008/06/01 15:49:25 kettenis Exp $ */ +/* $OpenBSD: isp_sbus.c,v 1.26 2009/03/29 21:53:52 sthen Exp $ */ /* * SBus specific probe and attach routines for Qlogic ISP SCSI adapters. * @@ -362,7 +362,7 @@ isp_sbus_mbxdma(struct ispsoftc *isp) isp->isp_rquest_dma = (u_int32_t) kdvma_mapin((caddr_t)isp->isp_rquest, len, 0); if (isp->isp_rquest_dma == 0) { - printf("%s: could not mapin request queue\n", isp->isp_name); + printf("%s: can't mapin request queue\n", isp->isp_name); return (1); } @@ -378,7 +378,7 @@ isp_sbus_mbxdma(struct ispsoftc *isp) isp->isp_result_dma = (u_int32_t) kdvma_mapin((caddr_t)isp->isp_result, len, 0); if (isp->isp_result_dma == 0) { - printf("%s: could not mapin result queue\n", isp->isp_name); + printf("%s: can't mapin result queue\n", isp->isp_name); return (1); } return (0); diff --git a/sys/arch/sparc64/dev/psycho.c b/sys/arch/sparc64/dev/psycho.c index ce63af93ee2..6950ebbe6e1 100644 --- a/sys/arch/sparc64/dev/psycho.c +++ b/sys/arch/sparc64/dev/psycho.c @@ -1,4 +1,4 @@ -/* $OpenBSD: psycho.c,v 1.64 2009/01/02 20:01:45 kettenis Exp $ */ +/* $OpenBSD: psycho.c,v 1.65 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: psycho.c,v 1.39 2001/10/07 20:30:41 eeh Exp $ */ /* @@ -518,7 +518,7 @@ psycho_attach(struct device *parent, struct device *self, void *aux) sc->sc_configtag = psycho_alloc_config_tag(sc->sc_psycho_this); if (bus_space_map(sc->sc_configtag, sc->sc_basepaddr, 0x01000000, 0, &sc->sc_configaddr)) - panic("could not map psycho PCI configuration space"); + panic("can't map psycho PCI configuration space"); } else { /* Just copy IOMMU state, config tag and address */ sc->sc_is = osc->sc_is; diff --git a/sys/arch/sparc64/dev/pyro.c b/sys/arch/sparc64/dev/pyro.c index b4c6907965f..94b6b5867fd 100644 --- a/sys/arch/sparc64/dev/pyro.c +++ b/sys/arch/sparc64/dev/pyro.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pyro.c,v 1.16 2009/01/02 20:01:45 kettenis Exp $ */ +/* $OpenBSD: pyro.c,v 1.17 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 2002 Jason L. Wright (jason@thought.net) @@ -202,7 +202,7 @@ pyro_init(struct pyro_softc *sc, int busa) pbm->pp_dmat = pyro_alloc_dma_tag(pbm); if (bus_space_map(pbm->pp_cfgt, 0, 0x10000000, 0, &pbm->pp_cfgh)) - panic("pyro: could not map config space"); + panic("pyro: can't map config space"); pbm->pp_pc = pyro_alloc_chipset(pbm, sc->sc_node, &_sparc_pci_chipset); diff --git a/sys/arch/sparc64/dev/schizo.c b/sys/arch/sparc64/dev/schizo.c index c50da5b257a..e03ab55b3d0 100644 --- a/sys/arch/sparc64/dev/schizo.c +++ b/sys/arch/sparc64/dev/schizo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: schizo.c,v 1.58 2009/01/02 20:01:45 kettenis Exp $ */ +/* $OpenBSD: schizo.c,v 1.59 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 2002 Jason L. Wright (jason@thought.net) @@ -219,7 +219,7 @@ schizo_init(struct schizo_softc *sc, int busa) pbm->sp_dmat = schizo_alloc_dma_tag(pbm); if (bus_space_map(pbm->sp_cfgt, 0, 0x1000000, 0, &pbm->sp_cfgh)) - panic("schizo: could not map config space"); + panic("schizo: can't map config space"); pbm->sp_pc = schizo_alloc_chipset(pbm, sc->sc_node, &_sparc_pci_chipset); diff --git a/sys/arch/vax/bi/if_ni.c b/sys/arch/vax/bi/if_ni.c index 2813aed66b1..59afd794221 100644 --- a/sys/arch/vax/bi/if_ni.c +++ b/sys/arch/vax/bi/if_ni.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ni.c,v 1.13 2008/11/28 02:44:17 brad Exp $ */ +/* $OpenBSD: if_ni.c,v 1.14 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: if_ni.c,v 1.15 2002/05/22 16:03:14 wiz Exp $ */ /* * Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved. @@ -191,11 +191,11 @@ ni_getpgs(struct ni_softc *sc, int size, caddr_t *v, paddr_t *p) if ((error = bus_dmamem_alloc(sc->sc_dmat, size, NBPG, 0, &seg, 1, &nsegs, BUS_DMA_NOWAIT)) != 0) - panic(" unable to allocate memory: error %d", error); + panic(" can't allocate memory: error %d", error); if ((error = bus_dmamem_map(sc->sc_dmat, &seg, nsegs, size, v, BUS_DMA_NOWAIT|BUS_DMA_COHERENT)) != 0) - panic(" unable to map memory: error %d", error); + panic(" can't map mem space: error %d", error); if (p) *p = seg.ds_addr; diff --git a/sys/arch/zaurus/dev/scoop_pcic.c b/sys/arch/zaurus/dev/scoop_pcic.c index 8f3bd018959..af3d4e9afb3 100644 --- a/sys/arch/zaurus/dev/scoop_pcic.c +++ b/sys/arch/zaurus/dev/scoop_pcic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scoop_pcic.c,v 1.2 2008/11/25 14:55:44 drahn Exp $ */ +/* $OpenBSD: scoop_pcic.c,v 1.3 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 2005 Uwe Stuehler <uwe@bsdx.de> @@ -104,7 +104,7 @@ scoop_pcic_socket_setup(struct pxapcic_socket *so) error = bus_space_map(iot, trunc_page(pa), round_page(size), 0, &scooph); if (error) - panic("%s: failed to map memory %x for scoop", + panic("%s: can't map memory %x for scoop", sc->sc_dev.dv_xname, pa); scooph += pa - trunc_page(pa); diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c index e51991dbcf6..76f6decc6eb 100644 --- a/sys/dev/cardbus/cardbus.c +++ b/sys/dev/cardbus/cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cardbus.c,v 1.38 2008/02/25 20:30:56 brad Exp $ */ +/* $OpenBSD: cardbus.c,v 1.39 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: cardbus.c,v 1.24 2000/04/02 19:11:37 mycroft Exp $ */ /* @@ -205,7 +205,7 @@ cardbus_read_tuples(struct cardbus_attach_args *ca, cardbusreg_t cis_ptr, if (Cardbus_mapreg_map(ca->ca_ct, reg, CARDBUS_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT, 0, &bar_tag, &bar_memh, &bar_addr, &bar_size)) { - printf("%s: failed to map memory\n", + printf("%s: can't map memory\n", sc->sc_dev.dv_xname); return (1); } diff --git a/sys/dev/cardbus/com_cardbus.c b/sys/dev/cardbus/com_cardbus.c index 1539e6f5de1..9f48960eacd 100644 --- a/sys/dev/cardbus/com_cardbus.c +++ b/sys/dev/cardbus/com_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: com_cardbus.c,v 1.33 2008/09/11 21:00:56 brad Exp $ */ +/* $OpenBSD: com_cardbus.c,v 1.34 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: com_cardbus.c,v 1.4 2000/04/17 09:21:59 joda Exp $ */ /* @@ -244,7 +244,7 @@ com_cardbus_attach(struct device *parent, struct device *self, void *aux) if (Cardbus_mapreg_map(ca->ca_ct, csc->cc_reg, csc->cc_type, 0, &sc->sc_iot, &sc->sc_ioh, &csc->cc_addr, &csc->cc_size) != 0) { - printf(": failed to map memory\n"); + printf(": can't map memory\n"); return; } diff --git a/sys/dev/cardbus/if_acx_cardbus.c b/sys/dev/cardbus/if_acx_cardbus.c index a7affd687b8..4c055ba7807 100644 --- a/sys/dev/cardbus/if_acx_cardbus.c +++ b/sys/dev/cardbus/if_acx_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_acx_cardbus.c,v 1.13 2009/03/11 23:51:15 stsp Exp $ */ +/* $OpenBSD: if_acx_cardbus.c,v 1.14 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org> @@ -135,7 +135,7 @@ acx_cardbus_attach(struct device *parent, struct device *self, void *aux) CARDBUS_MAPREG_TYPE_IO, 0, &csc->sc_io_bt, &csc->sc_io_bh, &base, &csc->sc_iomapsize); if (error != 0) { - printf(": could not map i/o space\n"); + printf(": can't map i/o space\n"); return; } csc->sc_iobar_val = base | CARDBUS_MAPREG_TYPE_IO; @@ -147,7 +147,7 @@ acx_cardbus_attach(struct device *parent, struct device *self, void *aux) error = Cardbus_mapreg_map(ct, b1, CARDBUS_MAPREG_TYPE_MEM, 0, &sc->sc_mem1_bt, &sc->sc_mem1_bh, &base, &csc->sc_mapsize1); if (error != 0) { - printf(": could not map memory1 space\n"); + printf(": can't map mem1 space\n"); return; } @@ -157,7 +157,7 @@ acx_cardbus_attach(struct device *parent, struct device *self, void *aux) error = Cardbus_mapreg_map(ct, b2, CARDBUS_MAPREG_TYPE_MEM, 0, &sc->sc_mem2_bt, &sc->sc_mem2_bh, &base, &csc->sc_mapsize2); if (error != 0) { - printf(": could not map memory2 space\n"); + printf(": can't map mem2 space\n"); return; } diff --git a/sys/dev/cardbus/if_bwi_cardbus.c b/sys/dev/cardbus/if_bwi_cardbus.c index 170f49be13e..d5312fc2df1 100644 --- a/sys/dev/cardbus/if_bwi_cardbus.c +++ b/sys/dev/cardbus/if_bwi_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bwi_cardbus.c,v 1.8 2008/09/11 20:55:34 brad Exp $ */ +/* $OpenBSD: if_bwi_cardbus.c,v 1.9 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org> @@ -118,7 +118,7 @@ bwi_cardbus_attach(struct device *parent, struct device *self, void *aux) CARDBUS_MAPREG_TYPE_MEM, 0, &sc->sc_mem_bt, &sc->sc_mem_bh, &base, &csc->csc_mapsize); if (error != 0) { - printf(": could not map memory space\n"); + printf(": can't map mem space\n"); return; } csc->csc_bar_val = base | CARDBUS_MAPREG_TYPE_MEM; diff --git a/sys/dev/cardbus/if_malo_cardbus.c b/sys/dev/cardbus/if_malo_cardbus.c index 0e2171da0b9..23de2afe67c 100644 --- a/sys/dev/cardbus/if_malo_cardbus.c +++ b/sys/dev/cardbus/if_malo_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_malo_cardbus.c,v 1.5 2006/11/29 10:37:11 mglocker Exp $ */ +/* $OpenBSD: if_malo_cardbus.c,v 1.6 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org> @@ -109,7 +109,7 @@ malo_cardbus_attach(struct device *parent, struct device *self, void *aux) CARDBUS_MAPREG_TYPE_MEM, 0, &sc->sc_mem1_bt, &sc->sc_mem1_bh, &base, &csc->sc_mapsize1); if (error != 0) { - printf(": could not map 1st memory space\n"); + printf(": can't map mem1 space\n"); return; } csc->sc_bar1_val = base | CARDBUS_MAPREG_TYPE_MEM; @@ -119,7 +119,7 @@ malo_cardbus_attach(struct device *parent, struct device *self, void *aux) CARDBUS_MAPREG_TYPE_MEM, 0, &sc->sc_mem2_bt, &sc->sc_mem2_bh, &base, &csc->sc_mapsize2); if (error != 0) { - printf(": could not map 2nd memory space\n"); + printf(": can't map mem2 space\n"); Cardbus_mapreg_unmap(ct, CARDBUS_BASE0_REG, sc->sc_mem1_bt, sc->sc_mem1_bh, csc->sc_mapsize1); return; diff --git a/sys/dev/cardbus/if_pgt_cardbus.c b/sys/dev/cardbus/if_pgt_cardbus.c index 343a06adb86..5627d35f640 100644 --- a/sys/dev/cardbus/if_pgt_cardbus.c +++ b/sys/dev/cardbus/if_pgt_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pgt_cardbus.c,v 1.7 2006/11/11 10:28:20 maja Exp $ */ +/* $OpenBSD: if_pgt_cardbus.c,v 1.8 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 2006 Marcus Glocker <mglocker@openbsd.org> @@ -121,7 +121,7 @@ pgt_cardbus_attach(struct device *parent, struct device *self, void *aux) PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT, 0, &sc->sc_iotag, &sc->sc_iohandle, &base, &csc->sc_mapsize); if (error != 0) { - printf(": could not map memory space\n"); + printf(": can't map mem space\n"); return; } csc->sc_bar0_val = base | CARDBUS_MAPREG_TYPE_MEM; diff --git a/sys/dev/cardbus/if_ral_cardbus.c b/sys/dev/cardbus/if_ral_cardbus.c index c7f9a480db2..e7b4bb78d79 100644 --- a/sys/dev/cardbus/if_ral_cardbus.c +++ b/sys/dev/cardbus/if_ral_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ral_cardbus.c,v 1.12 2008/11/25 22:20:11 damien Exp $ */ +/* $OpenBSD: if_ral_cardbus.c,v 1.13 2009/03/29 21:53:52 sthen Exp $ */ /*- * Copyright (c) 2005-2007 @@ -172,7 +172,7 @@ ral_cardbus_attach(struct device *parent, struct device *self, void *aux) CARDBUS_MAPREG_TYPE_MEM, 0, &sc->sc_st, &sc->sc_sh, &base, &csc->sc_mapsize); if (error != 0) { - printf(": could not map memory space\n"); + printf(": can't map mem space\n"); return; } diff --git a/sys/dev/eisa/aha1742.c b/sys/dev/eisa/aha1742.c index 5a6ca5bf687..940c17c3110 100644 --- a/sys/dev/eisa/aha1742.c +++ b/sys/dev/eisa/aha1742.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aha1742.c,v 1.31 2009/02/16 21:19:06 miod Exp $ */ +/* $OpenBSD: aha1742.c,v 1.32 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: aha1742.c,v 1.61 1996/05/12 23:40:01 mycroft Exp $ */ /* @@ -494,7 +494,7 @@ ahbattach(parent, self, aux) if (bus_space_map(iot, EISA_SLOT_ADDR(ea->ea_slot), EISA_SLOT_SIZE, 0, &ioh)) - panic("ahbattach: could not map I/O addresses"); + panic("ahbattach: can't map i/o addresses"); sc->sc_ioh = ioh; if (ahb_find(iot, ioh, sc)) panic("ahbattach: ahb_find failed!"); diff --git a/sys/dev/eisa/ahc_eisa.c b/sys/dev/eisa/ahc_eisa.c index 6b2fcd054dd..0226d074a89 100644 --- a/sys/dev/eisa/ahc_eisa.c +++ b/sys/dev/eisa/ahc_eisa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ahc_eisa.c,v 1.18 2007/04/10 17:47:55 miod Exp $ */ +/* $OpenBSD: ahc_eisa.c,v 1.19 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: ahc_eisa.c,v 1.10 1996/10/21 22:30:58 thorpej Exp $ */ /* @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ahc_eisa.c,v 1.18 2007/04/10 17:47:55 miod Exp $ + * $Id: ahc_eisa.c,v 1.19 2009/03/29 21:53:52 sthen Exp $ */ #include "eisa.h" @@ -162,7 +162,7 @@ void *aux; if (bus_space_map(iot, EISA_SLOT_ADDR(ea->ea_slot) + AHC_EISA_SLOT_OFFSET, AHC_EISA_IOSIZE, 0, &ioh)) - panic("ahc_eisa_attach: could not map I/O addresses"); + panic("ahc_eisa_attach: can't map i/o addresses"); if ((irq = ahc_eisa_irq(iot, ioh)) < 0) panic("ahc_eisa_attach: ahc_eisa_irq failed!"); diff --git a/sys/dev/eisa/bha_eisa.c b/sys/dev/eisa/bha_eisa.c index a0b0249e500..377d4b43c3b 100644 --- a/sys/dev/eisa/bha_eisa.c +++ b/sys/dev/eisa/bha_eisa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bha_eisa.c,v 1.5 2008/06/26 05:42:14 ray Exp $ */ +/* $OpenBSD: bha_eisa.c,v 1.6 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: bha_eisa.c,v 1.16 1998/08/15 10:10:49 mycroft Exp $ */ /*- @@ -164,13 +164,13 @@ bha_eisa_attach(parent, self, aux) if (bus_space_map(iot, EISA_SLOT_ADDR(ea->ea_slot) + BHA_EISA_SLOT_OFFSET, BHA_EISA_IOSIZE, 0, &ioh)) { - printf(": could not map EISA slot\n"); + printf(": can't map EISA slot\n"); return; } if (bha_eisa_address(iot, ioh, &port) || bus_space_map(iot, port, BHA_ISA_IOSIZE, 0, &ioh2)) { - printf(": could not map ISA address\n"); + printf(": can't map ISA address\n"); return; } diff --git a/sys/dev/eisa/eisa.c b/sys/dev/eisa/eisa.c index 9edcedf99f1..6762c7eec8a 100644 --- a/sys/dev/eisa/eisa.c +++ b/sys/dev/eisa/eisa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eisa.c,v 1.12 2007/06/25 14:13:40 tom Exp $ */ +/* $OpenBSD: eisa.c,v 1.13 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: eisa.c,v 1.15 1996/10/21 22:31:01 thorpej Exp $ */ /* @@ -153,7 +153,7 @@ eisaattach(parent, self, aux) * about it. */ if (bus_space_map(iot, slotaddr, EISA_SLOT_SIZE, 0, &slotioh)) { - printf("%s: can't map I/O space for slot %d\n", + printf("%s: can't map i/o space for slot %d\n", self->dv_xname, slot); continue; } diff --git a/sys/dev/eisa/if_fea.c b/sys/dev/eisa/if_fea.c index 3a075e7a1c6..abc4f2b4421 100644 --- a/sys/dev/eisa/if_fea.c +++ b/sys/dev/eisa/if_fea.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_fea.c,v 1.17 2004/05/12 06:35:10 tedu Exp $ */ +/* $OpenBSD: if_fea.c,v 1.18 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: if_fea.c,v 1.9 1996/10/21 22:31:05 thorpej Exp $ */ /*- @@ -189,7 +189,7 @@ pdq_eisa_attach(parent, self, aux) if (bus_space_map(sc->sc_csrtag, maddr, msize, 0, &sc->sc_csrhandle)) { bus_space_unmap(sc->sc_iotag, sc->sc_iobase, EISA_SLOT_SIZE); - printf("\n%s: failed to map memory (0x%x-0x%x)!\n", + printf("\n%s: can't map mem space (0x%x-0x%x)!\n", sc->sc_dev.dv_xname, maddr, maddr + msize - 1); return; } @@ -203,7 +203,7 @@ pdq_eisa_attach(parent, self, aux) } if (eisa_intr_map(ea->ea_ec, irq, &ih)) { - printf("%s: couldn't map interrupt (%d)\n", + printf("%s: can't map interrupt (%d)\n", sc->sc_dev.dv_xname, irq); return; } @@ -211,7 +211,7 @@ pdq_eisa_attach(parent, self, aux) sc->sc_ih = eisa_intr_establish(ea->ea_ec, ih, IST_LEVEL, IPL_NET, (int (*)(void *)) pdq_interrupt, sc->sc_pdq, sc->sc_dev.dv_xname); if (sc->sc_ih == NULL) { - printf("%s: couldn't establish interrupt", sc->sc_dev.dv_xname); + printf("%s: can't establish interrupt", sc->sc_dev.dv_xname); if (intrstr != NULL) printf(" at %s", intrstr); printf("\n"); @@ -228,7 +228,7 @@ pdq_eisa_attach(parent, self, aux) 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", + printf("%s: warning: can't establish shutdown hook\n", self->dv_xname); #if !defined(PDQ_IOMAPPED) printf("%s: using iomem 0x%x-0x%x\n", sc->sc_dev.dv_xname, maddr, diff --git a/sys/dev/eisa/uha_eisa.c b/sys/dev/eisa/uha_eisa.c index 9ce0016f8d3..6724bb6fe87 100644 --- a/sys/dev/eisa/uha_eisa.c +++ b/sys/dev/eisa/uha_eisa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uha_eisa.c,v 1.8 2009/01/21 21:53:59 grange Exp $ */ +/* $OpenBSD: uha_eisa.c,v 1.9 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: uha_eisa.c,v 1.5 1996/10/21 22:31:07 thorpej Exp $ */ /* @@ -126,7 +126,7 @@ uha_eisa_attach(parent, self, aux) if (bus_space_map(iot, EISA_SLOT_ADDR(ea->ea_slot) + UHA_EISA_SLOT_OFFSET, UHA_EISA_IOSIZE, 0, &ioh)) - panic("uha_attach: could not map I/O addresses"); + panic("uha_attach: can't map I/O addresses"); sc->sc_iot = iot; sc->sc_ioh = ioh; diff --git a/sys/dev/ic/acx.c b/sys/dev/ic/acx.c index 8fc8780e995..e79094ec13b 100644 --- a/sys/dev/ic/acx.c +++ b/sys/dev/ic/acx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acx.c,v 1.91 2009/03/11 23:51:15 stsp Exp $ */ +/* $OpenBSD: acx.c,v 1.92 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org> @@ -1927,7 +1927,7 @@ acx_dma_alloc(struct acx_softc *sc) BUS_DMA_NOWAIT); if (error != 0) { - printf("%s: could not map rx desc DMA memory\n", + printf("%s: can't map rx desc DMA memory\n", sc->sc_dev.dv_xname); return (error); } @@ -1967,7 +1967,7 @@ acx_dma_alloc(struct acx_softc *sc) ACX_TX_RING_SIZE, (caddr_t *)&rd->tx_ring, BUS_DMA_NOWAIT); if (error != 0) { - printf("%s: could not map tx desc DMA memory\n", + printf("%s: can't map tx desc DMA memory\n", sc->sc_dev.dv_xname); return (error); } diff --git a/sys/dev/ic/malo.c b/sys/dev/ic/malo.c index cfc24effef4..433495b0c0d 100644 --- a/sys/dev/ic/malo.c +++ b/sys/dev/ic/malo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: malo.c,v 1.86 2008/08/27 09:05:03 damien Exp $ */ +/* $OpenBSD: malo.c,v 1.87 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org> @@ -563,7 +563,7 @@ malo_alloc_rx_ring(struct malo_softc *sc, struct malo_rx_ring *ring, int count) count * sizeof(struct malo_rx_desc), (caddr_t *)&ring->desc, BUS_DMA_NOWAIT); if (error != 0) { - printf("%s: could not map desc DMA memory\n", + printf("%s: can't map desc DMA memory\n", sc->sc_dev.dv_xname); goto fail; } @@ -723,7 +723,7 @@ malo_alloc_tx_ring(struct malo_softc *sc, struct malo_tx_ring *ring, count * sizeof(struct malo_tx_desc), (caddr_t *)&ring->desc, BUS_DMA_NOWAIT); if (error != 0) { - printf("%s: could not map desc DMA memory\n", + printf("%s: can't map desc DMA memory\n", sc->sc_dev.dv_xname); goto fail; } @@ -1461,7 +1461,7 @@ malo_tx_mgt(struct malo_softc *sc, struct mbuf *m0, struct ieee80211_node *ni) error = bus_dmamap_load_mbuf(sc->sc_dmat, data->map, m0, BUS_DMA_NOWAIT); if (error != 0) { - printf("%s: could not map mbuf (error %d)\n", + printf("%s: can't map mbuf (error %d)\n", sc->sc_dev.dv_xname, error); m_freem(m0); return (error); @@ -1580,7 +1580,7 @@ malo_tx_data(struct malo_softc *sc, struct mbuf *m0, error = bus_dmamap_load_mbuf(sc->sc_dmat, data->map, m0, BUS_DMA_NOWAIT); if (error != 0) { - printf("%s: could not map mbuf (error %d)\n", + printf("%s: can't map mbuf (error %d)\n", sc->sc_dev.dv_xname, error); m_freem(m0); return (error); diff --git a/sys/dev/ic/rt2560.c b/sys/dev/ic/rt2560.c index 7fc917a5dc1..baf1237d3d3 100644 --- a/sys/dev/ic/rt2560.c +++ b/sys/dev/ic/rt2560.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rt2560.c,v 1.42 2008/12/22 18:20:47 damien Exp $ */ +/* $OpenBSD: rt2560.c,v 1.43 2009/03/29 21:53:52 sthen Exp $ */ /*- * Copyright (c) 2005, 2006 @@ -376,7 +376,7 @@ rt2560_alloc_tx_ring(struct rt2560_softc *sc, struct rt2560_tx_ring *ring, count * RT2560_TX_DESC_SIZE, (caddr_t *)&ring->desc, BUS_DMA_NOWAIT); if (error != 0) { - printf("%s: could not map desc DMA memory\n", + printf("%s: can't map desc DMA memory\n", sc->sc_dev.dv_xname); goto fail; } @@ -521,7 +521,7 @@ rt2560_alloc_rx_ring(struct rt2560_softc *sc, struct rt2560_rx_ring *ring, count * RT2560_RX_DESC_SIZE, (caddr_t *)&ring->desc, BUS_DMA_NOWAIT); if (error != 0) { - printf("%s: could not map desc DMA memory\n", + printf("%s: can't map desc DMA memory\n", sc->sc_dev.dv_xname); goto fail; } @@ -1561,7 +1561,7 @@ rt2560_tx_bcn(struct rt2560_softc *sc, struct mbuf *m0, error = bus_dmamap_load_mbuf(sc->sc_dmat, data->map, m0, BUS_DMA_NOWAIT); if (error != 0) { - printf("%s: could not map mbuf (error %d)\n", + printf("%s: can't map mbuf (error %d)\n", sc->sc_dev.dv_xname, error); m_freem(m0); return error; @@ -1621,7 +1621,7 @@ rt2560_tx_mgt(struct rt2560_softc *sc, struct mbuf *m0, error = bus_dmamap_load_mbuf(sc->sc_dmat, data->map, m0, BUS_DMA_NOWAIT); if (error != 0) { - printf("%s: could not map mbuf (error %d)\n", + printf("%s: can't map mbuf (error %d)\n", sc->sc_dev.dv_xname, error); m_freem(m0); return error; @@ -1784,7 +1784,7 @@ rt2560_tx_data(struct rt2560_softc *sc, struct mbuf *m0, error = bus_dmamap_load_mbuf(sc->sc_dmat, data->map, mprot, BUS_DMA_NOWAIT); if (error != 0) { - printf("%s: could not map mbuf (error %d)\n", + printf("%s: can't map mbuf (error %d)\n", sc->sc_dev.dv_xname, error); m_freem(mprot); m_freem(m0); @@ -1821,7 +1821,7 @@ rt2560_tx_data(struct rt2560_softc *sc, struct mbuf *m0, error = bus_dmamap_load_mbuf(sc->sc_dmat, data->map, m0, BUS_DMA_NOWAIT); if (error != 0 && error != EFBIG) { - printf("%s: could not map mbuf (error %d)\n", + printf("%s: can't map mbuf (error %d)\n", sc->sc_dev.dv_xname, error); m_freem(m0); return error; @@ -1849,7 +1849,7 @@ rt2560_tx_data(struct rt2560_softc *sc, struct mbuf *m0, error = bus_dmamap_load_mbuf(sc->sc_dmat, data->map, m0, BUS_DMA_NOWAIT); if (error != 0) { - printf("%s: could not map mbuf (error %d)\n", + printf("%s: can't map mbuf (error %d)\n", sc->sc_dev.dv_xname, error); m_freem(m0); return error; diff --git a/sys/dev/ic/rt2661.c b/sys/dev/ic/rt2661.c index d8a59e8adbe..86efea2c9f9 100644 --- a/sys/dev/ic/rt2661.c +++ b/sys/dev/ic/rt2661.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rt2661.c,v 1.47 2008/12/22 18:20:47 damien Exp $ */ +/* $OpenBSD: rt2661.c,v 1.48 2009/03/29 21:53:52 sthen Exp $ */ /*- * Copyright (c) 2006 @@ -410,7 +410,7 @@ rt2661_alloc_tx_ring(struct rt2661_softc *sc, struct rt2661_tx_ring *ring, count * RT2661_TX_DESC_SIZE, (caddr_t *)&ring->desc, BUS_DMA_NOWAIT); if (error != 0) { - printf("%s: could not map desc DMA memory\n", + printf("%s: can't map desc DMA memory\n", sc->sc_dev.dv_xname); goto fail; } @@ -552,7 +552,7 @@ rt2661_alloc_rx_ring(struct rt2661_softc *sc, struct rt2661_rx_ring *ring, count * RT2661_RX_DESC_SIZE, (caddr_t *)&ring->desc, BUS_DMA_NOWAIT); if (error != 0) { - printf("%s: could not map desc DMA memory\n", + printf("%s: can't map desc DMA memory\n", sc->sc_dev.dv_xname); goto fail; } @@ -1468,7 +1468,7 @@ rt2661_tx_mgt(struct rt2661_softc *sc, struct mbuf *m0, error = bus_dmamap_load_mbuf(sc->sc_dmat, data->map, m0, BUS_DMA_NOWAIT); if (error != 0) { - printf("%s: could not map mbuf (error %d)\n", + printf("%s: can't map mbuf (error %d)\n", sc->sc_dev.dv_xname, error); m_freem(m0); return error; @@ -1629,7 +1629,7 @@ rt2661_tx_data(struct rt2661_softc *sc, struct mbuf *m0, error = bus_dmamap_load_mbuf(sc->sc_dmat, data->map, mprot, BUS_DMA_NOWAIT); if (error != 0) { - printf("%s: could not map mbuf (error %d)\n", + printf("%s: can't map mbuf (error %d)\n", sc->sc_dev.dv_xname, error); m_freem(mprot); m_freem(m0); @@ -1665,7 +1665,7 @@ rt2661_tx_data(struct rt2661_softc *sc, struct mbuf *m0, error = bus_dmamap_load_mbuf(sc->sc_dmat, data->map, m0, BUS_DMA_NOWAIT); if (error != 0 && error != EFBIG) { - printf("%s: could not map mbuf (error %d)\n", + printf("%s: can't map mbuf (error %d)\n", sc->sc_dev.dv_xname, error); m_freem(m0); return error; @@ -1693,7 +1693,7 @@ rt2661_tx_data(struct rt2661_softc *sc, struct mbuf *m0, error = bus_dmamap_load_mbuf(sc->sc_dmat, data->map, m0, BUS_DMA_NOWAIT); if (error != 0) { - printf("%s: could not map mbuf (error %d)\n", + printf("%s: can't map mbuf (error %d)\n", sc->sc_dev.dv_xname, error); m_freem(m0); return error; diff --git a/sys/dev/ic/rt2860.c b/sys/dev/ic/rt2860.c index 9ab4a655e34..abad8e64c74 100644 --- a/sys/dev/ic/rt2860.c +++ b/sys/dev/ic/rt2860.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rt2860.c,v 1.32 2009/01/26 19:18:52 damien Exp $ */ +/* $OpenBSD: rt2860.c,v 1.33 2009/03/29 21:53:52 sthen Exp $ */ /*- * Copyright (c) 2007, 2008 @@ -389,7 +389,7 @@ rt2860_alloc_tx_ring(struct rt2860_softc *sc, struct rt2860_tx_ring *ring) error = bus_dmamem_map(sc->sc_dmat, &ring->seg, nsegs, size, (caddr_t *)&ring->txd, BUS_DMA_NOWAIT); if (error != 0) { - printf("%s: could not map DMA memory\n", sc->sc_dev.dv_xname); + printf("%s: can't map DMA memory\n", sc->sc_dev.dv_xname); goto fail; } @@ -499,7 +499,7 @@ rt2860_alloc_tx_pool(struct rt2860_softc *sc) error = bus_dmamem_map(sc->sc_dmat, &sc->txwi_seg, nsegs, size, &sc->txwi_vaddr, BUS_DMA_NOWAIT); if (error != 0) { - printf("%s: could not map DMA memory\n", sc->sc_dev.dv_xname); + printf("%s: can't map DMA memory\n", sc->sc_dev.dv_xname); goto fail; } @@ -589,7 +589,7 @@ rt2860_alloc_rx_ring(struct rt2860_softc *sc, struct rt2860_rx_ring *ring) error = bus_dmamem_map(sc->sc_dmat, &ring->seg, nsegs, size, (caddr_t *)&ring->rxd, BUS_DMA_NOWAIT); if (error != 0) { - printf("%s: could not map DMA memory\n", sc->sc_dev.dv_xname); + printf("%s: can't map DMA memory\n", sc->sc_dev.dv_xname); goto fail; } @@ -1489,7 +1489,7 @@ rt2860_tx(struct rt2860_softc *sc, struct mbuf *m, struct ieee80211_node *ni) error = bus_dmamap_load_mbuf(sc->sc_dmat, data->map, m, BUS_DMA_NOWAIT); if (__predict_false(error != 0 && error != EFBIG)) { - printf("%s: could not map mbuf (error %d)\n", + printf("%s: can't map mbuf (error %d)\n", sc->sc_dev.dv_xname, error); m_freem(m); return error; @@ -1527,7 +1527,7 @@ rt2860_tx(struct rt2860_softc *sc, struct mbuf *m, struct ieee80211_node *ni) error = bus_dmamap_load_mbuf(sc->sc_dmat, data->map, m, BUS_DMA_NOWAIT); if (__predict_false(error != 0)) { - printf("%s: could not map mbuf (error %d)\n", + printf("%s: can't map mbuf (error %d)\n", sc->sc_dev.dv_xname, error); m_freem(m); return error; diff --git a/sys/dev/ic/rtw.c b/sys/dev/ic/rtw.c index 13119b4348f..add5a908542 100644 --- a/sys/dev/ic/rtw.c +++ b/sys/dev/ic/rtw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtw.c,v 1.72 2009/01/21 21:54:00 grange Exp $ */ +/* $OpenBSD: rtw.c,v 1.73 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: rtw.c,v 1.29 2004/12/27 19:49:16 dyoung Exp $ */ /*- @@ -3956,7 +3956,7 @@ rtw_attach(struct rtw_softc *sc) (caddr_t*)&sc->sc_descs, BUS_DMA_COHERENT); if (rc != 0) { - printf("\n%s: could not map hw descriptors, error %d\n", + printf("\n%s: can't map hw descriptors, error %d\n", sc->sc_dev.dv_xname, rc); goto fail1; } diff --git a/sys/dev/ic/vga.c b/sys/dev/ic/vga.c index 11a1cfba0da..7e9056f1e0e 100644 --- a/sys/dev/ic/vga.c +++ b/sys/dev/ic/vga.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vga.c,v 1.49 2009/02/15 17:08:23 chl Exp $ */ +/* $OpenBSD: vga.c,v 1.50 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: vga.c,v 1.28.2.1 2000/06/30 16:27:47 simonb Exp $ */ /*- @@ -500,7 +500,7 @@ vga_init(vc, iot, memt) vh->vh_memt = memt; if (bus_space_map(vh->vh_iot, 0x3c0, 0x10, 0, &vh->vh_ioh_vga)) - panic("vga_common_setup: couldn't map vga io"); + panic("vga_common_setup: can't map vga i/o"); /* read "misc output register" */ mor = bus_space_read_1(vh->vh_iot, vh->vh_ioh_vga, 0xc); @@ -508,10 +508,10 @@ vga_init(vc, iot, memt) if (bus_space_map(vh->vh_iot, (vh->vh_mono ? 0x3b0 : 0x3d0), 0x10, 0, &vh->vh_ioh_6845)) - panic("vga_common_setup: couldn't map 6845 io"); + panic("vga_common_setup: can't map 6845 i/o"); if (bus_space_map(vh->vh_memt, 0xa0000, 0x20000, 0, &vh->vh_allmemh)) - panic("vga_common_setup: couldn't map memory"); + panic("vga_common_setup: can't map mem space"); if (bus_space_subregion(vh->vh_memt, vh->vh_allmemh, (vh->vh_mono ? 0x10000 : 0x18000), 0x8000, diff --git a/sys/dev/isa/aic_isa.c b/sys/dev/isa/aic_isa.c index 3245b152a69..cf81728a085 100644 --- a/sys/dev/isa/aic_isa.c +++ b/sys/dev/isa/aic_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aic_isa.c,v 1.4 2002/03/14 01:26:56 millert Exp $ */ +/* $OpenBSD: aic_isa.c,v 1.5 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: aic6360.c,v 1.52 1996/12/10 21:27:51 thorpej Exp $ */ /* @@ -129,7 +129,7 @@ aic_isa_attach(parent, self, aux) struct aic_softc *sc = (void *)self; if (bus_space_map(iot, ia->ia_iobase, AIC_NPORTS, 0, &ioh)) - panic("%s: could not map I/O-ports", sc->sc_dev.dv_xname); + panic("%s: can't map i/o-ports", sc->sc_dev.dv_xname); sc->sc_iot = iot; sc->sc_ioh = ioh; diff --git a/sys/dev/isa/ega.c b/sys/dev/isa/ega.c index bc93ef764b1..3fcda238a0f 100644 --- a/sys/dev/isa/ega.c +++ b/sys/dev/isa/ega.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ega.c,v 1.12 2007/02/06 22:03:24 miod Exp $ */ +/* $OpenBSD: ega.c,v 1.13 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: ega.c,v 1.4.4.1 2000/06/30 16:27:47 simonb Exp $ */ /* @@ -432,14 +432,14 @@ ega_init(vc, iot, memt, mono) vh->vh_mono = mono; if (bus_space_map(vh->vh_iot, 0x3c0, 0x10, 0, &vh->vh_ioh_vga)) - panic("ega_common_setup: couldn't map ega io"); + panic("ega_common_setup: can't map ega i/o"); if (bus_space_map(vh->vh_iot, (vh->vh_mono ? 0x3b0 : 0x3d0), 0x10, 0, &vh->vh_ioh_6845)) - panic("ega_common_setup: couldn't map 6845 io"); + panic("ega_common_setup: can't map 6845 i/o"); if (bus_space_map(vh->vh_memt, 0xa0000, 0x20000, 0, &vh->vh_allmemh)) - panic("ega_common_setup: couldn't map memory"); + panic("ega_common_setup: can't map mem space"); if (bus_space_subregion(vh->vh_memt, vh->vh_allmemh, (vh->vh_mono ? 0x10000 : 0x18000), 0x8000, diff --git a/sys/dev/isa/gscsio.c b/sys/dev/isa/gscsio.c index 8d400dc7f44..1a7b7dd5bd0 100644 --- a/sys/dev/isa/gscsio.c +++ b/sys/dev/isa/gscsio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gscsio.c,v 1.9 2007/06/05 08:37:20 jsg Exp $ */ +/* $OpenBSD: gscsio.c,v 1.10 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 2004 Alexander Yurchenko <grange@openbsd.org> * @@ -151,7 +151,7 @@ gscsio_attach(struct device *parent, struct device *self, void *aux) sc->sc_iot = ia->ia_iot; if (bus_space_map(sc->sc_iot, ia->ipa_io[0].base, GSCSIO_IOSIZE, 0, &sc->sc_ioh)) { - printf(": can't map I/O space\n"); + printf(": can't map i/o space\n"); return; } printf(": SC1100 SIO rev %d:", diff --git a/sys/dev/isa/if_eg.c b/sys/dev/isa/if_eg.c index 5d5d2e28409..48d7b6a06c5 100644 --- a/sys/dev/isa/if_eg.c +++ b/sys/dev/isa/if_eg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_eg.c,v 1.31 2008/10/02 20:21:13 brad Exp $ */ +/* $OpenBSD: if_eg.c,v 1.32 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: if_eg.c,v 1.26 1996/05/12 23:52:27 mycroft Exp $ */ /* @@ -326,7 +326,7 @@ egprobe(parent, match, aux) } if (bus_space_map(bst, ia->ia_iobase, EG_IO_PORTS, 0, &bsh)) { - DPRINTF(("%s: can't map I/O space\n", sc->sc_dev.dv_xname)); + DPRINTF(("%s: can't map i/o space\n", sc->sc_dev.dv_xname)); return (0); } sc->sc_bsh = bsh; diff --git a/sys/dev/isa/if_le_isa.c b/sys/dev/isa/if_le_isa.c index 14ff40f7f14..84b4f0a52ba 100644 --- a/sys/dev/isa/if_le_isa.c +++ b/sys/dev/isa/if_le_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le_isa.c,v 1.19 2007/06/17 21:20:47 jasper Exp $ */ +/* $OpenBSD: if_le_isa.c,v 1.20 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: if_le_isa.c,v 1.2 1996/05/12 23:52:56 mycroft Exp $ */ /*- @@ -303,7 +303,7 @@ le_isa_attach(struct device *parent, struct device *self, bus_space_handle_t ioh; if (bus_space_map(iot, ia->ia_iobase, ia->ia_iosize, 0, &ioh)) - panic("%s: could not map I/O-ports", sc->sc_dev.dv_xname); + panic("%s: can't map I/O-ports", sc->sc_dev.dv_xname); lesc->sc_iot = iot; lesc->sc_ioh = ioh; diff --git a/sys/dev/isa/isagpio.c b/sys/dev/isa/isagpio.c index 6be56c28f6e..8a69c639c4c 100644 --- a/sys/dev/isa/isagpio.c +++ b/sys/dev/isa/isagpio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isagpio.c,v 1.3 2006/04/01 08:32:52 grange Exp $ */ +/* $OpenBSD: isagpio.c,v 1.4 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 2006 Oleg Safiullin <form@pdp-11.org.ru> @@ -98,7 +98,7 @@ isagpio_attach(struct device *parent, struct device *self, void *aux) if (bus_space_map(ia->ia_iot, ia->ia_iobase, ia->ia_iosize, 0, &sc->sc_ioh) != 0) { - printf(": couldn't map I/O space\n"); + printf(": can't map i/o space\n"); return; } diff --git a/sys/dev/isa/mpu_isa.c b/sys/dev/isa/mpu_isa.c index cc1e852ec08..5e3fa5bcb6b 100644 --- a/sys/dev/isa/mpu_isa.c +++ b/sys/dev/isa/mpu_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpu_isa.c,v 1.3 2003/01/29 20:35:13 mickey Exp $ */ +/* $OpenBSD: mpu_isa.c,v 1.4 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 2002 Sergey Smitienko. All rights reserved. @@ -79,7 +79,7 @@ mpu_test (iot, iobase) rc = 0; if (bus_space_map(iot, iobase, MPU401_NPORT, 0, &ioh)) { - DPRINTF(("mpu_test: can`t map: %x/2\n", iobase)); + DPRINTF(("mpu_test: can't map: %x/2\n", iobase)); return (0); } @@ -144,7 +144,7 @@ mpu_isa_attach(parent, self, aux) if (bus_space_map (ia->ia_iot, ia->ia_iobase, MPU401_NPORT, 0, &sc->sc_mpu.ioh)) { - printf(": can`t map i/o space\n"); + printf(": can't map i/o space\n"); return; } diff --git a/sys/dev/isa/pcdisplay.c b/sys/dev/isa/pcdisplay.c index 3a35f1fe1b7..4f7df6e188c 100644 --- a/sys/dev/isa/pcdisplay.c +++ b/sys/dev/isa/pcdisplay.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcdisplay.c,v 1.9 2006/11/29 19:08:22 miod Exp $ */ +/* $OpenBSD: pcdisplay.c,v 1.10 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: pcdisplay.c,v 1.9.4.1 2000/06/30 16:27:48 simonb Exp $ */ /* @@ -185,10 +185,10 @@ pcdisplay_init(dc, iot, memt, mono) if (bus_space_map(memt, mono ? 0xb0000 : 0xb8000, 0x8000, 0, &ph->ph_memh)) - panic("pcdisplay_init: cannot map memory"); + panic("pcdisplay_init: can't map mem space"); if (bus_space_map(iot, mono ? 0x3b0 : 0x3d0, 0x10, 0, &ph->ph_ioh_6845)) - panic("pcdisplay_init: cannot map io"); + panic("pcdisplay_init: can't map i/o space"); /* * initialize the only screen diff --git a/sys/dev/isa/sch311x.c b/sys/dev/isa/sch311x.c index c2ab4c4029a..50d0cc76e22 100644 --- a/sys/dev/isa/sch311x.c +++ b/sys/dev/isa/sch311x.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sch311x.c,v 1.5 2009/03/25 20:41:31 mk Exp $ */ +/* $OpenBSD: sch311x.c,v 1.6 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 2008 Mark Kettenis <kettenis@openbsd.org> * Copyright (c) 2009 Michael Knudsen <mk@openbsd.org> @@ -269,7 +269,7 @@ schsio_attach(struct device *parent, struct device *self, void *aux) sc->sc_iot = ia->ia_iot; if (bus_space_map(sc->sc_iot, ia->ipa_io[0].base, SCHSIO_IOSIZE, 0, &sc->sc_ioh)) { - printf(": can't map I/O space\n"); + printf(": can't map i/o space\n"); return; } @@ -306,7 +306,7 @@ schsio_attach(struct device *parent, struct device *self, void *aux) if (bus_space_map(sc->sc_iot, iobase, SCHSIO_LDEV_RUNTIME_SZ, 0, &sc->sc_ioh_rr)) { - printf(": can't map I/O space\n"); + printf(": can't map i/o space\n"); return; } diff --git a/sys/dev/isa/viasio.c b/sys/dev/isa/viasio.c index cb7527ccd87..08be95cd50e 100644 --- a/sys/dev/isa/viasio.c +++ b/sys/dev/isa/viasio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: viasio.c,v 1.11 2008/09/10 14:01:22 blambert Exp $ */ +/* $OpenBSD: viasio.c,v 1.12 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 2005 Alexander Yurchenko <grange@openbsd.org> * @@ -176,7 +176,7 @@ viasio_attach(struct device *parent, struct device *self, void *aux) sc->sc_iot = ia->ia_iot; if (bus_space_map(sc->sc_iot, ia->ipa_io[0].base, VT1211_IOSIZE, 0, &sc->sc_ioh)) { - printf(": can't map I/O space\n"); + printf(": can't map i/o space\n"); return; } @@ -242,7 +242,7 @@ viasio_hm_init(struct viasio_softc *sc) /* Map HM I/O space */ if (bus_space_map(sc->sc_iot, iobase, VT1211_HM_IOSIZE, 0, &sc->sc_hm_ioh)) { - printf(" can't map I/O space"); + printf(" can't map i/o space"); return; } @@ -473,7 +473,7 @@ viasio_wdg_init(struct viasio_softc *sc) /* Map WDG I/O space */ if (bus_space_map(sc->sc_iot, iobase, VT1211_WDG_IOSIZE, 0, &sc->sc_wdg_ioh)) { - printf(" can't map I/O space"); + printf(" can't map i/o space"); return; } diff --git a/sys/dev/isa/wbsio.c b/sys/dev/isa/wbsio.c index 3a12ac2caab..9e4c27f3257 100644 --- a/sys/dev/isa/wbsio.c +++ b/sys/dev/isa/wbsio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wbsio.c,v 1.4 2008/04/08 18:48:43 kettenis Exp $ */ +/* $OpenBSD: wbsio.c,v 1.5 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 2008 Mark Kettenis <kettenis@openbsd.org> * @@ -161,7 +161,7 @@ wbsio_attach(struct device *parent, struct device *self, void *aux) sc->sc_iot = ia->ia_iot; if (bus_space_map(sc->sc_iot, ia->ipa_io[0].base, WBSIO_IOSIZE, 0, &sc->sc_ioh)) { - printf(": can't map I/O space\n"); + printf(": can't map i/o space\n"); return; } diff --git a/sys/dev/pci/alipm.c b/sys/dev/pci/alipm.c index dc17bfd9c2d..79f58647f42 100644 --- a/sys/dev/pci/alipm.c +++ b/sys/dev/pci/alipm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: alipm.c,v 1.13 2007/05/03 12:19:01 dlg Exp $ */ +/* $OpenBSD: alipm.c,v 1.14 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 2005 Mark Kettenis @@ -154,7 +154,7 @@ alipm_attach(struct device *parent, struct device *self, void *aux) if (iobase == 0 || bus_space_map(sc->sc_iot, iobase >> 16, iosize, 0, &sc->sc_ioh)) { - printf(": can't map I/O space\n"); + printf(": can't map i/o space\n"); return; } @@ -173,7 +173,7 @@ alipm_attach(struct device *parent, struct device *self, void *aux) /* Map I/O space */ if (pci_mapreg_map(pa, ALIPM_SMB_BASE, PCI_MAPREG_TYPE_IO, 0, &sc->sc_iot, &sc->sc_ioh, NULL, &iosize, ALIPM_SMB_SIZE)) { - printf(": can't map I/O space\n"); + printf(": can't map i/o space\n"); return; } diff --git a/sys/dev/pci/amdiic.c b/sys/dev/pci/amdiic.c index 2b734e91f8e..228a4dbbbd9 100644 --- a/sys/dev/pci/amdiic.c +++ b/sys/dev/pci/amdiic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: amdiic.c,v 1.6 2007/05/03 09:36:26 dlg Exp $ */ +/* $OpenBSD: amdiic.c,v 1.7 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 2005 Alexander Yurchenko <grange@openbsd.org> @@ -146,7 +146,7 @@ amdiic_attach(struct device *parent, struct device *self, void *aux) /* Map I/O space */ if (pci_mapreg_map(pa, AMD8111_SMB_BASE, PCI_MAPREG_TYPE_IO, 0, &sc->sc_iot, &sc->sc_ioh, NULL, &iosize, 0)) { - printf(": can't map I/O space\n"); + printf(": can't map i/o space\n"); return; } diff --git a/sys/dev/pci/auixp.c b/sys/dev/pci/auixp.c index 5fda4e24b1f..5aff1ffc3c3 100644 --- a/sys/dev/pci/auixp.c +++ b/sys/dev/pci/auixp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auixp.c,v 1.22 2008/10/25 22:30:43 jakemsr Exp $ */ +/* $OpenBSD: auixp.c,v 1.23 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: auixp.c,v 1.9 2005/06/27 21:13:09 thorpej Exp $ */ /* @@ -1252,7 +1252,7 @@ auixp_attach(struct device *parent, struct device *self, void *aux) /* map memory; its not sized -> what is the size? max PCI slot size? */ if (pci_mapreg_map(pa, PCI_CBIO, PCI_MAPREG_TYPE_MEM, 0, &sc->sc_iot, &sc->sc_ioh, &sc->sc_iob, &sc->sc_ios, 0)) { - printf(": can't map memory space\n"); + printf(": can't map mem space\n"); return; } diff --git a/sys/dev/pci/autri.c b/sys/dev/pci/autri.c index 8ef9d3fb6ce..ef9118acf58 100644 --- a/sys/dev/pci/autri.c +++ b/sys/dev/pci/autri.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autri.c,v 1.22 2008/10/25 22:30:43 jakemsr Exp $ */ +/* $OpenBSD: autri.c,v 1.23 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 2001 SOMEYA Yoshihiko and KUROSAWA Takahiro. @@ -525,7 +525,7 @@ autri_attach(parent, self, aux) /* map register to memory */ if (pci_mapreg_map(pa, AUTRI_PCI_MEMORY_BASE, PCI_MAPREG_TYPE_MEM, 0, &sc->memt, &sc->memh, NULL, &iosize, 0)) { - printf("%s: can't map memory space\n", sc->sc_dev.dv_xname); + printf("%s: can't map mem space\n", sc->sc_dev.dv_xname); return; } diff --git a/sys/dev/pci/bha_pci.c b/sys/dev/pci/bha_pci.c index f461f8070d9..8937311212f 100644 --- a/sys/dev/pci/bha_pci.c +++ b/sys/dev/pci/bha_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bha_pci.c,v 1.9 2008/06/26 05:42:17 ray Exp $ */ +/* $OpenBSD: bha_pci.c,v 1.10 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: bha_pci.c,v 1.16 1998/08/15 10:10:53 mycroft Exp $ */ /*- @@ -118,7 +118,7 @@ bha_pci_attach(parent, self, aux) if (pci_mapreg_map(pa, PCI_CBIO, PCI_MAPREG_TYPE_IO, 0, &iot, &ioh, NULL, &iosize, 0)) { - printf(": unable to map I/O space\n"); + printf(": can't map i/o space\n"); return; } @@ -134,7 +134,7 @@ bha_pci_attach(parent, self, aux) sc->sc_dmaflags = 0; if (pci_intr_map(pa, &ih)) { - printf(": couldn't map interrupt\n"); + printf(": can't map interrupt\n"); bus_space_unmap(iot, ioh, iosize); return; } @@ -142,7 +142,7 @@ bha_pci_attach(parent, self, aux) sc->sc_ih = pci_intr_establish(pc, ih, IPL_BIO, bha_intr, sc, sc->sc_dev.dv_xname); if (sc->sc_ih == NULL) { - printf(": couldn't establish interrupt"); + printf(": can't establish interrupt"); if (intrstr != NULL) printf(" at %s", intrstr); printf("\n"); diff --git a/sys/dev/pci/bktr/bktr_os.c b/sys/dev/pci/bktr/bktr_os.c index 7a48c82ce4b..4ddccc7d741 100644 --- a/sys/dev/pci/bktr/bktr_os.c +++ b/sys/dev/pci/bktr/bktr_os.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bktr_os.c,v 1.29 2008/05/25 00:36:10 brad Exp $ */ +/* $OpenBSD: bktr_os.c,v 1.30 2009/03/29 21:53:53 sthen Exp $ */ /* $FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.20 2000/10/20 08:16:53 roger Exp $ */ /* @@ -189,7 +189,7 @@ bktr_attach(struct device *parent, struct device *self, void *aux) DPR(("pci_mapreg_map: memt %lx, memh %lx, size %x\n", bktr->memt, bktr->memh, bktr->obmemsz)); if (retval) { - printf("%s: couldn't map memory\n", bktr_name(bktr)); + printf("%s: can't map mem space\n", bktr_name(bktr)); return; } @@ -203,7 +203,7 @@ bktr_attach(struct device *parent, struct device *self, void *aux) * map interrupt */ if (pci_intr_map(pa, &ih)) { - printf("%s: couldn't map interrupt\n", + printf("%s: can't map interrupt\n", bktr_name(bktr)); return; } @@ -211,7 +211,7 @@ bktr_attach(struct device *parent, struct device *self, void *aux) bktr->ih = pci_intr_establish(pa->pa_pc, ih, IPL_VIDEO, bktr_intr, bktr, bktr->bktr_dev.dv_xname); if (bktr->ih == NULL) { - printf("%s: couldn't establish interrupt", + printf("%s: can't establish interrupt", bktr_name(bktr)); if (intrstr != NULL) printf(" at %s", intrstr); diff --git a/sys/dev/pci/cmpci.c b/sys/dev/pci/cmpci.c index a2604de5f97..f54321cc8f2 100644 --- a/sys/dev/pci/cmpci.c +++ b/sys/dev/pci/cmpci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmpci.c,v 1.21 2008/10/25 22:30:43 jakemsr Exp $ */ +/* $OpenBSD: cmpci.c,v 1.22 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: cmpci.c,v 1.25 2004/10/26 06:32:20 xtraeme Exp $ */ /* @@ -378,20 +378,20 @@ cmpci_attach(struct device *parent, struct device *self, void *aux) /* map I/O space */ if (pci_mapreg_map(pa, CMPCI_PCI_IOBASEREG, PCI_MAPREG_TYPE_IO, 0, &sc->sc_iot, &sc->sc_ioh, NULL, NULL, 0)) { - printf(": failed to map I/O space\n"); + printf(": can't map i/o space\n"); return; } /* interrupt */ if (pci_intr_map(pa, &ih)) { - printf(": failed to map interrupt\n"); + printf(": can't map interrupt\n"); return; } intrstr = pci_intr_string(pa->pa_pc, ih); sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_AUDIO, cmpci_intr, sc, sc->sc_dev.dv_xname); if (sc->sc_ih == NULL) { - printf(": failed to establish interrupt"); + printf(": can't establish interrupt"); if (intrstr != NULL) printf(" at %s", intrstr); printf("\n"); diff --git a/sys/dev/pci/ehci_pci.c b/sys/dev/pci/ehci_pci.c index 059f091e1ab..56d804fbd84 100644 --- a/sys/dev/pci/ehci_pci.c +++ b/sys/dev/pci/ehci_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ehci_pci.c,v 1.14 2008/06/26 05:42:17 ray Exp $ */ +/* $OpenBSD: ehci_pci.c,v 1.15 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: ehci_pci.c,v 1.15 2004/04/23 21:13:06 itojun Exp $ */ /* @@ -108,7 +108,7 @@ ehci_pci_attach(struct device *parent, struct device *self, void *aux) /* Map I/O registers */ if (pci_mapreg_map(pa, PCI_CBMEM, PCI_MAPREG_TYPE_MEM, 0, &sc->sc.iot, &sc->sc.ioh, NULL, &sc->sc.sc_size, 0)) { - printf(": can't map memory space\n"); + printf(": can't map mem space\n"); return; } diff --git a/sys/dev/pci/emuxki.c b/sys/dev/pci/emuxki.c index 11e44b862e2..f190ed1315b 100644 --- a/sys/dev/pci/emuxki.c +++ b/sys/dev/pci/emuxki.c @@ -1,4 +1,4 @@ -/* $OpenBSD: emuxki.c,v 1.32 2008/12/09 12:30:12 brad Exp $ */ +/* $OpenBSD: emuxki.c,v 1.33 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: emuxki.c,v 1.1 2001/10/17 18:39:41 jdolecek Exp $ */ /*- @@ -437,7 +437,7 @@ emuxki_attach(struct device *parent, struct device *self, void *aux) if (pci_mapreg_map(pa, EMU_PCI_CBIO, PCI_MAPREG_TYPE_IO, 0, &(sc->sc_iot), &(sc->sc_ioh), &(sc->sc_iob), &(sc->sc_ios), 0)) { - printf(": can't map iospace\n"); + printf(": can't map i/o space\n"); return; } @@ -445,7 +445,7 @@ emuxki_attach(struct device *parent, struct device *self, void *aux) sc->sc_dmat = pa->pa_dmat; if (pci_intr_map(pa, &ih)) { - printf(": couldn't map interrupt\n"); + printf(": can't map interrupt\n"); bus_space_unmap(sc->sc_iot, sc->sc_ioh, sc->sc_ios); return; } @@ -454,7 +454,7 @@ emuxki_attach(struct device *parent, struct device *self, void *aux) sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_AUDIO, emuxki_intr, sc, sc->sc_dev.dv_xname); if (sc->sc_ih == NULL) { - printf(": couldn't establish interrupt"); + printf(": can't establish interrupt"); if (intrstr != NULL) printf(" at %s", intrstr); printf("\n"); diff --git a/sys/dev/pci/envy.c b/sys/dev/pci/envy.c index cb08f2ae8aa..c17d1d69fff 100644 --- a/sys/dev/pci/envy.c +++ b/sys/dev/pci/envy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: envy.c,v 1.14 2009/03/04 17:54:14 ratchov Exp $ */ +/* $OpenBSD: envy.c,v 1.15 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 2007 Alexandre Ratchov <alex@caoua.org> * @@ -514,13 +514,13 @@ envyattach(struct device *parent, struct device *self, void *aux) if (pci_mapreg_map(pa, ENVY_CTL_BAR, PCI_MAPREG_TYPE_IO, 0, &sc->ccs_iot, &sc->ccs_ioh, NULL, &sc->ccs_iosz, 0)) { - printf(": failed to map ctl i/o space\n"); + printf(": can't map ctl i/o space\n"); sc->ccs_iosz = 0; return; } if (pci_mapreg_map(pa, ENVY_MT_BAR, PCI_MAPREG_TYPE_IO, 0, &sc->mt_iot, &sc->mt_ioh, NULL, &sc->mt_iosz, 0)) { - printf(": failed to map mt i/o space\n"); + printf(": can't map mt i/o space\n"); sc->mt_iosz = 0; return; } diff --git a/sys/dev/pci/eso.c b/sys/dev/pci/eso.c index 86fb61f0f7e..5e10bc020d2 100644 --- a/sys/dev/pci/eso.c +++ b/sys/dev/pci/eso.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eso.c,v 1.27 2008/10/25 22:30:43 jakemsr Exp $ */ +/* $OpenBSD: eso.c,v 1.28 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: eso.c,v 1.48 2006/12/18 23:13:39 kleink Exp $ */ /* @@ -228,12 +228,12 @@ eso_attach(struct device *parent, struct device *self, void *aux) /* Map I/O registers. */ if (pci_mapreg_map(pa, ESO_PCI_BAR_IO, PCI_MAPREG_TYPE_IO, 0, &sc->sc_iot, &sc->sc_ioh, NULL, NULL, 0)) { - printf(", can't map I/O space\n"); + printf(": can't map i/o space\n"); return; } if (pci_mapreg_map(pa, ESO_PCI_BAR_SB, PCI_MAPREG_TYPE_IO, 0, &sc->sc_sb_iot, &sc->sc_sb_ioh, NULL, NULL, 0)) { - printf(", can't map SB I/O space\n"); + printf(": can't map SB I/O space\n"); return; } if (pci_mapreg_map(pa, ESO_PCI_BAR_VC, PCI_MAPREG_TYPE_IO, 0, @@ -243,7 +243,7 @@ eso_attach(struct device *parent, struct device *self, void *aux) } if (pci_mapreg_map(pa, ESO_PCI_BAR_MPU, PCI_MAPREG_TYPE_IO, 0, &sc->sc_mpu_iot, &sc->sc_mpu_ioh, NULL, NULL, 0)) { - printf(", can't map MPU I/O space\n"); + printf(": can't map MPU I/O space\n"); return; } diff --git a/sys/dev/pci/gdt_pci.c b/sys/dev/pci/gdt_pci.c index b84e47a1e6d..5441b56e244 100644 --- a/sys/dev/pci/gdt_pci.c +++ b/sys/dev/pci/gdt_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gdt_pci.c,v 1.21 2007/10/17 02:51:39 fgsch Exp $ */ +/* $OpenBSD: gdt_pci.c,v 1.22 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 1999, 2000 Niklas Hallqvist. All rights reserved. @@ -277,14 +277,14 @@ gdt_pci_attach(struct device *parent, struct device *self, void *aux) if (GDT_CLASS(sc) == GDT_PCINEW) { if (pci_mapreg_map(pa, GDT_PCINEW_IOMEM, PCI_MAPREG_TYPE_MEM, 0, &iomemt, &iomemh, &iomembase, &iomemsize, 0)) { - printf("cannot map memory mapped I/O ports\n"); + printf("can't map memory mapped i/o ports\n"); goto bail_out; } status |= IOMEM_MAPPED; if (pci_mapreg_map(pa, GDT_PCINEW_IO, PCI_MAPREG_TYPE_IO, 0, &iot, &ioh, &iobase, &iosize, 0)) { - printf("cannot map I/O ports\n"); + printf("can't map i/o space\n"); goto bail_out; } status |= IO_MAPPED; @@ -298,7 +298,7 @@ gdt_pci_attach(struct device *parent, struct device *self, void *aux) bus_space_set_region_4(dpmemt, dpmemh, 0, 0, GDT_DPR_IF_SZ >> 2); if (bus_space_read_1(dpmemt, dpmemh, 0) != 0) { - printf("cannot write to DPMEM\n"); + printf("can't write to DPMEM\n"); goto bail_out; } diff --git a/sys/dev/pci/ichiic.c b/sys/dev/pci/ichiic.c index 7748ac2537a..fb2e0a5bb9a 100644 --- a/sys/dev/pci/ichiic.c +++ b/sys/dev/pci/ichiic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ichiic.c,v 1.21 2008/10/16 04:03:18 brad Exp $ */ +/* $OpenBSD: ichiic.c,v 1.22 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 2005, 2006 Alexander Yurchenko <grange@openbsd.org> @@ -132,7 +132,7 @@ ichiic_attach(struct device *parent, struct device *self, void *aux) /* Map I/O space */ if (pci_mapreg_map(pa, ICH_SMB_BASE, PCI_MAPREG_TYPE_IO, 0, &sc->sc_iot, &sc->sc_ioh, NULL, &iosize, 0)) { - printf(": can't map I/O space\n"); + printf(": can't map i/o space\n"); return; } diff --git a/sys/dev/pci/ichwdt.c b/sys/dev/pci/ichwdt.c index 8db88061de5..a6000205b48 100644 --- a/sys/dev/pci/ichwdt.c +++ b/sys/dev/pci/ichwdt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ichwdt.c,v 1.2 2005/12/17 21:05:50 grange Exp $ */ +/* $OpenBSD: ichwdt.c,v 1.3 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 2004, 2005 Alexander Yurchenko <grange@openbsd.org> @@ -102,7 +102,7 @@ ichwdt_attach(struct device *parent, struct device *self, void *aux) sc->sc_iot = pa->pa_iot; if (pci_mapreg_map(pa, ICH_WDT_BASE, PCI_MAPREG_TYPE_MEM, 0, &sc->sc_iot, &sc->sc_ioh, NULL, NULL, 0)) { - printf(": failed to map memory space\n"); + printf(": can't map mem space\n"); return; } diff --git a/sys/dev/pci/if_acx_pci.c b/sys/dev/pci/if_acx_pci.c index b7219278f90..fe7ee15d42e 100644 --- a/sys/dev/pci/if_acx_pci.c +++ b/sys/dev/pci/if_acx_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_acx_pci.c,v 1.6 2006/11/18 20:44:40 grange Exp $ */ +/* $OpenBSD: if_acx_pci.c,v 1.7 2009/03/29 21:53:52 sthen Exp $ */ /*- * Copyright (c) 2006 Theo de Raadt <deraadt@openbsd.org> @@ -118,7 +118,7 @@ acx_pci_attach(struct device *parent, struct device *self, void *aux) PCI_MAPREG_TYPE_IO, 0, &psc->sc_io_bt, &psc->sc_io_bh, NULL, &psc->sc_iomapsize, 0); if (error != 0) { - printf(": could not map i/o space\n"); + printf(": can't map i/o space\n"); return; } b1 = ACX_PCI_BAR1; @@ -129,7 +129,7 @@ acx_pci_attach(struct device *parent, struct device *self, void *aux) PCI_MAPREG_MEM_TYPE_32BIT, 0, &sc->sc_mem1_bt, &sc->sc_mem1_bh, NULL, &psc->sc_mapsize1, 0); if (error != 0) { - printf(": could not map memory1 space\n"); + printf(": can't map mem1 space\n"); return; } @@ -137,12 +137,12 @@ acx_pci_attach(struct device *parent, struct device *self, void *aux) PCI_MAPREG_MEM_TYPE_32BIT, 0, &sc->sc_mem2_bt, &sc->sc_mem2_bh, NULL, &psc->sc_mapsize2, 0); if (error != 0) { - printf(": could not map memory2 space\n"); + printf(": can't map mem2 space\n"); return; } if (pci_intr_map(pa, &ih) != 0) { - printf(": could not map interrupt\n"); + printf(": can't map interrupt\n"); return; } @@ -150,7 +150,7 @@ acx_pci_attach(struct device *parent, struct device *self, void *aux) psc->sc_ih = pci_intr_establish(psc->sc_pc, ih, IPL_NET, acx_intr, sc, sc->sc_dev.dv_xname); if (psc->sc_ih == NULL) { - printf(": could not establish interrupt"); + printf(": can't establish interrupt"); if (intrstr != NULL) printf(" at %s", intrstr); printf("\n"); diff --git a/sys/dev/pci/if_age.c b/sys/dev/pci/if_age.c index 4d7195def09..742622c3c6d 100644 --- a/sys/dev/pci/if_age.c +++ b/sys/dev/pci/if_age.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_age.c,v 1.3 2009/02/23 01:38:37 kevlo Exp $ */ +/* $OpenBSD: if_age.c,v 1.4 2009/03/29 21:53:52 sthen Exp $ */ /*- * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org> @@ -161,12 +161,12 @@ age_attach(struct device *parent, struct device *self, void *aux) memtype = pci_mapreg_type(pa->pa_pc, pa->pa_tag, AGE_PCIR_BAR); if (pci_mapreg_map(pa, AGE_PCIR_BAR, memtype, 0, &sc->sc_mem_bt, &sc->sc_mem_bh, NULL, &sc->sc_mem_size, 0)) { - printf(": could not map mem space\n"); + printf(": can't map mem space\n"); return; } if (pci_intr_map(pa, &ih) != 0) { - printf(": could not map interrupt\n"); + printf(": can't map interrupt\n"); goto fail; } diff --git a/sys/dev/pci/if_ale.c b/sys/dev/pci/if_ale.c index b1db3921c2e..ba04c589c04 100644 --- a/sys/dev/pci/if_ale.c +++ b/sys/dev/pci/if_ale.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ale.c,v 1.3 2009/02/27 03:40:25 kevlo Exp $ */ +/* $OpenBSD: if_ale.c,v 1.4 2009/03/29 21:53:52 sthen Exp $ */ /*- * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org> * All rights reserved. @@ -381,12 +381,12 @@ ale_attach(struct device *parent, struct device *self, void *aux) memtype = pci_mapreg_type(pa->pa_pc, pa->pa_tag, ALE_PCIR_BAR); if (pci_mapreg_map(pa, ALE_PCIR_BAR, memtype, 0, &sc->sc_mem_bt, &sc->sc_mem_bh, NULL, &sc->sc_mem_size, 0)) { - printf(": could not map mem space\n"); + printf(": can't map mem space\n"); return; } if (pci_intr_map(pa, &ih) != 0) { - printf(": could not map interrupt\n"); + printf(": can't map interrupt\n"); goto fail; } diff --git a/sys/dev/pci/if_an_pci.c b/sys/dev/pci/if_an_pci.c index b3608b11364..abb6b755a8f 100644 --- a/sys/dev/pci/if_an_pci.c +++ b/sys/dev/pci/if_an_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_an_pci.c,v 1.16 2006/03/10 00:27:56 jsg Exp $ */ +/* $OpenBSD: if_an_pci.c,v 1.17 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -119,7 +119,7 @@ an_pci_attach(struct device *parent, struct device *self, void *aux) /* Map the I/O ports. */ if (pci_mapreg_map(pa, AN_PCI_LOIO, PCI_MAPREG_TYPE_IO, 0, &iot, &ioh, NULL, NULL, 0) != 0) { - printf(": can't map I/O space\n"); + printf(": can't map i/o space\n"); return; } sc->sc_iot = iot; diff --git a/sys/dev/pci/if_art.c b/sys/dev/pci/if_art.c index bd32e0e260f..162ae512bb9 100644 --- a/sys/dev/pci/if_art.c +++ b/sys/dev/pci/if_art.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_art.c,v 1.16 2008/09/10 14:01:22 blambert Exp $ */ +/* $OpenBSD: if_art.c,v 1.17 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 2004,2005 Internet Business Solutions AG, Zurich, Switzerland @@ -84,7 +84,7 @@ art_softc_attach(struct device *parent, struct device *self, void *aux) if (ebus_attach_device(&sc->art_ebus, psc, ma->ma_base, ma->ma_size) != 0) { - printf(": could not map framer\n"); + printf(": can't map framer\n"); return; } diff --git a/sys/dev/pci/if_ath_pci.c b/sys/dev/pci/if_ath_pci.c index d296afcc94a..a9fec524218 100644 --- a/sys/dev/pci/if_ath_pci.c +++ b/sys/dev/pci/if_ath_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ath_pci.c,v 1.18 2008/07/30 16:47:09 brad Exp $ */ +/* $OpenBSD: if_ath_pci.c,v 1.19 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: if_ath_pci.c,v 1.7 2004/06/30 05:58:17 mycroft Exp $ */ /*- @@ -144,7 +144,7 @@ ath_pci_attach(struct device *parent, struct device *self, void *aux) } if (pci_mapreg_map(pa, ATH_BAR0, mem_type, 0, &sc->sc_st, &sc->sc_sh, NULL, &sc->sc_ss, 0)) { - printf(": cannot map register space\n"); + printf(": can't map register space\n"); goto fail; } @@ -161,7 +161,7 @@ ath_pci_attach(struct device *parent, struct device *self, void *aux) * Arrange interrupt line. */ if (pci_intr_map(pa, &ih)) { - printf(": couldn't map interrupt!\n"); + printf(": can't map interrupt\n"); goto unmap; } @@ -169,7 +169,7 @@ ath_pci_attach(struct device *parent, struct device *self, void *aux) psc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, ath_intr, sc, sc->sc_dev.dv_xname); if (psc->sc_ih == NULL) { - printf(": couldn't map interrupt!\n"); + printf(": can't map interrupt\n"); goto unmap; } @@ -179,7 +179,7 @@ ath_pci_attach(struct device *parent, struct device *self, void *aux) psc->sc_sdhook = shutdownhook_establish(ath_pci_shutdown, psc); if (psc->sc_sdhook == NULL) { - printf(": couldn't establish shutdown hook!\n"); + printf(": can't establish shutdown hook\n"); goto deintr; } diff --git a/sys/dev/pci/if_bwi_pci.c b/sys/dev/pci/if_bwi_pci.c index 8f0e6ad9153..55d59cc89be 100644 --- a/sys/dev/pci/if_bwi_pci.c +++ b/sys/dev/pci/if_bwi_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bwi_pci.c,v 1.9 2008/09/11 20:55:34 brad Exp $ */ +/* $OpenBSD: if_bwi_pci.c,v 1.10 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org> @@ -126,13 +126,13 @@ bwi_pci_attach(struct device *parent, struct device *self, void *aux) memtype = pci_mapreg_type(pa->pa_pc, pa->pa_tag, BWI_PCI_BAR0); if (pci_mapreg_map(pa, BWI_PCI_BAR0, memtype, 0, &sc->sc_mem_bt, &sc->sc_mem_bh, NULL, &psc->psc_mapsize, 0)) { - printf(": could not map memory space\n"); + printf(": can't map mem space\n"); return; } /* map interrupt */ if (pci_intr_map(pa, &ih) != 0) { - printf(": could not map interrupt\n"); + printf(": can't map interrupt\n"); return; } @@ -141,7 +141,7 @@ bwi_pci_attach(struct device *parent, struct device *self, void *aux) psc->psc_ih = pci_intr_establish(psc->psc_pc, ih, IPL_NET, bwi_intr, sc, sc->sc_dev.dv_xname); if (psc->psc_ih == NULL) { - printf(": could not establish interrupt"); + printf(": can't establish interrupt"); if (intrstr != NULL) printf(" at %s", intrstr); printf("\n"); diff --git a/sys/dev/pci/if_cas.c b/sys/dev/pci/if_cas.c index c037ab2acd3..dc860564d34 100644 --- a/sys/dev/pci/if_cas.c +++ b/sys/dev/pci/if_cas.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cas.c,v 1.24 2008/11/28 02:44:17 brad Exp $ */ +/* $OpenBSD: if_cas.c,v 1.25 2009/03/29 21:53:52 sthen Exp $ */ /* * @@ -319,7 +319,7 @@ cas_attach(struct device *parent, struct device *self, void *aux) #define PCI_CAS_BASEADDR 0x10 if (pci_mapreg_map(pa, PCI_CAS_BASEADDR, PCI_MAPREG_TYPE_MEM, 0, &sc->sc_memt, &sc->sc_memh, NULL, &size, 0) != 0) { - printf(": could not map registers\n"); + printf(": can't map registers\n"); return; } diff --git a/sys/dev/pci/if_en_pci.c b/sys/dev/pci/if_en_pci.c index 1122c4337d0..605f2767583 100644 --- a/sys/dev/pci/if_en_pci.c +++ b/sys/dev/pci/if_en_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_en_pci.c,v 1.11 2005/09/11 18:17:08 mickey Exp $ */ +/* $OpenBSD: if_en_pci.c,v 1.12 2009/03/29 21:53:52 sthen Exp $ */ /* * @@ -203,14 +203,14 @@ void *aux; */ if (pci_intr_map(pa, &ih)) { - printf(": couldn't map interrupt\n"); + printf(": can't map interrupt\n"); return; } intrstr = pci_intr_string(scp->en_pc, ih); scp->sc_ih = pci_intr_establish(scp->en_pc, ih, IPL_NET, en_intr, sc, sc->sc_dev.dv_xname); if (scp->sc_ih == NULL) { - printf(": couldn't establish interrupt"); + printf(": can't establish interrupt"); if (intrstr != NULL) printf(" at %s", intrstr); printf("\n"); @@ -226,7 +226,7 @@ void *aux; &sc->en_memt, &sc->en_base, NULL, &sc->en_obmemsz, 0); if (retval) { - printf(": couldn't map memory\n"); + printf(": can't map mem space\n"); return; } diff --git a/sys/dev/pci/if_et.c b/sys/dev/pci/if_et.c index 463e9e89e2e..1dbf547e467 100644 --- a/sys/dev/pci/if_et.c +++ b/sys/dev/pci/if_et.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_et.c,v 1.16 2008/11/28 02:44:17 brad Exp $ */ +/* $OpenBSD: if_et.c,v 1.17 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 2007 The DragonFly Project. All rights reserved. * @@ -206,12 +206,12 @@ et_attach(struct device *parent, struct device *self, void *aux) memtype = pci_mapreg_type(pa->pa_pc, pa->pa_tag, ET_PCIR_BAR); if (pci_mapreg_map(pa, ET_PCIR_BAR, memtype, 0, &sc->sc_mem_bt, &sc->sc_mem_bh, NULL, &sc->sc_mem_size, 0)) { - printf(": could not map mem space\n"); + printf(": can't map mem space\n"); return; } if (pci_intr_map(pa, &ih) != 0) { - printf(": could not map interrupt\n"); + printf(": can't map interrupt\n"); return; } diff --git a/sys/dev/pci/if_fpa.c b/sys/dev/pci/if_fpa.c index d2ef3a19508..b67a937aac8 100644 --- a/sys/dev/pci/if_fpa.c +++ b/sys/dev/pci/if_fpa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_fpa.c,v 1.24 2005/09/11 18:17:08 mickey Exp $ */ +/* $OpenBSD: if_fpa.c,v 1.25 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: if_fpa.c,v 1.15 1996/10/21 22:56:40 thorpej Exp $ */ /*- @@ -129,13 +129,13 @@ pdq_pci_attach(parent, self, aux) #ifdef PDQ_IOMAPPED if (pci_mapreg_map(pa, DEFPA_CBIO, PCI_MAPREG_TYPE_IO, 0, &sc->sc_csrtag, &sc->sc_csrhandle, NULL, &csrsize, 0)) { - printf(": can't map I/O space!\n"); + printf(": can't map i/o space\n"); return; } #else if (pci_mapreg_map(pa, DEFPA_CBMA, PCI_MAPREG_TYPE_MEM, 0, &sc->sc_csrtag, &sc->sc_csrhandle, NULL, &csrsize, 0)) { - printf(": can't map memory space!\n"); + printf(": can't map mem space\n"); return; } #endif diff --git a/sys/dev/pci/if_gem_pci.c b/sys/dev/pci/if_gem_pci.c index d64d662f8ae..ed188600a6d 100644 --- a/sys/dev/pci/if_gem_pci.c +++ b/sys/dev/pci/if_gem_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_gem_pci.c,v 1.28 2007/04/19 19:00:01 kettenis Exp $ */ +/* $OpenBSD: if_gem_pci.c,v 1.29 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: if_gem_pci.c,v 1.1 2001/09/16 00:11:42 eeh Exp $ */ /* @@ -247,7 +247,7 @@ gem_attach_pci(struct device *parent, struct device *self, void *aux) #define PCI_GEM_BASEADDR 0x10 if (pci_mapreg_map(pa, PCI_GEM_BASEADDR, type, 0, &gsc->gsc_memt, &gsc->gsc_memh, NULL, &size, 0) != 0) { - printf(": could not map registers\n"); + printf(": can't map registers\n"); return; } diff --git a/sys/dev/pci/if_hme_pci.c b/sys/dev/pci/if_hme_pci.c index 71542930b1a..6d72638fbaf 100644 --- a/sys/dev/pci/if_hme_pci.c +++ b/sys/dev/pci/if_hme_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_hme_pci.c,v 1.14 2009/01/28 16:50:02 kettenis Exp $ */ +/* $OpenBSD: if_hme_pci.c,v 1.15 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: if_hme_pci.c,v 1.3 2000/12/28 22:59:13 sommerfeld Exp $ */ /* @@ -253,7 +253,7 @@ hmeattach_pci(parent, self, aux) #define PCI_HME_BASEADDR 0x10 if (pci_mapreg_map(pa, PCI_HME_BASEADDR, type, 0, &hsc->hsc_memt, &hsc->hsc_memh, NULL, &size, 0) != 0) { - printf(": could not map hme registers\n"); + printf(": can't map registers\n"); return; } sc->sc_seb = hsc->hsc_memh; diff --git a/sys/dev/pci/if_ipw.c b/sys/dev/pci/if_ipw.c index 3ae57311243..4400755118a 100644 --- a/sys/dev/pci/if_ipw.c +++ b/sys/dev/pci/if_ipw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ipw.c,v 1.84 2009/01/26 19:09:41 damien Exp $ */ +/* $OpenBSD: if_ipw.c,v 1.85 2009/03/29 21:53:52 sthen Exp $ */ /*- * Copyright (c) 2004-2008 @@ -179,7 +179,7 @@ ipw_attach(struct device *parent, struct device *self, void *aux) error = pci_mapreg_map(pa, IPW_PCI_BAR0, PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT, 0, &memt, &memh, &base, &sc->sc_sz, 0); if (error != 0) { - printf(": could not map memory space\n"); + printf(": can't map mem space\n"); return; } @@ -191,7 +191,7 @@ ipw_attach(struct device *parent, struct device *self, void *aux) CSR_WRITE_4(sc, IPW_CSR_INTR_MASK, 0); if (pci_intr_map(pa, &ih) != 0) { - printf(": could not map interrupt\n"); + printf(": can't map interrupt\n"); return; } @@ -199,7 +199,7 @@ ipw_attach(struct device *parent, struct device *self, void *aux) sc->sc_ih = pci_intr_establish(sc->sc_pct, ih, IPL_NET, ipw_intr, sc, sc->sc_dev.dv_xname); if (sc->sc_ih == NULL) { - printf(": could not establish interrupt"); + printf(": can't establish interrupt"); if (intrstr != NULL) printf(" at %s", intrstr); printf("\n"); @@ -345,7 +345,7 @@ ipw_dma_alloc(struct ipw_softc *sc) error = bus_dmamem_map(sc->sc_dmat, &sc->tbd_seg, nsegs, IPW_TBD_SZ, (caddr_t *)&sc->tbd_list, BUS_DMA_NOWAIT); if (error != 0) { - printf("%s: could not map tx ring DMA memory\n", + printf("%s: can't map tx ring DMA memory\n", sc->sc_dev.dv_xname); goto fail; } @@ -380,7 +380,7 @@ ipw_dma_alloc(struct ipw_softc *sc) error = bus_dmamem_map(sc->sc_dmat, &sc->rbd_seg, nsegs, IPW_RBD_SZ, (caddr_t *)&sc->rbd_list, BUS_DMA_NOWAIT); if (error != 0) { - printf("%s: could not map rx ring DMA memory\n", + printf("%s: can't map rx ring DMA memory\n", sc->sc_dev.dv_xname); goto fail; } @@ -415,7 +415,7 @@ ipw_dma_alloc(struct ipw_softc *sc) error = bus_dmamem_map(sc->sc_dmat, &sc->status_seg, nsegs, IPW_STATUS_SZ, (caddr_t *)&sc->status_list, BUS_DMA_NOWAIT); if (error != 0) { - printf("%s: could not map status ring DMA memory\n", + printf("%s: can't map status ring DMA memory\n", sc->sc_dev.dv_xname); goto fail; } @@ -515,7 +515,7 @@ ipw_dma_alloc(struct ipw_softc *sc) error = bus_dmamap_load(sc->sc_dmat, sbuf->map, mtod(sbuf->m, void *), MCLBYTES, NULL, BUS_DMA_NOWAIT); if (error != 0) { - printf("%s: could not map rx DMA memory\n", + printf("%s: can't map rx DMA memory\n", sc->sc_dev.dv_xname); goto fail; } @@ -1079,7 +1079,7 @@ ipw_cmd(struct ipw_softc *sc, uint32_t type, void *data, uint32_t len) error = bus_dmamap_load(sc->sc_dmat, sc->cmd_map, &sc->cmd, sizeof (struct ipw_cmd), NULL, BUS_DMA_NOWAIT); if (error != 0) { - printf("%s: could not map command DMA memory\n", + printf("%s: can't map command DMA memory\n", sc->sc_dev.dv_xname); splx(s); return error; @@ -1185,7 +1185,7 @@ ipw_tx_start(struct ifnet *ifp, struct mbuf *m, struct ieee80211_node *ni) error = bus_dmamap_load_mbuf(sc->sc_dmat, sbuf->map, m, BUS_DMA_NOWAIT); if (error != 0 && error != EFBIG) { - printf("%s: could not map mbuf (error %d)\n", + printf("%s: can't map mbuf (error %d)\n", sc->sc_dev.dv_xname, error); m_freem(m); return error; @@ -1213,7 +1213,7 @@ ipw_tx_start(struct ifnet *ifp, struct mbuf *m, struct ieee80211_node *ni) error = bus_dmamap_load_mbuf(sc->sc_dmat, sbuf->map, m, BUS_DMA_NOWAIT); if (error != 0) { - printf("%s: could not map mbuf (error %d)\n", + printf("%s: can't map mbuf (error %d)\n", sc->sc_dev.dv_xname, error); m_freem(m); return error; @@ -1223,7 +1223,7 @@ ipw_tx_start(struct ifnet *ifp, struct mbuf *m, struct ieee80211_node *ni) error = bus_dmamap_load(sc->sc_dmat, shdr->map, &shdr->hdr, sizeof (struct ipw_hdr), NULL, BUS_DMA_NOWAIT); if (error != 0) { - printf("%s: could not map header DMA memory (error %d)\n", + printf("%s: can't map header DMA memory (error %d)\n", sc->sc_dev.dv_xname, error); bus_dmamap_unload(sc->sc_dmat, sbuf->map); m_freem(m); diff --git a/sys/dev/pci/if_iwi.c b/sys/dev/pci/if_iwi.c index 1810a3e0828..37901b0f0d0 100644 --- a/sys/dev/pci/if_iwi.c +++ b/sys/dev/pci/if_iwi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwi.c,v 1.99 2009/01/26 19:09:41 damien Exp $ */ +/* $OpenBSD: if_iwi.c,v 1.100 2009/03/29 21:53:52 sthen Exp $ */ /*- * Copyright (c) 2004-2008 @@ -182,7 +182,7 @@ iwi_attach(struct device *parent, struct device *self, void *aux) error = pci_mapreg_map(pa, IWI_PCI_BAR0, PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT, 0, &memt, &memh, NULL, &sc->sc_sz, 0); if (error != 0) { - printf(": could not map memory space\n"); + printf(": can't map mem space\n"); return; } @@ -191,7 +191,7 @@ iwi_attach(struct device *parent, struct device *self, void *aux) sc->sc_dmat = pa->pa_dmat; if (pci_intr_map(pa, &ih) != 0) { - printf(": could not map interrupt\n"); + printf(": can't map interrupt\n"); return; } @@ -199,7 +199,7 @@ iwi_attach(struct device *parent, struct device *self, void *aux) sc->sc_ih = pci_intr_establish(sc->sc_pct, ih, IPL_NET, iwi_intr, sc, sc->sc_dev.dv_xname); if (sc->sc_ih == NULL) { - printf(": could not establish interrupt"); + printf(": can't establish interrupt"); if (intrstr != NULL) printf(" at %s", intrstr); printf("\n"); @@ -390,7 +390,7 @@ iwi_alloc_cmd_ring(struct iwi_softc *sc, struct iwi_cmd_ring *ring) sizeof (struct iwi_cmd_desc) * IWI_CMD_RING_COUNT, (caddr_t *)&ring->desc, BUS_DMA_NOWAIT); if (error != 0) { - printf("%s: could not map cmd ring DMA memory\n", + printf("%s: can't map cmd ring DMA memory\n", sc->sc_dev.dv_xname); goto fail; } @@ -466,7 +466,7 @@ iwi_alloc_tx_ring(struct iwi_softc *sc, struct iwi_tx_ring *ring, int ac) sizeof (struct iwi_tx_desc) * IWI_TX_RING_COUNT, (caddr_t *)&ring->desc, BUS_DMA_NOWAIT); if (error != 0) { - printf("%s: could not map tx ring DMA memory\n", + printf("%s: can't map tx ring DMA memory\n", sc->sc_dev.dv_xname); goto fail; } @@ -1293,7 +1293,7 @@ iwi_tx_start(struct ifnet *ifp, struct mbuf *m0, struct ieee80211_node *ni) error = bus_dmamap_load_mbuf(sc->sc_dmat, data->map, m0, BUS_DMA_NOWAIT); if (error != 0 && error != EFBIG) { - printf("%s: could not map mbuf (error %d)\n", + printf("%s: can't map mbuf (error %d)\n", sc->sc_dev.dv_xname, error); m_freem(m0); return error; @@ -1321,7 +1321,7 @@ iwi_tx_start(struct ifnet *ifp, struct mbuf *m0, struct ieee80211_node *ni) error = bus_dmamap_load_mbuf(sc->sc_dmat, data->map, m0, BUS_DMA_NOWAIT); if (error != 0) { - printf("%s: could not map mbuf (error %d)\n", + printf("%s: can't map mbuf (error %d)\n", sc->sc_dev.dv_xname, error); m_freem(m0); return error; @@ -1677,7 +1677,7 @@ iwi_load_firmware(struct iwi_softc *sc, const char *data, int size) error = bus_dmamem_map(sc->sc_dmat, &seg, nsegs, size, &virtaddr, BUS_DMA_NOWAIT); if (error != 0) { - printf("%s: could not map firmware DMA memory\n", + printf("%s: can't map firmware DMA memory\n", sc->sc_dev.dv_xname); goto fail3; } diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c index c41943d36fc..b8b19a741e7 100644 --- a/sys/dev/pci/if_iwn.c +++ b/sys/dev/pci/if_iwn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwn.c,v 1.48 2009/03/10 20:39:21 damien Exp $ */ +/* $OpenBSD: if_iwn.c,v 1.49 2009/03/29 21:53:52 sthen Exp $ */ /*- * Copyright (c) 2007, 2008 @@ -360,20 +360,20 @@ iwn_attach(struct device *parent, struct device *self, void *aux) error = pci_mapreg_map(pa, IWN_PCI_BAR0, memtype, 0, &sc->sc_st, &sc->sc_sh, NULL, &sc->sc_sz, 0); if (error != 0) { - printf(": could not map memory space\n"); + printf(": can't map mem space\n"); return; } /* Install interrupt handler. */ if (pci_intr_map(pa, &ih) != 0) { - printf(": could not map interrupt\n"); + printf(": can't map interrupt\n"); return; } intrstr = pci_intr_string(sc->sc_pct, ih); sc->sc_ih = pci_intr_establish(sc->sc_pct, ih, IPL_NET, iwn_intr, sc, sc->sc_dev.dv_xname); if (sc->sc_ih == NULL) { - printf(": could not establish interrupt"); + printf(": can't establish interrupt"); if (intrstr != NULL) printf(" at %s", intrstr); printf("\n"); @@ -2624,7 +2624,7 @@ iwn_tx(struct iwn_softc *sc, struct mbuf *m, struct ieee80211_node *ni) error = bus_dmamap_load_mbuf(sc->sc_dmat, data->map, m, BUS_DMA_NOWAIT); if (error != 0 && error != EFBIG) { - printf("%s: could not map mbuf (error %d)\n", + printf("%s: can't map mbuf (error %d)\n", sc->sc_dev.dv_xname, error); m_freem(m); return error; @@ -2652,7 +2652,7 @@ iwn_tx(struct iwn_softc *sc, struct mbuf *m, struct ieee80211_node *ni) error = bus_dmamap_load_mbuf(sc->sc_dmat, data->map, m, BUS_DMA_NOWAIT); if (error != 0) { - printf("%s: could not map mbuf (error %d)\n", + printf("%s: can't map mbuf (error %d)\n", sc->sc_dev.dv_xname, error); m_freem(m); return error; diff --git a/sys/dev/pci/if_jme.c b/sys/dev/pci/if_jme.c index ec65cd86043..ba8d7f18473 100644 --- a/sys/dev/pci/if_jme.c +++ b/sys/dev/pci/if_jme.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_jme.c,v 1.17 2009/02/25 13:10:38 jsg Exp $ */ +/* $OpenBSD: if_jme.c,v 1.18 2009/03/29 21:53:52 sthen Exp $ */ /*- * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org> * All rights reserved. @@ -506,12 +506,12 @@ jme_attach(struct device *parent, struct device *self, void *aux) memtype = pci_mapreg_type(pa->pa_pc, pa->pa_tag, JME_PCIR_BAR); if (pci_mapreg_map(pa, JME_PCIR_BAR, memtype, 0, &sc->jme_mem_bt, &sc->jme_mem_bh, NULL, &sc->jme_mem_size, 0)) { - printf(": could not map mem space\n"); + printf(": can't map mem space\n"); return; } if (pci_intr_map(pa, &ih) != 0) { - printf(": could not map interrupt\n"); + printf(": can't map interrupt\n"); return; } diff --git a/sys/dev/pci/if_lii.c b/sys/dev/pci/if_lii.c index 11a9d278d55..0bbe6e994d9 100644 --- a/sys/dev/pci/if_lii.c +++ b/sys/dev/pci/if_lii.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_lii.c,v 1.21 2008/11/28 02:44:18 brad Exp $ */ +/* $OpenBSD: if_lii.c,v 1.22 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 2007 The NetBSD Foundation. @@ -216,7 +216,7 @@ lii_attach(struct device *parent, struct device *self, void *aux) memtype = pci_mapreg_type(sc->sc_pc, sc->sc_tag, PCI_MAPREG_START); if (pci_mapreg_map(pa, PCI_MAPREG_START, memtype, 0, &sc->sc_mmiot, &sc->sc_mmioh, NULL, &sc->sc_mmios, 0)) { - printf(": failed to map memory!\n"); + printf(": can't map mem space\n"); return; } @@ -233,13 +233,13 @@ lii_attach(struct device *parent, struct device *self, void *aux) lii_read_macaddr(sc, sc->sc_ac.ac_enaddr); if (pci_intr_map(pa, &ih) != 0) { - printf(": failed to map interrupt!\n"); + printf(": can't map interrupt\n"); goto unmap; } sc->sc_ih = pci_intr_establish(sc->sc_pc, ih, IPL_NET, lii_intr, sc, DEVNAME(sc)); if (sc->sc_ih == NULL) { - printf(": failed to establish interrupt!\n"); + printf(": can't establish interrupt\n"); goto unmap; } @@ -987,25 +987,25 @@ lii_alloc_rings(struct lii_softc *sc) if (bus_dmamap_create(sc->sc_dmat, bs, 1, bs, (1<<30), BUS_DMA_NOWAIT, &sc->sc_ringmap) != 0) { - printf(": failed to create DMA map!\n"); + printf(": failed to create DMA map\n"); return 1; } if (bus_dmamem_alloc(sc->sc_dmat, bs, PAGE_SIZE, (1<<30), &sc->sc_ringseg, 1, &nsegs, BUS_DMA_NOWAIT) != 0) { - printf(": failed to allocate DMA memory!\n"); + printf(": failed to allocate DMA memory\n"); goto destroy; } if (bus_dmamem_map(sc->sc_dmat, &sc->sc_ringseg, nsegs, bs, (caddr_t *)&sc->sc_ring, BUS_DMA_NOWAIT) != 0) { - printf(": failed to map DMA memory!\n"); + printf(": failed to map DMA memory\n"); goto free; } if (bus_dmamap_load(sc->sc_dmat, sc->sc_ringmap, sc->sc_ring, bs, NULL, BUS_DMA_NOWAIT) != 0) { - printf(": failed to load DMA memory!\n"); + printf(": failed to load DMA memory\n"); goto unmap; } diff --git a/sys/dev/pci/if_malo_pci.c b/sys/dev/pci/if_malo_pci.c index 0aa43b71f90..0cdde5510b1 100644 --- a/sys/dev/pci/if_malo_pci.c +++ b/sys/dev/pci/if_malo_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_malo_pci.c,v 1.3 2006/12/29 07:17:53 mglocker Exp $ */ +/* $OpenBSD: if_malo_pci.c,v 1.4 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 2006 Marcus Glocker <mglocker@openbsd.org> @@ -105,7 +105,7 @@ malo_pci_attach(struct device *parent, struct device *self, void *aux) PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT, 0, &sc->sc_mem1_bt, &sc->sc_mem1_bh, NULL, &psc->sc_mapsize1, 0); if (error != 0) { - printf(": could not map 1st memory space\n"); + printf(": can't map 1st mem space\n"); return; } @@ -114,13 +114,13 @@ malo_pci_attach(struct device *parent, struct device *self, void *aux) PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT, 0, &sc->sc_mem2_bt, &sc->sc_mem2_bh, NULL, &psc->sc_mapsize2, 0); if (error != 0) { - printf(": could not map 2nd memory space\n"); + printf(": can't map 2nd mem space\n"); return; } /* map interrupt */ if (pci_intr_map(pa, &ih) != 0) { - printf(": could not map interrupt\n"); + printf(": can't map interrupt\n"); return; } diff --git a/sys/dev/pci/if_nfe.c b/sys/dev/pci/if_nfe.c index e0c4e34edf4..0ef03c16e88 100644 --- a/sys/dev/pci/if_nfe.c +++ b/sys/dev/pci/if_nfe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_nfe.c,v 1.87 2008/11/28 02:44:18 brad Exp $ */ +/* $OpenBSD: if_nfe.c,v 1.88 2009/03/29 21:53:52 sthen Exp $ */ /*- * Copyright (c) 2006, 2007 Damien Bergamini <damien.bergamini@free.fr> @@ -186,12 +186,12 @@ nfe_attach(struct device *parent, struct device *self, void *aux) memtype = pci_mapreg_type(pa->pa_pc, pa->pa_tag, NFE_PCI_BA); if (pci_mapreg_map(pa, NFE_PCI_BA, memtype, 0, &sc->sc_memt, &sc->sc_memh, NULL, &memsize, 0)) { - printf(": could not map mem space\n"); + printf(": can't map mem space\n"); return; } if (pci_intr_map(pa, &ih) != 0) { - printf(": could not map interrupt\n"); + printf(": can't map interrupt\n"); return; } @@ -924,7 +924,7 @@ nfe_encap(struct nfe_softc *sc, struct mbuf *m0) error = bus_dmamap_load_mbuf(sc->sc_dmat, map, m0, BUS_DMA_NOWAIT); if (error != 0) { - printf("%s: could not map mbuf (error %d)\n", + printf("%s: can't map mbuf (error %d)\n", sc->sc_dev.dv_xname, error); return error; } @@ -1244,7 +1244,7 @@ nfe_alloc_rx_ring(struct nfe_softc *sc, struct nfe_rx_ring *ring) error = bus_dmamem_map(sc->sc_dmat, &ring->seg, nsegs, NFE_RX_RING_COUNT * descsize, (caddr_t *)desc, BUS_DMA_NOWAIT); if (error != 0) { - printf("%s: could not map desc DMA memory\n", + printf("%s: can't map desc DMA memory\n", sc->sc_dev.dv_xname); goto fail; } @@ -1472,7 +1472,7 @@ nfe_jpool_alloc(struct nfe_softc *sc) error = bus_dmamem_map(sc->sc_dmat, &ring->jseg, nsegs, NFE_JPOOL_SIZE, &ring->jpool, BUS_DMA_NOWAIT); if (error != 0) { - printf("%s: could not map jumbo DMA memory\n", + printf("%s: can't map jumbo DMA memory\n", sc->sc_dev.dv_xname); goto fail; } @@ -1563,7 +1563,7 @@ nfe_alloc_tx_ring(struct nfe_softc *sc, struct nfe_tx_ring *ring) error = bus_dmamem_map(sc->sc_dmat, &ring->seg, nsegs, NFE_TX_RING_COUNT * descsize, (caddr_t *)desc, BUS_DMA_NOWAIT); if (error != 0) { - printf("%s: could not map desc DMA memory\n", + printf("%s: can't map desc DMA memory\n", sc->sc_dev.dv_xname); goto fail; } diff --git a/sys/dev/pci/if_pgt_pci.c b/sys/dev/pci/if_pgt_pci.c index 16504067d49..6c632882d2b 100644 --- a/sys/dev/pci/if_pgt_pci.c +++ b/sys/dev/pci/if_pgt_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pgt_pci.c,v 1.9 2006/11/18 20:44:40 grange Exp $ */ +/* $OpenBSD: if_pgt_pci.c,v 1.10 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 2006 Marcus Glocker <mglocker@openbsd.org> @@ -106,13 +106,13 @@ pgt_pci_attach(struct device *parent, struct device *self, void *aux) PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT, 0, &sc->sc_iotag, &sc->sc_iohandle, NULL, &psc->sc_mapsize, 0); if (error != 0) { - printf(": could not map memory space\n"); + printf(": can't map mem space\n"); return; } /* map interrupt */ if (pci_intr_map(pa, &ih) != 0) { - printf(": could not map interrupt\n"); + printf(": can't map interrupt\n"); return; } @@ -126,7 +126,7 @@ pgt_pci_attach(struct device *parent, struct device *self, void *aux) psc->sc_ih = pci_intr_establish(psc->sc_pc, ih, IPL_NET, pgt_intr, sc, sc->sc_dev.dv_xname); if (psc->sc_ih == NULL) { - printf(": could not establish interrupt"); + printf(": can't establish interrupt"); if (intrstr != NULL) printf(" at %s", intrstr); printf("\n"); diff --git a/sys/dev/pci/if_ral_pci.c b/sys/dev/pci/if_ral_pci.c index eaf45033441..904fc733b07 100644 --- a/sys/dev/pci/if_ral_pci.c +++ b/sys/dev/pci/if_ral_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ral_pci.c,v 1.14 2008/11/25 22:20:11 damien Exp $ */ +/* $OpenBSD: if_ral_pci.c,v 1.15 2009/03/29 21:53:52 sthen Exp $ */ /*- * Copyright (c) 2005-2007 @@ -159,12 +159,12 @@ ral_pci_attach(struct device *parent, struct device *self, void *aux) error = pci_mapreg_map(pa, RAL_PCI_BAR0, memtype, 0, &sc->sc_st, &sc->sc_sh, NULL, &psc->sc_mapsize, 0); if (error != 0) { - printf(": could not map memory space\n"); + printf(": can't map mem space\n"); return; } if (pci_intr_map(pa, &ih) != 0) { - printf(": could not map interrupt\n"); + printf(": can't map interrupt\n"); return; } @@ -172,7 +172,7 @@ ral_pci_attach(struct device *parent, struct device *self, void *aux) psc->sc_ih = pci_intr_establish(psc->sc_pc, ih, IPL_NET, psc->sc_opns->intr, sc, sc->sc_dev.dv_xname); if (psc->sc_ih == NULL) { - printf(": could not establish interrupt"); + printf(": can't establish interrupt"); if (intrstr != NULL) printf(" at %s", intrstr); printf("\n"); diff --git a/sys/dev/pci/if_sandrv.c b/sys/dev/pci/if_sandrv.c index 3dc519456d5..db53b162c79 100644 --- a/sys/dev/pci/if_sandrv.c +++ b/sys/dev/pci/if_sandrv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sandrv.c,v 1.13 2009/01/20 20:03:45 grange Exp $ */ +/* $OpenBSD: if_sandrv.c,v 1.14 2009/03/29 21:53:52 sthen Exp $ */ /*- * Copyright (c) 2001-2004 Sangoma Technologies (SAN) @@ -488,7 +488,7 @@ sdla_pci_probe(int atype, struct pci_attach_args *pa) /* Map and establish the interrupt */ if (pci_intr_map(pa, &ih)) { - printf(": couldn't map interrupt\n"); + printf(": can't map interrupt\n"); return (EINVAL); } intrstr = pci_intr_string(pa->pa_pc, ih); @@ -1147,7 +1147,7 @@ sdla_detect_aft(sdlahw_t *hw) bus_space_map(hw->hwcard->memt, hw->mem_base_addr, XILINX_PCI_MEM_SIZE, 0, &hw->dpmbase); if (!hw->dpmbase) { - printf("%s: couldn't map memory\n", hw->devname); + printf("%s: can't map mem space\n", hw->devname); return (EINVAL); } hw->status |= SDLA_MEM_MAPPED; diff --git a/sys/dev/pci/if_tl.c b/sys/dev/pci/if_tl.c index e1fadeec78b..6e852cec923 100644 --- a/sys/dev/pci/if_tl.c +++ b/sys/dev/pci/if_tl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_tl.c,v 1.46 2008/11/28 02:44:18 brad Exp $ */ +/* $OpenBSD: if_tl.c,v 1.47 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 1997, 1998 @@ -2003,7 +2003,7 @@ tl_attach(parent, self, aux) &sc->tl_btag, &sc->tl_bhandle, NULL, &iosize, 0)) { if (pci_mapreg_map(pa, TL_PCI_LOMEM, PCI_MAPREG_TYPE_IO, 0, &sc->tl_btag, &sc->tl_bhandle, NULL, &iosize, 0)) { - printf(": failed to map i/o space\n"); + printf(": can't map i/o space\n"); return; } } @@ -2012,7 +2012,7 @@ tl_attach(parent, self, aux) &sc->tl_btag, &sc->tl_bhandle, NULL, &iosize, 0)){ if (pci_mapreg_map(pa, TL_PCI_LOIO, PCI_MAPREG_TYPE_MEM, 0, &sc->tl_btag, &sc->tl_bhandle, NULL, &iosize, 0)){ - printf(": failed to map memory space\n"); + printf(": can't map mem space\n"); return; } } diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c index 9e64f710c78..e8a285961cc 100644 --- a/sys/dev/pci/if_vr.c +++ b/sys/dev/pci/if_vr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vr.c,v 1.80 2008/11/28 02:44:18 brad Exp $ */ +/* $OpenBSD: if_vr.c,v 1.81 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 1997, 1998 @@ -482,27 +482,27 @@ vr_attach(struct device *parent, struct device *self, void *aux) #ifdef VR_USEIOSPACE if (pci_mapreg_map(pa, VR_PCI_LOIO, PCI_MAPREG_TYPE_IO, 0, &sc->vr_btag, &sc->vr_bhandle, NULL, &size, 0)) { - printf(": failed to map i/o space\n"); + printf(": can't map i/o space\n"); return; } #else if (pci_mapreg_map(pa, VR_PCI_LOMEM, PCI_MAPREG_TYPE_MEM, 0, &sc->vr_btag, &sc->vr_bhandle, NULL, &size, 0)) { - printf(": failed to map memory space\n"); + printf(": can't map mem space\n"); return; } #endif /* Allocate interrupt */ if (pci_intr_map(pa, &ih)) { - printf(": couldn't map interrupt\n"); + printf(": can't map interrupt\n"); goto fail_1; } intrstr = pci_intr_string(pc, ih); sc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, vr_intr, sc, self->dv_xname); if (sc->sc_ih == NULL) { - printf(": could not establish interrupt"); + printf(": can't establish interrupt"); if (intrstr != NULL) printf(" at %s", intrstr); printf("\n"); diff --git a/sys/dev/pci/if_wi_pci.c b/sys/dev/pci/if_wi_pci.c index e383e6b6c03..fcf8408f929 100644 --- a/sys/dev/pci/if_wi_pci.c +++ b/sys/dev/pci/if_wi_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wi_pci.c,v 1.43 2006/11/26 19:46:28 deraadt Exp $ */ +/* $OpenBSD: if_wi_pci.c,v 1.44 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 2001-2003 Todd C. Miller <Todd.Miller@courtesan.com> @@ -194,13 +194,13 @@ wi_pci_acex_attach(struct pci_attach_args *pa, struct wi_softc *sc) if (pci_mapreg_map(pa, WI_ACEX_CMDRES, PCI_MAPREG_TYPE_IO, 0, &commandt, &commandh, NULL, &commandsize, 0) != 0) { - printf(": can't map command I/O space\n"); + printf(": can't map command i/o space\n"); return (ENXIO); } if (pci_mapreg_map(pa, WI_ACEX_LOCALRES, PCI_MAPREG_TYPE_IO, 0, &localt, &localh, NULL, &localsize, 0) != 0) { - printf(": can't map local I/O space\n"); + printf(": can't map local i/o space\n"); bus_space_unmap(commandt, commandh, commandsize); return (ENXIO); } @@ -209,7 +209,7 @@ wi_pci_acex_attach(struct pci_attach_args *pa, struct wi_softc *sc) if (pci_mapreg_map(pa, WI_TMD_IORES, PCI_MAPREG_TYPE_IO, 0, &iot, &ioh, NULL, &iosize, 0) != 0) { - printf(": can't map I/O space\n"); + printf(": can't map i/o space\n"); bus_space_unmap(localt, localh, localsize); bus_space_unmap(commandt, commandh, commandsize); return (ENXIO); @@ -310,7 +310,7 @@ wi_pci_plx_attach(struct pci_attach_args *pa, struct wi_softc *sc) if (pci_mapreg_map(pa, WI_PLX_IORES, PCI_MAPREG_TYPE_IO, 0, &iot, &ioh, NULL, &iosize, 0) != 0) { - printf(": can't map I/O space\n"); + printf(": can't map i/o space\n"); bus_space_unmap(memt, memh, memsize); return (ENXIO); } @@ -441,7 +441,7 @@ wi_pci_tmd_attach(struct pci_attach_args *pa, struct wi_softc *sc) if (pci_mapreg_map(pa, WI_TMD_IORES, PCI_MAPREG_TYPE_IO, 0, &iot, &ioh, NULL, &iosize, 0) != 0) { - printf(": can't map I/O space\n"); + printf(": can't map i/o space\n"); bus_space_unmap(localt, localh, localsize); return (ENXIO); } diff --git a/sys/dev/pci/if_wpi.c b/sys/dev/pci/if_wpi.c index ba528f11afe..d1f9b2c724b 100644 --- a/sys/dev/pci/if_wpi.c +++ b/sys/dev/pci/if_wpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wpi.c,v 1.83 2009/02/05 17:10:49 damien Exp $ */ +/* $OpenBSD: if_wpi.c,v 1.84 2009/03/29 21:53:52 sthen Exp $ */ /*- * Copyright (c) 2006-2008 @@ -215,20 +215,20 @@ wpi_attach(struct device *parent, struct device *self, void *aux) error = pci_mapreg_map(pa, WPI_PCI_BAR0, memtype, 0, &sc->sc_st, &sc->sc_sh, NULL, &sc->sc_sz, 0); if (error != 0) { - printf(": could not map memory space\n"); + printf(": can't map mem space\n"); return; } /* Install interrupt handler. */ if (pci_intr_map(pa, &ih) != 0) { - printf(": could not map interrupt\n"); + printf(": can't map interrupt\n"); return; } intrstr = pci_intr_string(sc->sc_pct, ih); sc->sc_ih = pci_intr_establish(sc->sc_pct, ih, IPL_NET, wpi_intr, sc, sc->sc_dev.dv_xname); if (sc->sc_ih == NULL) { - printf(": could not establish interrupt"); + printf(": can't establish interrupt"); if (intrstr != NULL) printf(" at %s", intrstr); printf("\n"); @@ -1858,7 +1858,7 @@ wpi_tx(struct wpi_softc *sc, struct mbuf *m, struct ieee80211_node *ni) error = bus_dmamap_load_mbuf(sc->sc_dmat, data->map, m, BUS_DMA_NOWAIT); if (error != 0 && error != EFBIG) { - printf("%s: could not map mbuf (error %d)\n", + printf("%s: can't map mbuf (error %d)\n", sc->sc_dev.dv_xname, error); m_freem(m); return error; @@ -1886,7 +1886,7 @@ wpi_tx(struct wpi_softc *sc, struct mbuf *m, struct ieee80211_node *ni) error = bus_dmamap_load_mbuf(sc->sc_dmat, data->map, m, BUS_DMA_NOWAIT); if (error != 0) { - printf("%s: could not map mbuf (error %d)\n", + printf("%s: can't map mbuf (error %d)\n", sc->sc_dev.dv_xname, error); m_freem(m); return error; diff --git a/sys/dev/pci/maestro.c b/sys/dev/pci/maestro.c index a8751dbd8e0..444dae82988 100644 --- a/sys/dev/pci/maestro.c +++ b/sys/dev/pci/maestro.c @@ -1,4 +1,4 @@ -/* $OpenBSD: maestro.c,v 1.26 2008/10/25 22:30:43 jakemsr Exp $ */ +/* $OpenBSD: maestro.c,v 1.27 2009/03/29 21:53:52 sthen Exp $ */ /* $FreeBSD: /c/ncvs/src/sys/dev/sound/pci/maestro.c,v 1.3 2000/11/21 12:22:11 julian Exp $ */ /* * FreeBSD's ESS Agogo/Maestro driver @@ -653,14 +653,14 @@ maestro_attach(parent, self, aux) /* Map interrupt */ if (pci_intr_map(pa, &ih)) { - printf(": couldn't map interrupt\n"); + printf(": can't map interrupt\n"); return; } intrstr = pci_intr_string(pc, ih); sc->ih = pci_intr_establish(pc, ih, IPL_AUDIO, maestro_intr, sc, sc->dev.dv_xname); if (sc->ih == NULL) { - printf(": couldn't establish interrupt"); + printf(": can't establish interrupt"); if (intrstr != NULL) printf(" at %s\n", intrstr); return; @@ -674,7 +674,7 @@ maestro_attach(parent, self, aux) /* Map i/o */ if ((error = pci_mapreg_map(pa, PCI_MAPS, PCI_MAPREG_TYPE_IO, 0, &sc->iot, &sc->ioh, NULL, NULL, 0)) != 0) { - printf(", couldn't map i/o space\n"); + printf(", can't map i/o space\n"); goto bad; }; @@ -752,7 +752,7 @@ maestro_attach(parent, self, aux) sc->host_if.write = maestro_write_codec; sc->host_if.reset = maestro_reset_codec; if (ac97_attach(&sc->host_if) != 0) { - printf("%s: couldn't attach codec\n", sc->dev.dv_xname); + printf("%s: can't attach codec\n", sc->dev.dv_xname); goto bad; } } diff --git a/sys/dev/pci/piixpm.c b/sys/dev/pci/piixpm.c index 422ae5d46e8..7e60e00cf0a 100644 --- a/sys/dev/pci/piixpm.c +++ b/sys/dev/pci/piixpm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: piixpm.c,v 1.30 2008/09/17 06:14:09 brad Exp $ */ +/* $OpenBSD: piixpm.c,v 1.31 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 2005, 2006 Alexander Yurchenko <grange@openbsd.org> @@ -131,7 +131,7 @@ piixpm_attach(struct device *parent, struct device *self, void *aux) if (PCI_MAPREG_IO_ADDR(base) == 0 || bus_space_map(sc->sc_iot, PCI_MAPREG_IO_ADDR(base), PIIX_SMB_SIZE, 0, &sc->sc_ioh)) { - printf(": can't map I/O space\n"); + printf(": can't map i/o space\n"); return; } diff --git a/sys/dev/pci/tga.c b/sys/dev/pci/tga.c index ed8dcccb432..f4c70ab097b 100644 --- a/sys/dev/pci/tga.c +++ b/sys/dev/pci/tga.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tga.c,v 1.30 2007/10/01 15:34:48 krw Exp $ */ +/* $OpenBSD: tga.c,v 1.31 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: tga.c,v 1.40 2002/03/13 15:05:18 ad Exp $ */ /* @@ -436,21 +436,21 @@ tgaattach(parent, self, aux) sc->sc_dc); } if (sc->sc_dc->dc_vaddr == NULL) { - printf(": couldn't map memory space; punt!\n"); + printf(": can't map mem space\n"); return; } /* XXX say what's going on. */ intrstr = NULL; if (pci_intr_map(pa, &intrh)) { - printf(": couldn't map interrupt"); + printf(": can't map interrupt"); return; } intrstr = pci_intr_string(pa->pa_pc, intrh); sc->sc_intr = pci_intr_establish(pa->pa_pc, intrh, IPL_TTY, tga_intr, sc->sc_dc, sc->sc_dev.dv_xname); if (sc->sc_intr == NULL) { - printf(": couldn't establish interrupt"); + printf(": can't establish interrupt"); if (intrstr != NULL) printf("at %s", intrstr); printf("\n"); @@ -790,7 +790,7 @@ tga_cnattach(iot, memt, pc, bus, device, function) /* sanity checks */ if (dcp->dc_vaddr == NULL) - panic("tga_console(%d, %d): couldn't map memory space", + panic("tga_console(%d, %d): can't map mem space", device, function); if (dcp->dc_tgaconf == NULL) panic("tga_console(%d, %d): unknown board configuration", diff --git a/sys/dev/pci/viaenv.c b/sys/dev/pci/viaenv.c index 3d5ee886383..30e462696fb 100644 --- a/sys/dev/pci/viaenv.c +++ b/sys/dev/pci/viaenv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: viaenv.c,v 1.11 2007/05/14 00:37:18 jsg Exp $ */ +/* $OpenBSD: viaenv.c,v 1.12 2009/03/29 21:53:52 sthen Exp $ */ /* $NetBSD: viaenv.c,v 1.9 2002/10/02 16:51:59 thorpej Exp $ */ /* @@ -280,7 +280,7 @@ viaenv_attach(struct device * parent, struct device * self, void *aux) } sc->sc_iot = pa->pa_iot; if (bus_space_map(sc->sc_iot, iobase & 0xff80, 128, 0, &sc->sc_ioh)) { - printf(": failed to map HWM I/O space"); + printf(": can't map HWM i/o space"); goto nohwm; } @@ -333,7 +333,7 @@ nohwm: iobase = pci_conf_read(pa->pa_pc, pa->pa_tag, VIAENV_PMBASE); if (bus_space_map(sc->sc_iot, PCI_MAPREG_IO_ADDR(iobase), VIAENV_PMSIZE, 0, &sc->sc_pm_ioh)) { - printf(": failed to map PM I/O space"); + printf(": can't map PM i/o space"); goto nopm; } diff --git a/sys/dev/pci/viapm.c b/sys/dev/pci/viapm.c index d6da31c2cbb..a61da35a418 100644 --- a/sys/dev/pci/viapm.c +++ b/sys/dev/pci/viapm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: viapm.c,v 1.9 2008/02/17 21:29:48 brad Exp $ */ +/* $OpenBSD: viapm.c,v 1.10 2009/03/29 21:53:53 sthen Exp $ */ /* * Copyright (c) 2005 Mark Kettenis <kettenis@openbsd.org> @@ -160,7 +160,7 @@ viapm_attach(struct device *parent, struct device *self, void *aux) if (iobase == 0 || bus_space_map(sc->sc_iot, iobase & 0xfffe, VIAPM_SMB_SIZE, 0, &sc->sc_ioh)) { - printf(": can't map I/O space\n"); + printf(": can't map i/o space\n"); return; } diff --git a/sys/dev/pci/yds.c b/sys/dev/pci/yds.c index aed3abfe339..5b2602bfef7 100644 --- a/sys/dev/pci/yds.c +++ b/sys/dev/pci/yds.c @@ -1,4 +1,4 @@ -/* $OpenBSD: yds.c,v 1.31 2008/10/25 22:30:43 jakemsr Exp $ */ +/* $OpenBSD: yds.c,v 1.32 2009/03/29 21:53:53 sthen Exp $ */ /* $NetBSD: yds.c,v 1.5 2001/05/21 23:55:04 minoura Exp $ */ /* @@ -689,7 +689,7 @@ yds_attach(parent, self, aux) /* Map register to memory */ if (pci_mapreg_map(pa, YDS_PCI_MBA, PCI_MAPREG_TYPE_MEM, 0, &sc->memt, &sc->memh, NULL, &size, 0)) { - printf("%s: can't map memory space\n", sc->sc_dev.dv_xname); + printf("%s: can't map mem space\n", sc->sc_dev.dv_xname); return; } diff --git a/sys/dev/pcmcia/if_cnw.c b/sys/dev/pcmcia/if_cnw.c index 1589a32d75b..45c127c0782 100644 --- a/sys/dev/pcmcia/if_cnw.c +++ b/sys/dev/pcmcia/if_cnw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cnw.c,v 1.18 2008/10/03 01:41:40 brad Exp $ */ +/* $OpenBSD: if_cnw.c,v 1.19 2009/03/29 21:53:53 sthen Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. @@ -401,7 +401,7 @@ cnw_attach(parent, self, aux) if (pcmcia_mem_map(sc->sc_pf, PCMCIA_MEM_COMMON, CNW_MEM_ADDR, CNW_MEM_SIZE, &sc->sc_pcmemh, &sc->sc_memoff, &sc->sc_memwin) != 0) { - printf(": can't map memory\n"); + printf(": can't map mem space\n"); return; } sc->sc_memt = sc->sc_pcmemh.memt; diff --git a/sys/dev/pcmcia/if_malo.c b/sys/dev/pcmcia/if_malo.c index ba2395d7a66..276bbbcdee5 100644 --- a/sys/dev/pcmcia/if_malo.c +++ b/sys/dev/pcmcia/if_malo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_malo.c,v 1.64 2008/10/14 18:01:53 naddy Exp $ */ +/* $OpenBSD: if_malo.c,v 1.65 2009/03/29 21:53:53 sthen Exp $ */ /* * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org> @@ -169,14 +169,14 @@ malo_pcmcia_attach(struct device *parent, struct device *self, void *aux) /* enable card */ pcmcia_function_init(psc->sc_pf, cfe); if (pcmcia_function_enable(psc->sc_pf)) { - printf(": can't enable function!\n"); + printf(": can't enable function\n"); return; } /* allocate I/O space */ if (pcmcia_io_alloc(psc->sc_pf, 0, cfe->iospace[0].length, cfe->iospace[0].length, &psc->sc_pcioh)) { - printf(": can't allocate i/o space!\n"); + printf(": can't allocate i/o space\n"); pcmcia_function_disable(psc->sc_pf); return; } @@ -184,7 +184,7 @@ malo_pcmcia_attach(struct device *parent, struct device *self, void *aux) /* map I/O space */ if (pcmcia_io_map(psc->sc_pf, PCMCIA_WIDTH_IO16, 0, cfe->iospace[0].length, &psc->sc_pcioh, &psc->sc_io_window)) { - printf(": can't map i/o space!\n"); + printf(": can't map i/o space\n"); pcmcia_io_free(psc->sc_pf, &psc->sc_pcioh); pcmcia_function_disable(psc->sc_pf); return; @@ -198,7 +198,7 @@ malo_pcmcia_attach(struct device *parent, struct device *self, void *aux) psc->sc_ih = pcmcia_intr_establish(psc->sc_pf, IPL_NET, cmalo_intr, sc, sc->sc_dev.dv_xname); if (psc->sc_ih == NULL) { - printf(": can't establish interrupt!\n"); + printf(": can't establish interrupt\n"); return; } intrstr = pcmcia_intr_string(psc->sc_pf, psc->sc_ih); @@ -494,7 +494,7 @@ cmalo_fw_load_helper(struct malo_softc *sc) return (0); if (val8 != MALO_VAL_SCRATCH_READY) { /* bad register value */ - printf("%s: device not ready for FW download!\n", + printf("%s: device not ready for FW download\n", sc->sc_dev.dv_xname); return (EIO); } @@ -525,7 +525,7 @@ cmalo_fw_load_helper(struct malo_softc *sc) delay(1000); } if (i == 50) { - printf("%s: timeout while helper FW block download!\n", + printf("%s: timeout while helper FW block download\n", sc->sc_dev.dv_xname); return (EIO); } @@ -553,7 +553,7 @@ cmalo_fw_load_main(struct malo_softc *sc) delay(1000); } if (i == 10) { - printf("%s: helper FW not loaded!\n", sc->sc_dev.dv_xname); + printf("%s: helper FW not loaded\n", sc->sc_dev.dv_xname); return (EIO); } DPRINTF(1, "%s: helper FW loaded successfully\n", sc->sc_dev.dv_xname); @@ -568,7 +568,7 @@ cmalo_fw_load_main(struct malo_softc *sc) */ if (val16 & 0x0001) { if (retry > MALO_FW_MAIN_MAXRETRY) { - printf("%s: main FW download failed!\n", + printf("%s: main FW download failed\n", sc->sc_dev.dv_xname); return (EIO); } @@ -597,7 +597,7 @@ cmalo_fw_load_main(struct malo_softc *sc) break; } if (i == 5000) { - printf("%s: timeout while main FW block download!\n", + printf("%s: timeout while main FW block download\n", sc->sc_dev.dv_xname); return (EIO); } @@ -613,7 +613,7 @@ cmalo_fw_load_main(struct malo_softc *sc) delay(1000); } if (i == 500) { - printf("%s: main FW not loaded!\n", sc->sc_dev.dv_xname); + printf("%s: main FW not loaded\n", sc->sc_dev.dv_xname); return (EIO); } @@ -755,7 +755,7 @@ cmalo_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg) cmalo_cmd_set_scan(sc); if (!sc->sc_net_num) { /* no networks found */ - DPRINTF(1, "%s: no networks found!\n", + DPRINTF(1, "%s: no networks found\n", sc->sc_dev.dv_xname); break; } @@ -930,7 +930,7 @@ cmalo_rx(struct malo_softc *sc) m = m_devget(sc->sc_data + rxdesc->pkgoffset, rxdesc->pkglen, ETHER_ALIGN, ifp, NULL); if (m == NULL) { - DPRINTF(1, "RX m_devget failed!\n"); + DPRINTF(1, "RX m_devget failed\n"); ifp->if_ierrors++; return; } @@ -1094,7 +1094,7 @@ cmalo_select_network(struct malo_softc *sc) } } DPRINTF(1, "%s: desired network not found in scan results " - "(%s)!\n", + "(%s)\n", sc->sc_dev.dv_xname, ic->ic_des_essid); } @@ -1833,7 +1833,7 @@ cmalo_cmd_rsp_assoc(struct malo_softc *sc) body = (struct malo_cmd_body_rsp_assoc *)(hdr + 1); if (body->status) { - DPRINTF(1, "%s: association failed (status %d)!\n", + DPRINTF(1, "%s: association failed (status %d)\n", sc->sc_dev.dv_xname, body->status); sc->sc_flags |= MALO_ASSOC_FAILED; } else @@ -2008,7 +2008,7 @@ cmalo_cmd_request(struct malo_softc *sc, uint16_t psize, int no_response) /* wait for the command response */ if (tsleep(sc, 0, "malocmd", 500)) { - printf("%s: timeout while waiting for cmd response!\n", + printf("%s: timeout while waiting for cmd response\n", sc->sc_dev.dv_xname); return (EIO); } @@ -2053,7 +2053,7 @@ cmalo_cmd_response(struct malo_softc *sc) /* check for a valid command response */ if (!(hdr->cmd & MALO_CMD_RESP)) { - printf("%s: got invalid command response (0x%04x)!\n", + printf("%s: got invalid command response (0x%04x)\n", sc->sc_dev.dv_xname, hdr->cmd); splx(s); return (EIO); @@ -2151,7 +2151,7 @@ cmalo_cmd_response(struct malo_softc *sc) sc->sc_dev.dv_xname); break; default: - printf("%s: got unknown cmd response (0x%04x)!\n", + printf("%s: got unknown cmd response (0x%04x)\n", sc->sc_dev.dv_xname, hdr->cmd); break; } diff --git a/sys/dev/pcmcia/if_wi_pcmcia.c b/sys/dev/pcmcia/if_wi_pcmcia.c index b06e43267b9..544d3c829ee 100644 --- a/sys/dev/pcmcia/if_wi_pcmcia.c +++ b/sys/dev/pcmcia/if_wi_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wi_pcmcia.c,v 1.66 2006/11/26 19:46:28 deraadt Exp $ */ +/* $OpenBSD: if_wi_pcmcia.c,v 1.67 2009/03/29 21:53:53 sthen Exp $ */ /* $NetBSD: if_wi_pcmcia.c,v 1.14 2001/11/26 04:34:56 ichiro Exp $ */ /* @@ -399,7 +399,7 @@ wi_pcmcia_attach(struct device *parent, struct device *self, void *aux) if (pcmcia_io_map(pf, PCMCIA_WIDTH_IO16, 0, WI_IOSIZ, &psc->sc_pcioh, &psc->sc_io_window)) { - printf(": can't map io space\n"); + printf(": can't map i/o space\n"); goto bad; } state++; @@ -420,7 +420,7 @@ wi_pcmcia_attach(struct device *parent, struct device *self, void *aux) sc->sc_ih = pcmcia_intr_establish(pa->pf, IPL_NET, wi_intr, psc, sc->sc_dev.dv_xname); if (sc->sc_ih == NULL) { - printf("%s: couldn't establish interrupt\n", + printf("%s: can't establish interrupt\n", sc->sc_dev.dv_xname); goto bad; } diff --git a/sys/dev/pcmcia/wdc_pcmcia.c b/sys/dev/pcmcia/wdc_pcmcia.c index 7ddc5b6deff..945c4953d98 100644 --- a/sys/dev/pcmcia/wdc_pcmcia.c +++ b/sys/dev/pcmcia/wdc_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wdc_pcmcia.c,v 1.18 2008/06/26 05:42:17 ray Exp $ */ +/* $OpenBSD: wdc_pcmcia.c,v 1.19 2009/03/29 21:53:53 sthen Exp $ */ /* $NetBSD: wdc_pcmcia.c,v 1.19 1999/02/19 21:49:43 abs Exp $ */ /*- @@ -309,7 +309,7 @@ wdc_pcmcia_attach(parent, self, aux) if (pcmcia_io_map(pa->pf, quirks & WDC_PCMCIA_FORCE_16BIT_IO ? PCMCIA_WIDTH_IO16 : PCMCIA_WIDTH_AUTO, 0, sc->sc_pioh.size, &sc->sc_pioh, &sc->sc_iowindow)) { - printf(": can't map first I/O space\n"); + printf(": can't map first i/o space\n"); goto iomap_failed; } @@ -322,7 +322,7 @@ wdc_pcmcia_attach(parent, self, aux) sc->sc_auxiowindow = -1; else if (pcmcia_io_map(pa->pf, PCMCIA_WIDTH_AUTO, 0, sc->sc_auxpioh.size, &sc->sc_auxpioh, &sc->sc_auxiowindow)) { - printf(": can't map second I/O space\n"); + printf(": can't map second i/o space\n"); goto iomapaux_failed; } |