Module Name: src
Committed By: ozaki-r
Date: Wed Sep 17 04:20:58 UTC 2014
Modified Files:
src/sys/rump/net/lib/libshmif: shmif_busops.c shmifvar.h
Log Message:
Make shmif buildable when DRPINTF enabled
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/rump/net/lib/libshmif/shmif_busops.c
cvs rdiff -u -r1.9 -r1.10 src/sys/rump/net/lib/libshmif/shmifvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/net/lib/libshmif/shmif_busops.c
diff -u src/sys/rump/net/lib/libshmif/shmif_busops.c:1.11 src/sys/rump/net/lib/libshmif/shmif_busops.c:1.12
--- src/sys/rump/net/lib/libshmif/shmif_busops.c:1.11 Fri Dec 20 10:00:59 2013
+++ src/sys/rump/net/lib/libshmif/shmif_busops.c Wed Sep 17 04:20:58 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: shmif_busops.c,v 1.11 2013/12/20 10:00:59 pooka Exp $ */
+/* $NetBSD: shmif_busops.c,v 1.12 2014/09/17 04:20:58 ozaki-r Exp $ */
/*
* Copyright (c) 2009, 2010 Antti Kantee. All Rights Reserved.
@@ -29,10 +29,10 @@
#ifdef _KERNEL
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: shmif_busops.c,v 1.11 2013/12/20 10:00:59 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: shmif_busops.c,v 1.12 2014/09/17 04:20:58 ozaki-r Exp $");
#else
#include <rump/rumpuser_port.h>
-__RCSID("$NetBSD: shmif_busops.c,v 1.11 2013/12/20 10:00:59 pooka Exp $");
+__RCSID("$NetBSD: shmif_busops.c,v 1.12 2014/09/17 04:20:58 ozaki-r Exp $");
#endif
#include <sys/param.h>
@@ -111,7 +111,7 @@ shmif_buswrite(struct shmif_mem *busmem,
memcpy(busmem->shm_data + off, data, chunk);
- DPRINTF(("buswrite: wrote %d bytes to %d", chunk, off));
+ DPRINTF(("buswrite: wrote %zu bytes to %d", chunk, off));
if (filledbus) {
*wrap = true;
@@ -122,7 +122,7 @@ shmif_buswrite(struct shmif_mem *busmem,
return (off + chunk) % BUSMEM_DATASIZE;
}
- DPRINTF((", wrapped bytes %d to 0\n", len));
+ DPRINTF((", wrapped bytes %zu to 0\n", len));
shmif_advancefirst(busmem, 0, len);
Index: src/sys/rump/net/lib/libshmif/shmifvar.h
diff -u src/sys/rump/net/lib/libshmif/shmifvar.h:1.9 src/sys/rump/net/lib/libshmif/shmifvar.h:1.10
--- src/sys/rump/net/lib/libshmif/shmifvar.h:1.9 Sat Aug 16 06:18:01 2014
+++ src/sys/rump/net/lib/libshmif/shmifvar.h Wed Sep 17 04:20:58 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: shmifvar.h,v 1.9 2014/08/16 06:18:01 ozaki-r Exp $ */
+/* $NetBSD: shmifvar.h,v 1.10 2014/09/17 04:20:58 ozaki-r Exp $ */
/*-
* Copyright (c) 2009, 2010 Antti Kantee. All Rights Reserved.
@@ -68,6 +68,7 @@ struct shmif_pkthdr {
#include <rump/rumpuser.h>
#define DPRINTF(x) rumpuser_dprintf x
#else
+#include <stdio.h>
#define DPRINTF(x) printf x
#endif
#else
