summaryrefslogtreecommitdiff
path: root/sys/dev/pci
diff options
context:
space:
mode:
authorStuart Henderson <sthen@cvs.openbsd.org>2009-03-29 21:53:54 +0000
committerStuart Henderson <sthen@cvs.openbsd.org>2009-03-29 21:53:54 +0000
commit69c5b21cf2da9c2ff6a2d3adf1f48f811feac372 (patch)
tree599868694b84d6aa6c93806fb08f3921218dba10 /sys/dev/pci
parente8880d029cebac8827fe0228bf64b8a2ba3ad456 (diff)
make various strings ("can't map mem space" and similar) more consistent
between instances, saving space in the kernel. feedback from many (some incorporated, some left for future work). ok deraadt, kettenis, "why not" miod.
Diffstat (limited to 'sys/dev/pci')
-rw-r--r--sys/dev/pci/alipm.c6
-rw-r--r--sys/dev/pci/amdiic.c4
-rw-r--r--sys/dev/pci/auixp.c4
-rw-r--r--sys/dev/pci/autri.c4
-rw-r--r--sys/dev/pci/bha_pci.c8
-rw-r--r--sys/dev/pci/bktr/bktr_os.c8
-rw-r--r--sys/dev/pci/cmpci.c8
-rw-r--r--sys/dev/pci/ehci_pci.c4
-rw-r--r--sys/dev/pci/emuxki.c8
-rw-r--r--sys/dev/pci/envy.c6
-rw-r--r--sys/dev/pci/eso.c8
-rw-r--r--sys/dev/pci/gdt_pci.c8
-rw-r--r--sys/dev/pci/ichiic.c4
-rw-r--r--sys/dev/pci/ichwdt.c4
-rw-r--r--sys/dev/pci/if_acx_pci.c12
-rw-r--r--sys/dev/pci/if_age.c6
-rw-r--r--sys/dev/pci/if_ale.c6
-rw-r--r--sys/dev/pci/if_an_pci.c4
-rw-r--r--sys/dev/pci/if_art.c4
-rw-r--r--sys/dev/pci/if_ath_pci.c10
-rw-r--r--sys/dev/pci/if_bwi_pci.c8
-rw-r--r--sys/dev/pci/if_cas.c4
-rw-r--r--sys/dev/pci/if_en_pci.c8
-rw-r--r--sys/dev/pci/if_et.c6
-rw-r--r--sys/dev/pci/if_fpa.c6
-rw-r--r--sys/dev/pci/if_gem_pci.c4
-rw-r--r--sys/dev/pci/if_hme_pci.c4
-rw-r--r--sys/dev/pci/if_ipw.c24
-rw-r--r--sys/dev/pci/if_iwi.c18
-rw-r--r--sys/dev/pci/if_iwn.c12
-rw-r--r--sys/dev/pci/if_jme.c6
-rw-r--r--sys/dev/pci/if_lii.c16
-rw-r--r--sys/dev/pci/if_malo_pci.c8
-rw-r--r--sys/dev/pci/if_nfe.c14
-rw-r--r--sys/dev/pci/if_pgt_pci.c8
-rw-r--r--sys/dev/pci/if_ral_pci.c8
-rw-r--r--sys/dev/pci/if_sandrv.c6
-rw-r--r--sys/dev/pci/if_tl.c6
-rw-r--r--sys/dev/pci/if_vr.c10
-rw-r--r--sys/dev/pci/if_wi_pci.c12
-rw-r--r--sys/dev/pci/if_wpi.c12
-rw-r--r--sys/dev/pci/maestro.c10
-rw-r--r--sys/dev/pci/piixpm.c4
-rw-r--r--sys/dev/pci/tga.c10
-rw-r--r--sys/dev/pci/viaenv.c6
-rw-r--r--sys/dev/pci/viapm.c4
-rw-r--r--sys/dev/pci/yds.c4
47 files changed, 182 insertions, 182 deletions
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;
}