[src/trunk]: src/sys/dev/ic Merge the nathanw_sa branch.

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

details:   https://anonhg.NetBSD.org/src/rev/0b3ca5ad137d
branches:  trunk
changeset: 541774:0b3ca5ad137d
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sat Jan 18 10:14:20 2003 +0000

description:
Merge the nathanw_sa branch.

diffstat:

 sys/dev/ic/awi.c     |   6 +++---
 sys/dev/ic/dpt.c     |   8 ++++----
 sys/dev/ic/i82365.c  |   6 +++---
 sys/dev/ic/rrunner.c |  18 ++++++++++--------
 4 files changed, 20 insertions(+), 18 deletions(-)

diffs (164 lines):

diff -r a53dc420b4ea -r 0b3ca5ad137d sys/dev/ic/awi.c
--- a/sys/dev/ic/awi.c  Sat Jan 18 10:09:03 2003 +0000
+++ b/sys/dev/ic/awi.c  Sat Jan 18 10:14:20 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: awi.c,v 1.50 2002/10/01 03:27:04 onoe Exp $    */
+/*     $NetBSD: awi.c,v 1.51 2003/01/18 10:14:20 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1999,2000,2001 The NetBSD Foundation, Inc.
@@ -85,7 +85,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: awi.c,v 1.50 2002/10/01 03:27:04 onoe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awi.c,v 1.51 2003/01/18 10:14:20 thorpej Exp $");
 
 #include "opt_inet.h"
 #include "bpfilter.h"
@@ -1616,7 +1616,7 @@
 {
        int error = 0;
 
-       if (curproc == NULL) {
+       if (curlwp == NULL) {
                /*
                 * XXX
                 * Though driver ioctl should be called with context,
diff -r a53dc420b4ea -r 0b3ca5ad137d sys/dev/ic/dpt.c
--- a/sys/dev/ic/dpt.c  Sat Jan 18 10:09:03 2003 +0000
+++ b/sys/dev/ic/dpt.c  Sat Jan 18 10:14:20 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dpt.c,v 1.35 2002/12/10 20:06:43 fvdl Exp $    */
+/*     $NetBSD: dpt.c,v 1.36 2003/01/18 10:14:20 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1997, 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dpt.c,v 1.35 2002/12/10 20:06:43 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dpt.c,v 1.36 2003/01/18 10:14:20 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1332,7 +1332,7 @@
        /*
         * Start the command and sleep on completion.
         */
-       PHOLD(proc);
+       PHOLD(curlwp);  /* XXXJRT curlwp */
        bus_dmamap_sync(sc->sc_dmat, sc->sc_dmamap, CCB_OFF(sc, ccb), 
            sizeof(struct dpt_ccb), BUS_DMASYNC_PREWRITE);
        s = splbio();
@@ -1342,7 +1342,7 @@
                panic("%s: dpt_cmd failed", sc->sc_dv.dv_xname);
        tsleep(ccb, PWAIT, "dptucmd", 0);
        splx(s);
-       PRELE(proc);
+       PRELE(curlwp);  /* XXXJRT curlwp */
 
        /*
         * Sync up the DMA map and copy out results.
diff -r a53dc420b4ea -r 0b3ca5ad137d sys/dev/ic/i82365.c
--- a/sys/dev/ic/i82365.c       Sat Jan 18 10:09:03 2003 +0000
+++ b/sys/dev/ic/i82365.c       Sat Jan 18 10:14:20 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i82365.c,v 1.70 2003/01/01 00:10:18 thorpej Exp $      */
+/*     $NetBSD: i82365.c,v 1.71 2003/01/18 10:14:21 thorpej Exp $      */
 
 /*
  * Copyright (c) 2000 Christian E. Hopps.  All rights reserved.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82365.c,v 1.70 2003/01/01 00:10:18 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82365.c,v 1.71 2003/01/18 10:14:21 thorpej Exp $");
 
 #define        PCICDEBUG
 
@@ -1389,7 +1389,7 @@
                printf("called with timeout %d\n", timo);
                panic("pcic_delay");
        }
-       if (curproc == NULL) {
+       if (curlwp == NULL) {
                printf("called in interrupt context\n");
                panic("pcic_delay");
        }
diff -r a53dc420b4ea -r 0b3ca5ad137d sys/dev/ic/rrunner.c
--- a/sys/dev/ic/rrunner.c      Sat Jan 18 10:09:03 2003 +0000
+++ b/sys/dev/ic/rrunner.c      Sat Jan 18 10:14:20 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rrunner.c,v 1.35 2003/01/06 20:30:36 wiz Exp $ */
+/*     $NetBSD: rrunner.c,v 1.36 2003/01/18 10:14:22 thorpej Exp $     */
 
 /*
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rrunner.c,v 1.35 2003/01/06 20:30:36 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rrunner.c,v 1.36 2003/01/18 10:14:22 thorpej Exp $");
 
 #include "opt_inet.h"
 #include "opt_ns.h"
@@ -1008,7 +1008,8 @@
        struct uio *uio;
        int ioflag;
 {
-       struct proc *p = curproc;
+       struct lwp *l = curlwp;
+       struct proc *p = l->l_proc;
        struct iovec *iovp;
        struct esh_softc *sc;
        struct esh_fp_ring_ctl *ring;
@@ -1046,7 +1047,7 @@
                }
        }
        
-       PHOLD(p);       /* Lock process info into memory */
+       PHOLD(l);       /* Lock process info into memory */
 
        /* Lock down the pages */
        for (i = 0; i < uio->uio_iovcnt; i++) {
@@ -1150,7 +1151,7 @@
                uvm_vsunlock(p, iovp->iov_base, iovp->iov_len);
        }
 
-       PRELE(p);       /* Release process info */
+       PRELE(l);       /* Release process info */
        esh_free_dmainfo(sc, di);
 
 fpread_done:
@@ -1168,7 +1169,8 @@
        struct uio *uio;
        int ioflag;
 {
-       struct proc *p = curproc;
+       struct lwp *l = curlwp;
+       struct proc *p = l->l_proc;
        struct iovec *iovp;
        struct esh_softc *sc;
        struct esh_send_ring_ctl *ring;
@@ -1206,7 +1208,7 @@
                }
        }
        
-       PHOLD(p);       /* Lock process info into memory */
+       PHOLD(l);       /* Lock process info into memory */
 
        /* Lock down the pages */
        for (i = 0; i < uio->uio_iovcnt; i++) {
@@ -1306,7 +1308,7 @@
                uvm_vsunlock(p, iovp->iov_base, iovp->iov_len);
        }
 
-       PRELE(p);       /* Release process info */
+       PRELE(l);       /* Release process info */
        esh_free_dmainfo(sc, di);
 
 fpwrite_done: