[src/trunk]: src/sys/dev/bluetooth Make this build again (ktrace-lwp branch c...

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

details:   https://anonhg.NetBSD.org/src/rev/6844f6ade28d
branches:  trunk
changeset: 586385:6844f6ade28d
user:      xtraeme <xtraeme%NetBSD.org@localhost>
date:      Sat Dec 17 13:18:28 2005 +0000

description:
Make this build again (ktrace-lwp branch changes).

diffstat:

 sys/dev/bluetooth/bthci.c    |  14 ++++++++------
 sys/dev/bluetooth/bthcivar.h |   8 ++++----
 2 files changed, 12 insertions(+), 10 deletions(-)

diffs (84 lines):

diff -r 5efccd5f9f9e -r 6844f6ade28d sys/dev/bluetooth/bthci.c
--- a/sys/dev/bluetooth/bthci.c Sat Dec 17 10:26:59 2005 +0000
+++ b/sys/dev/bluetooth/bthci.c Sat Dec 17 13:18:28 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bthci.c,v 1.17 2005/12/11 12:21:15 christos Exp $      */
+/*     $NetBSD: bthci.c,v 1.18 2005/12/17 13:18:28 xtraeme Exp $       */
 
 /*
  * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bthci.c,v 1.17 2005/12/11 12:21:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bthci.c,v 1.18 2005/12/17 13:18:28 xtraeme Exp $");
 
 #include "bthcidrv.h"
 
@@ -219,9 +219,10 @@
 }
 
 int
-bthciopen(dev_t dev, int flag, int mode, struct proc *p)
+bthciopen(dev_t dev, int flag, int mode, struct lwp *l)
 {
        struct bthci_softc *sc;
+       struct proc *p = l->l_proc;
        int error;
 
        sc = device_lookup(&bthci_cd, BTHCIUNIT(dev));
@@ -258,9 +259,10 @@
 }
 
 int
-bthciclose(dev_t dev, int flag, int mode, struct proc *p)
+bthciclose(dev_t dev, int flag, int mode, struct lwp *l)
 {
        struct bthci_softc *sc;
+       struct proc *p = l->l_proc;
        int error;
 
        sc = device_lookup(&bthci_cd, BTHCIUNIT(dev));
@@ -462,7 +464,7 @@
 #endif
 
 int
-bthcipoll(dev_t dev, int events, struct proc *p)
+bthcipoll(dev_t dev, int events, struct lwp *l)
 {
        struct bthci_softc *sc;
        int revents;
@@ -486,7 +488,7 @@
                } else {
                        DPRINTFN(2,("%s: recording read select\n",
                                    __func__));
-                       selrecord(p, &sc->sc_rd_sel);
+                       selrecord(l, &sc->sc_rd_sel);
                }
                splx(s);
        }
diff -r 5efccd5f9f9e -r 6844f6ade28d sys/dev/bluetooth/bthcivar.h
--- a/sys/dev/bluetooth/bthcivar.h      Sat Dec 17 10:26:59 2005 +0000
+++ b/sys/dev/bluetooth/bthcivar.h      Sat Dec 17 13:18:28 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bthcivar.h,v 1.3 2003/01/05 05:12:38 dsainty Exp $     */
+/*     $NetBSD: bthcivar.h,v 1.4 2005/12/17 13:18:28 xtraeme Exp $     */
 
 /*
  * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -37,11 +37,11 @@
  */
 
 struct bthci_methods {
-       int (*bt_open)(void *h, int flag, int mode, struct proc *p);
-       int (*bt_close)(void *h, int flag, int mode, struct proc *p);
+       int (*bt_open)(void *h, int flag, int mode, struct lwp *l);
+       int (*bt_close)(void *h, int flag, int mode, struct lwp *l);
        int (*bt_read)(void *h, struct uio *uio, int flag);
        int (*bt_write)(void *h, struct uio *uio, int flag);
-       int (*bt_poll)(void *h, int events, struct proc *p);
+       int (*bt_poll)(void *h, int events, struct lwp *l);
        int (*bt_kqfilter)(void *h, struct knote *kn);
 };