summaryrefslogtreecommitdiff
path: root/sys/dev/sbus
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2015-02-10 21:56:11 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2015-02-10 21:56:11 +0000
commitfb06ed88b5810f53d16a2f3f90904ed7ea4de07a (patch)
tree0ad268ca945306e22e87692f6bb02fcd1220d0e4 /sys/dev/sbus
parent4ed4205fc6bdb404dcf67f9f19347eea957f5982 (diff)
First step towards making uiomove() take a size_t size argument:
- rename uiomove() to uiomovei() and update all its users. - introduce uiomove(), which is similar to uiomovei() but with a size_t. - rewrite uiomovei() as an uiomove() wrapper. ok kettenis@
Diffstat (limited to 'sys/dev/sbus')
-rw-r--r--sys/dev/sbus/bpp.c4
-rw-r--r--sys/dev/sbus/magma.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/sbus/bpp.c b/sys/dev/sbus/bpp.c
index 88f3b21f796..f03f25ca8ba 100644
--- a/sys/dev/sbus/bpp.c
+++ b/sys/dev/sbus/bpp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bpp.c,v 1.3 2011/09/18 14:07:45 miod Exp $ */
+/* $OpenBSD: bpp.c,v 1.4 2015/02/10 21:56:09 miod Exp $ */
/* $NetBSD: bpp.c,v 1.25 2005/12/11 12:23:44 christos Exp $ */
/*-
@@ -305,7 +305,7 @@ bppwrite(dev_t dev, struct uio *uio, int flags)
caddr_t bp = sc->sc_buf;
size_t len = min(sc->sc_bufsz, uio->uio_resid);
- if ((error = uiomove(bp, len, uio)) != 0)
+ if ((error = uiomovei(bp, len, uio)) != 0)
break;
while (len > 0) {
diff --git a/sys/dev/sbus/magma.c b/sys/dev/sbus/magma.c
index 41de56dfee2..502d433f2aa 100644
--- a/sys/dev/sbus/magma.c
+++ b/sys/dev/sbus/magma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: magma.c,v 1.24 2014/07/12 18:48:52 tedu Exp $ */
+/* $OpenBSD: magma.c,v 1.25 2015/02/10 21:56:09 miod Exp $ */
/*-
* Copyright (c) 1998 Iain Hibbert
@@ -1549,7 +1549,7 @@ mbpp_rw(dev_t dev, struct uio *uio)
ptr = buffer;
if (uio->uio_rw == UIO_WRITE) {
- error = uiomove(ptr, len, uio);
+ error = uiomovei(ptr, len, uio);
if (error)
break;
}
@@ -1569,7 +1569,7 @@ mbpp_rw(dev_t dev, struct uio *uio)
if (uio->uio_rw == UIO_READ) {
if (cnt) {
- error = uiomove(ptr, cnt, uio);
+ error = uiomovei(ptr, cnt, uio);
if (error)
break;
gotdata++;