[src/yamt-uio_vmspace]: src/sys/dev/usb adapt dev/usb.

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

details:   https://anonhg.NetBSD.org/src/rev/98fdc185f917
branches:  yamt-uio_vmspace
changeset: 586714:98fdc185f917
user:      yamt <yamt%NetBSD.org@localhost>
date:      Sun Feb 05 12:54:07 2006 +0000

description:
adapt dev/usb.

diffstat:

 sys/dev/usb/ugen.c |  10 ++++------
 sys/dev/usb/urio.c |   7 +++----
 sys/dev/usb/usb.c  |   7 +++----
 3 files changed, 10 insertions(+), 14 deletions(-)

diffs (103 lines):

diff -r bf6fce56c082 -r 98fdc185f917 sys/dev/usb/ugen.c
--- a/sys/dev/usb/ugen.c        Sun Feb 05 12:48:22 2006 +0000
+++ b/sys/dev/usb/ugen.c        Sun Feb 05 12:54:07 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ugen.c,v 1.78 2005/12/11 12:24:01 christos Exp $       */
+/*     $NetBSD: ugen.c,v 1.78.2.1 2006/02/05 12:54:07 yamt Exp $       */
 
 /*
  * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.78 2005/12/11 12:24:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.78.2.1 2006/02/05 12:54:07 yamt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1225,9 +1225,8 @@
                uio.uio_iovcnt = 1;
                uio.uio_resid = len;
                uio.uio_offset = 0;
-               uio.uio_segflg = UIO_USERSPACE;
                uio.uio_rw = UIO_READ;
-               uio.uio_lwp = l;
+               uio.uio_vmspace = l->l_proc->p_vmspace;
                error = uiomove((void *)cdesc, len, &uio);
                free(cdesc, M_TEMP);
                return (error);
@@ -1271,11 +1270,10 @@
                        uio.uio_iovcnt = 1;
                        uio.uio_resid = len;
                        uio.uio_offset = 0;
-                       uio.uio_segflg = UIO_USERSPACE;
                        uio.uio_rw =
                                ur->ucr_request.bmRequestType & UT_READ ?
                                UIO_READ : UIO_WRITE;
-                       uio.uio_lwp = l;
+                       uio.uio_vmspace = l->l_proc->p_vmspace;
                        ptr = malloc(len, M_TEMP, M_WAITOK);
                        if (uio.uio_rw == UIO_WRITE) {
                                error = uiomove(ptr, len, &uio);
diff -r bf6fce56c082 -r 98fdc185f917 sys/dev/usb/urio.c
--- a/sys/dev/usb/urio.c        Sun Feb 05 12:48:22 2006 +0000
+++ b/sys/dev/usb/urio.c        Sun Feb 05 12:54:07 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: urio.c,v 1.21 2005/12/11 12:24:01 christos Exp $       */
+/*     $NetBSD: urio.c,v 1.21.2.1 2006/02/05 12:54:07 yamt Exp $       */
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: urio.c,v 1.21 2005/12/11 12:24:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: urio.c,v 1.21.2.1 2006/02/05 12:54:07 yamt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -548,10 +548,9 @@
                uio.uio_iovcnt = 1;
                uio.uio_resid = len;
                uio.uio_offset = 0;
-               uio.uio_segflg = UIO_USERSPACE;
                uio.uio_rw = req.bmRequestType & UT_READ ?
                             UIO_READ : UIO_WRITE;
-               uio.uio_lwp = l;
+               uio.uio_vmspace = l->l_proc->p_vmspace;
                ptr = malloc(len, M_TEMP, M_WAITOK);
                if (uio.uio_rw == UIO_WRITE) {
                        error = uiomove(ptr, len, &uio);
diff -r bf6fce56c082 -r 98fdc185f917 sys/dev/usb/usb.c
--- a/sys/dev/usb/usb.c Sun Feb 05 12:48:22 2006 +0000
+++ b/sys/dev/usb/usb.c Sun Feb 05 12:54:07 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: usb.c,v 1.84 2005/12/11 12:24:01 christos Exp $        */
+/*     $NetBSD: usb.c,v 1.84.2.1 2006/02/05 12:54:07 yamt Exp $        */
 
 /*
  * Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.84 2005/12/11 12:24:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.84.2.1 2006/02/05 12:54:07 yamt Exp $");
 
 #include "ohci.h"
 #include "uhci.h"
@@ -518,11 +518,10 @@
                        uio.uio_iovcnt = 1;
                        uio.uio_resid = len;
                        uio.uio_offset = 0;
-                       uio.uio_segflg = UIO_USERSPACE;
                        uio.uio_rw =
                                ur->ucr_request.bmRequestType & UT_READ ?
                                UIO_READ : UIO_WRITE;
-                       uio.uio_lwp = l;
+                       uio.uio_vmspace = l->l_proc->p_vmspace;
                        ptr = malloc(len, M_TEMP, M_WAITOK);
                        if (uio.uio_rw == UIO_WRITE) {
                                error = uiomove(ptr, len, &uio);