[src/netbsd-7]: src/sys/rump/dev/lib/libugenhc Pull up following revision(s) ...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a0d0ccff7c93
branches:  netbsd-7
changeset: 800190:a0d0ccff7c93
user:      snj <snj%NetBSD.org@localhost>
date:      Wed Apr 19 17:15:18 2017 +0000

description:
Pull up following revision(s) (requested by skrll in ticket #1403):
        sys/rump/dev/lib/libugenhc/ugenhc.c: revision 1.25, 1.26
Fix order of outputs in rumpuser_open call.
Now ugenhc works again after a four-year hiatus...
--
Fix bulk xfer buffer with usedma = false.

diffstat:

 sys/rump/dev/lib/libugenhc/ugenhc.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 639106d27125 -r a0d0ccff7c93 sys/rump/dev/lib/libugenhc/ugenhc.c
--- a/sys/rump/dev/lib/libugenhc/ugenhc.c       Wed Apr 19 17:09:38 2017 +0000
+++ b/sys/rump/dev/lib/libugenhc/ugenhc.c       Wed Apr 19 17:15:18 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ugenhc.c,v 1.22.2.1 2017/04/05 19:54:23 snj Exp $      */
+/*     $NetBSD: ugenhc.c,v 1.22.2.2 2017/04/19 17:15:18 snj Exp $      */
 
 /*
  * Copyright (c) 2009, 2010 Antti Kantee.  All Rights Reserved.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugenhc.c,v 1.22.2.1 2017/04/05 19:54:23 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugenhc.c,v 1.22.2.2 2017/04/19 17:15:18 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -489,7 +489,7 @@
                 */
 
                for (;;) {
-                       fd = rumpuser_open(buf, RUMPUSER_OPEN_RDWR, &error);
+                       error = rumpuser_open(buf, RUMPUSER_OPEN_RDWR, &fd);
                        if (fd == -1)
                                break;
 
@@ -603,7 +603,7 @@
        endpt = UE_GET_ADDR(endpt);
        KASSERT(endpt < UGEN_NEPTS);
 
-       buf = KERNADDR(&xfer->ux_dmabuf, 0);
+       buf = xfer->ux_buf;
        done = 0;
        if ((ed->bmAttributes & UE_XFERTYPE) == UE_ISOCHRONOUS) {
                for (i = 0, len = 0; i < xfer->ux_nframes; i++)