Module Name: src
Committed By: snj
Date: Wed Apr 19 17:15:18 UTC 2017
Modified Files:
src/sys/rump/dev/lib/libugenhc [netbsd-7]: ugenhc.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.22.2.1 -r1.22.2.2 src/sys/rump/dev/lib/libugenhc/ugenhc.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/rump/dev/lib/libugenhc/ugenhc.c
diff -u src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.22.2.1 src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.22.2.2
--- src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.22.2.1 Wed Apr 5 19:54:23 2017
+++ src/sys/rump/dev/lib/libugenhc/ugenhc.c Wed Apr 19 17:15:18 2017
@@ -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 @@ rhscintr(void *arg)
*/
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 @@ rumpusb_device_bulk_start(struct usbd_xf
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++)
