summaryrefslogtreecommitdiff
path: root/sys/dev/ic
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/ic')
-rw-r--r--sys/dev/ic/acx.c6
-rw-r--r--sys/dev/ic/malo.c10
-rw-r--r--sys/dev/ic/rt2560.c16
-rw-r--r--sys/dev/ic/rt2661.c14
-rw-r--r--sys/dev/ic/rt2860.c12
-rw-r--r--sys/dev/ic/rtw.c4
-rw-r--r--sys/dev/ic/vga.c8
7 files changed, 35 insertions, 35 deletions
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,
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 17:37:54 +0000