diff options
| author | christos <christos@NetBSD.org> | 2005-12-11 12:16:03 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2005-12-11 12:16:03 +0000 |
| commit | 95e1ffb15694e54f29f8baaa4232152b703c2a5a (patch) | |
| tree | d6510e195bc06092a8057e34c6442eba4e77d09a /sys/dev/sequencer.c | |
| parent | 4f17ba81bcaf3f5086d88a346cbfd12506a5e3e6 (diff) | |
merge ktrace-lwp.
Diffstat (limited to 'sys/dev/sequencer.c')
| -rw-r--r-- | sys/dev/sequencer.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/sys/dev/sequencer.c b/sys/dev/sequencer.c index 4226db4211e..db0c908e27c 100644 --- a/sys/dev/sequencer.c +++ b/sys/dev/sequencer.c @@ -1,4 +1,4 @@ -/* $NetBSD: sequencer.c,v 1.29 2005/06/01 18:41:51 drochner Exp $ */ +/* $NetBSD: sequencer.c,v 1.30 2005/12/11 12:20:53 christos Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sequencer.c,v 1.29 2005/06/01 18:41:51 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sequencer.c,v 1.30 2005/12/11 12:20:53 christos Exp $"); #include "sequencer.h" @@ -171,10 +171,10 @@ sequencerattach(n) } int -sequenceropen(dev, flags, ifmt, p) +sequenceropen(dev, flags, ifmt, l) dev_t dev; int flags, ifmt; - struct proc *p; + struct lwp *l; { int unit = SEQUENCERUNIT(dev); struct sequencer_softc *sc; @@ -319,10 +319,10 @@ seq_startoutput(sc) } int -sequencerclose(dev, flags, ifmt, p) +sequencerclose(dev, flags, ifmt, l) dev_t dev; int flags, ifmt; - struct proc *p; + struct lwp *l; { struct sequencer_softc *sc = &seqdevs[SEQUENCERUNIT(dev)]; int n, s; @@ -488,12 +488,12 @@ sequencerwrite(dev, uio, ioflag) } int -sequencerioctl(dev, cmd, addr, flag, p) +sequencerioctl(dev, cmd, addr, flag, l) dev_t dev; u_long cmd; caddr_t addr; int flag; - struct proc *p; + struct lwp *l; { struct sequencer_softc *sc = &seqdevs[SEQUENCERUNIT(dev)]; struct synth_info *si; @@ -514,8 +514,8 @@ sequencerioctl(dev, cmd, addr, flag, p) if (*(int *)addr) { if (sc->async) return EBUSY; - sc->async = p; - DPRINTF(("sequencer_ioctl: FIOASYNC %p\n", p)); + sc->async = l->l_proc; + DPRINTF(("sequencer_ioctl: FIOASYNC %p\n", l)); } else sc->async = 0; break; @@ -643,10 +643,10 @@ sequencerioctl(dev, cmd, addr, flag, p) } int -sequencerpoll(dev, events, p) +sequencerpoll(dev, events, l) dev_t dev; int events; - struct proc *p; + struct lwp *l; { struct sequencer_softc *sc = &seqdevs[SEQUENCERUNIT(dev)]; int revents = 0; @@ -663,10 +663,10 @@ sequencerpoll(dev, events, p) if (revents == 0) { if (events & (POLLIN | POLLRDNORM)) - selrecord(p, &sc->rsel); + selrecord(l, &sc->rsel); if (events & (POLLOUT | POLLWRNORM)) - selrecord(p, &sc->wsel); + selrecord(l, &sc->wsel); } return revents; @@ -1454,10 +1454,10 @@ midi_unit_count() } int -midiopen(dev, flags, ifmt, p) +midiopen(dev, flags, ifmt, l) dev_t dev; int flags, ifmt; - struct proc *p; + struct lwp *l; { return (ENXIO); } @@ -1472,10 +1472,10 @@ midi_getinfo(dev, mi) } int -midiclose(dev, flags, ifmt, p) +midiclose(dev, flags, ifmt, l) dev_t dev; int flags, ifmt; - struct proc *p; + struct lwp *l; { return (ENXIO); } |
