Module Name: src
Committed By: snj
Date: Sun Jul 26 18:31:39 UTC 2009
Modified Files:
src/sys/dev/ic [netbsd-5-0]: ciss.c tcic2.c
src/sys/dev/isa [netbsd-5-0]: if_ntwoc_isa.c isadma.c
src/sys/dev/pci [netbsd-5-0]: if_sk.c
src/sys/dev/pcmcia [netbsd-5-0]: if_cnw.c
src/sys/dev/usb [netbsd-5-0]: ulpt.c
Log Message:
Pull up following revision(s) (requested by dholland in ticket #874):
sys/dev/ic/ciss.c: revision 1.15
sys/dev/isa/isadma.c: revision 1.59
sys/dev/usb/ulpt.c: revision 1.82
sys/dev/ic/tcic2.c: revision 1.31
sys/dev/isa/if_ntwoc_isa.c: revision 1.18
sys/dev/pci/if_sk.c: revision 1.57
sys/dev/pcmcia/if_cnw.c: revision 1.46
More printf format fixes.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.10.1 src/sys/dev/ic/ciss.c
cvs rdiff -u -r1.30 -r1.30.20.1 src/sys/dev/ic/tcic2.c
cvs rdiff -u -r1.17 -r1.17.20.1 src/sys/dev/isa/if_ntwoc_isa.c
cvs rdiff -u -r1.58 -r1.58.16.1 src/sys/dev/isa/isadma.c
cvs rdiff -u -r1.54 -r1.54.6.1 src/sys/dev/pci/if_sk.c
cvs rdiff -u -r1.44 -r1.44.12.1 src/sys/dev/pcmcia/if_cnw.c
cvs rdiff -u -r1.81 -r1.81.14.1 src/sys/dev/usb/ulpt.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/dev/ic/ciss.c
diff -u src/sys/dev/ic/ciss.c:1.14 src/sys/dev/ic/ciss.c:1.14.10.1
--- src/sys/dev/ic/ciss.c:1.14 Thu Sep 4 19:03:14 2008
+++ src/sys/dev/ic/ciss.c Sun Jul 26 18:31:38 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ciss.c,v 1.14 2008/09/04 19:03:14 he Exp $ */
+/* $NetBSD: ciss.c,v 1.14.10.1 2009/07/26 18:31:38 snj Exp $ */
/* $OpenBSD: ciss.c,v 1.14 2006/03/13 16:02:23 mickey Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ciss.c,v 1.14 2008/09/04 19:03:14 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ciss.c,v 1.14.10.1 2009/07/26 18:31:38 snj Exp $");
#include "bio.h"
@@ -470,7 +470,8 @@
sgd = dmap->dm_segs;
CISS_DPRINTF(CISS_D_DMA, ("data=%p/%u<0x%lx/%lu",
- ccb->ccb_data, ccb->ccb_len, sgd->ds_addr, sgd->ds_len));
+ ccb->ccb_data, ccb->ccb_len, sgd->ds_addr,
+ (u_long)sgd->ds_len));
for (i = 0; i < dmap->dm_nsegs; sgd++, i++) {
cmd->sgl[i].addr_lo = htole32(sgd->ds_addr);
@@ -480,7 +481,8 @@
cmd->sgl[i].flags = htole32(0);
if (i) {
CISS_DPRINTF(CISS_D_DMA,
- (",0x%lx/%lu", sgd->ds_addr, sgd->ds_len));
+ (",0x%lx/%lu", sgd->ds_addr,
+ (u_long)sgd->ds_len));
}
}
Index: src/sys/dev/ic/tcic2.c
diff -u src/sys/dev/ic/tcic2.c:1.30 src/sys/dev/ic/tcic2.c:1.30.20.1
--- src/sys/dev/ic/tcic2.c:1.30 Tue Apr 8 12:07:27 2008
+++ src/sys/dev/ic/tcic2.c Sun Jul 26 18:31:38 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: tcic2.c,v 1.30 2008/04/08 12:07:27 cegger Exp $ */
+/* $NetBSD: tcic2.c,v 1.30.20.1 2009/07/26 18:31:38 snj Exp $ */
/*
* Copyright (c) 1998, 1999 Christoph Badura. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcic2.c,v 1.30 2008/04/08 12:07:27 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcic2.c,v 1.30.20.1 2009/07/26 18:31:38 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -753,7 +753,8 @@
i++;
sizepg = max(i, TCIC_MEM_SHIFT) - (TCIC_MEM_SHIFT-1);
- DPRINTF(("tcic_chip_mem_alloc: size %ld sizepg %ld\n", size, sizepg));
+ DPRINTF(("tcic_chip_mem_alloc: size %ld sizepg %ld\n", (u_long)size,
+ (u_long)sizepg));
/* can't allocate that much anyway */
if (sizepg > TCIC_MEM_PAGES) /* XXX -chb */
Index: src/sys/dev/isa/if_ntwoc_isa.c
diff -u src/sys/dev/isa/if_ntwoc_isa.c:1.17 src/sys/dev/isa/if_ntwoc_isa.c:1.17.20.1
--- src/sys/dev/isa/if_ntwoc_isa.c:1.17 Tue Apr 8 20:08:50 2008
+++ src/sys/dev/isa/if_ntwoc_isa.c Sun Jul 26 18:31:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ntwoc_isa.c,v 1.17 2008/04/08 20:08:50 cegger Exp $ */
+/* $NetBSD: if_ntwoc_isa.c,v 1.17.20.1 2009/07/26 18:31:39 snj Exp $ */
/*
* Copyright (c) 1999 Christian E. Hopps
* Copyright (c) 1996 John Hay.
@@ -29,11 +29,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: if_ntwoc_isa.c,v 1.17 2008/04/08 20:08:50 cegger Exp $
+ * $Id: if_ntwoc_isa.c,v 1.17.20.1 2009/07/26 18:31:39 snj Exp $
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ntwoc_isa.c,v 1.17 2008/04/08 20:08:50 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ntwoc_isa.c,v 1.17.20.1 2009/07/26 18:31:39 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -465,7 +465,7 @@
sca->scu_pagesize, 0, &sca->scu_memh))) {
aprint_error_dev(&sc->sc_dev, "can't map mem 0x%x sz %ld, %d\n",
ia->ia_iomem[0].ir_addr,
- sca->scu_pagesize, rv);
+ (u_long)sca->scu_pagesize, rv);
return;
}
@@ -548,7 +548,7 @@
(sca->sc_numports > 1 ? "s" : ""));
#else
printf("%s: dpram %ldk %d serial port%s\n",
- device_xname(&sc->sc_dev), pgs * (sca->scu_pagesize / 1024),
+ device_xname(&sc->sc_dev), (u_long)pgs * (sca->scu_pagesize / 1024),
sca->sc_numports, (sca->sc_numports > 1 ? "s" : ""));
#endif
Index: src/sys/dev/isa/isadma.c
diff -u src/sys/dev/isa/isadma.c:1.58 src/sys/dev/isa/isadma.c:1.58.16.1
--- src/sys/dev/isa/isadma.c:1.58 Mon Apr 28 20:23:52 2008
+++ src/sys/dev/isa/isadma.c Sun Jul 26 18:31:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: isadma.c,v 1.58 2008/04/28 20:23:52 martin Exp $ */
+/* $NetBSD: isadma.c,v 1.58.16.1 2009/07/26 18:31:39 snj Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isadma.c,v 1.58 2008/04/28 20:23:52 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isadma.c,v 1.58.16.1 2009/07/26 18:31:39 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -350,7 +350,7 @@
#ifdef ISADMA_DEBUG
printf("_isa_dmastart: drq %d, addr %p, nbytes 0x%lx, p %p, "
"flags 0x%x, dmaflags 0x%x\n",
- chan, addr, nbytes, p, flags, busdmaflags);
+ chan, addr, (u_long)nbytes, p, flags, busdmaflags);
#endif
if (ISA_DMA_DRQ_ISFREE(ids, chan)) {
Index: src/sys/dev/pci/if_sk.c
diff -u src/sys/dev/pci/if_sk.c:1.54 src/sys/dev/pci/if_sk.c:1.54.6.1
--- src/sys/dev/pci/if_sk.c:1.54 Tue Sep 9 05:54:23 2008
+++ src/sys/dev/pci/if_sk.c Sun Jul 26 18:31:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sk.c,v 1.54 2008/09/09 05:54:23 cegger Exp $ */
+/* $NetBSD: if_sk.c,v 1.54.6.1 2009/07/26 18:31:39 snj Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -115,7 +115,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.54 2008/09/09 05:54:23 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.54.6.1 2009/07/26 18:31:39 snj Exp $");
#include "bpfilter.h"
#include "rnd.h"
@@ -1576,7 +1576,8 @@
return;
}
- DPRINTFN(2, ("skc_attach: iobase=%lx, iosize=%lx\n", iobase, iosize));
+ DPRINTFN(2, ("skc_attach: iobase=%lx, iosize=%lx\n", iobase,
+ (u_long)iosize));
#endif
sc->sc_dmatag = pa->pa_dmat;
Index: src/sys/dev/pcmcia/if_cnw.c
diff -u src/sys/dev/pcmcia/if_cnw.c:1.44 src/sys/dev/pcmcia/if_cnw.c:1.44.12.1
--- src/sys/dev/pcmcia/if_cnw.c:1.44 Mon Apr 28 20:23:56 2008
+++ src/sys/dev/pcmcia/if_cnw.c Sun Jul 26 18:31:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cnw.c,v 1.44 2008/04/28 20:23:56 martin Exp $ */
+/* $NetBSD: if_cnw.c,v 1.44.12.1 2009/07/26 18:31:39 snj Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -105,7 +105,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cnw.c,v 1.44 2008/04/28 20:23:56 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cnw.c,v 1.44.12.1 2009/07/26 18:31:39 snj Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -823,8 +823,8 @@
if (sc->sc_ethercom.ec_if.if_flags & IFF_DEBUG)
printf("%s: %d bytes @0x%x+0x%lx\n",
device_xname(&sc->sc_dev), bufbytes,
- buffer, bufptr - buffer -
- sc->sc_memoff);
+ buffer, (u_long)(bufptr - buffer -
+ sc->sc_memoff));
#endif
}
n = mbytes <= bufbytes ? mbytes : bufbytes;
Index: src/sys/dev/usb/ulpt.c
diff -u src/sys/dev/usb/ulpt.c:1.81 src/sys/dev/usb/ulpt.c:1.81.14.1
--- src/sys/dev/usb/ulpt.c:1.81 Sat May 24 16:40:58 2008
+++ src/sys/dev/usb/ulpt.c Sun Jul 26 18:31:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ulpt.c,v 1.81 2008/05/24 16:40:58 cube Exp $ */
+/* $NetBSD: ulpt.c,v 1.81.14.1 2009/07/26 18:31:39 snj Exp $ */
/* $FreeBSD: src/sys/dev/usb/ulpt.c,v 1.24 1999/11/17 22:33:44 n_hibma Exp $ */
/*
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.81 2008/05/24 16:40:58 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.81.14.1 2009/07/26 18:31:39 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -760,8 +760,8 @@
else
timeout = USBD_NO_TIMEOUT;
- DPRINTFN(3, ("ulptread nonblocking=%d uio_reside=%d timeout=%d\n",
- nonblocking, uio->uio_resid, timeout));
+ DPRINTFN(3, ("ulptread nonblocking=%d uio_reside=%ld timeout=%d\n",
+ nonblocking, (u_long)uio->uio_resid, timeout));
xfer = sc->sc_in_xfer;
bufp = sc->sc_in_buf;
