Module Name: src
Committed By: skrll
Date: Thu May 7 15:17:22 UTC 2009
Modified Files:
src/sys/arch/hp700/dev: dino.c siop_sgc.c sti_sgc.c
src/sys/arch/hp700/gsc: if_ie_gsc.c siop_gsc.c
Log Message:
There are more "can't"s that "cannot"s. Be consistent and use "can't"
everywhere.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/hp700/dev/dino.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hp700/dev/siop_sgc.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hp700/dev/sti_sgc.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hp700/gsc/if_ie_gsc.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hp700/gsc/siop_gsc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp700/dev/dino.c
diff -u src/sys/arch/hp700/dev/dino.c:1.8 src/sys/arch/hp700/dev/dino.c:1.9
--- src/sys/arch/hp700/dev/dino.c:1.8 Thu Apr 30 07:01:26 2009
+++ src/sys/arch/hp700/dev/dino.c Thu May 7 15:17:22 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dino.c,v 1.8 2009/04/30 07:01:26 skrll Exp $ */
+/* $NetBSD: dino.c,v 1.9 2009/05/07 15:17:22 skrll Exp $ */
/* $OpenBSD: dino.c,v 1.5 2004/02/13 20:39:31 mickey Exp $ */
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.8 2009/04/30 07:01:26 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.9 2009/05/07 15:17:22 skrll Exp $");
/* #include "cardbus.h" */
@@ -1614,7 +1614,7 @@
"%s_io", sc->sc_dv.dv_xname);
if ((sc->sc_ioex = extent_create(sc->sc_ioexname, 0, 0xffff,
M_DEVBUF, NULL, 0, EX_NOWAIT | EX_MALLOCOK)) == NULL) {
- printf(": cannot allocate I/O extent map\n");
+ printf(": can't allocate I/O extent map\n");
bus_space_unmap(sc->sc_bt, sc->sc_bh, PAGE_SIZE);
return;
}
Index: src/sys/arch/hp700/dev/siop_sgc.c
diff -u src/sys/arch/hp700/dev/siop_sgc.c:1.1 src/sys/arch/hp700/dev/siop_sgc.c:1.2
--- src/sys/arch/hp700/dev/siop_sgc.c:1.1 Sun Mar 30 12:32:13 2008
+++ src/sys/arch/hp700/dev/siop_sgc.c Thu May 7 15:17:22 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: siop_sgc.c,v 1.1 2008/03/30 12:32:13 skrll Exp $ */
+/* $NetBSD: siop_sgc.c,v 1.2 2009/05/07 15:17:22 skrll Exp $ */
/* $OpenBSD: siop_sgc.c,v 1.1 2007/08/05 19:09:52 kettenis Exp $ */
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siop_sgc.c,v 1.1 2008/03/30 12:32:13 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siop_sgc.c,v 1.2 2009/05/07 15:17:22 skrll Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -93,7 +93,7 @@
sgc->sc_iot = ca->ca_iot;
if (bus_space_map(sgc->sc_iot, ca->ca_hpa,
IOMOD_HPASIZE, 0, &sgc->sc_ioh)) {
- printf(": cannot map io space\n");
+ printf(": can't map io space\n");
return;
}
Index: src/sys/arch/hp700/dev/sti_sgc.c
diff -u src/sys/arch/hp700/dev/sti_sgc.c:1.13 src/sys/arch/hp700/dev/sti_sgc.c:1.14
--- src/sys/arch/hp700/dev/sti_sgc.c:1.13 Sat Mar 29 15:59:26 2008
+++ src/sys/arch/hp700/dev/sti_sgc.c Thu May 7 15:17:22 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sti_sgc.c,v 1.13 2008/03/29 15:59:26 skrll Exp $ */
+/* $NetBSD: sti_sgc.c,v 1.14 2009/05/07 15:17:22 skrll Exp $ */
/* $OpenBSD: sti_sgc.c,v 1.21 2003/12/22 23:39:06 mickey Exp $ */
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sti_sgc.c,v 1.13 2008/03/29 15:59:26 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sti_sgc.c,v 1.14 2009/05/07 15:17:22 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -148,7 +148,7 @@
/* if it does not map, probably part of the lasi space */
if ((rv = bus_space_map(ca->ca_iot, rom, STI_ROMSIZE, 0, &romh))) {
#ifdef STIDEBUG
- printf ("sti: cannot map rom space (%d)\n", rv);
+ printf ("sti: can't map rom space (%d)\n", rv);
#endif
if ((rom & HPPA_IOBEGIN) == HPPA_IOBEGIN) {
romh = rom;
@@ -239,7 +239,7 @@
if ((rom & HPPA_IOBEGIN) == HPPA_IOBEGIN)
sc->romh = rom;
else {
- printf (": cannot map rom space (%d)\n", rv);
+ printf (": can't map rom space (%d)\n", rv);
return;
}
}
Index: src/sys/arch/hp700/gsc/if_ie_gsc.c
diff -u src/sys/arch/hp700/gsc/if_ie_gsc.c:1.15 src/sys/arch/hp700/gsc/if_ie_gsc.c:1.16
--- src/sys/arch/hp700/gsc/if_ie_gsc.c:1.15 Mon Oct 6 15:57:50 2008
+++ src/sys/arch/hp700/gsc/if_ie_gsc.c Thu May 7 15:17:22 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie_gsc.c,v 1.15 2008/10/06 15:57:50 skrll Exp $ */
+/* $NetBSD: if_ie_gsc.c,v 1.16 2009/05/07 15:17:22 skrll Exp $ */
/* $OpenBSD: if_ie_gsc.c,v 1.6 2001/01/12 22:57:04 mickey Exp $ */
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie_gsc.c,v 1.15 2008/10/06 15:57:50 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie_gsc.c,v 1.16 2009/05/07 15:17:22 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -424,7 +424,7 @@
*/
if (bus_dmamem_alloc(gsc->iemt, sc->sc_msize, PAGE_SIZE, 0,
&seg, 1, &rseg, BUS_DMA_NOWAIT | BUS_DMA_24BIT)) {
- printf (": cannot allocate %d bytes of DMA memory\n",
+ printf (": can't allocate %d bytes of DMA memory\n",
sc->sc_msize);
return;
}
@@ -434,7 +434,7 @@
*/
if (bus_dmamem_map(gsc->iemt, &seg, rseg, sc->sc_msize,
(void **)&sc->sc_maddr, BUS_DMA_NOWAIT)) {
- printf (": cannot map DMA memory\n");
+ printf (": can't map DMA memory\n");
bus_dmamem_free(gsc->iemt, &seg, rseg);
return;
}
@@ -444,7 +444,7 @@
*/
if (bus_dmamap_create(gsc->iemt, sc->sc_msize, rseg, sc->sc_msize,
0, BUS_DMA_NOWAIT, &sc->sc_dmamap)) {
- printf(": cannot create DMA map\n");
+ printf(": can't create DMA map\n");
bus_dmamem_unmap(gsc->iemt,
(void *)sc->sc_maddr, sc->sc_msize);
bus_dmamem_free(gsc->iemt, &seg, rseg);
@@ -457,7 +457,7 @@
if (bus_dmamap_load(gsc->iemt, sc->sc_dmamap,
sc->sc_maddr, sc->sc_msize,
NULL, BUS_DMA_NOWAIT)) {
- printf(": cannot load DMA map\n");
+ printf(": can't load DMA map\n");
bus_dmamap_destroy(gsc->iemt, sc->sc_dmamap);
bus_dmamem_unmap(gsc->iemt,
(void *)sc->sc_maddr, sc->sc_msize);
Index: src/sys/arch/hp700/gsc/siop_gsc.c
diff -u src/sys/arch/hp700/gsc/siop_gsc.c:1.7 src/sys/arch/hp700/gsc/siop_gsc.c:1.8
--- src/sys/arch/hp700/gsc/siop_gsc.c:1.7 Sun Mar 30 12:32:13 2008
+++ src/sys/arch/hp700/gsc/siop_gsc.c Thu May 7 15:17:22 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: siop_gsc.c,v 1.7 2008/03/30 12:32:13 skrll Exp $ */
+/* $NetBSD: siop_gsc.c,v 1.8 2009/05/07 15:17:22 skrll Exp $ */
/* $OpenBSD: siop_gsc.c,v 1.4 2007/08/23 21:01:22 kettenis Exp $ */
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siop_gsc.c,v 1.7 2008/03/30 12:32:13 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siop_gsc.c,v 1.8 2009/05/07 15:17:22 skrll Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -87,7 +87,7 @@
gsc->sc_iot = ga->ga_iot;
if (bus_space_map(gsc->sc_iot, ga->ga_hpa,
IOMOD_HPASIZE, 0, &gsc->sc_ioh)) {
- printf(": cannot map io space\n");
+ printf(": can't map io space\n");
return;
}
