diff options
| author | xtraeme <xtraeme@NetBSD.org> | 2005-12-17 13:18:28 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme@NetBSD.org> | 2005-12-17 13:18:28 +0000 |
| commit | 8810e90b328c1fbc9cf851bacee1edea97ec4e65 (patch) | |
| tree | fcd63111a019a6851e76191065e41f47b821b166 /sys/dev/bluetooth | |
| parent | 6b908020f296afcad64a235b9405f7d99cfcdb6c (diff) | |
Make this build again (ktrace-lwp branch changes).
Diffstat (limited to 'sys/dev/bluetooth')
| -rw-r--r-- | sys/dev/bluetooth/bthci.c | 14 | ||||
| -rw-r--r-- | sys/dev/bluetooth/bthcivar.h | 8 |
2 files changed, 12 insertions, 10 deletions
diff --git a/sys/dev/bluetooth/bthci.c b/sys/dev/bluetooth/bthci.c index c325058feae..a4b6e741fec 100644 --- a/sys/dev/bluetooth/bthci.c +++ b/sys/dev/bluetooth/bthci.c @@ -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 @@ bthci_detach(struct device *self, int flags) } 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 @@ bthciopen(dev_t dev, int flag, int mode, struct proc *p) } 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 @@ bthciioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p) #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 @@ bthcipoll(dev_t dev, int events, struct proc *p) } else { DPRINTFN(2,("%s: recording read select\n", __func__)); - selrecord(p, &sc->sc_rd_sel); + selrecord(l, &sc->sc_rd_sel); } splx(s); } diff --git a/sys/dev/bluetooth/bthcivar.h b/sys/dev/bluetooth/bthcivar.h index a786903e0c0..4601f63e2df 100644 --- a/sys/dev/bluetooth/bthcivar.h +++ b/sys/dev/bluetooth/bthcivar.h @@ -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); }; |
