summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authordarrenr <darrenr@NetBSD.org>2003-06-28 14:20:43 +0000
committerdarrenr <darrenr@NetBSD.org>2003-06-28 14:20:43 +0000
commit960df3c8d11a934b85f6f7d3ac388ec5ee57c12f (patch)
tree04eacdb0da6eefa4c57bf27833661e791d6a5853 /sys/dev
parentda6b84e29093b9bfc2c3f38bfa199d379d8984d5 (diff)
Pass lwp pointers throughtout the kernel, as required, so that the lwpid can
be inserted into ktrace records. The general change has been to replace "struct proc *" with "struct lwp *" in various function prototypes, pass the lwp through and use l_proc to get the process pointer when needed. Bump the kernel rev up to 1.6V
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/acpi/acpica/Osd/OsdSchedule.c6
-rw-r--r--sys/dev/ata/ld_ataraid.c4
-rw-r--r--sys/dev/ata/wd.c20
-rw-r--r--sys/dev/audio.c77
-rw-r--r--sys/dev/audio_if.h4
-rw-r--r--sys/dev/ccd.c60
-rw-r--r--sys/dev/cgd.c46
-rw-r--r--sys/dev/clockctl.c12
-rw-r--r--sys/dev/cons.c22
-rw-r--r--sys/dev/dksubr.c28
-rw-r--r--sys/dev/dkvar.h14
-rw-r--r--sys/dev/dmover/dmover_io.c8
-rw-r--r--sys/dev/i2o/dpti.c12
-rw-r--r--sys/dev/i2o/iop.c12
-rw-r--r--sys/dev/ic/com.c21
-rw-r--r--sys/dev/ic/cy.c26
-rw-r--r--sys/dev/ic/dpt.c16
-rw-r--r--sys/dev/ic/joy.c16
-rw-r--r--sys/dev/ic/lpt.c16
-rw-r--r--sys/dev/ic/mlx.c10
-rw-r--r--sys/dev/ic/rrunner.c19
-rw-r--r--sys/dev/ic/vga.c10
-rw-r--r--sys/dev/ic/vgavar.h4
-rw-r--r--sys/dev/ieee1394/fwohci.c12
-rw-r--r--sys/dev/ieee1394/ieee1394var.h4
-rw-r--r--sys/dev/ieee1394/sbp2.c6
-rw-r--r--sys/dev/ir/cirvar.h6
-rw-r--r--sys/dev/ir/irframe.c16
-rw-r--r--sys/dev/ir/irframe_tty.c26
-rw-r--r--sys/dev/ir/irframevar.h8
-rw-r--r--sys/dev/isa/fd.c26
-rw-r--r--sys/dev/isa/mcd.c18
-rw-r--r--sys/dev/isa/pcdisplay.c10
-rw-r--r--sys/dev/isa/spkr.c16
-rw-r--r--sys/dev/kttcp.c6
-rw-r--r--sys/dev/ld.c10
-rw-r--r--sys/dev/mca/ed_mca.c18
-rw-r--r--sys/dev/md.c26
-rw-r--r--sys/dev/midi.c22
-rw-r--r--sys/dev/midi_if.h4
-rw-r--r--sys/dev/midisyn.c10
-rw-r--r--sys/dev/midisynvar.h4
-rw-r--r--sys/dev/mm.c8
-rw-r--r--sys/dev/pci/agp.c10
-rw-r--r--sys/dev/pci/bktr/bktr_core.c10
-rw-r--r--sys/dev/pci/bktr/bktr_core.h6
-rw-r--r--sys/dev/pci/bktr/bktr_os.c26
-rw-r--r--sys/dev/pci/cz.c23
-rw-r--r--sys/dev/pci/if_wi_pci.c15
-rw-r--r--sys/dev/pci/machfb.c6
-rw-r--r--sys/dev/pci/mly.c10
-rw-r--r--sys/dev/pci/oboe.c16
-rw-r--r--sys/dev/pci/pci_usrreq.c10
-rw-r--r--sys/dev/pci/pcivar.h4
-rw-r--r--sys/dev/pci/twe.c10
-rw-r--r--sys/dev/pci/vga_pci.c10
-rw-r--r--sys/dev/radio.c14
-rw-r--r--sys/dev/raidframe/rf_copyback.c15
-rw-r--r--sys/dev/raidframe/rf_disks.c15
-rw-r--r--sys/dev/raidframe/rf_kintf.h4
-rw-r--r--sys/dev/raidframe/rf_netbsdkintf.c48
-rw-r--r--sys/dev/raidframe/rf_reconstruct.c16
-rw-r--r--sys/dev/rnd.c14
-rw-r--r--sys/dev/scsipi/cd.c18
-rw-r--r--sys/dev/scsipi/ch.c24
-rw-r--r--sys/dev/scsipi/scsiconf.c18
-rw-r--r--sys/dev/scsipi/scsipi_ioctl.c12
-rw-r--r--sys/dev/scsipi/scsipiconf.h4
-rw-r--r--sys/dev/scsipi/sd.c18
-rw-r--r--sys/dev/scsipi/ses.c18
-rw-r--r--sys/dev/scsipi/ss.c14
-rw-r--r--sys/dev/scsipi/st.c18
-rw-r--r--sys/dev/scsipi/uk.c18
-rw-r--r--sys/dev/sequencer.c36
-rw-r--r--sys/dev/sysmon/sysmon.c32
-rw-r--r--sys/dev/sysmon/sysmon_envsys.c12
-rw-r--r--sys/dev/sysmon/sysmon_power.c14
-rw-r--r--sys/dev/sysmon/sysmon_wdog.c12
-rw-r--r--sys/dev/sysmon/sysmonvar.h29
-rw-r--r--sys/dev/usb/ubtbcmfw.c6
-rw-r--r--sys/dev/usb/ucom.c28
-rw-r--r--sys/dev/usb/ugen.c26
-rw-r--r--sys/dev/usb/uhid.c24
-rw-r--r--sys/dev/usb/uirda.c18
-rw-r--r--sys/dev/usb/ulpt.c10
-rw-r--r--sys/dev/usb/urio.c14
-rw-r--r--sys/dev/usb/usb.c18
-rw-r--r--sys/dev/usb/uscanner.c12
-rw-r--r--sys/dev/usb/ustir.c24
-rw-r--r--sys/dev/verified_exec.c11
-rw-r--r--sys/dev/vnd.c39
-rw-r--r--sys/dev/wscons/wsdisplay.c54
-rw-r--r--sys/dev/wscons/wsdisplay_compat_usl.c11
-rw-r--r--sys/dev/wscons/wsdisplayvar.h14
-rw-r--r--sys/dev/wscons/wsevent.c8
-rw-r--r--sys/dev/wscons/wseventvar.h4
-rw-r--r--sys/dev/wscons/wskbd.c35
-rw-r--r--sys/dev/wscons/wsmouse.c32
-rw-r--r--sys/dev/wscons/wsmux.c30
-rw-r--r--sys/dev/wscons/wsmuxvar.h14
-rw-r--r--sys/dev/wsfont/wsfontdev.c10
101 files changed, 881 insertions, 859 deletions
diff --git a/sys/dev/acpi/acpica/Osd/OsdSchedule.c b/sys/dev/acpi/acpica/Osd/OsdSchedule.c
index a5d5d71a8d9..30ff54a0b7f 100644
--- a/sys/dev/acpi/acpica/Osd/OsdSchedule.c
+++ b/sys/dev/acpi/acpica/Osd/OsdSchedule.c
@@ -1,4 +1,4 @@
-/* $NetBSD: OsdSchedule.c,v 1.6 2003/04/20 20:21:30 thorpej Exp $ */
+/* $NetBSD: OsdSchedule.c,v 1.7 2003/06/28 14:21:32 darrenr Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: OsdSchedule.c,v 1.6 2003/04/20 20:21:30 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: OsdSchedule.c,v 1.7 2003/06/28 14:21:32 darrenr Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -103,7 +103,7 @@ AcpiOsGetThreadId(void)
KASSERT(curlwp != NULL);
/* XXX Bleh, we're not allowed to return 0 (how stupid!) */
- return (curproc->p_pid + 1);
+ return (curlwp->l_proc->p_pid + 1);
}
/*
diff --git a/sys/dev/ata/ld_ataraid.c b/sys/dev/ata/ld_ataraid.c
index dbe617d749f..5990530a5ca 100644
--- a/sys/dev/ata/ld_ataraid.c
+++ b/sys/dev/ata/ld_ataraid.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_ataraid.c,v 1.5 2003/06/07 23:37:25 thorpej Exp $ */
+/* $NetBSD: ld_ataraid.c,v 1.6 2003/06/28 14:21:32 darrenr Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -215,7 +215,7 @@ ld_ataraid_attach(struct device *parent, struct device *self, void *aux)
vp = sc->sc_vnodes[i];
sc->sc_vnodes[i] = NULL;
if (vp != NULL)
- (void) vn_close(vp, FREAD|FWRITE, NOCRED, curproc);
+ (void) vn_close(vp, FREAD|FWRITE, NOCRED, curlwp);
}
finish:
diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c
index 52467524b91..a052766fa75 100644
--- a/sys/dev/ata/wd.c
+++ b/sys/dev/ata/wd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wd.c,v 1.253 2003/05/17 21:52:03 thorpej Exp $ */
+/* $NetBSD: wd.c,v 1.254 2003/06/28 14:21:32 darrenr Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.253 2003/05/17 21:52:03 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.254 2003/06/28 14:21:32 darrenr Exp $");
#ifndef WDCDEBUG
#define WDCDEBUG
@@ -914,10 +914,10 @@ wdunlock(wd)
}
int
-wdopen(dev, flag, fmt, p)
+wdopen(dev, flag, fmt, l)
dev_t dev;
int flag, fmt;
- struct proc *p;
+ struct lwp *l;
{
struct wd_softc *wd;
int part, error;
@@ -997,10 +997,10 @@ bad4:
}
int
-wdclose(dev, flag, fmt, p)
+wdclose(dev, flag, fmt, l)
dev_t dev;
int flag, fmt;
- struct proc *p;
+ struct lwp *l;
{
struct wd_softc *wd = device_lookup(&wd_cd, WDUNIT(dev));
int part = WDPART(dev);
@@ -1164,12 +1164,12 @@ wdperror(wd)
}
int
-wdioctl(dev, xfer, addr, flag, p)
+wdioctl(dev, xfer, addr, flag, l)
dev_t dev;
u_long xfer;
caddr_t addr;
int flag;
- struct proc *p;
+ struct lwp *l;
{
struct wd_softc *wd = device_lookup(&wd_cd, WDUNIT(dev));
int error = 0;
@@ -1417,7 +1417,7 @@ bad:
wi->wi_uio.uio_segflg = UIO_USERSPACE;
wi->wi_uio.uio_rw =
(atareq->flags & ATACMD_READ) ? B_READ : B_WRITE;
- wi->wi_uio.uio_procp = p;
+ wi->wi_uio.uio_lwp = l;
error = physio(wdioctlstrategy, &wi->wi_bp, dev,
(atareq->flags & ATACMD_READ) ? B_READ : B_WRITE,
minphys, &wi->wi_uio);
@@ -1428,7 +1428,7 @@ bad:
wi->wi_bp.b_data = 0;
wi->wi_bp.b_bcount = 0;
wi->wi_bp.b_dev = 0;
- wi->wi_bp.b_proc = p;
+ wi->wi_bp.b_proc = l->l_proc;
wdioctlstrategy(&wi->wi_bp);
error = wi->wi_bp.b_error;
}
diff --git a/sys/dev/audio.c b/sys/dev/audio.c
index 3056b077a52..67a62533aaf 100644
--- a/sys/dev/audio.c
+++ b/sys/dev/audio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.178 2003/05/26 12:43:35 augustss Exp $ */
+/* $NetBSD: audio.c,v 1.179 2003/06/28 14:21:29 darrenr Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.178 2003/05/26 12:43:35 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.179 2003/06/28 14:21:29 darrenr Exp $");
#include "audio.h"
#if NAUDIO > 0
@@ -103,19 +103,19 @@ int audio_blk_ms = AUDIO_BLK_MS;
int audiosetinfo(struct audio_softc *, struct audio_info *);
int audiogetinfo(struct audio_softc *, struct audio_info *);
-int audio_open(dev_t, struct audio_softc *, int, int, struct proc *);
-int audio_close(struct audio_softc *, int, int, struct proc *);
+int audio_open(dev_t, struct audio_softc *, int, int, struct lwp *);
+int audio_close(struct audio_softc *, int, int, struct lwp *);
int audio_read(struct audio_softc *, struct uio *, int);
int audio_write(struct audio_softc *, struct uio *, int);
-int audio_ioctl(struct audio_softc *, u_long, caddr_t, int, struct proc *);
-int audio_poll(struct audio_softc *, int, struct proc *);
+int audio_ioctl(struct audio_softc *, u_long, caddr_t, int, struct lwp *);
+int audio_poll(struct audio_softc *, int, struct lwp *);
int audio_kqfilter(struct audio_softc *, struct knote *);
paddr_t audio_mmap(struct audio_softc *, off_t, int);
-int mixer_open(dev_t, struct audio_softc *, int, int, struct proc *);
-int mixer_close(struct audio_softc *, int, int, struct proc *);
-int mixer_ioctl(struct audio_softc *, u_long, caddr_t, int, struct proc *);
-static void mixer_remove(struct audio_softc *, struct proc *p);
+int mixer_open(dev_t, struct audio_softc *, int, int, struct lwp *);
+int mixer_close(struct audio_softc *, int, int, struct lwp *);
+int mixer_ioctl(struct audio_softc *, u_long, caddr_t, int, struct lwp *);
+static void mixer_remove(struct audio_softc *, struct lwp *p);
static void mixer_signal(struct audio_softc *);
void audio_init_record(struct audio_softc *);
@@ -538,7 +538,7 @@ audio_free_ring(struct audio_softc *sc, struct audio_ringbuffer *r)
}
int
-audioopen(dev_t dev, int flags, int ifmt, struct proc *p)
+audioopen(dev_t dev, int flags, int ifmt, struct lwp *l)
{
struct audio_softc *sc;
int error;
@@ -554,13 +554,13 @@ audioopen(dev_t dev, int flags, int ifmt, struct proc *p)
switch (AUDIODEV(dev)) {
case SOUND_DEVICE:
case AUDIO_DEVICE:
- error = audio_open(dev, sc, flags, ifmt, p);
+ error = audio_open(dev, sc, flags, ifmt, l);
break;
case AUDIOCTL_DEVICE:
error = 0;
break;
case MIXER_DEVICE:
- error = mixer_open(dev, sc, flags, ifmt, p);
+ error = mixer_open(dev, sc, flags, ifmt, l);
break;
default:
error = ENXIO;
@@ -572,7 +572,7 @@ audioopen(dev_t dev, int flags, int ifmt, struct proc *p)
}
int
-audioclose(dev_t dev, int flags, int ifmt, struct proc *p)
+audioclose(dev_t dev, int flags, int ifmt, struct lwp *l)
{
int unit = AUDIOUNIT(dev);
struct audio_softc *sc = audio_cd.cd_devs[unit];
@@ -581,10 +581,10 @@ audioclose(dev_t dev, int flags, int ifmt, struct proc *p)
switch (AUDIODEV(dev)) {
case SOUND_DEVICE:
case AUDIO_DEVICE:
- error = audio_close(sc, flags, ifmt, p);
+ error = audio_close(sc, flags, ifmt, l);
break;
case MIXER_DEVICE:
- error = mixer_close(sc, flags, ifmt, p);
+ error = mixer_close(sc, flags, ifmt, l);
break;
case AUDIOCTL_DEVICE:
error = 0;
@@ -661,7 +661,7 @@ audiowrite(dev_t dev, struct uio *uio, int ioflag)
}
int
-audioioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
+audioioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct lwp *l)
{
int unit = AUDIOUNIT(dev);
struct audio_softc *sc = audio_cd.cd_devs[unit];
@@ -675,10 +675,10 @@ audioioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
case SOUND_DEVICE:
case AUDIO_DEVICE:
case AUDIOCTL_DEVICE:
- error = audio_ioctl(sc, cmd, addr, flag, p);
+ error = audio_ioctl(sc, cmd, addr, flag, l);
break;
case MIXER_DEVICE:
- error = mixer_ioctl(sc, cmd, addr, flag, p);
+ error = mixer_ioctl(sc, cmd, addr, flag, l);
break;
default:
error = ENXIO;
@@ -690,7 +690,7 @@ audioioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
}
int
-audiopoll(dev_t dev, int events, struct proc *p)
+audiopoll(dev_t dev, int events, struct lwp *l)
{
int unit = AUDIOUNIT(dev);
struct audio_softc *sc = audio_cd.cd_devs[unit];
@@ -703,7 +703,7 @@ audiopoll(dev_t dev, int events, struct proc *p)
switch (AUDIODEV(dev)) {
case SOUND_DEVICE:
case AUDIO_DEVICE:
- error = audio_poll(sc, events, p);
+ error = audio_poll(sc, events, l);
break;
case AUDIOCTL_DEVICE:
case MIXER_DEVICE:
@@ -915,7 +915,7 @@ audio_wakeup(int *chan)
int
audio_open(dev_t dev, struct audio_softc *sc, int flags, int ifmt,
- struct proc *p)
+ struct lwp *l)
{
int error;
int mode;
@@ -1110,7 +1110,7 @@ audio_drain(struct audio_softc *sc)
*/
/* ARGSUSED */
int
-audio_close(struct audio_softc *sc, int flags, int ifmt, struct proc *p)
+audio_close(struct audio_softc *sc, int flags, int ifmt, struct lwp *l)
{
struct audio_hw_if *hw = sc->hw_if;
int s;
@@ -1760,7 +1760,7 @@ audio_write(struct audio_softc *sc, struct uio *uio, int ioflag)
int
audio_ioctl(struct audio_softc *sc, u_long cmd, caddr_t addr, int flag,
- struct proc *p)
+ struct lwp *l)
{
struct audio_hw_if *hw = sc->hw_if;
struct audio_offset *ao;
@@ -1782,8 +1782,8 @@ audio_ioctl(struct audio_softc *sc, u_long cmd, caddr_t addr, int flag,
if (*(int *)addr) {
if (sc->sc_async_audio)
return (EBUSY);
- sc->sc_async_audio = p;
- DPRINTF(("audio_ioctl: FIOASYNC %p\n", p));
+ sc->sc_async_audio = l->l_proc;
+ DPRINTF(("audio_ioctl: FIOASYNC %p\n", l->l_proc));
} else
sc->sc_async_audio = 0;
break;
@@ -1915,7 +1915,7 @@ audio_ioctl(struct audio_softc *sc, u_long cmd, caddr_t addr, int flag,
default:
if (hw->dev_ioctl) {
- error = hw->dev_ioctl(sc->hw_hdl, cmd, addr, flag, p);
+ error = hw->dev_ioctl(sc->hw_hdl, cmd, addr, flag, l);
} else {
DPRINTF(("audio_ioctl: unknown ioctl\n"));
error = EINVAL;
@@ -1928,7 +1928,7 @@ audio_ioctl(struct audio_softc *sc, u_long cmd, caddr_t addr, int flag,
}
int
-audio_poll(struct audio_softc *sc, int events, struct proc *p)
+audio_poll(struct audio_softc *sc, int events, struct lwp *l)
{
int revents = 0;
int s = splaudio();
@@ -1961,10 +1961,10 @@ audio_poll(struct audio_softc *sc, int events, struct proc *p)
if (revents == 0) {
if (events & (POLLIN | POLLRDNORM))
- selrecord(p, &sc->sc_rsel);
+ selrecord(l, &sc->sc_rsel);
if (events & (POLLOUT | POLLWRNORM))
- selrecord(p, &sc->sc_wsel);
+ selrecord(l, &sc->sc_wsel);
}
splx(s);
@@ -3193,7 +3193,7 @@ audiogetinfo(struct audio_softc *sc, struct audio_info *ai)
*/
int
mixer_open(dev_t dev, struct audio_softc *sc, int flags, int ifmt,
- struct proc *p)
+ struct lwp *l)
{
if (!sc->hw_if)
return (ENXIO);
@@ -3207,9 +3207,10 @@ mixer_open(dev_t dev, struct audio_softc *sc, int flags, int ifmt,
* Remove a process from those to be signalled on mixer activity.
*/
static void
-mixer_remove(struct audio_softc *sc, struct proc *p)
+mixer_remove(struct audio_softc *sc, struct lwp *l)
{
struct mixer_asyncs **pm, *m;
+ struct proc *p = l->l_proc;
for(pm = &sc->sc_async_mixer; *pm; pm = &(*pm)->next) {
if ((*pm)->proc == p) {
@@ -3238,18 +3239,18 @@ mixer_signal(struct audio_softc *sc)
*/
/* ARGSUSED */
int
-mixer_close(struct audio_softc *sc, int flags, int ifmt, struct proc *p)
+mixer_close(struct audio_softc *sc, int flags, int ifmt, struct lwp *l)
{
DPRINTF(("mixer_close: sc %p\n", sc));
- mixer_remove(sc, p);
+ mixer_remove(sc, l);
return (0);
}
int
mixer_ioctl(struct audio_softc *sc, u_long cmd, caddr_t addr, int flag,
- struct proc *p)
+ struct lwp *l)
{
struct audio_hw_if *hw = sc->hw_if;
int error = EINVAL;
@@ -3259,13 +3260,13 @@ mixer_ioctl(struct audio_softc *sc, u_long cmd, caddr_t addr, int flag,
switch (cmd) {
case FIOASYNC:
- mixer_remove(sc, p); /* remove old entry */
+ mixer_remove(sc, l); /* remove old entry */
if (*(int *)addr) {
struct mixer_asyncs *ma;
ma = malloc(sizeof (struct mixer_asyncs),
M_DEVBUF, M_WAITOK);
ma->next = sc->sc_async_mixer;
- ma->proc = p;
+ ma->proc = l->l_proc;
sc->sc_async_mixer = ma;
}
error = 0;
@@ -3298,7 +3299,7 @@ mixer_ioctl(struct audio_softc *sc, u_long cmd, caddr_t addr, int flag,
default:
if (hw->dev_ioctl)
- error = hw->dev_ioctl(sc->hw_hdl, cmd, addr, flag, p);
+ error = hw->dev_ioctl(sc->hw_hdl, cmd, addr, flag, l);
else
error = EINVAL;
break;
diff --git a/sys/dev/audio_if.h b/sys/dev/audio_if.h
index 5e591d01e17..b33321de9ec 100644
--- a/sys/dev/audio_if.h
+++ b/sys/dev/audio_if.h
@@ -1,4 +1,4 @@
-/* $NetBSD: audio_if.h,v 1.51 2003/04/06 18:20:12 wiz Exp $ */
+/* $NetBSD: audio_if.h,v 1.52 2003/06/28 14:21:30 darrenr Exp $ */
/*
* Copyright (c) 1994 Havard Eidnes.
@@ -146,7 +146,7 @@ struct audio_hw_if {
void (*)(void *), void *, struct audio_params *);
int (*trigger_input)(void *, void *, void *, int,
void (*)(void *), void *, struct audio_params *);
- int (*dev_ioctl)(void *, u_long, caddr_t, int, struct proc *);
+ int (*dev_ioctl)(void *, u_long, caddr_t, int, struct lwp *);
};
struct audio_attach_args {
diff --git a/sys/dev/ccd.c b/sys/dev/ccd.c
index 49534bd4067..24932c17067 100644
--- a/sys/dev/ccd.c
+++ b/sys/dev/ccd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ccd.c,v 1.88 2003/05/17 21:42:08 thorpej Exp $ */
+/* $NetBSD: ccd.c,v 1.89 2003/06/28 14:21:30 darrenr Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.88 2003/05/17 21:42:08 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.89 2003/06/28 14:21:30 darrenr Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -156,8 +156,8 @@ static void ccdstart __P((struct ccd_softc *));
static void ccdinterleave __P((struct ccd_softc *));
static void ccdintr __P((struct ccd_softc *, struct buf *));
static int ccdinit __P((struct ccd_softc *, char **, struct vnode **,
- struct proc *));
-static int ccdlookup __P((char *, struct proc *p, struct vnode **));
+ struct lwp *));
+static int ccdlookup __P((char *, struct lwp *l, struct vnode **));
static struct ccdbuf *ccdbuffer __P((struct ccd_softc *, struct buf *,
daddr_t, caddr_t, long));
static void ccdgetdefaultlabel __P((struct ccd_softc *, struct disklabel *));
@@ -230,11 +230,11 @@ ccdattach(num)
}
static int
-ccdinit(cs, cpaths, vpp, p)
+ccdinit(cs, cpaths, vpp, l)
struct ccd_softc *cs;
char **cpaths;
struct vnode **vpp;
- struct proc *p;
+ struct lwp *l;
{
struct ccdcinfo *ci = NULL;
size_t size;
@@ -289,7 +289,7 @@ ccdinit(cs, cpaths, vpp, p)
/*
* XXX: Cache the component's dev_t.
*/
- if ((error = VOP_GETATTR(vpp[ix], &va, p->p_ucred, p)) != 0) {
+ if ((error = VOP_GETATTR(vpp[ix], &va, l->l_proc->p_ucred, l)) != 0) {
#ifdef DEBUG
if (ccddebug & (CCDB_FOLLOW|CCDB_INIT))
printf("%s: %s: getattr failed %s = %d\n",
@@ -304,7 +304,7 @@ ccdinit(cs, cpaths, vpp, p)
* Get partition information for the component.
*/
error = VOP_IOCTL(vpp[ix], DIOCGPART, &dpart,
- FREAD, p->p_ucred, p);
+ FREAD, l->l_proc->p_ucred, l);
if (error) {
#ifdef DEBUG
if (ccddebug & (CCDB_FOLLOW|CCDB_INIT))
@@ -509,10 +509,10 @@ ccdinterleave(cs)
/* ARGSUSED */
int
-ccdopen(dev, flags, fmt, p)
+ccdopen(dev, flags, fmt, l)
dev_t dev;
int flags, fmt;
- struct proc *p;
+ struct lwp *l;
{
int unit = ccdunit(dev);
struct ccd_softc *cs;
@@ -575,10 +575,10 @@ ccdopen(dev, flags, fmt, p)
/* ARGSUSED */
int
-ccdclose(dev, flags, fmt, p)
+ccdclose(dev, flags, fmt, l)
dev_t dev;
int flags, fmt;
- struct proc *p;
+ struct lwp *l;
{
int unit = ccdunit(dev);
struct ccd_softc *cs;
@@ -977,12 +977,12 @@ ccdwrite(dev, uio, flags)
}
int
-ccdioctl(dev, cmd, data, flag, p)
+ccdioctl(dev, cmd, data, flag, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
int unit = ccdunit(dev);
int s, i, j, lookedup = 0, error;
@@ -992,6 +992,7 @@ ccdioctl(dev, cmd, data, flag, p)
struct ccd_ioctl *ccio = (struct ccd_ioctl *)data;
char **cpp;
struct vnode **vpp;
+ struct proc *p = l->l_proc;
#ifdef __HAVE_OLD_DISKLABEL
struct disklabel newlabel;
#endif
@@ -1093,10 +1094,10 @@ ccdioctl(dev, cmd, data, flag, p)
if (ccddebug & CCDB_INIT)
printf("ccdioctl: lookedup = %d\n", lookedup);
#endif
- if ((error = ccdlookup(cpp[i], p, &vpp[i])) != 0) {
+ if ((error = ccdlookup(cpp[i], l, &vpp[i])) != 0) {
for (j = 0; j < lookedup; ++j)
(void)vn_close(vpp[j], FREAD|FWRITE,
- p->p_ucred, p);
+ p->p_ucred, l);
free(vpp, M_DEVBUF);
free(cpp, M_DEVBUF);
goto out;
@@ -1107,10 +1108,10 @@ ccdioctl(dev, cmd, data, flag, p)
/*
* Initialize the ccd. Fills in the softc for us.
*/
- if ((error = ccdinit(cs, cpp, vpp, p)) != 0) {
+ if ((error = ccdinit(cs, cpp, vpp, l)) != 0) {
for (j = 0; j < lookedup; ++j)
(void)vn_close(vpp[j], FREAD|FWRITE,
- p->p_ucred, p);
+ p->p_ucred, l);
free(vpp, M_DEVBUF);
free(cpp, M_DEVBUF);
goto out;
@@ -1183,7 +1184,7 @@ ccdioctl(dev, cmd, data, flag, p)
cs->sc_cinfo[i].ci_vp);
#endif
(void)vn_close(cs->sc_cinfo[i].ci_vp, FREAD|FWRITE,
- p->p_ucred, p);
+ p->p_ucred, l);
free(cs->sc_cinfo[i].ci_path, M_DEVBUF);
}
@@ -1310,7 +1311,7 @@ ccdsize(dev)
omask = cs->sc_dkdev.dk_openmask & (1 << part);
lp = cs->sc_dkdev.dk_label;
- if (omask == 0 && ccdopen(dev, 0, S_IFBLK, curproc))
+ if (omask == 0 && ccdopen(dev, 0, S_IFBLK, curlwp))
return (-1);
if (lp->d_partitions[part].p_fstype != FS_SWAP)
@@ -1319,7 +1320,7 @@ ccdsize(dev)
size = lp->d_partitions[part].p_size *
(lp->d_secsize / DEV_BSIZE);
- if (omask == 0 && ccdclose(dev, 0, S_IFBLK, curproc))
+ if (omask == 0 && ccdclose(dev, 0, S_IFBLK, curlwp))
return (-1);
return (size);
@@ -1343,17 +1344,20 @@ ccddump(dev, blkno, va, size)
* set *vpp to the file's vnode.
*/
static int
-ccdlookup(path, p, vpp)
+ccdlookup(path, l, vpp)
char *path;
- struct proc *p;
+ struct lwp *l;
struct vnode **vpp; /* result */
{
struct nameidata nd;
struct vnode *vp;
struct vattr va;
+ struct proc *p;
int error;
- NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, path, p);
+ p = l->l_proc;
+
+ NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, path, l);
if ((error = vn_open(&nd, FREAD|FWRITE, 0)) != 0) {
#ifdef DEBUG
if (ccddebug & (CCDB_FOLLOW|CCDB_INIT))
@@ -1365,24 +1369,24 @@ ccdlookup(path, p, vpp)
if (vp->v_usecount > 1) {
VOP_UNLOCK(vp, 0);
- (void)vn_close(vp, FREAD|FWRITE, p->p_ucred, p);
+ (void)vn_close(vp, FREAD|FWRITE, p->p_ucred, l);
return (EBUSY);
}
- if ((error = VOP_GETATTR(vp, &va, p->p_ucred, p)) != 0) {
+ if ((error = VOP_GETATTR(vp, &va, p->p_ucred, l)) != 0) {
#ifdef DEBUG
if (ccddebug & (CCDB_FOLLOW|CCDB_INIT))
printf("ccdlookup: getattr error = %d\n", error);
#endif
VOP_UNLOCK(vp, 0);
- (void)vn_close(vp, FREAD|FWRITE, p->p_ucred, p);
+ (void)vn_close(vp, FREAD|FWRITE, p->p_ucred, l);
return (error);
}
/* XXX: eventually we should handle VREG, too. */
if (va.va_type != VBLK) {
VOP_UNLOCK(vp, 0);
- (void)vn_close(vp, FREAD|FWRITE, p->p_ucred, p);
+ (void)vn_close(vp, FREAD|FWRITE, p->p_ucred, l);
return (ENOTBLK);
}
diff --git a/sys/dev/cgd.c b/sys/dev/cgd.c
index f6070d9c423..88db923b3c5 100644
--- a/sys/dev/cgd.c
+++ b/sys/dev/cgd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd.c,v 1.10 2003/05/17 14:26:30 agc Exp $ */
+/* $NetBSD: cgd.c,v 1.11 2003/06/28 14:21:30 darrenr Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.10 2003/05/17 14:26:30 agc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.11 2003/06/28 14:21:30 darrenr Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -87,10 +87,10 @@ const struct cdevsw cgd_cdevsw = {
static void cgdstart(struct dk_softc *, struct buf *);
static void cgdiodone(struct buf *);
-static int cgd_ioctl_set(struct cgd_softc *, void *, struct proc *);
-static int cgd_ioctl_clr(struct cgd_softc *, void *, struct proc *);
+static int cgd_ioctl_set(struct cgd_softc *, void *, struct lwp *);
+static int cgd_ioctl_clr(struct cgd_softc *, void *, struct lwp *);
static int cgdinit(struct cgd_softc *, char *, struct vnode *,
- struct proc *);
+ struct lwp *);
static void cgd_cipher(struct cgd_softc *, caddr_t, caddr_t,
size_t, daddr_t, size_t, int);
@@ -213,23 +213,23 @@ cgdattach(int num)
}
int
-cgdopen(dev_t dev, int flags, int fmt, struct proc *p)
+cgdopen(dev_t dev, int flags, int fmt, struct lwp *l)
{
struct cgd_softc *cs;
DPRINTF_FOLLOW(("cgdopen(%d, %d)\n", dev, flags));
GETCGD_SOFTC(cs, dev);
- return dk_open(di, &cs->sc_dksc, dev, flags, fmt, p);
+ return dk_open(di, &cs->sc_dksc, dev, flags, fmt, l);
}
int
-cgdclose(dev_t dev, int flags, int fmt, struct proc *p)
+cgdclose(dev_t dev, int flags, int fmt, struct lwp *l)
{
struct cgd_softc *cs;
DPRINTF_FOLLOW(("cgdclose(%d, %d)\n", dev, flags));
GETCGD_SOFTC(cs, dev);
- return dk_close(di, &cs->sc_dksc, dev, flags, fmt, p);
+ return dk_close(di, &cs->sc_dksc, dev, flags, fmt, l);
}
void
@@ -410,7 +410,7 @@ cgdwrite(dev_t dev, struct uio *uio, int flags)
}
int
-cgdioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+cgdioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct cgd_softc *cs;
struct dk_softc *dksc;
@@ -419,7 +419,7 @@ cgdioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
int pmask = 1 << part;
DPRINTF_FOLLOW(("cgdioctl(%d, %ld, %p, %d, %p)\n",
- dev, cmd, data, flag, p));
+ dev, cmd, data, flag, l));
GETCGD_SOFTC(cs, dev);
dksc = &cs->sc_dksc;
switch (cmd) {
@@ -437,7 +437,7 @@ cgdioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
if (dksc->sc_flags & DKF_INITED)
ret = EBUSY;
else
- ret = cgd_ioctl_set(cs, data, p);
+ ret = cgd_ioctl_set(cs, data, l);
break;
case CGDIOCCLR:
if (!(dksc->sc_flags & DKF_INITED)) {
@@ -448,10 +448,10 @@ cgdioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
ret = EBUSY;
break;
}
- ret = cgd_ioctl_clr(cs, data, p);
+ ret = cgd_ioctl_clr(cs, data, l);
break;
default:
- ret = dk_ioctl(di, dksc, dev, cmd, data, flag, p);
+ ret = dk_ioctl(di, dksc, dev, cmd, data, flag, l);
break;
}
@@ -478,7 +478,7 @@ cgddump(dev_t dev, daddr_t blkno, caddr_t va, size_t size)
/* ARGSUSED */
static int
-cgd_ioctl_set(struct cgd_softc *cs, void *data, struct proc *p)
+cgd_ioctl_set(struct cgd_softc *cs, void *data, struct lwp *l)
{
struct cgd_ioctl *ci = data;
struct vnode *vp;
@@ -487,10 +487,10 @@ cgd_ioctl_set(struct cgd_softc *cs, void *data, struct proc *p)
char inbuf[MAX_KEYSIZE];
cp = ci->ci_disk;
- if ((ret = dk_lookup(cp, p, &vp)) != 0)
+ if ((ret = dk_lookup(cp, l, &vp)) != 0)
return ret;
- if ((ret = cgdinit(cs, cp, vp, p)) != 0)
+ if ((ret = cgdinit(cs, cp, vp, l)) != 0)
goto bail;
memset(inbuf, 0x0, sizeof(inbuf));
@@ -544,16 +544,16 @@ cgd_ioctl_set(struct cgd_softc *cs, void *data, struct proc *p)
return 0;
bail:
- (void)vn_close(vp, FREAD|FWRITE, p->p_ucred, p);
+ (void)vn_close(vp, FREAD|FWRITE, l->l_proc->p_ucred, l);
return ret;
}
/* ARGSUSED */
static int
-cgd_ioctl_clr(struct cgd_softc *cs, void *data, struct proc *p)
+cgd_ioctl_clr(struct cgd_softc *cs, void *data, struct lwp *l)
{
- (void)vn_close(cs->sc_tvn, FREAD|FWRITE, p->p_ucred, p);
+ (void)vn_close(cs->sc_tvn, FREAD|FWRITE, l->l_proc->p_ucred, l);
cs->sc_cfuncs->cf_destroy(cs->sc_cdata.cf_priv);
free(cs->sc_tpath, M_DEVBUF);
cs->sc_dksc.sc_flags &= ~DKF_INITED;
@@ -564,7 +564,7 @@ cgd_ioctl_clr(struct cgd_softc *cs, void *data, struct proc *p)
static int
cgdinit(struct cgd_softc *cs, char *cpath, struct vnode *vp,
- struct proc *p)
+ struct lwp *l)
{
struct dk_geom *pdg;
struct partinfo dpart;
@@ -584,12 +584,12 @@ cgdinit(struct cgd_softc *cs, char *cpath, struct vnode *vp,
cs->sc_tpath = malloc(cs->sc_tpathlen, M_DEVBUF, M_WAITOK);
memcpy(cs->sc_tpath, tmppath, cs->sc_tpathlen);
- if ((ret = VOP_GETATTR(vp, &va, p->p_ucred, p)) != 0)
+ if ((ret = VOP_GETATTR(vp, &va, l->l_proc->p_ucred, l)) != 0)
goto bail;
cs->sc_tdev = va.va_rdev;
- ret = VOP_IOCTL(vp, DIOCGPART, &dpart, FREAD, p->p_ucred, p);
+ ret = VOP_IOCTL(vp, DIOCGPART, &dpart, FREAD, l->l_proc->p_ucred, l);
if (ret)
goto bail;
diff --git a/sys/dev/clockctl.c b/sys/dev/clockctl.c
index 9828745a290..b0c1c32f4a7 100644
--- a/sys/dev/clockctl.c
+++ b/sys/dev/clockctl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: clockctl.c,v 1.10 2003/02/10 23:20:15 perry Exp $ */
+/* $NetBSD: clockctl.c,v 1.11 2003/06/28 14:21:30 darrenr Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clockctl.c,v 1.10 2003/02/10 23:20:15 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clockctl.c,v 1.11 2003/06/28 14:21:30 darrenr Exp $");
#include "opt_ntp.h"
@@ -69,12 +69,12 @@ clockctlattach(int num)
}
int
-clockctlioctl(dev, cmd, data, flags, p)
+clockctlioctl(dev, cmd, data, flags, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flags;
- struct proc *p;
+ struct lwp *l;
{
int error = 0;
@@ -84,7 +84,7 @@ clockctlioctl(dev, cmd, data, flags, p)
(struct sys_settimeofday_args *)data;
error = settimeofday1(SCARG(args, tv),
- SCARG(args, tzp), p);
+ SCARG(args, tzp), l->l_proc);
if (error)
return (error);
break;
@@ -94,7 +94,7 @@ clockctlioctl(dev, cmd, data, flags, p)
(struct sys_adjtime_args *)data;
error = adjtime1(SCARG(args, delta),
- SCARG(args, olddelta), p);
+ SCARG(args, olddelta), l->l_proc);
if (error)
return (error);
break;
diff --git a/sys/dev/cons.c b/sys/dev/cons.c
index 1d4da938ef4..fae46808136 100644
--- a/sys/dev/cons.c
+++ b/sys/dev/cons.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cons.c,v 1.46 2003/03/06 00:38:26 matt Exp $ */
+/* $NetBSD: cons.c,v 1.47 2003/06/28 14:21:30 darrenr Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cons.c,v 1.46 2003/03/06 00:38:26 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cons.c,v 1.47 2003/06/28 14:21:30 darrenr Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -76,7 +76,7 @@ struct consdev *cn_tab; /* physical console device info */
struct vnode *cn_devvp; /* vnode for underlying device. */
int
-cnopen(dev_t dev, int flag, int mode, struct proc *p)
+cnopen(dev_t dev, int flag, int mode, struct lwp *l)
{
const struct cdevsw *cdev;
dev_t cndev;
@@ -115,11 +115,11 @@ cnopen(dev_t dev, int flag, int mode, struct proc *p)
/* try to get a reference on its vnode, but fail silently */
cdevvp(cndev, &cn_devvp);
}
- return ((*cdev->d_open)(cndev, flag, mode, p));
+ return ((*cdev->d_open)(cndev, flag, mode, l));
}
int
-cnclose(dev_t dev, int flag, int mode, struct proc *p)
+cnclose(dev_t dev, int flag, int mode, struct lwp *l)
{
const struct cdevsw *cdev;
struct vnode *vp;
@@ -143,7 +143,7 @@ cnclose(dev_t dev, int flag, int mode, struct proc *p)
}
if (vfinddev(dev, VCHR, &vp) && vcount(vp))
return (0);
- return ((*cdev->d_close)(dev, flag, mode, p));
+ return ((*cdev->d_close)(dev, flag, mode, l));
}
int
@@ -192,7 +192,7 @@ cnwrite(dev_t dev, struct uio *uio, int flag)
}
int
-cnioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+cnioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
const struct cdevsw *cdev;
int error;
@@ -202,7 +202,7 @@ cnioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
* output from the "virtual" console.
*/
if (cmd == TIOCCONS && constty != NULL) {
- error = suser(p->p_ucred, (u_short *) NULL);
+ error = suser(l->l_proc->p_ucred, (u_short *) NULL);
if (error)
return (error);
constty = NULL;
@@ -224,12 +224,12 @@ cnioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
cdev = cdevsw_lookup(dev);
if (cdev == NULL)
return (ENXIO);
- return ((*cdev->d_ioctl)(dev, cmd, data, flag, p));
+ return ((*cdev->d_ioctl)(dev, cmd, data, flag, l));
}
/*ARGSUSED*/
int
-cnpoll(dev_t dev, int events, struct proc *p)
+cnpoll(dev_t dev, int events, struct lwp *l)
{
const struct cdevsw *cdev;
@@ -247,7 +247,7 @@ cnpoll(dev_t dev, int events, struct proc *p)
cdev = cdevsw_lookup(dev);
if (cdev == NULL)
return (ENXIO);
- return ((*cdev->d_poll)(dev, events, p));
+ return ((*cdev->d_poll)(dev, events, l));
}
/*ARGSUSED*/
diff --git a/sys/dev/dksubr.c b/sys/dev/dksubr.c
index 0df4a125012..86564676a28 100644
--- a/sys/dev/dksubr.c
+++ b/sys/dev/dksubr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dksubr.c,v 1.7 2003/05/12 00:19:00 atatat Exp $ */
+/* $NetBSD: dksubr.c,v 1.8 2003/06/28 14:21:31 darrenr Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2002 The NetBSD Foundation, Inc.
@@ -85,7 +85,7 @@ dk_sc_init(struct dk_softc *dksc, void *osc, char *xname)
/* ARGSUSED */
int
dk_open(struct dk_intf *di, struct dk_softc *dksc, dev_t dev,
- int flags, int fmt, struct proc *p)
+ int flags, int fmt, struct lwp *l)
{
struct disklabel *lp = dksc->sc_dkdev.dk_label;
int part = DISKPART(dev);
@@ -138,7 +138,7 @@ done:
/* ARGSUSED */
int
dk_close(struct dk_intf *di, struct dk_softc *dksc, dev_t dev,
- int flags, int fmt, struct proc *p)
+ int flags, int fmt, struct lwp *l)
{
int part = DISKPART(dev);
int pmask = 1 << part;
@@ -223,7 +223,7 @@ dk_size(struct dk_intf *di, struct dk_softc *dksc, dev_t dev)
part = DISKPART(dev);
is_open = dksc->sc_dkdev.dk_openmask & (1 << part);
- if (!is_open && di->di_open(dev, 0, S_IFBLK, curproc))
+ if (!is_open && di->di_open(dev, 0, S_IFBLK, curlwp))
return -1;
lp = dksc->sc_dkdev.dk_label;
@@ -233,7 +233,7 @@ dk_size(struct dk_intf *di, struct dk_softc *dksc, dev_t dev)
size = lp->d_partitions[part].p_size *
(lp->d_secsize / DEV_BSIZE);
- if (!is_open && di->di_close(dev, 0, S_IFBLK, curproc))
+ if (!is_open && di->di_close(dev, 0, S_IFBLK, curlwp))
return 1;
return size;
@@ -241,7 +241,7 @@ dk_size(struct dk_intf *di, struct dk_softc *dksc, dev_t dev)
int
dk_ioctl(struct dk_intf *di, struct dk_softc *dksc, dev_t dev,
- u_long cmd, caddr_t data, int flag, struct proc *p)
+ u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct disklabel *lp;
#ifdef __HAVE_OLD_DISKLABEL
@@ -497,17 +497,19 @@ dk_makedisklabel(struct dk_intf *di, struct dk_softc *dksc)
* set *vpp to the file's vnode.
*/
int
-dk_lookup(path, p, vpp)
+dk_lookup(path, l, vpp)
char *path;
- struct proc *p;
+ struct lwp *l;
struct vnode **vpp; /* result */
{
struct nameidata nd;
struct vnode *vp;
struct vattr va;
+ struct proc *p;
int error;
- NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, path, p);
+ p = l->l_proc;
+ NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, path, l);
if ((error = vn_open(&nd, FREAD|FWRITE, 0)) != 0) {
DPRINTF((DKDB_FOLLOW|DKDB_INIT),
("dk_lookup: vn_open error = %d\n", error));
@@ -517,22 +519,22 @@ dk_lookup(path, p, vpp)
if (vp->v_usecount > 1) {
VOP_UNLOCK(vp, 0);
- (void)vn_close(vp, FREAD|FWRITE, p->p_ucred, p);
+ (void)vn_close(vp, FREAD|FWRITE, p->p_ucred, l);
return (EBUSY);
}
- if ((error = VOP_GETATTR(vp, &va, p->p_ucred, p)) != 0) {
+ if ((error = VOP_GETATTR(vp, &va, p->p_ucred, l)) != 0) {
DPRINTF((DKDB_FOLLOW|DKDB_INIT),
("dk_lookup: getattr error = %d\n", error));
VOP_UNLOCK(vp, 0);
- (void)vn_close(vp, FREAD|FWRITE, p->p_ucred, p);
+ (void)vn_close(vp, FREAD|FWRITE, p->p_ucred, l);
return (error);
}
/* XXX: eventually we should handle VREG, too. */
if (va.va_type != VBLK) {
VOP_UNLOCK(vp, 0);
- (void)vn_close(vp, FREAD|FWRITE, p->p_ucred, p);
+ (void)vn_close(vp, FREAD|FWRITE, p->p_ucred, l);
return (ENOTBLK);
}
diff --git a/sys/dev/dkvar.h b/sys/dev/dkvar.h
index c35811f6d19..dfd424310b4 100644
--- a/sys/dev/dkvar.h
+++ b/sys/dev/dkvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dkvar.h,v 1.1 2002/10/04 18:02:00 elric Exp $ */
+/* $NetBSD: dkvar.h,v 1.2 2003/06/28 14:21:31 darrenr Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -85,8 +85,8 @@ struct dk_softc {
struct dk_intf {
int di_dtype; /* disk type */
char *di_dkname; /* disk type name */
- int (*di_open)(dev_t, int, int, struct proc *);
- int (*di_close)(dev_t, int, int, struct proc *);
+ int (*di_open)(dev_t, int, int, struct lwp *);
+ int (*di_close)(dev_t, int, int, struct lwp *);
void (*di_strategy)(struct buf *);
void (*di_diskstart)(struct dk_softc *, struct buf *);
};
@@ -103,17 +103,17 @@ struct dk_intf {
void dk_sc_init(struct dk_softc *, void *, char *);
int dk_open(struct dk_intf *, struct dk_softc *, dev_t,
- int, int, struct proc *);
+ int, int, struct lwp *);
int dk_close(struct dk_intf *, struct dk_softc *, dev_t,
- int, int, struct proc *);
+ int, int, struct lwp *);
void dk_strategy(struct dk_intf *, struct dk_softc *, struct buf *);
int dk_size(struct dk_intf *, struct dk_softc *, dev_t);
int dk_ioctl(struct dk_intf *, struct dk_softc *, dev_t,
- u_long, caddr_t, int, struct proc *);
+ u_long, caddr_t, int, struct lwp *);
int dk_dump(struct dk_intf *, struct dk_softc *, dev_t,
daddr_t, caddr_t, size_t);
void dk_getdisklabel(struct dk_intf *, struct dk_softc *, dev_t);
void dk_getdefaultlabel(struct dk_intf *, struct dk_softc *,
struct disklabel *);
-int dk_lookup(char *, struct proc *, struct vnode **);
+int dk_lookup(char *, struct lwp *, struct vnode **);
diff --git a/sys/dev/dmover/dmover_io.c b/sys/dev/dmover/dmover_io.c
index 23cc1cb6581..714fe7e593f 100644
--- a/sys/dev/dmover/dmover_io.c
+++ b/sys/dev/dmover/dmover_io.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dmover_io.c,v 1.9 2003/05/30 11:37:47 scw Exp $ */
+/* $NetBSD: dmover_io.c,v 1.10 2003/06/28 14:21:33 darrenr Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dmover_io.c,v 1.9 2003/05/30 11:37:47 scw Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dmover_io.c,v 1.10 2003/06/28 14:21:33 darrenr Exp $");
#include <sys/param.h>
#include <sys/queue.h>
@@ -172,7 +172,7 @@ dmio_usrreq_init(struct file *fp, struct dmio_usrreq_state *dus,
uio_out->uio_resid = len;
uio_out->uio_rw = UIO_READ;
uio_out->uio_segflg = UIO_USERSPACE;
- uio_out->uio_procp = curproc;
+ uio_out->uio_lwp = curlwp;
dreq->dreq_outbuf_type = DMOVER_BUF_UIO;
dreq->dreq_outbuf.dmbuf_uio = uio_out;
@@ -233,7 +233,7 @@ dmio_usrreq_init(struct file *fp, struct dmio_usrreq_state *dus,
uio_in->uio_resid = len;
uio_in->uio_rw = UIO_WRITE;
uio_in->uio_segflg = UIO_USERSPACE;
- uio_in->uio_procp = curproc;
+ uio_in->uio_lwp = curlwp;
dreq->dreq_inbuf[i].dmbuf_uio = uio_in;
}
diff --git a/sys/dev/i2o/dpti.c b/sys/dev/i2o/dpti.c
index 98cda8c4e09..6f4d3460cb4 100644
--- a/sys/dev/i2o/dpti.c
+++ b/sys/dev/i2o/dpti.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dpti.c,v 1.11 2003/02/14 18:29:05 thorpej Exp $ */
+/* $NetBSD: dpti.c,v 1.12 2003/06/28 14:21:33 darrenr Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dpti.c,v 1.11 2003/02/14 18:29:05 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dpti.c,v 1.12 2003/06/28 14:21:33 darrenr Exp $");
#include "opt_i2o.h"
@@ -205,7 +205,7 @@ dpti_attach(struct device *parent, struct device *self, void *aux)
}
int
-dptiopen(dev_t dev, int flag, int mode, struct proc *p)
+dptiopen(dev_t dev, int flag, int mode, struct lwp *l)
{
if (securelevel > 1)
@@ -217,7 +217,7 @@ dptiopen(dev_t dev, int flag, int mode, struct proc *p)
}
int
-dptiioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+dptiioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct iop_softc *iop;
struct dpti_softc *sc;
@@ -274,9 +274,9 @@ dptiioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
tsleep(&sc->sc_nactive, PRIBIO, "dptislp", 0);
if (linux)
- rv = dpti_passthrough(sc, data, p);
+ rv = dpti_passthrough(sc, data, l->l_proc);
else
- rv = dpti_passthrough(sc, *(caddr_t *)data, p);
+ rv = dpti_passthrough(sc, *(caddr_t *)data, l->l_proc);
sc->sc_nactive--;
wakeup_one(&sc->sc_nactive);
diff --git a/sys/dev/i2o/iop.c b/sys/dev/i2o/iop.c
index b9db3bb3f61..cc941554917 100644
--- a/sys/dev/i2o/iop.c
+++ b/sys/dev/i2o/iop.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iop.c,v 1.36 2003/05/03 18:11:10 wiz Exp $ */
+/* $NetBSD: iop.c,v 1.37 2003/06/28 14:21:33 darrenr Exp $ */
/*-
* Copyright (c) 2000, 2001, 2002 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.36 2003/05/03 18:11:10 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.37 2003/06/28 14:21:33 darrenr Exp $");
#include "opt_i2o.h"
#include "iop.h"
@@ -2461,7 +2461,7 @@ int iop_util_eventreg(struct iop_softc *sc, struct iop_initiator *ii, int mask)
}
int
-iopopen(dev_t dev, int flag, int mode, struct proc *p)
+iopopen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct iop_softc *sc;
@@ -2477,7 +2477,7 @@ iopopen(dev_t dev, int flag, int mode, struct proc *p)
}
int
-iopclose(dev_t dev, int flag, int mode, struct proc *p)
+iopclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct iop_softc *sc;
@@ -2488,7 +2488,7 @@ iopclose(dev_t dev, int flag, int mode, struct proc *p)
}
int
-iopioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+iopioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct iop_softc *sc;
struct iovec *iov;
@@ -2501,7 +2501,7 @@ iopioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
switch (cmd) {
case IOPIOCPT:
- return (iop_passthrough(sc, (struct ioppt *)data, p));
+ return (iop_passthrough(sc, (struct ioppt *)data, l->l_proc));
case IOPIOCGSTATUS:
iov = (struct iovec *)data;
diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c
index 2d6d1df83b9..13b06a8834d 100644
--- a/sys/dev/ic/com.c
+++ b/sys/dev/ic/com.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com.c,v 1.213 2003/06/23 11:01:57 martin Exp $ */
+/* $NetBSD: com.c,v 1.214 2003/06/28 14:21:34 darrenr Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.213 2003/06/23 11:01:57 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.214 2003/06/28 14:21:34 darrenr Exp $");
#include "opt_com.h"
#include "opt_ddb.h"
@@ -810,7 +810,7 @@ com_shutdown(struct com_softc *sc)
}
int
-comopen(dev_t dev, int flag, int mode, struct proc *p)
+comopen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct com_softc *sc;
struct tty *tp;
@@ -837,7 +837,7 @@ comopen(dev_t dev, int flag, int mode, struct proc *p)
if (ISSET(tp->t_state, TS_ISOPEN) &&
ISSET(tp->t_state, TS_XCLUDE) &&
- p->p_ucred->cr_uid != 0)
+ l->l_proc->p_ucred->cr_uid != 0)
return (EBUSY);
s = spltty();
@@ -964,7 +964,7 @@ bad:
}
int
-comclose(dev_t dev, int flag, int mode, struct proc *p)
+comclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct com_softc *sc = device_lookup(&com_cd, COMUNIT(dev));
struct tty *tp = sc->sc_tty;
@@ -1016,7 +1016,7 @@ comwrite(dev_t dev, struct uio *uio, int flag)
}
int
-compoll(dev_t dev, int events, struct proc *p)
+compoll(dev_t dev, int events, struct lwp *l)
{
struct com_softc *sc = device_lookup(&com_cd, COMUNIT(dev));
struct tty *tp = sc->sc_tty;
@@ -1024,7 +1024,7 @@ compoll(dev_t dev, int events, struct proc *p)
if (COM_ISALIVE(sc) == 0)
return (EIO);
- return ((*tp->t_linesw->l_poll)(tp, events, p));
+ return (*tp->t_linesw->l_poll)(tp, events, l);
}
struct tty *
@@ -1037,21 +1037,22 @@ comtty(dev_t dev)
}
int
-comioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+comioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct com_softc *sc = device_lookup(&com_cd, COMUNIT(dev));
struct tty *tp = sc->sc_tty;
+ struct proc *p = l->l_proc;
int error;
int s;
if (COM_ISALIVE(sc) == 0)
return (EIO);
- error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, p);
+ error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return (error);
- error = ttioctl(tp, cmd, data, flag, p);
+ error = ttioctl(tp, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return (error);
diff --git a/sys/dev/ic/cy.c b/sys/dev/ic/cy.c
index baafbf88a69..03e20d76ff8 100644
--- a/sys/dev/ic/cy.c
+++ b/sys/dev/ic/cy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cy.c,v 1.30 2003/01/31 00:26:29 thorpej Exp $ */
+/* $NetBSD: cy.c,v 1.31 2003/06/28 14:21:34 darrenr Exp $ */
/*
* cy.c
@@ -16,7 +16,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cy.c,v 1.30 2003/01/31 00:26:29 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cy.c,v 1.31 2003/06/28 14:21:34 darrenr Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -272,7 +272,7 @@ cy_getport(dev_t dev)
* open routine. returns zero if successful, else error code
*/
int
-cyopen(dev_t dev, int flag, int mode, struct proc *p)
+cyopen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct cy_softc *sc;
struct cy_port *cy;
@@ -372,7 +372,8 @@ cyopen(dev_t dev, int flag, int mode, struct proc *p)
SET(tp->t_state, TS_CARR_ON);
else
CLR(tp->t_state, TS_CARR_ON);
- } else if (ISSET(tp->t_state, TS_XCLUDE) && p->p_ucred->cr_uid != 0) {
+ } else if (ISSET(tp->t_state, TS_XCLUDE) &&
+ l->l_proc->p_ucred->cr_uid != 0) {
return EBUSY;
} else {
s = spltty();
@@ -401,7 +402,7 @@ cyopen(dev_t dev, int flag, int mode, struct proc *p)
* close routine. returns zero if successful, else error code
*/
int
-cyclose(dev_t dev, int flag, int mode, struct proc *p)
+cyclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct cy_softc *sc;
struct cy_port *cy;
@@ -469,10 +470,7 @@ cywrite(dev_t dev, struct uio *uio, int flag)
* Poll routine
*/
int
-cypoll(dev, events, p)
- dev_t dev;
- int events;
- struct proc *p;
+cypoll(dev_t dev, int events, struct lwp *l)
{
struct cy_port *cy;
struct tty *tp;
@@ -480,7 +478,7 @@ cypoll(dev, events, p)
cy = CY_PORT(dev);
tp = cy->cy_tty;
- return ((*tp->t_linesw->l_poll)(tp, events, p));
+ return ((*tp->t_linesw->l_poll)(tp, events, l));
}
/*
@@ -500,22 +498,24 @@ cytty(dev_t dev)
* ioctl routine
*/
int
-cyioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+cyioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct cy_softc *sc;
struct cy_port *cy;
+ struct proc *p;
struct tty *tp;
int error;
+ p = l ? l->l_proc : NULL;
cy = CY_PORT(dev);
sc = CY_BOARD(cy);
tp = cy->cy_tty;
- error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, p);
+ error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return error;
- error = ttioctl(tp, cmd, data, flag, p);
+ error = ttioctl(tp, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return error;
diff --git a/sys/dev/ic/dpt.c b/sys/dev/ic/dpt.c
index e93be6323cf..57dbb3c12ee 100644
--- a/sys/dev/ic/dpt.c
+++ b/sys/dev/ic/dpt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dpt.c,v 1.39 2003/01/31 00:26:29 thorpej Exp $ */
+/* $NetBSD: dpt.c,v 1.40 2003/06/28 14:21:34 darrenr 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.39 2003/01/31 00:26:29 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dpt.c,v 1.40 2003/06/28 14:21:34 darrenr Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -197,7 +197,7 @@ static void dpt_ctlrinfo(struct dpt_softc *, struct dpt_eata_ctlrinfo *);
static void dpt_hba_inquire(struct dpt_softc *, struct eata_inquiry_data **);
static void dpt_minphys(struct buf *);
static int dpt_passthrough(struct dpt_softc *, struct eata_ucp *,
- struct proc *);
+ struct lwp *);
static void dpt_scsipi_request(struct scsipi_channel *,
scsipi_adapter_req_t, void *);
static void dpt_shutdown(void *);
@@ -1109,7 +1109,7 @@ dpt_hba_inquire(struct dpt_softc *sc, struct eata_inquiry_data **ei)
}
int
-dptopen(dev_t dev, int flag, int mode, struct proc *p)
+dptopen(dev_t dev, int flag, int mode, struct lwp *l)
{
if (securelevel > 1)
@@ -1121,7 +1121,7 @@ dptopen(dev_t dev, int flag, int mode, struct proc *p)
}
int
-dptioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+dptioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct dpt_softc *sc;
int rv;
@@ -1161,7 +1161,7 @@ dptioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
if (sc->sc_uactive++)
tsleep(&sc->sc_uactive, PRIBIO, "dptslp", 0);
- rv = dpt_passthrough(sc, (struct eata_ucp *)data, p);
+ rv = dpt_passthrough(sc, (struct eata_ucp *)data, l);
sc->sc_uactive--;
wakeup_one(&sc->sc_uactive);
@@ -1267,7 +1267,7 @@ dpt_sysinfo(struct dpt_softc *sc, struct dpt_sysinfo *info)
}
int
-dpt_passthrough(struct dpt_softc *sc, struct eata_ucp *ucp, struct proc *proc)
+dpt_passthrough(struct dpt_softc *sc, struct eata_ucp *ucp, struct lwp *l)
{
struct dpt_ccb *ccb;
struct eata_sp sp;
@@ -1307,7 +1307,7 @@ dpt_passthrough(struct dpt_softc *sc, struct eata_ucp *ucp, struct proc *proc)
return (EFBIG);
}
rv = bus_dmamap_load(sc->sc_dmat, xfer,
- ucp->ucp_dataaddr, ucp->ucp_datalen, proc,
+ ucp->ucp_dataaddr, ucp->ucp_datalen, l->l_proc,
BUS_DMA_WAITOK | BUS_DMA_STREAMING |
(datain ? BUS_DMA_READ : BUS_DMA_WRITE));
if (rv != 0) {
diff --git a/sys/dev/ic/joy.c b/sys/dev/ic/joy.c
index 259cbf0a79a..64d52858774 100644
--- a/sys/dev/ic/joy.c
+++ b/sys/dev/ic/joy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: joy.c,v 1.4 2002/10/23 09:13:17 jdolecek Exp $ */
+/* $NetBSD: joy.c,v 1.5 2003/06/28 14:21:34 darrenr Exp $ */
/*-
* Copyright (c) 1995 Jean-Marc Zucconi
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: joy.c,v 1.4 2002/10/23 09:13:17 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: joy.c,v 1.5 2003/06/28 14:21:34 darrenr Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -106,10 +106,10 @@ joyattach(sc)
}
int
-joyopen(dev, flag, mode, p)
+joyopen(dev, flag, mode, l)
dev_t dev;
int flag, mode;
- struct proc *p;
+ struct lwp *l;
{
int unit = JOYUNIT(dev);
int i = JOYPART(dev);
@@ -130,10 +130,10 @@ joyopen(dev, flag, mode, p)
}
int
-joyclose(dev, flag, mode, p)
+joyclose(dev, flag, mode, l)
dev_t dev;
int flag, mode;
- struct proc *p;
+ struct lwp *l;
{
int unit = JOYUNIT(dev);
int i = JOYPART(dev);
@@ -187,12 +187,12 @@ joyread(dev, uio, flag)
}
int
-joyioctl(dev, cmd, data, flag, p)
+joyioctl(dev, cmd, data, flag, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
int unit = JOYUNIT(dev);
struct joy_softc *sc = joy_cd.cd_devs[unit];
diff --git a/sys/dev/ic/lpt.c b/sys/dev/ic/lpt.c
index 4f608564bca..c93c8428615 100644
--- a/sys/dev/ic/lpt.c
+++ b/sys/dev/ic/lpt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt.c,v 1.61 2002/12/10 07:19:25 rafal Exp $ */
+/* $NetBSD: lpt.c,v 1.62 2003/06/28 14:21:34 darrenr Exp $ */
/*
* Copyright (c) 1993, 1994 Charles M. Hannum.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt.c,v 1.61 2002/12/10 07:19:25 rafal Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt.c,v 1.62 2003/06/28 14:21:34 darrenr Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -127,11 +127,11 @@ lpt_attach_subr(sc)
* Reset the printer, then wait until it's selected and not busy.
*/
int
-lptopen(dev, flag, mode, p)
+lptopen(dev, flag, mode, l)
dev_t dev;
int flag;
int mode;
- struct proc *p;
+ struct lwp *l;
{
u_char flags = LPTFLAGS(dev);
struct lpt_softc *sc;
@@ -252,11 +252,11 @@ lptwakeup(arg)
* Close the device, and free the local line buffer.
*/
int
-lptclose(dev, flag, mode, p)
+lptclose(dev, flag, mode, l)
dev_t dev;
int flag;
int mode;
- struct proc *p;
+ struct lwp *l;
{
struct lpt_softc *sc = device_lookup(&lpt_cd, LPTUNIT(dev));
bus_space_tag_t iot = sc->sc_iot;
@@ -419,12 +419,12 @@ lptintr(arg)
}
int
-lptioctl(dev, cmd, data, flag, p)
+lptioctl(dev, cmd, data, flag, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
int error = 0;
diff --git a/sys/dev/ic/mlx.c b/sys/dev/ic/mlx.c
index 3b6967d3d82..4555d2522b4 100644
--- a/sys/dev/ic/mlx.c
+++ b/sys/dev/ic/mlx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mlx.c,v 1.26 2003/01/01 00:10:19 thorpej Exp $ */
+/* $NetBSD: mlx.c,v 1.27 2003/06/28 14:21:35 darrenr Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mlx.c,v 1.26 2003/01/01 00:10:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mlx.c,v 1.27 2003/06/28 14:21:35 darrenr Exp $");
#include "ld.h"
@@ -722,7 +722,7 @@ mlx_adjqparam(struct mlx_softc *mlx, int mpu, int slop)
* Accept an open operation on the control device.
*/
int
-mlxopen(dev_t dev, int flag, int mode, struct proc *p)
+mlxopen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct mlx_softc *mlx;
@@ -741,7 +741,7 @@ mlxopen(dev_t dev, int flag, int mode, struct proc *p)
* Accept the last close on the control device.
*/
int
-mlxclose(dev_t dev, int flag, int mode, struct proc *p)
+mlxclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct mlx_softc *mlx;
@@ -754,7 +754,7 @@ mlxclose(dev_t dev, int flag, int mode, struct proc *p)
* Handle control operations.
*/
int
-mlxioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+mlxioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct mlx_softc *mlx;
struct mlx_rebuild_request *rb;
diff --git a/sys/dev/ic/rrunner.c b/sys/dev/ic/rrunner.c
index 7981c43da8f..46bf1915215 100644
--- a/sys/dev/ic/rrunner.c
+++ b/sys/dev/ic/rrunner.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rrunner.c,v 1.37 2003/01/31 00:26:31 thorpej Exp $ */
+/* $NetBSD: rrunner.c,v 1.38 2003/06/28 14:21:35 darrenr 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.37 2003/01/31 00:26:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rrunner.c,v 1.38 2003/06/28 14:21:35 darrenr Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
@@ -711,11 +711,7 @@ bad_init:
*/
int
-esh_fpopen(dev, oflags, devtype, p)
- dev_t dev;
- int oflags;
- int devtype;
- struct proc *p;
+esh_fpopen(dev_t dev, int oflags, int devtype, struct lwp *l)
{
struct esh_softc *sc;
struct rr_ring_ctl *ring_ctl;
@@ -932,11 +928,7 @@ bad_fp_dmamem_alloc:
int
-esh_fpclose(dev, fflag, devtype, p)
- dev_t dev;
- int fflag;
- int devtype;
- struct proc *p;
+esh_fpclose(dev_t dev, int fflag, int devtype, struct lwp *l)
{
struct esh_softc *sc;
struct rr_ring_ctl *ring_ctl;
@@ -2042,7 +2034,8 @@ eshstart(ifp)
*/
error = bus_dmamap_load(sc->sc_dmat, send->ec_dma,
- bp->b_data, bp->b_bcount, bp->b_proc,
+ bp->b_data, bp->b_bcount,
+ bp->b_proc,
BUS_DMA_WRITE|BUS_DMA_NOWAIT);
if (error)
diff --git a/sys/dev/ic/vga.c b/sys/dev/ic/vga.c
index 10e00fb3c96..f0465a5b15f 100644
--- a/sys/dev/ic/vga.c
+++ b/sys/dev/ic/vga.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vga.c,v 1.69 2003/02/09 10:29:35 jdolecek Exp $ */
+/* $NetBSD: vga.c,v 1.70 2003/06/28 14:21:35 darrenr Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.69 2003/02/09 10:29:35 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.70 2003/06/28 14:21:35 darrenr Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -247,7 +247,7 @@ const struct wsscreen_list vga_screenlist = {
_vga_scrlist_mono
};
-static int vga_ioctl(void *, u_long, caddr_t, int, struct proc *);
+static int vga_ioctl(void *, u_long, caddr_t, int, struct lwp *);
static paddr_t vga_mmap(void *, off_t, int);
static int vga_alloc_screen(void *, const struct wsscreen_descr *,
void **, int *, int *, long *);
@@ -716,7 +716,7 @@ vga_set_video(struct vga_config *vc, int state)
}
int
-vga_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
+vga_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct vga_config *vc = v;
const struct vga_funcs *vf = vc->vc_funcs;
@@ -756,7 +756,7 @@ vga_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
if (vf->vf_ioctl == NULL)
return (EPASSTHROUGH);
- return ((*vf->vf_ioctl)(v, cmd, data, flag, p));
+ return ((*vf->vf_ioctl)(v, cmd, data, flag, l));
}
static paddr_t
diff --git a/sys/dev/ic/vgavar.h b/sys/dev/ic/vgavar.h
index 2e11e0f4f9b..40d4f6c6555 100644
--- a/sys/dev/ic/vgavar.h
+++ b/sys/dev/ic/vgavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: vgavar.h,v 1.19 2003/02/09 10:29:36 jdolecek Exp $ */
+/* $NetBSD: vgavar.h,v 1.20 2003/06/28 14:21:35 darrenr Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -42,7 +42,7 @@ struct vga_handle {
#define vh_memh vh_ph.ph_memh
struct vga_funcs {
- int (*vf_ioctl)(void *, u_long, caddr_t, int, struct proc *);
+ int (*vf_ioctl)(void *, u_long, caddr_t, int, struct lwp *);
paddr_t (*vf_mmap)(void *, off_t, int);
};
diff --git a/sys/dev/ieee1394/fwohci.c b/sys/dev/ieee1394/fwohci.c
index 31e97eab648..e40829e16fa 100644
--- a/sys/dev/ieee1394/fwohci.c
+++ b/sys/dev/ieee1394/fwohci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fwohci.c,v 1.76 2003/05/26 16:10:36 haya Exp $ */
+/* $NetBSD: fwohci.c,v 1.77 2003/06/28 14:21:35 darrenr Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.76 2003/05/26 16:10:36 haya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.77 2003/06/28 14:21:35 darrenr Exp $");
#define FWOHCI_WAIT_DEBUG 1
@@ -178,7 +178,7 @@ int fwohci_ir_ctx_clear(struct device *, ieee1394_ir_tag_t);
int fwohci_ir_read(struct device *, ieee1394_ir_tag_t, struct uio *,
int, int);
int fwohci_ir_wait(struct device *, ieee1394_ir_tag_t, void *, char *name);
-int fwohci_ir_select(struct device *, ieee1394_ir_tag_t, struct proc *);
+int fwohci_ir_select(struct device *, ieee1394_ir_tag_t, struct lwp *);
@@ -5295,12 +5295,12 @@ fwohci_ir_wait(struct device *dev, ieee1394_ir_tag_t tag, void *wchan, char *nam
/*
* int fwohci_ir_select(struct device *dev, ieee1394_ir_tag_t tag,
- * struct proc *p)
+ * struct lwp *l)
*
* This function returns the number of packets in queue.
*/
int
-fwohci_ir_select(struct device *dev, ieee1394_ir_tag_t tag, struct proc *p)
+fwohci_ir_select(struct device *dev, ieee1394_ir_tag_t tag, struct lwp *l)
{
struct fwohci_ir_ctx *irc = (struct fwohci_ir_ctx *)tag;
int pktnum;
@@ -5311,7 +5311,7 @@ fwohci_ir_select(struct device *dev, ieee1394_ir_tag_t tag, struct proc *p)
}
if ((pktnum = fwohci_ir_ctx_packetnum(irc)) == 0) {
- selrecord(p, &irc->irc_sel);
+ selrecord(l, &irc->irc_sel);
}
return pktnum;
diff --git a/sys/dev/ieee1394/ieee1394var.h b/sys/dev/ieee1394/ieee1394var.h
index 72b255f0c70..73d4f742263 100644
--- a/sys/dev/ieee1394/ieee1394var.h
+++ b/sys/dev/ieee1394/ieee1394var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee1394var.h,v 1.18 2002/12/13 07:47:53 jmc Exp $ */
+/* $NetBSD: ieee1394var.h,v 1.19 2003/06/28 14:21:36 darrenr Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -118,7 +118,7 @@ struct ieee1394_softc {
int (*sc1394_ir_wait)(struct device *, ieee1394_ir_tag_t,
void *, char *);
int (*sc1394_ir_select)(struct device *, ieee1394_ir_tag_t,
- struct proc *);
+ struct lwp *);
/* for isochronous transmission */
ieee1394_it_tag_t (*sc1394_it_open)(struct device *, int, int, int);
diff --git a/sys/dev/ieee1394/sbp2.c b/sys/dev/ieee1394/sbp2.c
index 31c6cadff34..848b99d8468 100644
--- a/sys/dev/ieee1394/sbp2.c
+++ b/sys/dev/ieee1394/sbp2.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sbp2.c,v 1.16 2003/03/07 20:18:57 jmc Exp $ */
+/* $NetBSD: sbp2.c,v 1.17 2003/06/28 14:21:36 darrenr Exp $ */
/*
* Copyright (c) 2001,2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbp2.c,v 1.16 2003/03/07 20:18:57 jmc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbp2.c,v 1.17 2003/06/28 14:21:36 darrenr Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -780,7 +780,7 @@ sbp2_runcmd(struct sbp2 *sbp2, struct sbp2_cmd *cmd)
io.uio_rw = UIO_WRITE;
else
io.uio_rw = UIO_READ;
- io.uio_procp = NULL;
+ io.uio_lwp = NULL;
iov.iov_base = cmd->data;
iov.iov_len = cmd->datalen;
orb->pt = sbp2_alloc_pt(&io, cmd->rw, orb);
diff --git a/sys/dev/ir/cirvar.h b/sys/dev/ir/cirvar.h
index 98032f67100..c22c38d655b 100644
--- a/sys/dev/ir/cirvar.h
+++ b/sys/dev/ir/cirvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cirvar.h,v 1.2 2001/12/12 15:33:53 augustss Exp $ */
+/* $NetBSD: cirvar.h,v 1.3 2003/06/28 14:21:36 darrenr Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,8 +37,8 @@
*/
struct cir_methods {
- int (*im_open)(void *h, int flag, int mode, struct proc *p);
- int (*im_close)(void *h, int flag, int mode, struct proc *p);
+ int (*im_open)(void *h, int flag, int mode, struct lwp *l);
+ int (*im_close)(void *h, int flag, int mode, struct lwp *l);
int (*im_read)(void *h, struct uio *uio, int flag);
int (*im_write)(void *h, struct uio *uio, int flag);
int (*im_setparams)(void *h, struct cir_params *params);
diff --git a/sys/dev/ir/irframe.c b/sys/dev/ir/irframe.c
index 4f92845ffdf..49035a8920e 100644
--- a/sys/dev/ir/irframe.c
+++ b/sys/dev/ir/irframe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: irframe.c,v 1.24 2003/04/17 12:34:25 fvdl Exp $ */
+/* $NetBSD: irframe.c,v 1.25 2003/06/28 14:21:36 darrenr Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -182,7 +182,7 @@ irframe_detach(struct device *self, int flags)
}
int
-irframeopen(dev_t dev, int flag, int mode, struct proc *p)
+irframeopen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct irframe_softc *sc;
int error;
@@ -195,7 +195,7 @@ irframeopen(dev_t dev, int flag, int mode, struct proc *p)
if (sc->sc_open)
return (EBUSY);
if (sc->sc_methods->im_open != NULL) {
- error = sc->sc_methods->im_open(sc->sc_handle, flag, mode, p);
+ error = sc->sc_methods->im_open(sc->sc_handle, flag, mode, l);
if (error)
return (error);
}
@@ -208,7 +208,7 @@ irframeopen(dev_t dev, int flag, int mode, struct proc *p)
}
int
-irframeclose(dev_t dev, int flag, int mode, struct proc *p)
+irframeclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct irframe_softc *sc;
int error;
@@ -218,7 +218,7 @@ irframeclose(dev_t dev, int flag, int mode, struct proc *p)
return (ENXIO);
sc->sc_open = 0;
if (sc->sc_methods->im_close != NULL)
- error = sc->sc_methods->im_close(sc->sc_handle, flag, mode, p);
+ error = sc->sc_methods->im_close(sc->sc_handle, flag, mode, l);
else
error = 0;
return (error);
@@ -336,7 +336,7 @@ irf_reset_params(struct irframe_softc *sc)
}
int
-irframeioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
+irframeioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct lwp *l)
{
struct irframe_softc *sc;
void *vaddr = addr;
@@ -378,7 +378,7 @@ irframeioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
}
int
-irframepoll(dev_t dev, int events, struct proc *p)
+irframepoll(dev_t dev, int events, struct lwp *l)
{
struct irframe_softc *sc;
@@ -388,7 +388,7 @@ irframepoll(dev_t dev, int events, struct proc *p)
if ((sc->sc_dev.dv_flags & DVF_ACTIVE) == 0 || !sc->sc_open)
return (EIO);
- return (sc->sc_methods->im_poll(sc->sc_handle, events, p));
+ return (sc->sc_methods->im_poll(sc->sc_handle, events, l));
}
int
diff --git a/sys/dev/ir/irframe_tty.c b/sys/dev/ir/irframe_tty.c
index f6c49e7ad65..8365f427e44 100644
--- a/sys/dev/ir/irframe_tty.c
+++ b/sys/dev/ir/irframe_tty.c
@@ -1,4 +1,4 @@
-/* $NetBSD: irframe_tty.c,v 1.24 2003/06/13 15:09:17 uwe Exp $ */
+/* $NetBSD: irframe_tty.c,v 1.25 2003/06/28 14:21:36 darrenr Exp $ */
/*
* TODO
@@ -130,7 +130,7 @@ struct irframet_softc {
int irframetopen(dev_t dev, struct tty *tp);
int irframetclose(struct tty *tp, int flag);
int irframetioctl(struct tty *tp, u_long cmd, caddr_t data, int flag,
- struct proc *);
+ struct lwp *);
int irframetinput(int c, struct tty *tp);
int irframetstart(struct tty *tp);
@@ -138,11 +138,11 @@ int irframetstart(struct tty *tp);
void irframettyattach(int);
/* irframe methods */
-Static int irframet_open(void *h, int flag, int mode, struct proc *p);
-Static int irframet_close(void *h, int flag, int mode, struct proc *p);
+Static int irframet_open(void *h, int flag, int mode, struct lwp *l);
+Static int irframet_close(void *h, int flag, int mode, struct lwp *l);
Static int irframet_read(void *h, struct uio *uio, int flag);
Static int irframet_write(void *h, struct uio *uio, int flag);
-Static int irframet_poll(void *h, int events, struct proc *p);
+Static int irframet_poll(void *h, int events, struct lwp *l);
Static int irframet_kqfilter(void *h, struct knote *kn);
Static int irframet_set_params(void *h, struct irda_params *params);
Static int irframet_get_speeds(void *h, int *speeds);
@@ -204,10 +204,12 @@ irframettyattach(int n)
int
irframetopen(dev_t dev, struct tty *tp)
{
- struct proc *p = curproc; /* XXX */
+ struct lwp *l = curlwp; /* XXX */
struct irframet_softc *sc;
+ struct proc *p;
int error, s;
+ p = l->l_proc;
DPRINTF(("%s\n", __FUNCTION__));
if ((error = suser(p->p_ucred, &p->p_acflag)) != 0)
@@ -282,7 +284,7 @@ irframetclose(struct tty *tp, int flag)
/* ARGSUSED */
int
irframetioctl(struct tty *tp, u_long cmd, caddr_t data, int flag,
- struct proc *p)
+ struct lwp *l)
{
struct irframet_softc *sc = (struct irframet_softc *)tp->t_sc;
int error;
@@ -456,7 +458,7 @@ irframetinput(int c, struct tty *tp)
/*** irframe methods ***/
int
-irframet_open(void *h, int flag, int mode, struct proc *p)
+irframet_open(void *h, int flag, int mode, struct lwp *l)
{
struct tty *tp = h;
struct irframet_softc *sc = (struct irframet_softc *)tp->t_sc;
@@ -477,7 +479,7 @@ irframet_open(void *h, int flag, int mode, struct proc *p)
}
int
-irframet_close(void *h, int flag, int mode, struct proc *p)
+irframet_close(void *h, int flag, int mode, struct lwp *l)
{
struct tty *tp = h;
struct irframet_softc *sc = (struct irframet_softc *)tp->t_sc;
@@ -635,7 +637,7 @@ irt_write_frame(struct tty *tp, u_int8_t *buf, size_t len)
}
int
-irframet_poll(void *h, int events, struct proc *p)
+irframet_poll(void *h, int events, struct lwp *l)
{
struct tty *tp = h;
struct irframet_softc *sc = (struct irframet_softc *)tp->t_sc;
@@ -656,7 +658,7 @@ irframet_poll(void *h, int events, struct proc *p)
revents |= events & (POLLIN | POLLRDNORM);
} else {
DPRINTF(("%s: recording select\n", __FUNCTION__));
- selrecord(p, &sc->sc_rsel);
+ selrecord(l, &sc->sc_rsel);
}
}
splx(s);
@@ -832,7 +834,7 @@ irt_ioctl(struct tty *tp, u_long cmd, void *arg)
dev = tp->t_dev;
cdev = cdevsw_lookup(dev);
if (cdev != NULL)
- error = (*cdev->d_ioctl)(dev, cmd, arg, 0, curproc);
+ error = (*cdev->d_ioctl)(dev, cmd, arg, 0, curlwp);
else
error = ENXIO;
#ifdef DIAGNOSTIC
diff --git a/sys/dev/ir/irframevar.h b/sys/dev/ir/irframevar.h
index d8f4156246e..72c5d3969c0 100644
--- a/sys/dev/ir/irframevar.h
+++ b/sys/dev/ir/irframevar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: irframevar.h,v 1.10 2003/01/03 09:46:41 dsainty Exp $ */
+/* $NetBSD: irframevar.h,v 1.11 2003/06/28 14:21:36 darrenr Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -37,11 +37,11 @@
*/
struct irframe_methods {
- int (*im_open)(void *h, int flag, int mode, struct proc *p);
- int (*im_close)(void *h, int flag, int mode, struct proc *p);
+ int (*im_open)(void *h, int flag, int mode, struct lwp *l);
+ int (*im_close)(void *h, int flag, int mode, struct lwp *l);
int (*im_read)(void *h, struct uio *uio, int flag);
int (*im_write)(void *h, struct uio *uio, int flag);
- int (*im_poll)(void *h, int events, struct proc *p);
+ int (*im_poll)(void *h, int events, struct lwp *l);
int (*im_kqfilter)(void *h, struct knote *kn);
int (*im_set_params)(void *h, struct irda_params *params);
int (*im_get_speeds)(void *h, int *speeds);
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c
index fbd708fc424..d1acb9d223d 100644
--- a/sys/dev/isa/fd.c
+++ b/sys/dev/isa/fd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.43 2003/06/12 14:44:37 drochner Exp $ */
+/* $NetBSD: fd.c,v 1.44 2003/06/28 14:21:37 darrenr Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -92,7 +92,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.43 2003/06/12 14:44:37 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.44 2003/06/28 14:21:37 darrenr Exp $");
#include "rnd.h"
#include "opt_ddb.h"
@@ -253,7 +253,7 @@ void fdcpseudointr __P((void *arg));
void fdcretry __P((struct fdc_softc *fdc));
void fdfinish __P((struct fd_softc *fd, struct buf *bp));
__inline const struct fd_type *fd_dev_to_type __P((struct fd_softc *, dev_t));
-int fdformat __P((dev_t, struct ne7_fd_formb *, struct proc *));
+int fdformat __P((dev_t, struct ne7_fd_formb *, struct lwp *));
void fd_mountroot_hook __P((struct device *));
@@ -790,11 +790,11 @@ out_fdc(iot, ioh, x)
}
int
-fdopen(dev, flags, mode, p)
+fdopen(dev, flags, mode, l)
dev_t dev;
int flags;
int mode;
- struct proc *p;
+ struct lwp *l;
{
struct fd_softc *fd;
const struct fd_type *type;
@@ -820,11 +820,11 @@ fdopen(dev, flags, mode, p)
}
int
-fdclose(dev, flags, mode, p)
+fdclose(dev, flags, mode, l)
dev_t dev;
int flags;
int mode;
- struct proc *p;
+ struct lwp *l;
{
struct fd_softc *fd = device_lookup(&fd_cd, FDUNIT(dev));
@@ -1275,12 +1275,12 @@ fdcretry(fdc)
}
int
-fdioctl(dev, cmd, addr, flag, p)
+fdioctl(dev, cmd, addr, flag, l)
dev_t dev;
u_long cmd;
caddr_t addr;
int flag;
- struct proc *p;
+ struct lwp *l;
{
struct fd_softc *fd = device_lookup(&fd_cd, FDUNIT(dev));
struct fdformat_parms *form_parms;
@@ -1462,7 +1462,7 @@ fdioctl(dev, cmd, addr, flag, p)
fd_formb->fd_formb_secsize(i) = fd->sc_type->secsize;
}
- error = fdformat(dev, fd_formb, p);
+ error = fdformat(dev, fd_formb, l);
free(fd_formb, M_TEMP);
return error;
@@ -1484,10 +1484,10 @@ fdioctl(dev, cmd, addr, flag, p)
}
int
-fdformat(dev, finfo, p)
+fdformat(dev, finfo, l)
dev_t dev;
struct ne7_fd_formb *finfo;
- struct proc *p;
+ struct lwp *l;
{
int rv = 0, s;
struct fd_softc *fd = device_lookup(&fd_cd, FDUNIT(dev));
@@ -1504,7 +1504,7 @@ fdformat(dev, finfo, p)
memset((void *)bp, 0, sizeof(struct buf));
BUF_INIT(bp);
bp->b_flags = B_BUSY | B_PHYS | B_FORMAT;
- bp->b_proc = p;
+ bp->b_proc = l->l_proc;
bp->b_dev = dev;
/*
diff --git a/sys/dev/isa/mcd.c b/sys/dev/isa/mcd.c
index 1baff4485f0..6de1f6415f3 100644
--- a/sys/dev/isa/mcd.c
+++ b/sys/dev/isa/mcd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mcd.c,v 1.82 2003/05/10 23:12:44 thorpej Exp $ */
+/* $NetBSD: mcd.c,v 1.83 2003/06/28 14:21:37 darrenr Exp $ */
/*
* Copyright (c) 1993, 1994, 1995 Charles M. Hannum. All rights reserved.
@@ -56,7 +56,7 @@
/*static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mcd.c,v 1.82 2003/05/10 23:12:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcd.c,v 1.83 2003/06/28 14:21:37 darrenr Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -326,10 +326,10 @@ mcdunlock(sc)
}
int
-mcdopen(dev, flag, fmt, p)
+mcdopen(dev, flag, fmt, l)
dev_t dev;
int flag, fmt;
- struct proc *p;
+ struct lwp *l;
{
int error, part;
struct mcd_softc *sc;
@@ -428,10 +428,10 @@ bad3:
}
int
-mcdclose(dev, flag, fmt, p)
+mcdclose(dev, flag, fmt, l)
dev_t dev;
int flag, fmt;
- struct proc *p;
+ struct lwp *l;
{
struct mcd_softc *sc = device_lookup(&mcd_cd, MCDUNIT(dev));
int part = MCDPART(dev);
@@ -479,7 +479,7 @@ mcdstrategy(bp)
bp->b_blkno, bp->b_bcount, 0);
if (bp->b_blkno < 0 ||
(bp->b_bcount % sc->blksize) != 0) {
- printf("%s: strategy: blkno = %d bcount = %ld\n",
+ printf("%s: strategy: blkno = %qd bcount = %ld\n",
sc->sc_dev.dv_xname, bp->b_blkno, bp->b_bcount);
bp->b_error = EINVAL;
goto bad;
@@ -602,12 +602,12 @@ mcdwrite(dev, uio, flags)
}
int
-mcdioctl(dev, cmd, addr, flag, p)
+mcdioctl(dev, cmd, addr, flag, l)
dev_t dev;
u_long cmd;
caddr_t addr;
int flag;
- struct proc *p;
+ struct lwp *l;
{
struct mcd_softc *sc = device_lookup(&mcd_cd, MCDUNIT(dev));
int error;
diff --git a/sys/dev/isa/pcdisplay.c b/sys/dev/isa/pcdisplay.c
index c3443566f15..580647092f7 100644
--- a/sys/dev/isa/pcdisplay.c
+++ b/sys/dev/isa/pcdisplay.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcdisplay.c,v 1.22 2002/10/02 03:10:49 thorpej Exp $ */
+/* $NetBSD: pcdisplay.c,v 1.23 2003/06/28 14:21:37 darrenr Exp $ */
/*
* Copyright (c) 1998
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcdisplay.c,v 1.22 2002/10/02 03:10:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcdisplay.c,v 1.23 2003/06/28 14:21:37 darrenr Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -118,7 +118,7 @@ const struct wsscreen_list pcdisplay_screenlist = {
_pcdisplay_scrlist
};
-static int pcdisplay_ioctl __P((void *, u_long, caddr_t, int, struct proc *));
+static int pcdisplay_ioctl __P((void *, u_long, caddr_t, int, struct lwp *));
static paddr_t pcdisplay_mmap __P((void *, off_t, int));
static int pcdisplay_alloc_screen __P((void *, const struct wsscreen_descr *,
void **, int *, int *, long *));
@@ -381,12 +381,12 @@ pcdisplay_is_console(iot)
}
static int
-pcdisplay_ioctl(v, cmd, data, flag, p)
+pcdisplay_ioctl(v, cmd, data, flag, l)
void *v;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
/*
* XXX "do something!"
diff --git a/sys/dev/isa/spkr.c b/sys/dev/isa/spkr.c
index d7524c5219a..333a0a118d6 100644
--- a/sys/dev/isa/spkr.c
+++ b/sys/dev/isa/spkr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: spkr.c,v 1.13 2003/04/20 22:02:46 christos Exp $ */
+/* $NetBSD: spkr.c,v 1.14 2003/06/28 14:21:37 darrenr Exp $ */
/*
* Copyright (c) 1990 Eric S. Raymond (esr@snark.thyrsus.com)
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.13 2003/04/20 22:02:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.14 2003/06/28 14:21:37 darrenr Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -429,11 +429,11 @@ spkrattach(parent, self, aux)
}
int
-spkropen(dev, flags, mode, p)
+spkropen(dev, flags, mode, l)
dev_t dev;
int flags;
int mode;
- struct proc *p;
+ struct lwp *l;
{
#ifdef SPKRDEBUG
printf("spkropen: entering with dev = %x\n", dev);
@@ -477,11 +477,11 @@ spkrwrite(dev, uio, flags)
}
}
-int spkrclose(dev, flags, mode, p)
+int spkrclose(dev, flags, mode, l)
dev_t dev;
int flags;
int mode;
- struct proc *p;
+ struct lwp *l;
{
#ifdef SPKRDEBUG
printf("spkrclose: entering with dev = %x\n", dev);
@@ -498,12 +498,12 @@ int spkrclose(dev, flags, mode, p)
return(0);
}
-int spkrioctl(dev, cmd, data, flag, p)
+int spkrioctl(dev, cmd, data, flag, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
#ifdef SPKRDEBUG
printf("spkrioctl: entering with dev = %x, cmd = %lx\n", dev, cmd);
diff --git a/sys/dev/kttcp.c b/sys/dev/kttcp.c
index 0432a2bfbf9..ad1a1cd3eb5 100644
--- a/sys/dev/kttcp.c
+++ b/sys/dev/kttcp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kttcp.c,v 1.9 2003/02/26 06:31:09 matt Exp $ */
+/* $NetBSD: kttcp.c,v 1.10 2003/06/28 14:21:31 darrenr Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@@ -484,8 +484,8 @@ kttcp_soreceive(struct socket *so, unsigned long long slen,
* info, we save a copy of m->m_nextpkt into nextrecord.
*/
#ifdef notyet /* XXXX */
- if (uio->uio_procp)
- uio->uio_procp->p_stats->p_ru.ru_msgrcv++;
+ if (uio->uio_lwp)
+ uio->uio_lwp->l_proc->p_stats->p_ru.ru_msgrcv++;
#endif
KASSERT(m == so->so_rcv.sb_mb);
SBLASTRECORDCHK(&so->so_rcv, "kttcp_soreceive 1");
diff --git a/sys/dev/ld.c b/sys/dev/ld.c
index 3d843a4c700..0ac9c219896 100644
--- a/sys/dev/ld.c
+++ b/sys/dev/ld.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld.c,v 1.24 2003/06/13 02:32:27 thorpej Exp $ */
+/* $NetBSD: ld.c,v 1.25 2003/06/28 14:21:31 darrenr Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.24 2003/06/13 02:32:27 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.25 2003/06/28 14:21:31 darrenr Exp $");
#include "rnd.h"
@@ -267,7 +267,7 @@ ldshutdown(void *cookie)
/* ARGSUSED */
int
-ldopen(dev_t dev, int flags, int fmt, struct proc *p)
+ldopen(dev_t dev, int flags, int fmt, struct lwp *l)
{
struct ld_softc *sc;
int unit, part;
@@ -311,7 +311,7 @@ ldopen(dev_t dev, int flags, int fmt, struct proc *p)
/* ARGSUSED */
int
-ldclose(dev_t dev, int flags, int fmt, struct proc *p)
+ldclose(dev_t dev, int flags, int fmt, struct lwp *l)
{
struct ld_softc *sc;
int part, unit;
@@ -362,7 +362,7 @@ ldwrite(dev_t dev, struct uio *uio, int ioflag)
/* ARGSUSED */
int
-ldioctl(dev_t dev, u_long cmd, caddr_t addr, int32_t flag, struct proc *p)
+ldioctl(dev_t dev, u_long cmd, caddr_t addr, int32_t flag, struct lwp *l)
{
struct ld_softc *sc;
int part, unit, error;
diff --git a/sys/dev/mca/ed_mca.c b/sys/dev/mca/ed_mca.c
index f55a3916524..cc5bf68a227 100644
--- a/sys/dev/mca/ed_mca.c
+++ b/sys/dev/mca/ed_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ed_mca.c,v 1.20 2003/05/10 23:12:45 thorpej Exp $ */
+/* $NetBSD: ed_mca.c,v 1.21 2003/06/28 14:21:37 darrenr Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.20 2003/05/10 23:12:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.21 2003/06/28 14:21:37 darrenr Exp $");
#include "rnd.h"
#include "locators.h"
@@ -329,10 +329,10 @@ ed_unlock(ed)
}
int
-edmcaopen(dev, flag, fmt, p)
+edmcaopen(dev, flag, fmt, l)
dev_t dev;
int flag, fmt;
- struct proc *p;
+ struct lwp *l;
{
struct ed_softc *wd;
int part, error;
@@ -406,10 +406,10 @@ bad4:
}
int
-edmcaclose(dev, flag, fmt, p)
+edmcaclose(dev, flag, fmt, l)
dev_t dev;
int flag, fmt;
- struct proc *p;
+ struct lwp *l;
{
struct ed_softc *wd = device_lookup(&ed_cd, DISKUNIT(dev));
int part = DISKPART(dev);
@@ -519,12 +519,12 @@ edgetdisklabel(dev, ed)
}
int
-edmcaioctl(dev, xfer, addr, flag, p)
+edmcaioctl(dev, xfer, addr, flag, l)
dev_t dev;
u_long xfer;
caddr_t addr;
int flag;
- struct proc *p;
+ struct lwp *l;
{
struct ed_softc *ed = device_lookup(&ed_cd, DISKUNIT(dev));
int error;
@@ -616,7 +616,7 @@ edmcaioctl(dev, xfer, addr, flag, p)
auio.uio_segflg = 0;
auio.uio_offset =
fop->df_startblk * wd->sc_dk.dk_label->d_secsize;
- auio.uio_procp = p;
+ auio.uio_lwp = l;
error = physio(wdformat, NULL, dev, B_WRITE, minphys,
&auio);
fop->df_count -= auio.uio_resid;
diff --git a/sys/dev/md.c b/sys/dev/md.c
index 84d61722dda..4626b77708c 100644
--- a/sys/dev/md.c
+++ b/sys/dev/md.c
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.34 2003/05/13 02:56:13 thorpej Exp $ */
+/* $NetBSD: md.c,v 1.35 2003/06/28 14:21:31 darrenr Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross, Leo Weppelman.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: md.c,v 1.34 2003/05/13 02:56:13 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: md.c,v 1.35 2003/06/28 14:21:31 darrenr Exp $");
#include "opt_md.h"
@@ -194,8 +194,7 @@ static int md_server_loop __P((struct md_softc *sc));
static int md_ioctl_server __P((struct md_softc *sc,
struct md_conf *umd, struct proc *proc));
#endif /* MEMORY_DISK_SERVER */
-static int md_ioctl_kalloc __P((struct md_softc *sc,
- struct md_conf *umd, struct proc *proc));
+static int md_ioctl_kalloc __P((struct md_softc *sc, struct md_conf *umd));
int
mdsize(dev_t dev)
@@ -217,10 +216,10 @@ mdsize(dev_t dev)
}
int
-mdopen(dev, flag, fmt, proc)
+mdopen(dev, flag, fmt, l)
dev_t dev;
int flag, fmt;
- struct proc *proc;
+ struct lwp *l;
{
int unit;
struct md_softc *sc;
@@ -254,10 +253,10 @@ mdopen(dev, flag, fmt, proc)
}
int
-mdclose(dev, flag, fmt, proc)
+mdclose(dev, flag, fmt, l)
dev_t dev;
int flag, fmt;
- struct proc *proc;
+ struct lwp *l;
{
int unit;
@@ -379,12 +378,12 @@ mdstrategy(bp)
}
int
-mdioctl(dev, cmd, data, flag, proc)
+mdioctl(dev, cmd, data, flag, l)
dev_t dev;
u_long cmd;
int flag;
caddr_t data;
- struct proc *proc;
+ struct lwp *l;
{
int unit;
struct md_softc *sc;
@@ -409,10 +408,10 @@ mdioctl(dev, cmd, data, flag, proc)
break;
switch (umd->md_type) {
case MD_KMEM_ALLOCATED:
- return md_ioctl_kalloc(sc, umd, proc);
+ return md_ioctl_kalloc(sc, umd);
#if MEMORY_DISK_SERVER
case MD_UMEM_SERVER:
- return md_ioctl_server(sc, umd, proc);
+ return md_ioctl_server(sc, umd, l->l_proc);
#endif /* MEMORY_DISK_SERVER */
default:
break;
@@ -427,10 +426,9 @@ mdioctl(dev, cmd, data, flag, proc)
* Just allocate some kernel memory and return.
*/
static int
-md_ioctl_kalloc(sc, umd, proc)
+md_ioctl_kalloc(sc, umd)
struct md_softc *sc;
struct md_conf *umd;
- struct proc *proc;
{
vaddr_t addr;
vsize_t size;
diff --git a/sys/dev/midi.c b/sys/dev/midi.c
index 62c598821b4..ece21ca188d 100644
--- a/sys/dev/midi.c
+++ b/sys/dev/midi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: midi.c,v 1.32 2003/01/31 02:16:23 thorpej Exp $ */
+/* $NetBSD: midi.c,v 1.33 2003/06/28 14:21:31 darrenr Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: midi.c,v 1.32 2003/01/31 02:16:23 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: midi.c,v 1.33 2003/06/28 14:21:31 darrenr Exp $");
#include "midi.h"
#include "sequencer.h"
@@ -379,7 +379,7 @@ midi_out(void *addr)
}
int
-midiopen(dev_t dev, int flags, int ifmt, struct proc *p)
+midiopen(dev_t dev, int flags, int ifmt, struct lwp *l)
{
struct midi_softc *sc;
struct midi_hw_if *hw;
@@ -423,7 +423,7 @@ midiopen(dev_t dev, int flags, int ifmt, struct proc *p)
}
int
-midiclose(dev_t dev, int flags, int ifmt, struct proc *p)
+midiclose(dev_t dev, int flags, int ifmt, struct lwp *l)
{
int unit = MIDIUNIT(dev);
struct midi_softc *sc = midi_cd.cd_devs[unit];
@@ -682,7 +682,7 @@ midi_writebytes(int unit, u_char *buf, int cc)
}
int
-midiioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
+midiioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct lwp *l)
{
int unit = MIDIUNIT(dev);
struct midi_softc *sc = midi_cd.cd_devs[unit];
@@ -704,8 +704,8 @@ midiioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
if (*(int *)addr) {
if (sc->async)
return EBUSY;
- sc->async = p;
- DPRINTF(("midi_ioctl: FIOASYNC %p\n", p));
+ sc->async = l->l_proc;
+ DPRINTF(("midi_ioctl: FIOASYNC %p\n", l->l_proc));
} else
sc->async = 0;
break;
@@ -727,7 +727,7 @@ midiioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
default:
if (hw->ioctl)
- error = hw->ioctl(sc->hw_hdl, cmd, addr, flag, p);
+ error = hw->ioctl(sc->hw_hdl, cmd, addr, flag, l);
else
error = EINVAL;
break;
@@ -736,7 +736,7 @@ midiioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
}
int
-midipoll(dev_t dev, int events, struct proc *p)
+midipoll(dev_t dev, int events, struct lwp *l)
{
int unit = MIDIUNIT(dev);
struct midi_softc *sc = midi_cd.cd_devs[unit];
@@ -760,10 +760,10 @@ midipoll(dev_t dev, int events, struct proc *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);
}
splx(s);
diff --git a/sys/dev/midi_if.h b/sys/dev/midi_if.h
index b1fb11339f9..e45952e3ff4 100644
--- a/sys/dev/midi_if.h
+++ b/sys/dev/midi_if.h
@@ -1,4 +1,4 @@
-/* $NetBSD: midi_if.h,v 1.10 2001/10/02 22:41:22 augustss Exp $ */
+/* $NetBSD: midi_if.h,v 1.11 2003/06/28 14:21:31 darrenr Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@ struct midi_hw_if {
void (*close)(void *); /* close hardware */
int (*output)(void *, int); /* output a byte */
void (*getinfo)(void *, struct midi_info *);
- int (*ioctl)(void *, u_long, caddr_t, int, struct proc *);
+ int (*ioctl)(void *, u_long, caddr_t, int, struct lwp *);
};
void midi_attach(struct midi_softc *, struct device *);
diff --git a/sys/dev/midisyn.c b/sys/dev/midisyn.c
index 53d41e69bbc..0d9d82cf596 100644
--- a/sys/dev/midisyn.c
+++ b/sys/dev/midisyn.c
@@ -1,4 +1,4 @@
-/* $NetBSD: midisyn.c,v 1.10 2002/01/13 19:28:08 tsutsui Exp $ */
+/* $NetBSD: midisyn.c,v 1.11 2003/06/28 14:21:31 darrenr Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: midisyn.c,v 1.10 2002/01/13 19:28:08 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: midisyn.c,v 1.11 2003/06/28 14:21:31 darrenr Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -79,7 +79,7 @@ int midisyn_open(void *, int,
void midisyn_close(void *);
int midisyn_output(void *, int);
void midisyn_getinfo(void *, struct midi_info *);
-int midisyn_ioctl(void *, u_long, caddr_t, int, struct proc *);
+int midisyn_ioctl(void *, u_long, caddr_t, int, struct lwp *);
struct midi_hw_if midisyn_hw_if = {
midisyn_open,
@@ -134,12 +134,12 @@ midisyn_getinfo(void *addr, struct midi_info *mi)
}
int
-midisyn_ioctl(void *maddr, u_long cmd, caddr_t addr, int flag, struct proc *p)
+midisyn_ioctl(void *maddr, u_long cmd, caddr_t addr, int flag, struct lwp *l)
{
midisyn *ms = maddr;
if (ms->mets->ioctl)
- return (ms->mets->ioctl(ms, cmd, addr, flag, p));
+ return (ms->mets->ioctl(ms, cmd, addr, flag, l));
else
return (EINVAL);
}
diff --git a/sys/dev/midisynvar.h b/sys/dev/midisynvar.h
index aedc80ee094..a0840500e9e 100644
--- a/sys/dev/midisynvar.h
+++ b/sys/dev/midisynvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: midisynvar.h,v 1.4 2001/10/02 22:41:22 augustss Exp $ */
+/* $NetBSD: midisynvar.h,v 1.5 2003/06/28 14:21:31 darrenr Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@ typedef struct midisyn midisyn;
struct midisyn_methods {
int (*open) (midisyn *, int);
void (*close) (midisyn *);
- int (*ioctl) (midisyn *, u_long, caddr_t, int, struct proc *);
+ int (*ioctl) (midisyn *, u_long, caddr_t, int, struct lwp *);
int (*allocv) (midisyn *, u_int32_t, u_int32_t);
void (*noteon) (midisyn *, u_int32_t, u_int32_t, u_int32_t);
void (*noteoff) (midisyn *, u_int32_t, u_int32_t, u_int32_t);
diff --git a/sys/dev/mm.c b/sys/dev/mm.c
index 4917a485fad..1dce645c3b5 100644
--- a/sys/dev/mm.c
+++ b/sys/dev/mm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mm.c,v 1.2 2002/09/06 13:18:43 gehenna Exp $ */
+/* $NetBSD: mm.c,v 1.3 2003/06/28 14:21:31 darrenr Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mm.c,v 1.2 2002/09/06 13:18:43 gehenna Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mm.c,v 1.3 2003/06/28 14:21:31 darrenr Exp $");
/*
* Memory special file
@@ -56,12 +56,12 @@ __KERNEL_RCSID(0, "$NetBSD: mm.c,v 1.2 2002/09/06 13:18:43 gehenna Exp $");
dev_type_ioctl(mmioctl);
int
-mmioctl(dev, cmd, data, flag, p)
+mmioctl(dev, cmd, data, flag, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
switch (minor(dev)) {
case DEV_MEM:
diff --git a/sys/dev/pci/agp.c b/sys/dev/pci/agp.c
index 0cbed167de2..3f60ec4a407 100644
--- a/sys/dev/pci/agp.c
+++ b/sys/dev/pci/agp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: agp.c,v 1.26 2003/02/24 21:56:00 tron Exp $ */
+/* $NetBSD: agp.c,v 1.27 2003/06/28 14:21:38 darrenr Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -65,7 +65,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp.c,v 1.26 2003/02/24 21:56:00 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp.c,v 1.27 2003/06/28 14:21:38 darrenr Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -792,7 +792,7 @@ agp_unbind_user(struct agp_softc *sc, agp_unbind *unbind)
}
int
-agpopen(dev_t dev, int oflags, int devtype, struct proc *p)
+agpopen(dev_t dev, int oflags, int devtype, struct lwp *l)
{
struct agp_softc *sc = device_lookup(&agp_cd, AGPUNIT(dev));
@@ -811,7 +811,7 @@ agpopen(dev_t dev, int oflags, int devtype, struct proc *p)
}
int
-agpclose(dev_t dev, int fflag, int devtype, struct proc *p)
+agpclose(dev_t dev, int fflag, int devtype, struct lwp *l)
{
struct agp_softc *sc = device_lookup(&agp_cd, AGPUNIT(dev));
struct agp_memory *mem;
@@ -845,7 +845,7 @@ agpclose(dev_t dev, int fflag, int devtype, struct proc *p)
}
int
-agpioctl(dev_t dev, u_long cmd, caddr_t data, int fflag, struct proc *p)
+agpioctl(dev_t dev, u_long cmd, caddr_t data, int fflag, struct lwp *l)
{
struct agp_softc *sc = device_lookup(&agp_cd, AGPUNIT(dev));
diff --git a/sys/dev/pci/bktr/bktr_core.c b/sys/dev/pci/bktr/bktr_core.c
index d0129827a03..7d794d8b4c4 100644
--- a/sys/dev/pci/bktr/bktr_core.c
+++ b/sys/dev/pci/bktr/bktr_core.c
@@ -1,6 +1,6 @@
/* $SourceForge: bktr_core.c,v 1.6 2003/03/11 23:11:22 thomasklausner Exp $ */
-/* $NetBSD: bktr_core.c,v 1.31 2003/05/03 18:11:37 wiz Exp $ */
+/* $NetBSD: bktr_core.c,v 1.32 2003/06/28 14:21:39 darrenr Exp $ */
/* $FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.114 2000/10/31 13:09:56 roger Exp$ */
/*
@@ -98,7 +98,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bktr_core.c,v 1.31 2003/05/03 18:11:37 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bktr_core.c,v 1.32 2003/06/28 14:21:39 darrenr Exp $");
#include "opt_bktr.h" /* Include any kernel config options */
@@ -1281,7 +1281,7 @@ int
video_ioctl(bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct thread* td)
#else
int
-video_ioctl(bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct proc* pr)
+video_ioctl(bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct lwp* l)
#endif
{
volatile u_char c_temp;
@@ -1577,7 +1577,7 @@ video_ioctl(bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct proc
#ifdef __FreeBSD__
bktr->proc = td->td_proc;
#else
- bktr->proc = pr;
+ bktr->proc = l->l_proc;
#endif
break;
@@ -1903,7 +1903,7 @@ int
tuner_ioctl(bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct thread* td)
#else
int
-tuner_ioctl(bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct proc* pr)
+tuner_ioctl(bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct lwp* l)
#endif
{
int tmp_int;
diff --git a/sys/dev/pci/bktr/bktr_core.h b/sys/dev/pci/bktr/bktr_core.h
index c90efe8aef7..dc55b16514f 100644
--- a/sys/dev/pci/bktr/bktr_core.h
+++ b/sys/dev/pci/bktr/bktr_core.h
@@ -1,6 +1,6 @@
/* $SourceForge: bktr_core.h,v 1.3 2003/03/11 23:11:23 thomasklausner Exp $ */
-/* $NetBSD: bktr_core.h,v 1.4 2003/03/12 00:14:41 wiz Exp $ */
+/* $NetBSD: bktr_core.h,v 1.5 2003/06/28 14:21:41 darrenr Exp $ */
/* $FreeBSD: src/sys/dev/bktr/bktr_core.h,v 1.4 2000/06/26 09:41:32 roger Exp$ */
/*
@@ -85,13 +85,13 @@ int video_open(bktr_ptr_t bktr);
int video_close(bktr_ptr_t bktr);
int video_read(bktr_ptr_t bktr, int unit, dev_t dev, struct uio *uio);
int video_ioctl(bktr_ptr_t bktr, int unit,
- ioctl_cmd_t cmd, caddr_t arg, struct proc* pr);
+ ioctl_cmd_t cmd, caddr_t arg, struct lwp* pr);
int tuner_open(bktr_ptr_t bktr);
int tuner_close(bktr_ptr_t bktr);
int tuner_ioctl(bktr_ptr_t bktr, int unit,
- ioctl_cmd_t cmd, caddr_t arg, struct proc* pr);
+ ioctl_cmd_t cmd, caddr_t arg, struct lwp* pr);
int vbi_open(bktr_ptr_t bktr);
int vbi_close(bktr_ptr_t bktr);
diff --git a/sys/dev/pci/bktr/bktr_os.c b/sys/dev/pci/bktr/bktr_os.c
index d42617daca1..775b150c11a 100644
--- a/sys/dev/pci/bktr/bktr_os.c
+++ b/sys/dev/pci/bktr/bktr_os.c
@@ -1,6 +1,6 @@
/* $SourceForge: bktr_os.c,v 1.5 2003/03/11 23:11:25 thomasklausner Exp $ */
-/* $NetBSD: bktr_os.c,v 1.35 2003/03/12 00:14:41 wiz Exp $ */
+/* $NetBSD: bktr_os.c,v 1.36 2003/06/28 14:21:41 darrenr Exp $ */
/* $FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.20 2000/10/20 08:16:53 roger Exp$ */
/*
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bktr_os.c,v 1.35 2003/03/12 00:14:41 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bktr_os.c,v 1.36 2003/06/28 14:21:41 darrenr Exp $");
#ifdef __FreeBSD__
#include "bktr.h"
@@ -581,7 +581,7 @@ get_bktr_mem(int unit, unsigned size)
*
*/
int
-bktr_open(dev_t dev, int flags, int fmt, struct proc *p)
+bktr_open(dev_t dev, int flags, int fmt, struct lwp *l)
{
bktr_ptr_t bktr;
int unit;
@@ -661,7 +661,7 @@ bktr_open(dev_t dev, int flags, int fmt, struct proc *p)
*
*/
int
-bktr_close(dev_t dev, int flags, int fmt, struct proc *p)
+bktr_close(dev_t dev, int flags, int fmt, struct lwp *l)
{
bktr_ptr_t bktr;
int unit;
@@ -799,7 +799,7 @@ bktr_mmap(dev_t dev, vm_offset_t offset, int nprot)
return(atop(vtophys(bktr->bigbuf) + offset));
}
-int bktr_poll(dev_t dev, int events, struct proc *p)
+int bktr_poll(dev_t dev, int events, struct lwp *l)
{
int unit;
bktr_ptr_t bktr;
@@ -1086,7 +1086,7 @@ get_bktr_mem(int unit, unsigned size)
*
*/
int
-bktr_open(dev_t dev, int flags, int fmt, struct proc *p)
+bktr_open(dev_t dev, int flags, int fmt, struct lwp *l)
{
bktr_ptr_t bktr;
int unit;
@@ -1149,7 +1149,7 @@ bktr_open(dev_t dev, int flags, int fmt, struct proc *p)
*
*/
int
-bktr_close(dev_t dev, int flags, int fmt, struct proc *p)
+bktr_close(dev_t dev, int flags, int fmt, struct lwp *l)
{
bktr_ptr_t bktr;
int unit;
@@ -1264,7 +1264,7 @@ int bktr_mmap(dev_t dev, vm_offset_t offset, int nprot)
return(i386_btop(vtophys(bktr->bigbuf) + offset));
}
-int bktr_poll(dev_t dev, int events, struct proc *p)
+int bktr_poll(dev_t dev, int events, struct lwp *l)
{
int unit;
bktr_ptr_t bktr;
@@ -1652,7 +1652,7 @@ free_bktr_mem(bktr, dmap, kva)
*
*/
int
-bktr_open(dev_t dev, int flags, int fmt, struct proc *p)
+bktr_open(dev_t dev, int flags, int fmt, struct lwp *l)
{
bktr_ptr_t bktr;
int unit;
@@ -1685,7 +1685,7 @@ bktr_open(dev_t dev, int flags, int fmt, struct proc *p)
*
*/
int
-bktr_close(dev_t dev, int flags, int fmt, struct proc *p)
+bktr_close(dev_t dev, int flags, int fmt, struct lwp *l)
{
bktr_ptr_t bktr;
int unit;
@@ -1744,7 +1744,7 @@ bktr_write(dev_t dev, struct uio *uio, int ioflag)
*
*/
int
-bktr_ioctl(dev_t dev, ioctl_cmd_t cmd, caddr_t arg, int flag, struct proc* pr)
+bktr_ioctl(dev_t dev, ioctl_cmd_t cmd, caddr_t arg, int flag, struct lwp *l)
{
bktr_ptr_t bktr;
int unit;
@@ -1758,9 +1758,9 @@ bktr_ioctl(dev_t dev, ioctl_cmd_t cmd, caddr_t arg, int flag, struct proc* pr)
switch (FUNCTION(dev)) {
case VIDEO_DEV:
- return(video_ioctl(bktr, unit, cmd, arg, pr));
+ return(video_ioctl(bktr, unit, cmd, arg, l));
case TUNER_DEV:
- return(tuner_ioctl(bktr, unit, cmd, arg, pr));
+ return(tuner_ioctl(bktr, unit, cmd, arg, l));
}
return(ENXIO);
diff --git a/sys/dev/pci/cz.c b/sys/dev/pci/cz.c
index 630881f0250..3a930fb0b67 100644
--- a/sys/dev/pci/cz.c
+++ b/sys/dev/pci/cz.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cz.c,v 1.26 2003/02/05 00:02:37 perry Exp $ */
+/* $NetBSD: cz.c,v 1.27 2003/06/28 14:21:38 darrenr Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cz.c,v 1.26 2003/02/05 00:02:37 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cz.c,v 1.27 2003/06/28 14:21:38 darrenr Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -962,7 +962,7 @@ cztty_shutdown(struct cztty_softc *sc)
* Open a Cyclades-Z serial port.
*/
int
-czttyopen(dev_t dev, int flags, int mode, struct proc *p)
+czttyopen(dev_t dev, int flags, int mode, struct lwp *l)
{
struct cztty_softc *sc = CZTTY_SOFTC(dev);
struct cz_softc *cz;
@@ -980,7 +980,7 @@ czttyopen(dev_t dev, int flags, int mode, struct proc *p)
if (ISSET(tp->t_state, TS_ISOPEN) &&
ISSET(tp->t_state, TS_XCLUDE) &&
- p->p_ucred->cr_uid != 0)
+ l->l_proc->p_ucred->cr_uid != 0)
return (EBUSY);
s = spltty();
@@ -1082,7 +1082,7 @@ czttyopen(dev_t dev, int flags, int mode, struct proc *p)
* Close a Cyclades-Z serial port.
*/
int
-czttyclose(dev_t dev, int flags, int mode, struct proc *p)
+czttyclose(dev_t dev, int flags, int mode, struct lwp *l)
{
struct cztty_softc *sc = CZTTY_SOFTC(dev);
struct tty *tp = sc->sc_tty;
@@ -1140,15 +1140,15 @@ czttywrite(dev_t dev, struct uio *uio, int flags)
* Poll a Cyclades-Z serial port.
*/
int
-czttypoll(dev, events, p)
+czttypoll(dev, events, l)
dev_t dev;
int events;
- struct proc *p;
+ struct lwp *l;
{
struct cztty_softc *sc = CZTTY_SOFTC(dev);
struct tty *tp = sc->sc_tty;
- return ((*tp->t_linesw->l_poll)(tp, events, p));
+ return ((*tp->t_linesw->l_poll)(tp, events, l));
}
/*
@@ -1157,17 +1157,18 @@ czttypoll(dev, events, p)
* Perform a control operation on a Cyclades-Z serial port.
*/
int
-czttyioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+czttyioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct cztty_softc *sc = CZTTY_SOFTC(dev);
struct tty *tp = sc->sc_tty;
+ struct proc *p = l->l_proc;
int s, error;
- error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, p);
+ error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return (error);
- error = ttioctl(tp, cmd, data, flag, p);
+ error = ttioctl(tp, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return (error);
diff --git a/sys/dev/pci/if_wi_pci.c b/sys/dev/pci/if_wi_pci.c
index 790b2f7474f..fa10f8e1c6d 100644
--- a/sys/dev/pci/if_wi_pci.c
+++ b/sys/dev/pci/if_wi_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wi_pci.c,v 1.23 2003/04/12 08:17:45 christos Exp $ */
+/* $NetBSD: if_wi_pci.c,v 1.24 2003/06/28 14:21:38 darrenr Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wi_pci.c,v 1.23 2003/04/12 08:17:45 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wi_pci.c,v 1.24 2003/06/28 14:21:38 darrenr Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -166,12 +166,10 @@ wi_pci_reset(sc)
{
int i, secs, usecs;
- bus_space_write_2(sc->sc_iot, sc->sc_ioh,
- WI_PCI_COR, WI_COR_SOFT_RESET);
+ CSR_WRITE_2(sc, WI_PCI_COR, WI_COR_SOFT_RESET);
DELAY(250*1000); /* 1/4 second */
- bus_space_write_2(sc->sc_iot, sc->sc_ioh,
- WI_PCI_COR, WI_COR_CLEAR);
+ CSR_WRITE_2(sc, WI_PCI_COR, WI_COR_CLEAR);
DELAY(500*1000); /* 1/2 second */
/* wait 2 seconds for firmware to complete initialization. */
@@ -296,6 +294,11 @@ wi_pci_attach(parent, self, aux)
sc->sc_enable = wi_pci_enable;
sc->sc_disable = wi_pci_disable;
+ /* Enable the card. */
+ pci_conf_write(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG,
+ pci_conf_read(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG) |
+ PCI_COMMAND_MASTER_ENABLE);
+
sc->sc_iot = iot;
sc->sc_ioh = ioh;
/* Make sure interrupts are disabled. */
diff --git a/sys/dev/pci/machfb.c b/sys/dev/pci/machfb.c
index dc7ce6db503..20e3108bf11 100644
--- a/sys/dev/pci/machfb.c
+++ b/sys/dev/pci/machfb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: machfb.c,v 1.12 2003/01/20 11:02:47 martin Exp $ */
+/* $NetBSD: machfb.c,v 1.13 2003/06/28 14:21:38 darrenr Exp $ */
/*
* Copyright (c) 2002 Bang Jun-Young
@@ -350,7 +350,7 @@ struct wsscreen_list mach64_screenlist = {
_mach64_scrlist
};
-int mach64_ioctl(void *, u_long, caddr_t, int, struct proc *);
+int mach64_ioctl(void *, u_long, caddr_t, int, struct lwp *);
paddr_t mach64_mmap(void *, off_t, int);
int mach64_alloc_screen(void *, const struct wsscreen_descr *, void **,
int *, int *, long *);
@@ -1225,7 +1225,7 @@ mach64_eraserows(void *cookie, int row, int nrows, long fillattr)
*/
int
-mach64_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
+mach64_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
return ENOTTY;
diff --git a/sys/dev/pci/mly.c b/sys/dev/pci/mly.c
index c0ed51c7000..a1e67e28815 100644
--- a/sys/dev/pci/mly.c
+++ b/sys/dev/pci/mly.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mly.c,v 1.19 2003/04/01 02:04:34 thorpej Exp $ */
+/* $NetBSD: mly.c,v 1.20 2003/06/28 14:21:38 darrenr Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mly.c,v 1.19 2003/04/01 02:04:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mly.c,v 1.20 2003/06/28 14:21:38 darrenr Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2272,7 +2272,7 @@ mly_dmamem_free(struct mly_softc *mly, int size, bus_dmamap_t dmamap,
* Accept an open operation on the control device.
*/
int
-mlyopen(dev_t dev, int flag, int mode, struct proc *p)
+mlyopen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct mly_softc *mly;
@@ -2291,7 +2291,7 @@ mlyopen(dev_t dev, int flag, int mode, struct proc *p)
* Accept the last close on the control device.
*/
int
-mlyclose(dev_t dev, int flag, int mode, struct proc *p)
+mlyclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct mly_softc *mly;
@@ -2304,7 +2304,7 @@ mlyclose(dev_t dev, int flag, int mode, struct proc *p)
* Handle control operations.
*/
int
-mlyioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+mlyioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct mly_softc *mly;
int rv;
diff --git a/sys/dev/pci/oboe.c b/sys/dev/pci/oboe.c
index f40555aa54d..444703a6b9a 100644
--- a/sys/dev/pci/oboe.c
+++ b/sys/dev/pci/oboe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: oboe.c,v 1.11 2002/11/26 18:49:44 christos Exp $ */
+/* $NetBSD: oboe.c,v 1.12 2003/06/28 14:21:38 darrenr Exp $ */
/* XXXXFVDL THIS DRIVER IS BROKEN FOR NON-i386 -- vtophys() usage */
@@ -72,14 +72,14 @@ void oboe_attach(struct device *parent, struct device *self, void *aux);
int oboe_activate(struct device *self, enum devact act);
int oboe_detach(struct device *self, int flags);
-int oboe_open(void *h, int flag, int mode, struct proc *p);
-int oboe_close(void *h, int flag, int mode, struct proc *p);
+int oboe_open(void *h, int flag, int mode, struct lwp *l);
+int oboe_close(void *h, int flag, int mode, struct lwp *l);
int oboe_read(void *h, struct uio *uio, int flag);
int oboe_write(void *h, struct uio *uio, int flag);
int oboe_set_params(void *h, struct irda_params *params);
int oboe_get_speeds(void *h, int *speeds);
int oboe_get_turnarounds(void *h, int *times);
-int oboe_poll(void *h, int events, struct proc *p);
+int oboe_poll(void *h, int events, struct lwp *l);
int oboe_kqfilter(void *h, struct knote *kn);
#ifdef OBOE_DEBUG
@@ -279,7 +279,7 @@ oboe_detach(struct device *self, int flags)
}
int
-oboe_open(void *h, int flag, int mode, struct proc *p)
+oboe_open(void *h, int flag, int mode, struct lwp *l)
{
struct oboe_softc *sc = h;
@@ -294,7 +294,7 @@ oboe_open(void *h, int flag, int mode, struct proc *p)
}
int
-oboe_close(void *h, int flag, int mode, struct proc *p)
+oboe_close(void *h, int flag, int mode, struct lwp *l)
{
struct oboe_softc *sc = h;
int error = 0;
@@ -457,7 +457,7 @@ oboe_get_turnarounds(void *h, int *turnarounds)
}
int
-oboe_poll(void *h, int events, struct proc *p)
+oboe_poll(void *h, int events, struct lwp *l)
{
struct oboe_softc *sc = h;
int revents = 0;
@@ -474,7 +474,7 @@ oboe_poll(void *h, int events, struct proc *p)
revents |= events & (POLLIN | POLLRDNORM);
} else {
DPRINTF(("%s: recording select\n", __FUNCTION__));
- selrecord(p, &sc->sc_rsel);
+ selrecord(l, &sc->sc_rsel);
}
}
splx(s);
diff --git a/sys/dev/pci/pci_usrreq.c b/sys/dev/pci/pci_usrreq.c
index 702c913639f..fe2607709e2 100644
--- a/sys/dev/pci/pci_usrreq.c
+++ b/sys/dev/pci/pci_usrreq.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_usrreq.c,v 1.6 2002/10/23 09:13:33 jdolecek Exp $ */
+/* $NetBSD: pci_usrreq.c,v 1.7 2003/06/28 14:21:38 darrenr Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_usrreq.c,v 1.6 2002/10/23 09:13:33 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_usrreq.c,v 1.7 2003/06/28 14:21:38 darrenr Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -65,7 +65,7 @@ const struct cdevsw pci_cdevsw = {
};
int
-pciopen(dev_t dev, int flags, int mode, struct proc *p)
+pciopen(dev_t dev, int flags, int mode, struct lwp *l)
{
struct pci_softc *sc;
int unit;
@@ -79,7 +79,7 @@ pciopen(dev_t dev, int flags, int mode, struct proc *p)
}
int
-pciioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+pciioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct pci_softc *sc = device_lookup(&pci_cd, minor(dev));
struct pciio_bdf_cfgreg *bdfr = (void *) data;
@@ -144,7 +144,7 @@ pcimmap(dev_t dev, off_t offset, int prot)
*/
int
pci_devioctl(pci_chipset_tag_t pc, pcitag_t tag, u_long cmd, caddr_t data,
- int flag, struct proc *p)
+ int flag, struct lwp *l)
{
struct pciio_cfgreg *r = (void *) data;
diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h
index ae3eba28bf7..3b0e7d8d2e8 100644
--- a/sys/dev/pci/pcivar.h
+++ b/sys/dev/pci/pcivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pcivar.h,v 1.56 2003/06/15 23:09:09 fvdl Exp $ */
+/* $NetBSD: pcivar.h,v 1.57 2003/06/28 14:21:38 darrenr Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -208,7 +208,7 @@ const struct pci_quirkdata *
*/
struct proc;
int pci_devioctl __P((pci_chipset_tag_t, pcitag_t, u_long, caddr_t,
- int flag, struct proc *));
+ int flag, struct lwp *));
/*
* Power Management (PCI 2.2)
diff --git a/sys/dev/pci/twe.c b/sys/dev/pci/twe.c
index 4c17836af49..ad30681036d 100644
--- a/sys/dev/pci/twe.c
+++ b/sys/dev/pci/twe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: twe.c,v 1.35 2003/01/01 00:10:23 thorpej Exp $ */
+/* $NetBSD: twe.c,v 1.36 2003/06/28 14:21:38 darrenr Exp $ */
/*-
* Copyright (c) 2000, 2001, 2002 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.35 2003/01/01 00:10:23 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.36 2003/06/28 14:21:38 darrenr Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1143,7 +1143,7 @@ twe_ccb_submit(struct twe_softc *sc, struct twe_ccb *ccb)
* Accept an open operation on the control device.
*/
int
-tweopen(dev_t dev, int flag, int mode, struct proc *p)
+tweopen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct twe_softc *twe;
@@ -1160,7 +1160,7 @@ tweopen(dev_t dev, int flag, int mode, struct proc *p)
* Accept the last close on the control device.
*/
int
-tweclose(dev_t dev, int flag, int mode, struct proc *p)
+tweclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct twe_softc *twe;
@@ -1173,7 +1173,7 @@ tweclose(dev_t dev, int flag, int mode, struct proc *p)
* Handle control operations.
*/
int
-tweioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+tweioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct twe_softc *twe;
struct twe_ccb *ccb;
diff --git a/sys/dev/pci/vga_pci.c b/sys/dev/pci/vga_pci.c
index d97c11e3658..43bab831a3c 100644
--- a/sys/dev/pci/vga_pci.c
+++ b/sys/dev/pci/vga_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vga_pci.c,v 1.21 2003/02/26 11:51:06 salo Exp $ */
+/* $NetBSD: vga_pci.c,v 1.22 2003/06/28 14:21:39 darrenr Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga_pci.c,v 1.21 2003/02/26 11:51:06 salo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga_pci.c,v 1.22 2003/06/28 14:21:39 darrenr Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -78,7 +78,7 @@ static int vga_pci_lookup_quirks(struct pci_attach_args *);
CFATTACH_DECL(vga_pci, sizeof(struct vga_pci_softc),
vga_pci_match, vga_pci_attach, NULL, NULL);
-int vga_pci_ioctl(void *, u_long, caddr_t, int, struct proc *);
+int vga_pci_ioctl(void *, u_long, caddr_t, int, struct lwp *);
paddr_t vga_pci_mmap(void *, off_t, int);
const struct vga_funcs vga_pci_funcs = {
@@ -225,7 +225,7 @@ vga_pci_cnattach(bus_space_tag_t iot, bus_space_tag_t memt,
}
int
-vga_pci_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
+vga_pci_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct vga_config *vc = v;
struct vga_pci_softc *psc = (void *) vc->softc;
@@ -235,7 +235,7 @@ vga_pci_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
case PCI_IOC_CFGREAD:
case PCI_IOC_CFGWRITE:
return (pci_devioctl(psc->sc_pc, psc->sc_pcitag,
- cmd, data, flag, p));
+ cmd, data, flag, l));
default:
return (EPASSTHROUGH);
diff --git a/sys/dev/radio.c b/sys/dev/radio.c
index c8cfebebff4..7117021fc42 100644
--- a/sys/dev/radio.c
+++ b/sys/dev/radio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: radio.c,v 1.9 2003/01/01 00:10:15 thorpej Exp $ */
+/* $NetBSD: radio.c,v 1.10 2003/06/28 14:21:31 darrenr Exp $ */
/* $OpenBSD: radio.c,v 1.2 2001/12/05 10:27:06 mickey Exp $ */
/* $RuOBSD: radio.c,v 1.7 2001/12/04 06:03:05 tm Exp $ */
@@ -30,7 +30,7 @@
/* This is the /dev/radio driver from OpenBSD */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radio.c,v 1.9 2003/01/01 00:10:15 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radio.c,v 1.10 2003/06/28 14:21:31 darrenr Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -86,7 +86,7 @@ radioattach(struct device *parent, struct device *self, void *aux)
}
int
-radioopen(dev_t dev, int flags, int fmt, struct proc *p)
+radioopen(dev_t dev, int flags, int fmt, struct lwp *l)
{
int unit;
struct radio_softc *sc;
@@ -98,26 +98,26 @@ radioopen(dev_t dev, int flags, int fmt, struct proc *p)
return (ENXIO);
if (sc->hw_if->open != NULL)
- return (sc->hw_if->open(sc->hw_hdl, flags, fmt, p));
+ return (sc->hw_if->open(sc->hw_hdl, flags, fmt, l->l_proc));
else
return (0);
}
int
-radioclose(dev_t dev, int flags, int fmt, struct proc *p)
+radioclose(dev_t dev, int flags, int fmt, struct lwp *l)
{
struct radio_softc *sc;
sc = radio_cd.cd_devs[RADIOUNIT(dev)];
if (sc->hw_if->close != NULL)
- return (sc->hw_if->close(sc->hw_hdl, flags, fmt, p));
+ return (sc->hw_if->close(sc->hw_hdl, flags, fmt, l->l_proc));
else
return (0);
}
int
-radioioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
+radioioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct lwp *l)
{
struct radio_softc *sc;
int unit, error;
diff --git a/sys/dev/raidframe/rf_copyback.c b/sys/dev/raidframe/rf_copyback.c
index 7d0d996abe5..545dd4e8c8a 100644
--- a/sys/dev/raidframe/rf_copyback.c
+++ b/sys/dev/raidframe/rf_copyback.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_copyback.c,v 1.23 2003/03/21 23:11:22 dsl Exp $ */
+/* $NetBSD: rf_copyback.c,v 1.24 2003/06/28 14:21:42 darrenr Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -38,7 +38,7 @@
****************************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_copyback.c,v 1.23 2003/03/21 23:11:22 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_copyback.c,v 1.24 2003/06/28 14:21:42 darrenr Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -99,7 +99,7 @@ rf_CopybackReconstructedData(raidPtr)
struct partinfo dpart;
struct vnode *vp;
struct vattr va;
- struct proc *proc;
+ struct lwp *l;
int ac;
@@ -123,7 +123,7 @@ rf_CopybackReconstructedData(raidPtr)
}
badDisk = &raidPtr->Disks[frow][fcol];
- proc = raidPtr->engine_thread;
+ l = LIST_FIRST(&raidPtr->engine_thread->p_lwps);
/* This device may have been opened successfully the first time. Close
* it before trying to open it again.. */
@@ -143,7 +143,7 @@ rf_CopybackReconstructedData(raidPtr)
printf("About to (re-)open the device: %s\n",
raidPtr->Disks[frow][fcol].devname);
- retcode = raidlookup(raidPtr->Disks[frow][fcol].devname, proc, &vp);
+ retcode = raidlookup(raidPtr->Disks[frow][fcol].devname, l, &vp);
if (retcode) {
printf("raid%d: copyback: raidlookup on device: %s failed: %d!\n",
@@ -159,11 +159,12 @@ rf_CopybackReconstructedData(raidPtr)
/* Ok, so we can at least do a lookup... How about actually
* getting a vp for it? */
- if ((retcode = VOP_GETATTR(vp, &va, proc->p_ucred, proc)) != 0) {
+ if ((retcode = VOP_GETATTR(vp, &va,
+ l->l_proc->p_ucred, l)) != 0) {
return;
}
retcode = VOP_IOCTL(vp, DIOCGPART, &dpart,
- FREAD, proc->p_ucred, proc);
+ FREAD, l->l_proc->p_ucred, l);
if (retcode) {
return;
}
diff --git a/sys/dev/raidframe/rf_disks.c b/sys/dev/raidframe/rf_disks.c
index 41a5e477b08..88db78a0f9c 100644
--- a/sys/dev/raidframe/rf_disks.c
+++ b/sys/dev/raidframe/rf_disks.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_disks.c,v 1.42 2003/04/13 22:07:11 oster Exp $ */
+/* $NetBSD: rf_disks.c,v 1.43 2003/06/28 14:21:42 darrenr Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -67,7 +67,7 @@
***************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_disks.c,v 1.42 2003/04/13 22:07:11 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_disks.c,v 1.43 2003/06/28 14:21:42 darrenr Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -613,7 +613,7 @@ rf_ConfigureDisk(raidPtr, buf, diskPtr, row, col)
struct partinfo dpart;
struct vnode *vp;
struct vattr va;
- struct proc *proc;
+ struct lwp *l;
int error;
p = rf_find_non_white(buf);
@@ -623,7 +623,7 @@ rf_ConfigureDisk(raidPtr, buf, diskPtr, row, col)
}
(void) strcpy(diskPtr->devname, p);
- proc = raidPtr->engine_thread;
+ l = LIST_FIRST(&raidPtr->engine_thread->p_lwps);
/* Let's start by claiming the component is fine and well... */
diskPtr->status = rf_ds_optimal;
@@ -631,7 +631,7 @@ rf_ConfigureDisk(raidPtr, buf, diskPtr, row, col)
raidPtr->raid_cinfo[row][col].ci_vp = NULL;
raidPtr->raid_cinfo[row][col].ci_dev = NULL;
- error = raidlookup(diskPtr->devname, proc, &vp);
+ error = raidlookup(diskPtr->devname, l, &vp);
if (error) {
printf("raidlookup on device: %s failed!\n", diskPtr->devname);
if (error == ENXIO) {
@@ -643,11 +643,12 @@ rf_ConfigureDisk(raidPtr, buf, diskPtr, row, col)
}
if (diskPtr->status == rf_ds_optimal) {
- if ((error = VOP_GETATTR(vp, &va, proc->p_ucred, proc)) != 0) {
+ if ((error = VOP_GETATTR(vp, &va,
+ l->l_proc->p_ucred, l)) != 0) {
return (error);
}
error = VOP_IOCTL(vp, DIOCGPART, &dpart,
- FREAD, proc->p_ucred, proc);
+ FREAD, l->l_proc->p_ucred, l);
if (error) {
return (error);
}
diff --git a/sys/dev/raidframe/rf_kintf.h b/sys/dev/raidframe/rf_kintf.h
index 38da10188c9..f5047a3a69a 100644
--- a/sys/dev/raidframe/rf_kintf.h
+++ b/sys/dev/raidframe/rf_kintf.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_kintf.h,v 1.16 2001/10/04 15:58:54 oster Exp $ */
+/* $NetBSD: rf_kintf.h,v 1.17 2003/06/28 14:21:42 darrenr Exp $ */
/*
* rf_kintf.h
*
@@ -47,7 +47,7 @@ int raidread_component_label(dev_t, struct vnode *, RF_ComponentLabel_t *);
#define RF_NORMAL_COMPONENT_UPDATE 0
#define RF_FINAL_COMPONENT_UPDATE 1
void rf_update_component_labels(RF_Raid_t *, int);
-int raidlookup(char *, struct proc *, struct vnode **);
+int raidlookup(char *, struct lwp *, struct vnode **);
int raidmarkclean(dev_t dev, struct vnode *b_vp, int);
int raidmarkdirty(dev_t dev, struct vnode *b_vp, int);
void raid_init_component_label(RF_Raid_t *, RF_ComponentLabel_t *);
diff --git a/sys/dev/raidframe/rf_netbsdkintf.c b/sys/dev/raidframe/rf_netbsdkintf.c
index 0ac791067be..ff17e26f42b 100644
--- a/sys/dev/raidframe/rf_netbsdkintf.c
+++ b/sys/dev/raidframe/rf_netbsdkintf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.159 2003/05/10 23:12:46 thorpej Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.160 2003/06/28 14:21:42 darrenr Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -111,7 +111,7 @@
***********************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.159 2003/05/10 23:12:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.160 2003/06/28 14:21:42 darrenr Exp $");
#include <sys/param.h>
#include <sys/errno.h>
@@ -175,7 +175,7 @@ static void InitBP(struct buf * bp, struct vnode *, unsigned rw_flag,
dev_t dev, RF_SectorNum_t startSect,
RF_SectorCount_t numSect, caddr_t buf,
void (*cbFunc) (struct buf *), void *cbArg,
- int logBytesPerSector, struct proc * b_proc);
+ int logBytesPerSector, struct proc * proc);
static void raidinit(RF_Raid_t *);
void raidattach(int);
@@ -498,7 +498,7 @@ raidsize(dev)
omask = rs->sc_dkdev.dk_openmask & (1 << part);
lp = rs->sc_dkdev.dk_label;
- if (omask == 0 && raidopen(dev, 0, S_IFBLK, curproc))
+ if (omask == 0 && raidopen(dev, 0, S_IFBLK, curlwp))
return (-1);
if (lp->d_partitions[part].p_fstype != FS_SWAP)
@@ -507,7 +507,7 @@ raidsize(dev)
size = lp->d_partitions[part].p_size *
(lp->d_secsize / DEV_BSIZE);
- if (omask == 0 && raidclose(dev, 0, S_IFBLK, curproc))
+ if (omask == 0 && raidclose(dev, 0, S_IFBLK, curlwp))
return (-1);
return (size);
@@ -526,10 +526,10 @@ raiddump(dev, blkno, va, size)
}
/* ARGSUSED */
int
-raidopen(dev, flags, fmt, p)
+raidopen(dev, flags, fmt, l)
dev_t dev;
int flags, fmt;
- struct proc *p;
+ struct lwp *l;
{
int unit = raidunit(dev);
struct raid_softc *rs;
@@ -599,10 +599,10 @@ raidopen(dev, flags, fmt, p)
}
/* ARGSUSED */
int
-raidclose(dev, flags, fmt, p)
+raidclose(dev, flags, fmt, l)
dev_t dev;
int flags, fmt;
- struct proc *p;
+ struct lwp *l;
{
int unit = raidunit(dev);
struct raid_softc *rs;
@@ -767,12 +767,12 @@ raidwrite(dev, uio, flags)
}
int
-raidioctl(dev, cmd, data, flag, p)
+raidioctl(dev, cmd, data, flag, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
int unit = raidunit(dev);
int error = 0;
@@ -1989,7 +1989,7 @@ KernelWakeupFunc(vbp)
*/
static void
InitBP(bp, b_vp, rw_flag, dev, startSect, numSect, buf, cbFunc, cbArg,
- logBytesPerSector, b_proc)
+ logBytesPerSector, p)
struct buf *bp;
struct vnode *b_vp;
unsigned rw_flag;
@@ -2000,7 +2000,7 @@ InitBP(bp, b_vp, rw_flag, dev, startSect, numSect, buf, cbFunc, cbArg,
void (*cbFunc) (struct buf *);
void *cbArg;
int logBytesPerSector;
- struct proc *b_proc;
+ struct proc *p;
{
/* bp->b_flags = B_PHYS | rw_flag; */
bp->b_flags = B_CALL | rw_flag; /* XXX need B_PHYS here too??? */
@@ -2014,7 +2014,7 @@ InitBP(bp, b_vp, rw_flag, dev, startSect, numSect, buf, cbFunc, cbArg,
if (bp->b_bcount == 0) {
panic("bp->b_bcount is zero in InitBP!!");
}
- bp->b_proc = b_proc;
+ bp->b_proc = p;
bp->b_iodone = cbFunc;
bp->b_vp = b_vp;
@@ -2140,35 +2140,37 @@ raidmakedisklabel(rs)
* You'll find the original of this in ccd.c
*/
int
-raidlookup(path, p, vpp)
+raidlookup(path, l, vpp)
char *path;
- struct proc *p;
+ struct lwp *l;
struct vnode **vpp; /* result */
{
struct nameidata nd;
struct vnode *vp;
+ struct proc *p;
struct vattr va;
int error;
- NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, path, p);
+ p = l ? l->l_proc : NULL;
+ NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, path, l);
if ((error = vn_open(&nd, FREAD | FWRITE, 0)) != 0) {
return (error);
}
vp = nd.ni_vp;
if (vp->v_usecount > 1) {
VOP_UNLOCK(vp, 0);
- (void) vn_close(vp, FREAD | FWRITE, p->p_ucred, p);
+ (void) vn_close(vp, FREAD | FWRITE, p->p_ucred, l);
return (EBUSY);
}
- if ((error = VOP_GETATTR(vp, &va, p->p_ucred, p)) != 0) {
+ if ((error = VOP_GETATTR(vp, &va, p->p_ucred, l)) != 0) {
VOP_UNLOCK(vp, 0);
- (void) vn_close(vp, FREAD | FWRITE, p->p_ucred, p);
+ (void) vn_close(vp, FREAD | FWRITE, p->p_ucred, l);
return (error);
}
/* XXX: eventually we should handle VREG, too. */
if (va.va_type != VBLK) {
VOP_UNLOCK(vp, 0);
- (void) vn_close(vp, FREAD | FWRITE, p->p_ucred, p);
+ (void) vn_close(vp, FREAD | FWRITE, p->p_ucred, l);
return (ENOTBLK);
}
VOP_UNLOCK(vp, 0);
@@ -2515,8 +2517,10 @@ rf_close_component(raidPtr, vp, auto_configured)
int auto_configured;
{
struct proc *p;
+ struct lwp *l;
p = raidPtr->engine_thread;
+ l = LIST_FIRST(&p->p_lwps);
if (vp != NULL) {
if (auto_configured == 1) {
@@ -2525,7 +2529,7 @@ rf_close_component(raidPtr, vp, auto_configured)
vput(vp);
} else {
- (void) vn_close(vp, FREAD | FWRITE, p->p_ucred, p);
+ (void) vn_close(vp, FREAD | FWRITE, p->p_ucred, l);
}
}
}
diff --git a/sys/dev/raidframe/rf_reconstruct.c b/sys/dev/raidframe/rf_reconstruct.c
index 125d1860edc..221fd1eb72f 100644
--- a/sys/dev/raidframe/rf_reconstruct.c
+++ b/sys/dev/raidframe/rf_reconstruct.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_reconstruct.c,v 1.54 2003/04/10 04:11:50 simonb Exp $ */
+/* $NetBSD: rf_reconstruct.c,v 1.55 2003/06/28 14:21:42 darrenr Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_reconstruct.c,v 1.54 2003/04/10 04:11:50 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_reconstruct.c,v 1.55 2003/06/28 14:21:42 darrenr Exp $");
#include <sys/time.h>
#include <sys/buf.h>
@@ -409,7 +409,7 @@ rf_ReconstructInPlace(raidPtr, row, col)
struct partinfo dpart;
struct vnode *vp;
struct vattr va;
- struct proc *proc;
+ struct lwp *lwp;
int retcode;
int ac;
@@ -457,7 +457,7 @@ rf_ReconstructInPlace(raidPtr, row, col)
return (EINVAL);
}
- proc = raidPtr->engine_thread;
+ lwp = LIST_FIRST(&raidPtr->engine_thread->p_lwps);
/* This device may have been opened successfully the
first time. Close it before trying to open it again.. */
@@ -483,7 +483,7 @@ rf_ReconstructInPlace(raidPtr, row, col)
#endif
RF_UNLOCK_MUTEX(raidPtr->mutex);
retcode = raidlookup(raidPtr->Disks[row][col].devname,
- proc, &vp);
+ lwp, &vp);
if (retcode) {
printf("raid%d: rebuilding: raidlookup on device: %s failed: %d!\n",raidPtr->raidid,
@@ -501,15 +501,15 @@ rf_ReconstructInPlace(raidPtr, row, col)
/* Ok, so we can at least do a lookup...
How about actually getting a vp for it? */
- if ((retcode = VOP_GETATTR(vp, &va, proc->p_ucred,
- proc)) != 0) {
+ if ((retcode = VOP_GETATTR(vp, &va, lwp->l_proc->p_ucred,
+ lwp)) != 0) {
RF_LOCK_MUTEX(raidPtr->mutex);
raidPtr->reconInProgress--;
RF_UNLOCK_MUTEX(raidPtr->mutex);
return(retcode);
}
retcode = VOP_IOCTL(vp, DIOCGPART, &dpart,
- FREAD, proc->p_ucred, proc);
+ FREAD, lwp->l_proc->p_ucred, lwp);
if (retcode) {
RF_LOCK_MUTEX(raidPtr->mutex);
raidPtr->reconInProgress--;
diff --git a/sys/dev/rnd.c b/sys/dev/rnd.c
index 0daa505e44f..74be788497a 100644
--- a/sys/dev/rnd.c
+++ b/sys/dev/rnd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rnd.c,v 1.40 2003/05/16 15:34:25 itojun Exp $ */
+/* $NetBSD: rnd.c,v 1.41 2003/06/28 14:21:31 darrenr Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rnd.c,v 1.40 2003/05/16 15:34:25 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rnd.c,v 1.41 2003/06/28 14:21:31 darrenr Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -346,7 +346,7 @@ rnd_init(void)
}
int
-rndopen(dev_t dev, int flags, int ifmt, struct proc *p)
+rndopen(dev_t dev, int flags, int ifmt, struct lwp *l)
{
if (rnd_ready == 0)
@@ -498,7 +498,7 @@ rndwrite(dev_t dev, struct uio *uio, int ioflag)
}
int
-rndioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
+rndioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct lwp *l)
{
rndsource_element_t *rse;
rndstat_t *rst;
@@ -506,9 +506,11 @@ rndioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
rndctl_t *rctl;
rnddata_t *rnddata;
u_int32_t count, start;
+ struct proc *p;
int ret, s;
ret = 0;
+ p = l->l_proc;
switch (cmd) {
@@ -668,7 +670,7 @@ rndioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
}
int
-rndpoll(dev_t dev, int events, struct proc *p)
+rndpoll(dev_t dev, int events, struct lwp *l)
{
u_int32_t entcnt;
int revents, s;
@@ -702,7 +704,7 @@ rndpoll(dev_t dev, int events, struct proc *p)
if (entcnt >= RND_ENTROPY_THRESHOLD * 8)
revents |= events & (POLLIN | POLLRDNORM);
else
- selrecord(p, &rnd_selq);
+ selrecord(l, &rnd_selq);
return (revents);
}
diff --git a/sys/dev/scsipi/cd.c b/sys/dev/scsipi/cd.c
index a5c05766beb..878c1d849a0 100644
--- a/sys/dev/scsipi/cd.c
+++ b/sys/dev/scsipi/cd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cd.c,v 1.183 2003/05/10 23:12:47 thorpej Exp $ */
+/* $NetBSD: cd.c,v 1.184 2003/06/28 14:21:43 darrenr Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.183 2003/05/10 23:12:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.184 2003/06/28 14:21:43 darrenr Exp $");
#include "rnd.h"
@@ -330,10 +330,10 @@ cdunlock(cd)
* open the device. Make sure the partition info is a up-to-date as can be.
*/
int
-cdopen(dev, flag, fmt, p)
+cdopen(dev, flag, fmt, l)
dev_t dev;
int flag, fmt;
- struct proc *p;
+ struct lwp *l;
{
struct cd_softc *cd;
struct scsipi_periph *periph;
@@ -491,10 +491,10 @@ bad4:
* occurence of an open device
*/
int
-cdclose(dev, flag, fmt, p)
+cdclose(dev, flag, fmt, l)
dev_t dev;
int flag, fmt;
- struct proc *p;
+ struct lwp *l;
{
struct cd_softc *cd = cd_cd.cd_devs[CDUNIT(dev)];
struct scsipi_periph *periph = cd->sc_periph;
@@ -1093,12 +1093,12 @@ cdreadmsaddr(cd, addr)
* Knows about the internals of this device
*/
int
-cdioctl(dev, cmd, addr, flag, p)
+cdioctl(dev, cmd, addr, flag, l)
dev_t dev;
u_long cmd;
caddr_t addr;
int flag;
- struct proc *p;
+ struct lwp *l;
{
struct cd_softc *cd = cd_cd.cd_devs[CDUNIT(dev)];
struct scsipi_periph *periph = cd->sc_periph;
@@ -1442,7 +1442,7 @@ bad:
default:
if (part != RAW_PART)
return (ENOTTY);
- return (scsipi_do_ioctl(periph, dev, cmd, addr, flag, p));
+ return (scsipi_do_ioctl(periph, dev, cmd, addr, flag, l));
}
#ifdef DIAGNOSTIC
diff --git a/sys/dev/scsipi/ch.c b/sys/dev/scsipi/ch.c
index ce42ba22d30..de1200ee89c 100644
--- a/sys/dev/scsipi/ch.c
+++ b/sys/dev/scsipi/ch.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ch.c,v 1.55 2002/11/26 18:49:47 christos Exp $ */
+/* $NetBSD: ch.c,v 1.56 2003/06/28 14:21:43 darrenr Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ch.c,v 1.55 2002/11/26 18:49:47 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ch.c,v 1.56 2003/06/28 14:21:43 darrenr Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -256,10 +256,10 @@ chattach(parent, self, aux)
}
int
-chopen(dev, flags, fmt, p)
+chopen(dev, flags, fmt, l)
dev_t dev;
int flags, fmt;
- struct proc *p;
+ struct lwp *l;
{
struct ch_softc *sc;
struct scsipi_periph *periph;
@@ -312,10 +312,10 @@ chopen(dev, flags, fmt, p)
}
int
-chclose(dev, flags, fmt, p)
+chclose(dev, flags, fmt, l)
dev_t dev;
int flags, fmt;
- struct proc *p;
+ struct lwp *l;
{
struct ch_softc *sc = ch_cd.cd_devs[CHUNIT(dev)];
struct scsipi_periph *periph = sc->sc_periph;
@@ -354,12 +354,12 @@ chread(dev, uio, flags)
}
int
-chioctl(dev, cmd, data, flags, p)
+chioctl(dev, cmd, data, flags, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flags;
- struct proc *p;
+ struct lwp *l;
{
struct ch_softc *sc = ch_cd.cd_devs[CHUNIT(dev)];
int error = 0;
@@ -451,7 +451,7 @@ chioctl(dev, cmd, data, flags, p)
default:
error = scsipi_do_ioctl(sc->sc_periph, dev, cmd, data,
- flags, p);
+ flags, l);
break;
}
@@ -459,10 +459,10 @@ chioctl(dev, cmd, data, flags, p)
}
int
-chpoll(dev, events, p)
+chpoll(dev, events, l)
dev_t dev;
int events;
- struct proc *p;
+ struct lwp *l;
{
struct ch_softc *sc = ch_cd.cd_devs[CHUNIT(dev)];
int revents;
@@ -475,7 +475,7 @@ chpoll(dev, events, p)
if (sc->sc_events == 0)
revents |= events & (POLLIN | POLLRDNORM);
else
- selrecord(p, &sc->sc_selq);
+ selrecord(l, &sc->sc_selq);
return (revents);
}
diff --git a/sys/dev/scsipi/scsiconf.c b/sys/dev/scsipi/scsiconf.c
index 56a6554b25f..41e2215ee86 100644
--- a/sys/dev/scsipi/scsiconf.c
+++ b/sys/dev/scsipi/scsiconf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: scsiconf.c,v 1.205 2003/05/13 03:02:36 thorpej Exp $ */
+/* $NetBSD: scsiconf.c,v 1.206 2003/06/28 14:21:43 darrenr Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.205 2003/05/13 03:02:36 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.206 2003/06/28 14:21:43 darrenr Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -967,10 +967,10 @@ bad:
/****** Entry points for user control of the SCSI bus. ******/
int
-scsibusopen(dev, flag, fmt, p)
+scsibusopen(dev, flag, fmt, l)
dev_t dev;
int flag, fmt;
- struct proc *p;
+ struct lwp *l;
{
struct scsibus_softc *sc;
int error, unit = minor(dev);
@@ -991,10 +991,10 @@ scsibusopen(dev, flag, fmt, p)
}
int
-scsibusclose(dev, flag, fmt, p)
+scsibusclose(dev, flag, fmt, l)
dev_t dev;
int flag, fmt;
- struct proc *p;
+ struct lwp *l;
{
struct scsibus_softc *sc = scsibus_cd.cd_devs[minor(dev)];
@@ -1006,12 +1006,12 @@ scsibusclose(dev, flag, fmt, p)
}
int
-scsibusioctl(dev, cmd, addr, flag, p)
+scsibusioctl(dev, cmd, addr, flag, l)
dev_t dev;
u_long cmd;
caddr_t addr;
int flag;
- struct proc *p;
+ struct lwp *l;
{
struct scsibus_softc *sc = scsibus_cd.cd_devs[minor(dev)];
struct scsipi_channel *chan = sc->sc_channel;
@@ -1057,7 +1057,7 @@ scsibusioctl(dev, cmd, addr, flag, p)
error = ENOTTY;
else
error = (*chan->chan_adapter->adapt_ioctl)(chan,
- cmd, addr, flag, p);
+ cmd, addr, flag, l->l_proc);
break;
}
diff --git a/sys/dev/scsipi/scsipi_ioctl.c b/sys/dev/scsipi/scsipi_ioctl.c
index 2485ce0f72f..2697ed4ee9c 100644
--- a/sys/dev/scsipi/scsipi_ioctl.c
+++ b/sys/dev/scsipi/scsipi_ioctl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: scsipi_ioctl.c,v 1.44 2003/02/23 08:50:59 yamt Exp $ */
+/* $NetBSD: scsipi_ioctl.c,v 1.45 2003/06/28 14:21:43 darrenr Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsipi_ioctl.c,v 1.44 2003/02/23 08:50:59 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsipi_ioctl.c,v 1.45 2003/06/28 14:21:43 darrenr Exp $");
#include "opt_compat_freebsd.h"
#include "opt_compat_netbsd.h"
@@ -319,13 +319,13 @@ bad:
* still be running in the context of the calling process
*/
int
-scsipi_do_ioctl(periph, dev, cmd, addr, flag, p)
+scsipi_do_ioctl(periph, dev, cmd, addr, flag, l)
struct scsipi_periph *periph;
dev_t dev;
u_long cmd;
caddr_t addr;
int flag;
- struct proc *p;
+ struct lwp *l;
{
int error;
@@ -366,7 +366,7 @@ scsipi_do_ioctl(periph, dev, cmd, addr, flag, p)
si->si_uio.uio_segflg = UIO_USERSPACE;
si->si_uio.uio_rw =
(screq->flags & SCCMD_READ) ? UIO_READ : UIO_WRITE;
- si->si_uio.uio_procp = p;
+ si->si_uio.uio_lwp = l;
error = physio(scsistrategy, &si->si_bp, dev,
(screq->flags & SCCMD_READ) ? B_READ : B_WRITE,
periph->periph_channel->chan_adapter->adapt_minphys,
@@ -377,7 +377,7 @@ scsipi_do_ioctl(periph, dev, cmd, addr, flag, p)
si->si_bp.b_data = 0;
si->si_bp.b_bcount = 0;
si->si_bp.b_dev = dev;
- si->si_bp.b_proc = p;
+ si->si_bp.b_proc = l->l_proc;
scsistrategy(&si->si_bp);
error = si->si_bp.b_error;
}
diff --git a/sys/dev/scsipi/scsipiconf.h b/sys/dev/scsipi/scsipiconf.h
index 9921ab34c6a..ca06d6ef76c 100644
--- a/sys/dev/scsipi/scsipiconf.h
+++ b/sys/dev/scsipi/scsipiconf.h
@@ -1,4 +1,4 @@
-/* $NetBSD: scsipiconf.h,v 1.74 2003/05/03 18:11:40 wiz Exp $ */
+/* $NetBSD: scsipiconf.h,v 1.75 2003/06/28 14:21:44 darrenr Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -673,7 +673,7 @@ int scsipi_thread_call_callback __P((struct scsipi_channel *,
void scsipi_async_event __P((struct scsipi_channel *,
scsipi_async_event_t, void *));
int scsipi_do_ioctl __P((struct scsipi_periph *, dev_t, u_long, caddr_t,
- int, struct proc *));
+ int, struct lwp *));
void scsipi_print_xfer_mode __P((struct scsipi_periph *));
void scsipi_set_xfer_mode __P((struct scsipi_channel *, int, int));
diff --git a/sys/dev/scsipi/sd.c b/sys/dev/scsipi/sd.c
index d1387f30aa5..f71ee712953 100644
--- a/sys/dev/scsipi/sd.c
+++ b/sys/dev/scsipi/sd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.200 2003/05/13 03:00:07 thorpej Exp $ */
+/* $NetBSD: sd.c,v 1.201 2003/06/28 14:21:44 darrenr Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.200 2003/05/13 03:00:07 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.201 2003/06/28 14:21:44 darrenr Exp $");
#include "opt_scsi.h"
#include "opt_bufq.h"
@@ -360,10 +360,10 @@ sdunlock(sd)
* open the device. Make sure the partition info is a up-to-date as can be.
*/
int
-sdopen(dev, flag, fmt, p)
+sdopen(dev, flag, fmt, l)
dev_t dev;
int flag, fmt;
- struct proc *p;
+ struct lwp *l;
{
struct sd_softc *sd;
struct scsipi_periph *periph;
@@ -515,10 +515,10 @@ bad4:
* device. Convenient now but usually a pain.
*/
int
-sdclose(dev, flag, fmt, p)
+sdclose(dev, flag, fmt, l)
dev_t dev;
int flag, fmt;
- struct proc *p;
+ struct lwp *l;
{
struct sd_softc *sd = sd_cd.cd_devs[SDUNIT(dev)];
struct scsipi_periph *periph = sd->sc_periph;
@@ -904,12 +904,12 @@ sdwrite(dev, uio, ioflag)
* Knows about the internals of this device
*/
int
-sdioctl(dev, cmd, addr, flag, p)
+sdioctl(dev, cmd, addr, flag, l)
dev_t dev;
u_long cmd;
caddr_t addr;
int flag;
- struct proc *p;
+ struct lwp *l;
{
struct sd_softc *sd = sd_cd.cd_devs[SDUNIT(dev)];
struct scsipi_periph *periph = sd->sc_periph;
@@ -1126,7 +1126,7 @@ bad:
default:
if (part != RAW_PART)
return (ENOTTY);
- return (scsipi_do_ioctl(periph, dev, cmd, addr, flag, p));
+ return (scsipi_do_ioctl(periph, dev, cmd, addr, flag, l));
}
#ifdef DIAGNOSTIC
diff --git a/sys/dev/scsipi/ses.c b/sys/dev/scsipi/ses.c
index b0b2c3d10fd..f3ac2b3c47e 100644
--- a/sys/dev/scsipi/ses.c
+++ b/sys/dev/scsipi/ses.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ses.c,v 1.20 2003/02/07 17:36:13 mjacob Exp $ */
+/* $NetBSD: ses.c,v 1.21 2003/06/28 14:21:44 darrenr Exp $ */
/*
* Copyright (C) 2000 National Aeronautics & Space Administration
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ses.c,v 1.20 2003/02/07 17:36:13 mjacob Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ses.c,v 1.21 2003/06/28 14:21:44 darrenr Exp $");
#include "opt_scsi.h"
@@ -296,11 +296,11 @@ ses_device_type(sa)
}
int
-sesopen(dev, flags, fmt, p)
+sesopen(dev, flags, fmt, l)
dev_t dev;
int flags;
int fmt;
- struct proc *p;
+ struct lwp *l;
{
struct ses_softc *softc;
int error, unit;
@@ -344,11 +344,11 @@ out:
}
int
-sesclose(dev, flags, fmt, p)
+sesclose(dev, flags, fmt, l)
dev_t dev;
int flags;
int fmt;
- struct proc *p;
+ struct lwp *l;
{
struct ses_softc *softc;
int unit;
@@ -367,12 +367,12 @@ sesclose(dev, flags, fmt, p)
}
int
-sesioctl(dev, cmd, arg_addr, flag, p)
+sesioctl(dev, cmd, arg_addr, flag, l)
dev_t dev;
u_long cmd;
caddr_t arg_addr;
int flag;
- struct proc *p;
+ struct lwp *l;
{
ses_encstat tmp;
ses_objstat objs;
@@ -490,7 +490,7 @@ sesioctl(dev, cmd, arg_addr, flag, p)
default:
error = scsipi_do_ioctl(ssc->sc_periph,
- dev, cmd, arg_addr, flag, p);
+ dev, cmd, arg_addr, flag, l);
break;
}
return (error);
diff --git a/sys/dev/scsipi/ss.c b/sys/dev/scsipi/ss.c
index 4f42459dd3c..e81c551caac 100644
--- a/sys/dev/scsipi/ss.c
+++ b/sys/dev/scsipi/ss.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ss.c,v 1.47 2003/03/20 05:49:22 dbj Exp $ */
+/* $NetBSD: ss.c,v 1.48 2003/06/28 14:21:44 darrenr Exp $ */
/*
* Copyright (c) 1995 Kenneth Stailey. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ss.c,v 1.47 2003/03/20 05:49:22 dbj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ss.c,v 1.48 2003/06/28 14:21:44 darrenr Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -237,7 +237,7 @@ ssactivate(struct device *self, enum devact act)
* open the device.
*/
int
-ssopen(dev_t dev, int flag, int mode, struct proc *p)
+ssopen(dev_t dev, int flag, int mode, struct lwp *l)
{
int unit;
u_int ssmode;
@@ -309,7 +309,7 @@ bad:
* occurence of an open device
*/
int
-ssclose(dev_t dev, int flag, int mode, struct proc *p)
+ssclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct ss_softc *ss = ss_cd.cd_devs[SSUNIT(dev)];
struct scsipi_periph *periph = ss->sc_periph;
@@ -517,12 +517,12 @@ ssstart(periph)
* knows about the internals of this device
*/
int
-ssioctl(dev, cmd, addr, flag, p)
+ssioctl(dev, cmd, addr, flag, l)
dev_t dev;
u_long cmd;
caddr_t addr;
int flag;
- struct proc *p;
+ struct lwp *l;
{
struct ss_softc *ss = ss_cd.cd_devs[SSUNIT(dev)];
int error = 0;
@@ -574,7 +574,7 @@ ssioctl(dev, cmd, addr, flag, p)
#endif
default:
return (scsipi_do_ioctl(ss->sc_periph, dev, cmd, addr,
- flag, p));
+ flag, l));
}
return (error);
}
diff --git a/sys/dev/scsipi/st.c b/sys/dev/scsipi/st.c
index 3018fe97965..6029069f95a 100644
--- a/sys/dev/scsipi/st.c
+++ b/sys/dev/scsipi/st.c
@@ -1,4 +1,4 @@
-/* $NetBSD: st.c,v 1.161 2003/04/14 16:18:23 perry Exp $ */
+/* $NetBSD: st.c,v 1.162 2003/06/28 14:21:44 darrenr Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.161 2003/04/14 16:18:23 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.162 2003/06/28 14:21:44 darrenr Exp $");
#include "opt_scsi.h"
@@ -538,11 +538,11 @@ st_loadquirks(st)
* open the device.
*/
int
-stopen(dev, flags, mode, p)
+stopen(dev, flags, mode, l)
dev_t dev;
int flags;
int mode;
- struct proc *p;
+ struct lwp *l;
{
u_int stmode, dsty;
int error, sflags, unit, tries, ntries;
@@ -729,11 +729,11 @@ bad:
* occurence of an open device
*/
int
-stclose(dev, flags, mode, p)
+stclose(dev, flags, mode, l)
dev_t dev;
int flags;
int mode;
- struct proc *p;
+ struct lwp *l;
{
int stxx, error = 0;
struct st_softc *st = st_cd.cd_devs[STUNIT(dev)];
@@ -1363,12 +1363,12 @@ stwrite(dev, uio, iomode)
* knows about the internals of this device
*/
int
-stioctl(dev, cmd, arg, flag, p)
+stioctl(dev, cmd, arg, flag, l)
dev_t dev;
u_long cmd;
caddr_t arg;
int flag;
- struct proc *p;
+ struct lwp *l;
{
int error = 0;
int unit;
@@ -1566,7 +1566,7 @@ stioctl(dev, cmd, arg, flag, p)
default:
error = scsipi_do_ioctl(st->sc_periph, dev, cmd, arg,
- flag, p);
+ flag, l);
break;
}
return (error);
diff --git a/sys/dev/scsipi/uk.c b/sys/dev/scsipi/uk.c
index a2b56428c05..de5a1febc62 100644
--- a/sys/dev/scsipi/uk.c
+++ b/sys/dev/scsipi/uk.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uk.c,v 1.38 2002/10/23 09:13:52 jdolecek Exp $ */
+/* $NetBSD: uk.c,v 1.39 2003/06/28 14:21:45 darrenr Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uk.c,v 1.38 2002/10/23 09:13:52 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uk.c,v 1.39 2003/06/28 14:21:45 darrenr Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -167,10 +167,10 @@ ukdetach(self, flags)
* open the device.
*/
int
-ukopen(dev, flag, fmt, p)
+ukopen(dev, flag, fmt, l)
dev_t dev;
int flag, fmt;
- struct proc *p;
+ struct lwp *l;
{
int unit, error;
struct uk_softc *uk;
@@ -212,10 +212,10 @@ ukopen(dev, flag, fmt, p)
* occurence of an open device
*/
int
-ukclose(dev, flag, fmt, p)
+ukclose(dev, flag, fmt, l)
dev_t dev;
int flag, fmt;
- struct proc *p;
+ struct lwp *l;
{
struct uk_softc *uk = uk_cd.cd_devs[UKUNIT(dev)];
struct scsipi_periph *periph = uk->sc_periph;
@@ -236,14 +236,14 @@ ukclose(dev, flag, fmt, p)
* Only does generic scsi ioctls.
*/
int
-ukioctl(dev, cmd, addr, flag, p)
+ukioctl(dev, cmd, addr, flag, l)
dev_t dev;
u_long cmd;
caddr_t addr;
int flag;
- struct proc *p;
+ struct lwp *l;
{
register struct uk_softc *uk = uk_cd.cd_devs[UKUNIT(dev)];
- return (scsipi_do_ioctl(uk->sc_periph, dev, cmd, addr, flag, p));
+ return (scsipi_do_ioctl(uk->sc_periph, dev, cmd, addr, flag, l));
}
diff --git a/sys/dev/sequencer.c b/sys/dev/sequencer.c
index 57eb8a52c46..46568bedf4f 100644
--- a/sys/dev/sequencer.c
+++ b/sys/dev/sequencer.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sequencer.c,v 1.22 2002/11/26 18:49:41 christos Exp $ */
+/* $NetBSD: sequencer.c,v 1.23 2003/06/28 14:21:32 darrenr Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sequencer.c,v 1.22 2002/11/26 18:49:41 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sequencer.c,v 1.23 2003/06/28 14:21:32 darrenr Exp $");
#include "sequencer.h"
@@ -173,10 +173,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;
@@ -321,10 +321,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;
@@ -490,12 +490,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;
@@ -516,8 +516,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;
@@ -645,10 +645,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;
@@ -665,10 +665,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;
@@ -1456,10 +1456,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);
}
@@ -1474,10 +1474,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);
}
diff --git a/sys/dev/sysmon/sysmon.c b/sys/dev/sysmon/sysmon.c
index bc5e3ca7ee7..7d0e2886edf 100644
--- a/sys/dev/sysmon/sysmon.c
+++ b/sys/dev/sysmon/sysmon.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon.c,v 1.8 2003/04/18 01:31:35 thorpej Exp $ */
+/* $NetBSD: sysmon.c,v 1.9 2003/06/28 14:21:45 darrenr Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon.c,v 1.8 2003/04/18 01:31:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon.c,v 1.9 2003/06/28 14:21:45 darrenr Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -72,24 +72,24 @@ const struct cdevsw sysmon_cdevsw = {
* Open the system monitor device.
*/
int
-sysmonopen(dev_t dev, int flag, int mode, struct proc *p)
+sysmonopen(dev_t dev, int flag, int mode, struct lwp *l)
{
int error;
switch (minor(dev)) {
#if NSYSMON_ENVSYS > 0
case SYSMON_MINOR_ENVSYS:
- error = sysmonopen_envsys(dev, flag, mode, p);
+ error = sysmonopen_envsys(dev, flag, mode, l);
break;
#endif
#if NSYSMON_WDOG > 0
case SYSMON_MINOR_WDOG:
- error = sysmonopen_wdog(dev, flag, mode, p);
+ error = sysmonopen_wdog(dev, flag, mode, l);
break;
#endif
#if NSYSMON_POWER > 0
case SYSMON_MINOR_POWER:
- error = sysmonopen_power(dev, flag, mode, p);
+ error = sysmonopen_power(dev, flag, mode, l);
break;
#endif
default:
@@ -105,24 +105,24 @@ sysmonopen(dev_t dev, int flag, int mode, struct proc *p)
* Close the system monitor device.
*/
int
-sysmonclose(dev_t dev, int flag, int mode, struct proc *p)
+sysmonclose(dev_t dev, int flag, int mode, struct lwp *l)
{
int error;
switch (minor(dev)) {
#if NSYSMON_ENVSYS > 0
case SYSMON_MINOR_ENVSYS:
- error = sysmonclose_envsys(dev, flag, mode, p);
+ error = sysmonclose_envsys(dev, flag, mode, l);
break;
#endif
#if NSYSMON_WDOG > 0
case SYSMON_MINOR_WDOG:
- error = sysmonclose_wdog(dev, flag, mode, p);
+ error = sysmonclose_wdog(dev, flag, mode, l);
break;
#endif
#if NSYSMON_POWER > 0
case SYSMON_MINOR_POWER:
- error = sysmonclose_power(dev, flag, mode, p);
+ error = sysmonclose_power(dev, flag, mode, l);
break;
#endif
default:
@@ -138,24 +138,24 @@ sysmonclose(dev_t dev, int flag, int mode, struct proc *p)
* Perform a control request.
*/
int
-sysmonioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+sysmonioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
int error;
switch (minor(dev)) {
#if NSYSMON_ENVSYS > 0
case SYSMON_MINOR_ENVSYS:
- error = sysmonioctl_envsys(dev, cmd, data, flag, p);
+ error = sysmonioctl_envsys(dev, cmd, data, flag, l);
break;
#endif
#if NSYSMON_WDOG > 0
case SYSMON_MINOR_WDOG:
- error = sysmonioctl_wdog(dev, cmd, data, flag, p);
+ error = sysmonioctl_wdog(dev, cmd, data, flag, l);
break;
#endif
#if NSYSMON_POWER > 0
case SYSMON_MINOR_POWER:
- error = sysmonioctl_power(dev, cmd, data, flag, p);
+ error = sysmonioctl_power(dev, cmd, data, flag, l);
break;
#endif
default:
@@ -194,14 +194,14 @@ sysmonread(dev_t dev, struct uio *uio, int flags)
* Poll the system monitor device.
*/
int
-sysmonpoll(dev_t dev, int events, struct proc *p)
+sysmonpoll(dev_t dev, int events, struct lwp *l)
{
int rv;
switch (minor(dev)) {
#if NSYSMON_POWER > 0
case SYSMON_MINOR_POWER:
- rv = sysmonpoll_power(dev, events, p);
+ rv = sysmonpoll_power(dev, events, l);
break;
#endif
default:
diff --git a/sys/dev/sysmon/sysmon_envsys.c b/sys/dev/sysmon/sysmon_envsys.c
index ee4bf338b48..2d539b7c180 100644
--- a/sys/dev/sysmon/sysmon_envsys.c
+++ b/sys/dev/sysmon/sysmon_envsys.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys.c,v 1.4 2002/12/31 05:26:56 explorer Exp $ */
+/* $NetBSD: sysmon_envsys.c,v 1.5 2003/06/28 14:21:45 darrenr Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.4 2002/12/31 05:26:56 explorer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.5 2003/06/28 14:21:45 darrenr Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -75,7 +75,7 @@ struct simplelock sysmon_envsys_initialized_slock = SIMPLELOCK_INITIALIZER;
#define SYSMON_ENVSYS_UNLOCK() \
lockmgr(&sysmon_envsys_lock, LK_RELEASE, NULL)
-int sysmonioctl_envsys(dev_t, u_long, caddr_t, int, struct proc *);
+int sysmonioctl_envsys(dev_t, u_long, caddr_t, int, struct lwp *);
struct sysmon_envsys *sysmon_envsys_find(u_int);
void sysmon_envsys_release(struct sysmon_envsys *);
@@ -86,7 +86,7 @@ void sysmon_envsys_release(struct sysmon_envsys *);
* Open the system monitor device.
*/
int
-sysmonopen_envsys(dev_t dev, int flag, int mode, struct proc *p)
+sysmonopen_envsys(dev_t dev, int flag, int mode, struct lwp *l)
{
simple_lock(&sysmon_envsys_initialized_slock);
if (sysmon_envsys_initialized == 0) {
@@ -104,7 +104,7 @@ sysmonopen_envsys(dev_t dev, int flag, int mode, struct proc *p)
* Close the system monitor device.
*/
int
-sysmonclose_envsys(dev_t dev, int flag, int mode, struct proc *p)
+sysmonclose_envsys(dev_t dev, int flag, int mode, struct lwp *l)
{
/* Nothing to do */
@@ -118,7 +118,7 @@ sysmonclose_envsys(dev_t dev, int flag, int mode, struct proc *p)
*/
int
sysmonioctl_envsys(dev_t dev, u_long cmd, caddr_t data, int flag,
- struct proc *p)
+ struct lwp *l)
{
struct sysmon_envsys *sme;
int error = 0;
diff --git a/sys/dev/sysmon/sysmon_power.c b/sys/dev/sysmon/sysmon_power.c
index f66171c0065..7c0c9c92369 100644
--- a/sys/dev/sysmon/sysmon_power.c
+++ b/sys/dev/sysmon/sysmon_power.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_power.c,v 1.5 2003/05/19 23:24:55 kochi Exp $ */
+/* $NetBSD: sysmon_power.c,v 1.6 2003/06/28 14:21:45 darrenr Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -143,7 +143,7 @@ sysmon_power_event_queue_flush(void)
* Open the system monitor device.
*/
int
-sysmonopen_power(dev_t dev, int flag, int mode, struct proc *p)
+sysmonopen_power(dev_t dev, int flag, int mode, struct lwp *l)
{
int error = 0;
@@ -151,7 +151,7 @@ sysmonopen_power(dev_t dev, int flag, int mode, struct proc *p)
if (sysmon_power_daemon != NULL)
error = EBUSY;
else {
- sysmon_power_daemon = p;
+ sysmon_power_daemon = l->l_proc;
sysmon_power_event_queue_flush();
}
simple_unlock(&sysmon_power_event_queue_slock);
@@ -165,7 +165,7 @@ sysmonopen_power(dev_t dev, int flag, int mode, struct proc *p)
* Close the system monitor device.
*/
int
-sysmonclose_power(dev_t dev, int flag, int mode, struct proc *p)
+sysmonclose_power(dev_t dev, int flag, int mode, struct lwp *l)
{
int count;
@@ -225,7 +225,7 @@ sysmonread_power(dev_t dev, struct uio *uio, int flags)
* Poll the system monitor device.
*/
int
-sysmonpoll_power(dev_t dev, int events, struct proc *p)
+sysmonpoll_power(dev_t dev, int events, struct lwp *l)
{
int revents;
@@ -239,7 +239,7 @@ sysmonpoll_power(dev_t dev, int events, struct proc *p)
if (sysmon_power_event_queue_count)
revents |= events & (POLLIN | POLLRDNORM);
else
- selrecord(p, &sysmon_power_event_queue_selinfo);
+ selrecord(l, &sysmon_power_event_queue_selinfo);
simple_unlock(&sysmon_power_event_queue_slock);
return (revents);
@@ -310,7 +310,7 @@ sysmonkqfilter_power(dev_t dev, struct knote *kn)
* Perform a power managmenet control request.
*/
int
-sysmonioctl_power(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+sysmonioctl_power(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
int error = 0;
diff --git a/sys/dev/sysmon/sysmon_wdog.c b/sys/dev/sysmon/sysmon_wdog.c
index 6468d6703fb..63e528c4295 100644
--- a/sys/dev/sysmon/sysmon_wdog.c
+++ b/sys/dev/sysmon/sysmon_wdog.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_wdog.c,v 1.6 2002/12/30 06:16:10 explorer Exp $ */
+/* $NetBSD: sysmon_wdog.c,v 1.7 2003/06/28 14:21:45 darrenr Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_wdog.c,v 1.6 2002/12/30 06:16:10 explorer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_wdog.c,v 1.7 2003/06/28 14:21:45 darrenr Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -89,7 +89,7 @@ void sysmon_wdog_shutdown(void *);
* Open the system monitor device.
*/
int
-sysmonopen_wdog(dev_t dev, int flag, int mode, struct proc *p)
+sysmonopen_wdog(dev_t dev, int flag, int mode, struct lwp *l)
{
simple_lock(&sysmon_wdog_list_slock);
@@ -111,7 +111,7 @@ sysmonopen_wdog(dev_t dev, int flag, int mode, struct proc *p)
* Close the system monitor device.
*/
int
-sysmonclose_wdog(dev_t dev, int flag, int mode, struct proc *p)
+sysmonclose_wdog(dev_t dev, int flag, int mode, struct lwp *l)
{
struct sysmon_wdog *smw;
int omode, s, error = 0;
@@ -149,7 +149,7 @@ sysmonclose_wdog(dev_t dev, int flag, int mode, struct proc *p)
* Perform a watchdog control request.
*/
int
-sysmonioctl_wdog(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+sysmonioctl_wdog(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct sysmon_wdog *smw;
int s, error = 0;
@@ -226,7 +226,7 @@ sysmonioctl_wdog(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
if ((smw = sysmon_armed_wdog) != NULL) {
error = (*smw->smw_tickle)(smw);
if (error == 0)
- smw->smw_tickler = p->p_pid;
+ smw->smw_tickler = l->l_proc->p_pid;
} else
error = ESRCH;
SYSMON_WDOG_UNLOCK(s);
diff --git a/sys/dev/sysmon/sysmonvar.h b/sys/dev/sysmon/sysmonvar.h
index 539b741f9f8..52f26dfe2c4 100644
--- a/sys/dev/sysmon/sysmonvar.h
+++ b/sys/dev/sysmon/sysmonvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmonvar.h,v 1.6 2003/04/18 01:31:35 thorpej Exp $ */
+/* $NetBSD: sysmonvar.h,v 1.7 2003/06/28 14:21:45 darrenr Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -41,6 +41,7 @@
#include <sys/power.h>
#include <sys/queue.h>
+struct lwp;
struct proc;
struct knote;
struct uio;
@@ -73,9 +74,9 @@ struct sysmon_envsys {
#define SME_SENSOR_IDX(sme, idx) ((idx) - (sme)->sme_fsensor)
-int sysmonopen_envsys(dev_t, int, int, struct proc *);
-int sysmonclose_envsys(dev_t, int, int, struct proc *);
-int sysmonioctl_envsys(dev_t, u_long, caddr_t, int, struct proc *);
+int sysmonopen_envsys(dev_t, int, int, struct lwp *);
+int sysmonclose_envsys(dev_t, int, int, struct lwp *);
+int sysmonioctl_envsys(dev_t, u_long, caddr_t, int, struct lwp *);
int sysmon_envsys_register(struct sysmon_envsys *);
void sysmon_envsys_unregister(struct sysmon_envsys *);
@@ -98,12 +99,12 @@ struct sysmon_wdog {
pid_t smw_tickler; /* last process to tickle */
};
-int sysmonopen_wdog(dev_t, int, int, struct proc *);
-int sysmonclose_wdog(dev_t, int, int, struct proc *);
-int sysmonioctl_wdog(dev_t, u_long, caddr_t, int, struct proc *);
+int sysmonopen_wdog(dev_t, int, int, struct lwp *);
+int sysmonclose_wdog(dev_t, int, int, struct lwp *);
+int sysmonioctl_wdog(dev_t, u_long, caddr_t, int, struct lwp *);
-int sysmon_wdog_register(struct sysmon_wdog *);
-void sysmon_wdog_unregister(struct sysmon_wdog *);
+int sysmon_wdog_register(struct sysmon_wdog *);
+void sysmon_wdog_unregister(struct sysmon_wdog *);
/*****************************************************************************
* Power management support
@@ -116,12 +117,12 @@ struct sysmon_pswitch {
LIST_ENTRY(sysmon_pswitch) smpsw_list;
};
-int sysmonopen_power(dev_t, int, int, struct proc *);
-int sysmonclose_power(dev_t, int, int, struct proc *);
+int sysmonopen_power(dev_t, int, int, struct lwp *);
+int sysmonclose_power(dev_t, int, int, struct lwp *);
int sysmonread_power(dev_t, struct uio *, int);
-int sysmonpoll_power(dev_t, int, struct proc *);
+int sysmonpoll_power(dev_t, int, struct lwp *);
int sysmonkqfilter_power(dev_t, struct knote *);
-int sysmonioctl_power(dev_t, u_long, caddr_t, int, struct proc *);
+int sysmonioctl_power(dev_t, u_long, caddr_t, int, struct lwp *);
void sysmon_power_settype(const char *);
@@ -129,5 +130,5 @@ int sysmon_pswitch_register(struct sysmon_pswitch *);
void sysmon_pswitch_unregister(struct sysmon_pswitch *);
void sysmon_pswitch_event(struct sysmon_pswitch *, int);
-
+
#endif /* _DEV_SYSMON_SYSMONVAR_H_ */
diff --git a/sys/dev/usb/ubtbcmfw.c b/sys/dev/usb/ubtbcmfw.c
index 3d10fd3c783..1ff03da22fd 100644
--- a/sys/dev/usb/ubtbcmfw.c
+++ b/sys/dev/usb/ubtbcmfw.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ubtbcmfw.c,v 1.4 2002/08/24 17:58:15 augustss Exp $ */
+/* $NetBSD: ubtbcmfw.c,v 1.5 2003/06/28 14:21:45 darrenr Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubtbcmfw.c,v 1.4 2002/08/24 17:58:15 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubtbcmfw.c,v 1.5 2003/06/28 14:21:45 darrenr Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -222,7 +222,7 @@ ubtbcmfw_load_file(usbd_device_handle dev, usbd_pipe_handle out,
char buf[1024];
struct timeval delta;
- NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, filename, p);
+ NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, filename, curlwp);
/* Loop until we are well passed boot */
for (;;) {
error = vn_open(&nd, FREAD, 0);
diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c
index d7ffb068052..a61c1346b84 100644
--- a/sys/dev/usb/ucom.c
+++ b/sys/dev/usb/ucom.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ucom.c,v 1.49 2003/01/01 00:10:25 thorpej Exp $ */
+/* $NetBSD: ucom.c,v 1.50 2003/06/28 14:21:46 darrenr Exp $ */
/*
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.49 2003/01/01 00:10:25 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.50 2003/06/28 14:21:46 darrenr Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -153,7 +153,7 @@ Static int ucomparam(struct tty *, struct termios *);
Static void ucomstart(struct tty *);
Static void ucom_shutdown(struct ucom_softc *);
Static int ucom_do_ioctl(struct ucom_softc *, u_long, caddr_t,
- int, usb_proc_ptr);
+ int, struct lwp *);
Static void ucom_dtr(struct ucom_softc *, int);
Static void ucom_rts(struct ucom_softc *, int);
Static void ucom_break(struct ucom_softc *, int);
@@ -300,10 +300,11 @@ ucom_shutdown(struct ucom_softc *sc)
}
int
-ucomopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
+ucomopen(dev_t dev, int flag, int mode, struct lwp *l)
{
int unit = UCOMUNIT(dev);
usbd_status err;
+ struct proc *p = l->l_proc;
struct ucom_softc *sc;
struct tty *tp;
int s;
@@ -495,7 +496,7 @@ bad:
}
int
-ucomclose(dev_t dev, int flag, int mode, usb_proc_ptr p)
+ucomclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct ucom_softc *sc = ucom_cd.cd_devs[UCOMUNIT(dev)];
struct tty *tp = sc->sc_tty;
@@ -562,7 +563,7 @@ ucomwrite(dev_t dev, struct uio *uio, int flag)
}
int
-ucompoll(dev_t dev, int events, usb_proc_ptr p)
+ucompoll(dev_t dev, int events, struct lwp *l)
{
struct ucom_softc *sc = ucom_cd.cd_devs[UCOMUNIT(dev)];
struct tty *tp = sc->sc_tty;
@@ -572,7 +573,7 @@ ucompoll(dev_t dev, int events, usb_proc_ptr p)
return (EIO);
sc->sc_refcnt++;
- error = ((*tp->t_linesw->l_poll)(tp, events, p));
+ error = ((*tp->t_linesw->l_poll)(tp, events, l));
if (--sc->sc_refcnt < 0)
usb_detach_wakeup(USBDEV(sc->sc_dev));
return (error);
@@ -588,13 +589,13 @@ ucomtty(dev_t dev)
}
int
-ucomioctl(dev_t dev, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
+ucomioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct ucom_softc *sc = ucom_cd.cd_devs[UCOMUNIT(dev)];
int error;
sc->sc_refcnt++;
- error = ucom_do_ioctl(sc, cmd, data, flag, p);
+ error = ucom_do_ioctl(sc, cmd, data, flag, l);
if (--sc->sc_refcnt < 0)
usb_detach_wakeup(USBDEV(sc->sc_dev));
return (error);
@@ -602,9 +603,10 @@ ucomioctl(dev_t dev, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
Static int
ucom_do_ioctl(struct ucom_softc *sc, u_long cmd, caddr_t data,
- int flag, usb_proc_ptr p)
+ int flag, struct lwp *l)
{
struct tty *tp = sc->sc_tty;
+ struct proc *p = l->l_proc;
int error;
int s;
@@ -613,17 +615,17 @@ ucom_do_ioctl(struct ucom_softc *sc, u_long cmd, caddr_t data,
DPRINTF(("ucomioctl: cmd=0x%08lx\n", cmd));
- error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, p);
+ error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return (error);
- error = ttioctl(tp, cmd, data, flag, p);
+ error = ttioctl(tp, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return (error);
if (sc->sc_methods->ucom_ioctl != NULL) {
error = sc->sc_methods->ucom_ioctl(sc->sc_parent,
- sc->sc_portno, cmd, data, flag, p);
+ sc->sc_portno, cmd, data, flag, l->l_proc);
if (error != EPASSTHROUGH)
return (error);
}
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index 68ea2eb2cce..d723742e5d2 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ugen.c,v 1.63 2002/11/26 18:49:48 christos Exp $ */
+/* $NetBSD: ugen.c,v 1.64 2003/06/28 14:21:46 darrenr Exp $ */
/* $FreeBSD: src/sys/dev/usb/ugen.c,v 1.26 1999/11/17 22:33:41 n_hibma Exp $ */
/*
@@ -40,7 +40,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.63 2002/11/26 18:49:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.64 2003/06/28 14:21:46 darrenr Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -172,7 +172,7 @@ Static void ugen_isoc_rintr(usbd_xfer_handle xfer, usbd_private_handle addr,
Static int ugen_do_read(struct ugen_softc *, int, struct uio *, int);
Static int ugen_do_write(struct ugen_softc *, int, struct uio *, int);
Static int ugen_do_ioctl(struct ugen_softc *, int, u_long,
- caddr_t, int, usb_proc_ptr);
+ caddr_t, int, struct lwp *);
Static int ugen_set_config(struct ugen_softc *sc, int configno);
Static usb_config_descriptor_t *ugen_get_cdesc(struct ugen_softc *sc,
int index, int *lenp);
@@ -312,7 +312,7 @@ ugen_set_config(struct ugen_softc *sc, int configno)
}
int
-ugenopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
+ugenopen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct ugen_softc *sc;
int unit = UGENUNIT(dev);
@@ -445,7 +445,7 @@ ugenopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
}
int
-ugenclose(dev_t dev, int flag, int mode, usb_proc_ptr p)
+ugenclose(dev_t dev, int flag, int mode, struct lwp *l)
{
int endpt = UGENENDPOINT(dev);
struct ugen_softc *sc;
@@ -1014,7 +1014,7 @@ ugen_get_alt_index(struct ugen_softc *sc, int ifaceidx)
Static int
ugen_do_ioctl(struct ugen_softc *sc, int endpt, u_long cmd,
- caddr_t addr, int flag, usb_proc_ptr p)
+ caddr_t addr, int flag, struct lwp *l)
{
struct ugen_endpoint *sce;
usbd_status err;
@@ -1197,7 +1197,7 @@ ugen_do_ioctl(struct ugen_softc *sc, int endpt, u_long cmd,
uio.uio_offset = 0;
uio.uio_segflg = UIO_USERSPACE;
uio.uio_rw = UIO_READ;
- uio.uio_procp = p;
+ uio.uio_lwp = l;
error = uiomove((void *)cdesc, len, &uio);
free(cdesc, M_TEMP);
return (error);
@@ -1243,7 +1243,7 @@ ugen_do_ioctl(struct ugen_softc *sc, int endpt, u_long cmd,
uio.uio_rw =
ur->ucr_request.bmRequestType & UT_READ ?
UIO_READ : UIO_WRITE;
- uio.uio_procp = p;
+ uio.uio_lwp = l;
ptr = malloc(len, M_TEMP, M_WAITOK);
if (uio.uio_rw == UIO_WRITE) {
error = uiomove(ptr, len, &uio);
@@ -1281,7 +1281,7 @@ ugen_do_ioctl(struct ugen_softc *sc, int endpt, u_long cmd,
}
int
-ugenioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, usb_proc_ptr p)
+ugenioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct lwp *l)
{
int endpt = UGENENDPOINT(dev);
struct ugen_softc *sc;
@@ -1290,14 +1290,14 @@ ugenioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, usb_proc_ptr p)
USB_GET_SC(ugen, UGENUNIT(dev), sc);
sc->sc_refcnt++;
- error = ugen_do_ioctl(sc, endpt, cmd, addr, flag, p);
+ error = ugen_do_ioctl(sc, endpt, cmd, addr, flag, l);
if (--sc->sc_refcnt < 0)
usb_detach_wakeup(USBDEV(sc->sc_dev));
return (error);
}
int
-ugenpoll(dev_t dev, int events, usb_proc_ptr p)
+ugenpoll(dev_t dev, int events, struct lwp *l)
{
struct ugen_softc *sc;
struct ugen_endpoint *sce;
@@ -1330,7 +1330,7 @@ ugenpoll(dev_t dev, int events, usb_proc_ptr p)
if (sce->q.c_cc > 0)
revents |= events & (POLLIN | POLLRDNORM);
else
- selrecord(p, &sce->rsel);
+ selrecord(l, &sce->rsel);
}
break;
case UE_ISOCHRONOUS:
@@ -1338,7 +1338,7 @@ ugenpoll(dev_t dev, int events, usb_proc_ptr p)
if (sce->cur != sce->fill)
revents |= events & (POLLIN | POLLRDNORM);
else
- selrecord(p, &sce->rsel);
+ selrecord(l, &sce->rsel);
}
break;
case UE_BULK:
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index 81289127dc5..183860b5cf9 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uhid.c,v 1.57 2003/03/11 16:44:00 augustss Exp $ */
+/* $NetBSD: uhid.c,v 1.58 2003/06/28 14:21:46 darrenr Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.57 2003/03/11 16:44:00 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.58 2003/06/28 14:21:46 darrenr Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -120,7 +120,7 @@ Static void uhid_intr(struct uhidev *, void *, u_int len);
Static int uhid_do_read(struct uhid_softc *, struct uio *uio, int);
Static int uhid_do_write(struct uhid_softc *, struct uio *uio, int);
-Static int uhid_do_ioctl(struct uhid_softc*, u_long, caddr_t, int, usb_proc_ptr);
+Static int uhid_do_ioctl(struct uhid_softc*, u_long, caddr_t, int, struct lwp *);
USB_DECLARE_DRIVER(uhid);
@@ -251,7 +251,7 @@ uhid_intr(struct uhidev *addr, void *data, u_int len)
}
int
-uhidopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
+uhidopen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct uhid_softc *sc;
int error;
@@ -279,7 +279,7 @@ uhidopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
}
int
-uhidclose(dev_t dev, int flag, int mode, usb_proc_ptr p)
+uhidclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct uhid_softc *sc;
@@ -412,7 +412,7 @@ uhidwrite(dev_t dev, struct uio *uio, int flag)
int
uhid_do_ioctl(struct uhid_softc *sc, u_long cmd, caddr_t addr,
- int flag, usb_proc_ptr p)
+ int flag, struct lwp *l)
{
struct usb_ctl_report_desc *rd;
struct usb_ctl_report *re;
@@ -435,8 +435,8 @@ uhid_do_ioctl(struct uhid_softc *sc, u_long cmd, caddr_t addr,
if (*(int *)addr) {
if (sc->sc_async != NULL)
return (EBUSY);
- sc->sc_async = p;
- DPRINTF(("uhid_do_ioctl: FIOASYNC %p\n", p));
+ sc->sc_async = l->l_proc;
+ DPRINTF(("uhid_do_ioctl: FIOASYNC %p\n", l->l_proc));
} else
sc->sc_async = NULL;
break;
@@ -526,7 +526,7 @@ uhid_do_ioctl(struct uhid_softc *sc, u_long cmd, caddr_t addr,
}
int
-uhidioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, usb_proc_ptr p)
+uhidioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct lwp *l)
{
struct uhid_softc *sc;
int error;
@@ -534,14 +534,14 @@ uhidioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, usb_proc_ptr p)
USB_GET_SC(uhid, UHIDUNIT(dev), sc);
sc->sc_refcnt++;
- error = uhid_do_ioctl(sc, cmd, addr, flag, p);
+ error = uhid_do_ioctl(sc, cmd, addr, flag, l);
if (--sc->sc_refcnt < 0)
usb_detach_wakeup(USBDEV(sc->sc_hdev.sc_dev));
return (error);
}
int
-uhidpoll(dev_t dev, int events, usb_proc_ptr p)
+uhidpoll(dev_t dev, int events, struct lwp *l)
{
struct uhid_softc *sc;
int revents = 0;
@@ -559,7 +559,7 @@ uhidpoll(dev_t dev, int events, usb_proc_ptr p)
if (sc->sc_q.c_cc > 0)
revents |= events & (POLLIN | POLLRDNORM);
else
- selrecord(p, &sc->sc_rsel);
+ selrecord(l, &sc->sc_rsel);
}
splx(s);
diff --git a/sys/dev/usb/uirda.c b/sys/dev/usb/uirda.c
index 2af7428744c..28e6839ddf9 100644
--- a/sys/dev/usb/uirda.c
+++ b/sys/dev/usb/uirda.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uirda.c,v 1.14 2002/11/26 18:49:49 christos Exp $ */
+/* $NetBSD: uirda.c,v 1.15 2003/06/28 14:21:46 darrenr Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.14 2002/11/26 18:49:49 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.15 2003/06/28 14:21:46 darrenr Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -227,14 +227,14 @@ struct uirda_softc {
#define UIRDA_WR_TIMEOUT 200
-int uirda_open(void *h, int flag, int mode, usb_proc_ptr p);
-int uirda_close(void *h, int flag, int mode, usb_proc_ptr p);
+int uirda_open(void *h, int flag, int mode, struct lwp *l);
+int uirda_close(void *h, int flag, int mode, struct lwp *l);
int uirda_read(void *h, struct uio *uio, int flag);
int uirda_write(void *h, struct uio *uio, int flag);
int uirda_set_params(void *h, struct irda_params *params);
int uirda_get_speeds(void *h, int *speeds);
int uirda_get_turnarounds(void *h, int *times);
-int uirda_poll(void *h, int events, usb_proc_ptr p);
+int uirda_poll(void *h, int events, struct lwp *l);
int uirda_kqfilter(void *h, struct knote *kn);
struct irframe_methods uirda_methods = {
@@ -441,7 +441,7 @@ uirda_activate(device_ptr_t self, enum devact act)
}
int
-uirda_open(void *h, int flag, int mode, usb_proc_ptr p)
+uirda_open(void *h, int flag, int mode, struct lwp *l)
{
struct uirda_softc *sc = h;
int error;
@@ -510,7 +510,7 @@ bad1:
}
int
-uirda_close(void *h, int flag, int mode, usb_proc_ptr p)
+uirda_close(void *h, int flag, int mode, struct lwp *l)
{
struct uirda_softc *sc = h;
@@ -657,7 +657,7 @@ uirda_write(void *h, struct uio *uio, int flag)
}
int
-uirda_poll(void *h, int events, usb_proc_ptr p)
+uirda_poll(void *h, int events, struct lwp *l)
{
struct uirda_softc *sc = h;
int revents = 0;
@@ -674,7 +674,7 @@ uirda_poll(void *h, int events, usb_proc_ptr p)
revents |= events & (POLLIN | POLLRDNORM);
} else {
DPRINTFN(2,("%s: recording select\n", __func__));
- selrecord(p, &sc->sc_rd_sel);
+ selrecord(l, &sc->sc_rd_sel);
}
}
splx(s);
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c
index 7af0fca008a..b10b8541fe3 100644
--- a/sys/dev/usb/ulpt.c
+++ b/sys/dev/usb/ulpt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ulpt.c,v 1.57 2003/01/05 10:19:42 scw Exp $ */
+/* $NetBSD: ulpt.c,v 1.58 2003/06/28 14:21:46 darrenr Exp $ */
/* $FreeBSD: src/sys/dev/usb/ulpt.c,v 1.24 1999/11/17 22:33:44 n_hibma Exp $ */
/*
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.57 2003/01/05 10:19:42 scw Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.58 2003/06/28 14:21:46 darrenr Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -495,7 +495,7 @@ int ulptusein = 1;
* Reset the printer, then wait until it's selected and not busy.
*/
int
-ulptopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
+ulptopen(dev_t dev, int flag, int mode, struct lwp *l)
{
u_char flags = ULPTFLAGS(dev);
struct ulpt_softc *sc;
@@ -624,7 +624,7 @@ ulpt_statusmsg(u_char status, struct ulpt_softc *sc)
}
int
-ulptclose(dev_t dev, int flag, int mode, usb_proc_ptr p)
+ulptclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct ulpt_softc *sc;
@@ -714,7 +714,7 @@ ulptwrite(dev_t dev, struct uio *uio, int flags)
}
int
-ulptioctl(dev_t dev, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
+ulptioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
int error = 0;
diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c
index 95281dc1f79..d8cea1f65a6 100644
--- a/sys/dev/usb/urio.c
+++ b/sys/dev/usb/urio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: urio.c,v 1.15 2002/10/23 09:14:02 jdolecek Exp $ */
+/* $NetBSD: urio.c,v 1.16 2003/06/28 14:21:46 darrenr Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: urio.c,v 1.15 2002/10/23 09:14:02 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: urio.c,v 1.16 2003/06/28 14:21:46 darrenr Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -310,7 +310,7 @@ urio_activate(device_ptr_t self, enum devact act)
#endif
int
-urioopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
+urioopen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct urio_softc *sc;
usbd_status err;
@@ -343,7 +343,7 @@ urioopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
}
int
-urioclose(dev_t dev, int flag, int mode, usb_proc_ptr p)
+urioclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct urio_softc *sc;
USB_GET_SC(urio, URIOUNIT(dev), sc);
@@ -485,7 +485,7 @@ uriowrite(dev_t dev, struct uio *uio, int flag)
int
-urioioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, usb_proc_ptr p)
+urioioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct lwp *l)
{
struct urio_softc * sc;
int unit = URIOUNIT(dev);
@@ -549,7 +549,7 @@ urioioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, usb_proc_ptr p)
uio.uio_segflg = UIO_USERSPACE;
uio.uio_rw = req.bmRequestType & UT_READ ?
UIO_READ : UIO_WRITE;
- uio.uio_procp = p;
+ uio.uio_lwp = l;
ptr = malloc(len, M_TEMP, M_WAITOK);
if (uio.uio_rw == UIO_WRITE) {
error = uiomove(ptr, len, &uio);
@@ -581,7 +581,7 @@ ret:
#if defined(__OpenBSD__)
int
-urioselect(dev_t dev, int events, usb_proc_ptr p)
+urioselect(dev_t dev, int events, struct lwp *l)
{
return (0);
}
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index 4f40bafb4b7..9e804d0983e 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.c,v 1.77 2003/01/01 00:10:26 thorpej Exp $ */
+/* $NetBSD: usb.c,v 1.78 2003/06/28 14:21:46 darrenr 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.77 2003/01/01 00:10:26 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.78 2003/06/28 14:21:46 darrenr Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -381,7 +381,7 @@ usbctlprint(void *aux, const char *pnp)
#endif /* defined(__NetBSD__) || defined(__OpenBSD__) */
int
-usbopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
+usbopen(dev_t dev, int flag, int mode, struct lwp *l)
{
int unit = minor(dev);
struct usb_softc *sc;
@@ -436,7 +436,7 @@ usbread(dev_t dev, struct uio *uio, int flag)
}
int
-usbclose(dev_t dev, int flag, int mode, usb_proc_ptr p)
+usbclose(dev_t dev, int flag, int mode, struct lwp *l)
{
int unit = minor(dev);
@@ -449,7 +449,7 @@ usbclose(dev_t dev, int flag, int mode, usb_proc_ptr p)
}
int
-usbioctl(dev_t devt, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
+usbioctl(dev_t devt, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct usb_softc *sc;
int unit = minor(devt);
@@ -462,7 +462,7 @@ usbioctl(dev_t devt, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
case FIOASYNC:
if (*(int *)data)
- usb_async_proc = p;
+ usb_async_proc = l->l_proc;
else
usb_async_proc = 0;
return (0);
@@ -522,7 +522,7 @@ usbioctl(dev_t devt, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
uio.uio_rw =
ur->ucr_request.bmRequestType & UT_READ ?
UIO_READ : UIO_WRITE;
- uio.uio_procp = p;
+ uio.uio_lwp = l;
ptr = malloc(len, M_TEMP, M_WAITOK);
if (uio.uio_rw == UIO_WRITE) {
error = uiomove(ptr, len, &uio);
@@ -576,7 +576,7 @@ usbioctl(dev_t devt, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
}
int
-usbpoll(dev_t dev, int events, usb_proc_ptr p)
+usbpoll(dev_t dev, int events, struct lwp *l)
{
int revents, mask, s;
@@ -588,7 +588,7 @@ usbpoll(dev_t dev, int events, usb_proc_ptr p)
if (events & mask && usb_nevents > 0)
revents |= events & mask;
if (revents == 0 && events & mask)
- selrecord(p, &usb_selevent);
+ selrecord(l, &usb_selevent);
splx(s);
return (revents);
diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c
index 2aac4be795c..78bac2c4ccd 100644
--- a/sys/dev/usb/uscanner.c
+++ b/sys/dev/usb/uscanner.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uscanner.c,v 1.40 2003/01/27 00:32:44 wiz Exp $ */
+/* $NetBSD: uscanner.c,v 1.41 2003/06/28 14:21:46 darrenr Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.40 2003/01/27 00:32:44 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.41 2003/06/28 14:21:46 darrenr Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -383,7 +383,7 @@ USB_ATTACH(uscanner)
}
int
-uscanneropen(dev_t dev, int flag, int mode, usb_proc_ptr p)
+uscanneropen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct uscanner_softc *sc;
int unit = USCANNERUNIT(dev);
@@ -446,7 +446,7 @@ uscanneropen(dev_t dev, int flag, int mode, usb_proc_ptr p)
}
int
-uscannerclose(dev_t dev, int flag, int mode, usb_proc_ptr p)
+uscannerclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct uscanner_softc *sc;
@@ -688,7 +688,7 @@ USB_DETACH(uscanner)
}
int
-uscannerpoll(dev_t dev, int events, usb_proc_ptr p)
+uscannerpoll(dev_t dev, int events, struct lwp *l)
{
struct uscanner_softc *sc;
int revents = 0;
@@ -755,7 +755,7 @@ uscannerkqfilter(dev_t dev, struct knote *kn)
}
int
-uscannerioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, usb_proc_ptr p)
+uscannerioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct lwp *l)
{
return (EINVAL);
}
diff --git a/sys/dev/usb/ustir.c b/sys/dev/usb/ustir.c
index 64aded8e09a..b5c86069b54 100644
--- a/sys/dev/usb/ustir.c
+++ b/sys/dev/usb/ustir.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ustir.c,v 1.10 2002/12/28 04:55:30 dsainty Exp $ */
+/* $NetBSD: ustir.c,v 1.11 2003/06/28 14:21:47 darrenr Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.10 2002/12/28 04:55:30 dsainty Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.11 2003/06/28 14:21:47 darrenr Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -209,18 +209,18 @@ struct ustir_softc {
#define USTIR_WR_TIMEOUT 200
Static int ustir_activate(device_ptr_t self, enum devact act);
-Static int ustir_open(void *h, int flag, int mode, usb_proc_ptr p);
-Static int ustir_close(void *h, int flag, int mode, usb_proc_ptr p);
+Static int ustir_open(void *h, int flag, int mode, struct lwp *l);
+Static int ustir_close(void *h, int flag, int mode, struct lwp *l);
Static int ustir_read(void *h, struct uio *uio, int flag);
Static int ustir_write(void *h, struct uio *uio, int flag);
Static int ustir_set_params(void *h, struct irda_params *params);
Static int ustir_get_speeds(void *h, int *speeds);
Static int ustir_get_turnarounds(void *h, int *times);
-Static int ustir_poll(void *h, int events, usb_proc_ptr p);
+Static int ustir_poll(void *h, int events, struct lwp *l);
Static int ustir_kqfilter(void *h, struct knote *kn);
#ifdef USTIR_DEBUG_IOCTLS
-Static int ustir_ioctl(void *h, u_long cmd, caddr_t addr, int flag, usb_proc_ptr p);
+Static int ustir_ioctl(void *h, u_long cmd, caddr_t addr, int flag, struct lwp *l);
#endif
Static struct irframe_methods const ustir_methods = {
@@ -856,7 +856,7 @@ ustir_activate(device_ptr_t self, enum devact act)
/* ARGSUSED */
Static int
-ustir_open(void *h, int flag, int mode, usb_proc_ptr p)
+ustir_open(void *h, int flag, int mode, struct lwp *l)
{
struct ustir_softc *sc = h;
int error;
@@ -945,7 +945,7 @@ ustir_open(void *h, int flag, int mode, usb_proc_ptr p)
/* ARGSUSED */
Static int
-ustir_close(void *h, int flag, int mode, usb_proc_ptr p)
+ustir_close(void *h, int flag, int mode, struct lwp *l)
{
struct ustir_softc *sc = h;
@@ -1185,7 +1185,7 @@ ustir_write(void *h, struct uio *uio, int flag)
}
Static int
-ustir_poll(void *h, int events, usb_proc_ptr p)
+ustir_poll(void *h, int events, struct lwp *l)
{
struct ustir_softc *sc = h;
int revents = 0;
@@ -1198,7 +1198,7 @@ ustir_poll(void *h, int events, usb_proc_ptr p)
} else {
DPRINTFN(2,("%s: recording write select\n",
__func__));
- selrecord(p, &sc->sc_wr_sel);
+ selrecord(l, &sc->sc_wr_sel);
}
}
@@ -1209,7 +1209,7 @@ ustir_poll(void *h, int events, usb_proc_ptr p)
} else {
DPRINTFN(2,("%s: recording read select\n",
__func__));
- selrecord(p, &sc->sc_rd_sel);
+ selrecord(l, &sc->sc_rd_sel);
}
}
@@ -1293,7 +1293,7 @@ ustir_kqfilter(void *h, struct knote *kn)
}
#ifdef USTIR_DEBUG_IOCTLS
-Static int ustir_ioctl(void *h, u_long cmd, caddr_t addr, int flag, usb_proc_ptr p)
+Static int ustir_ioctl(void *h, u_long cmd, caddr_t addr, int flag, struct lwp *l)
{
struct ustir_softc *sc = h;
int error;
diff --git a/sys/dev/verified_exec.c b/sys/dev/verified_exec.c
index 5b367c9b53b..d5855644d41 100644
--- a/sys/dev/verified_exec.c
+++ b/sys/dev/verified_exec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: verified_exec.c,v 1.1 2002/10/29 12:31:22 blymn Exp $ */
+/* $NetBSD: verified_exec.c,v 1.2 2003/06/28 14:21:32 darrenr Exp $ */
/*-
* Copyright (c) 1998-1999 Brett Lymn
@@ -185,14 +185,17 @@ add_veriexec_inode(struct veriexec_dev_list *list, unsigned long inode,
*/
int
verifiedexecioctl(dev_t dev, u_long cmd, caddr_t data, int flags,
- struct proc *p)
+ struct lwp *l)
{
int error = 0;
- struct verified_exec_params *params = (struct verified_exec_params *)data;
+ struct verified_exec_params *params;
struct nameidata nid;
struct vattr vattr;
+ struct proc *p;
struct veriexec_dev_list *dlp;
+ p = l->l_proc;
+ params = (struct verified_exec_params *)data;
#ifdef VERIFIED_EXEC_DEBUG
printf("veriexec_ioctl: got cmd 0x%lx for file %s\n", cmd, params->file);
#endif
@@ -210,7 +213,7 @@ verifiedexecioctl(dev_t dev, u_long cmd, caddr_t data, int flags,
* exec to use later.
*/
NDINIT(&nid, LOOKUP, FOLLOW, UIO_USERSPACE,
- params->file, p);
+ params->file, l);
if ((error = vn_open(&nid, FREAD, 0)) != 0) {
return(error);
}
diff --git a/sys/dev/vnd.c b/sys/dev/vnd.c
index 0e48794a4e1..f3d1f630405 100644
--- a/sys/dev/vnd.c
+++ b/sys/dev/vnd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd.c,v 1.99 2003/05/17 16:11:52 thorpej Exp $ */
+/* $NetBSD: vnd.c,v 1.100 2003/06/28 14:21:32 darrenr Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -98,7 +98,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.99 2003/05/17 16:11:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.100 2003/06/28 14:21:32 darrenr Exp $");
#if defined(_KERNEL_OPT)
#include "fs_nfs.h"
@@ -253,10 +253,10 @@ vnddetach()
}
int
-vndopen(dev, flags, mode, p)
+vndopen(dev, flags, mode, l)
dev_t dev;
int flags, mode;
- struct proc *p;
+ struct lwp *l;
{
int unit = vndunit(dev);
struct vnd_softc *sc;
@@ -265,7 +265,7 @@ vndopen(dev, flags, mode, p)
#ifdef DEBUG
if (vnddebug & VDB_FOLLOW)
- printf("vndopen(0x%x, 0x%x, 0x%x, %p)\n", dev, flags, mode, p);
+ printf("vndopen(0x%x, 0x%x, 0x%x, %p)\n", dev, flags, mode, l);
#endif
if (unit >= numvnd)
return (ENXIO);
@@ -318,10 +318,10 @@ vndopen(dev, flags, mode, p)
}
int
-vndclose(dev, flags, mode, p)
+vndclose(dev, flags, mode, l)
dev_t dev;
int flags, mode;
- struct proc *p;
+ struct lwp *l;
{
int unit = vndunit(dev);
struct vnd_softc *sc;
@@ -329,7 +329,7 @@ vndclose(dev, flags, mode, p)
#ifdef DEBUG
if (vnddebug & VDB_FOLLOW)
- printf("vndclose(0x%x, 0x%x, 0x%x, %p)\n", dev, flags, mode, p);
+ printf("vndclose(0x%x, 0x%x, 0x%x, %p)\n", dev, flags, mode, l);
#endif
if (unit >= numvnd)
@@ -735,12 +735,12 @@ vndwrite(dev, uio, flags)
/* ARGSUSED */
int
-vndioctl(dev, cmd, data, flag, p)
+vndioctl(dev, cmd, data, flag, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
int unit = vndunit(dev);
struct vnd_softc *vnd;
@@ -749,6 +749,7 @@ vndioctl(dev, cmd, data, flag, p)
struct nameidata nd;
int error, part, pmask;
size_t geomsize;
+ struct proc *p = l->l_proc;
int fflags;
#ifdef __HAVE_OLD_DISKLABEL
struct disklabel newlabel;
@@ -812,10 +813,10 @@ vndioctl(dev, cmd, data, flag, p)
fflags = FREAD;
if ((vio->vnd_flags & VNDIOF_READONLY) == 0)
fflags |= FWRITE;
- NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, vio->vnd_file, p);
+ NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, vio->vnd_file, l);
if ((error = vn_open(&nd, fflags, 0)) != 0)
goto unlock_and_exit;
- error = VOP_GETATTR(nd.ni_vp, &vattr, p->p_ucred, p);
+ error = VOP_GETATTR(nd.ni_vp, &vattr, p->p_ucred, l);
VOP_UNLOCK(nd.ni_vp, 0);
if (!error && nd.ni_vp->v_type != VREG)
error = EOPNOTSUPP;
@@ -916,7 +917,7 @@ vndioctl(dev, cmd, data, flag, p)
break;
close_and_exit:
- (void) vn_close(nd.ni_vp, fflags, p->p_ucred, p);
+ (void) vn_close(nd.ni_vp, fflags, p->p_ucred, l);
unlock_and_exit:
vndunlock(vnd);
return (error);
@@ -976,7 +977,7 @@ unlock_and_exit:
vnd = &vnd_softc[vnu->vnu_unit];
if (vnd->sc_flags & VNF_INITED) {
- error = VOP_GETATTR(vnd->sc_vp, &va, p->p_ucred, p);
+ error = VOP_GETATTR(vnd->sc_vp, &va, p->p_ucred, l);
if (error)
return (error);
vnu->vnu_dev = va.va_fsid;
@@ -1128,7 +1129,7 @@ vndsetcred(vnd, cred)
* buffers back to stable storage.
*/
error = vinvalbuf(vnd->sc_vp, V_SAVE, vnd->sc_cred,
- curproc, 0, 0);
+ curlwp, 0, 0);
}
VOP_UNLOCK(vnd->sc_vp, 0);
@@ -1175,7 +1176,7 @@ vndclear(vnd, myminor)
int myminor;
{
struct vnode *vp = vnd->sc_vp;
- struct proc *p = curproc; /* XXX */
+ struct lwp *l = curlwp;
int fflags = FREAD;
int bmaj, cmaj, i, mn;
@@ -1200,7 +1201,7 @@ vndclear(vnd, myminor)
vnd->sc_flags &= ~(VNF_INITED | VNF_READONLY | VNF_VLABEL);
if (vp == (struct vnode *)0)
panic("vndioctl: null vp");
- (void) vn_close(vp, fflags, vnd->sc_cred, p);
+ (void) vn_close(vp, fflags, vnd->sc_cred, l);
crfree(vnd->sc_cred);
vnd->sc_vp = (struct vnode *)0;
vnd->sc_cred = (struct ucred *)0;
@@ -1228,7 +1229,7 @@ vndsize(dev)
omask = sc->sc_dkdev.dk_openmask & (1 << part);
lp = sc->sc_dkdev.dk_label;
- if (omask == 0 && vndopen(dev, 0, S_IFBLK, curproc))
+ if (omask == 0 && vndopen(dev, 0, S_IFBLK, curlwp)) /* XXX */
return (-1);
if (lp->d_partitions[part].p_fstype != FS_SWAP)
@@ -1237,7 +1238,7 @@ vndsize(dev)
size = lp->d_partitions[part].p_size *
(lp->d_secsize / DEV_BSIZE);
- if (omask == 0 && vndclose(dev, 0, S_IFBLK, curproc))
+ if (omask == 0 && vndclose(dev, 0, S_IFBLK, curlwp)) /* XXX */
return (-1);
return (size);
diff --git a/sys/dev/wscons/wsdisplay.c b/sys/dev/wscons/wsdisplay.c
index 3ed36adc345..c9545dfcf4c 100644
--- a/sys/dev/wscons/wsdisplay.c
+++ b/sys/dev/wscons/wsdisplay.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay.c,v 1.73 2003/03/06 00:38:28 matt Exp $ */
+/* $NetBSD: wsdisplay.c,v 1.74 2003/06/28 14:21:47 darrenr Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.73 2003/03/06 00:38:28 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.74 2003/06/28 14:21:47 darrenr Exp $");
#include "opt_wsdisplay_compat.h"
#include "opt_compat_netbsd.h"
@@ -671,7 +671,7 @@ wsdisplay_cnattach(const struct wsscreen_descr *type, void *cookie,
* Tty and cdevsw functions.
*/
int
-wsdisplayopen(dev_t dev, int flag, int mode, struct proc *p)
+wsdisplayopen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct wsdisplay_softc *sc;
struct tty *tp;
@@ -684,7 +684,7 @@ wsdisplayopen(dev_t dev, int flag, int mode, struct proc *p)
if (ISWSDISPLAYSTAT(dev)) {
wsevent_init(&sc->evar);
- sc->evar.io = p;
+ sc->evar.io = l->l_proc;
return (0);
}
@@ -713,7 +713,7 @@ wsdisplayopen(dev_t dev, int flag, int mode, struct proc *p)
wsdisplayparam(tp, &tp->t_termios);
ttsetwater(tp);
} else if ((tp->t_state & TS_XCLUDE) != 0 &&
- p->p_ucred->cr_uid != 0)
+ l->l_proc->p_ucred->cr_uid != 0)
return EBUSY;
tp->t_state |= TS_CARR_ON;
@@ -736,7 +736,7 @@ wsdisplayopen(dev_t dev, int flag, int mode, struct proc *p)
}
int
-wsdisplayclose(dev_t dev, int flag, int mode, struct proc *p)
+wsdisplayclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct wsdisplay_softc *sc;
struct tty *tp;
@@ -785,7 +785,7 @@ wsdisplayclose(dev_t dev, int flag, int mode, struct proc *p)
if (scr->scr_rawkbd) {
int kbmode = WSKBD_TRANSLATED;
(void)wsdisplay_internal_ioctl(sc, scr, WSKBDIO_SETMODE,
- (caddr_t)&kbmode, 0, p);
+ (caddr_t)&kbmode, 0, l);
}
#endif
@@ -847,7 +847,7 @@ wsdisplaywrite(dev_t dev, struct uio *uio, int flag)
}
int
-wsdisplaypoll(dev_t dev, int events, struct proc *p)
+wsdisplaypoll(dev_t dev, int events, struct lwp *l)
{
struct wsdisplay_softc *sc;
struct tty *tp;
@@ -856,7 +856,7 @@ wsdisplaypoll(dev_t dev, int events, struct proc *p)
sc = device_lookup(&wsdisplay_cd, WSDISPLAYUNIT(dev));
if (ISWSDISPLAYSTAT(dev))
- return (wsevent_poll(&sc->evar, events, p));
+ return (wsevent_poll(&sc->evar, events, l));
if (ISWSDISPLAYCTL(dev))
return (0);
@@ -867,7 +867,7 @@ wsdisplaypoll(dev_t dev, int events, struct proc *p)
return (ENODEV);
tp = scr->scr_tty;
- return ((*tp->t_linesw->l_poll)(tp, events, p));
+ return ((*tp->t_linesw->l_poll)(tp, events, l));
}
int
@@ -910,7 +910,7 @@ wsdisplaytty(dev_t dev)
}
int
-wsdisplayioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+wsdisplayioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct wsdisplay_softc *sc;
struct tty *tp;
@@ -920,16 +920,16 @@ wsdisplayioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
sc = device_lookup(&wsdisplay_cd, WSDISPLAYUNIT(dev));
#ifdef WSDISPLAY_COMPAT_USL
- error = wsdisplay_usl_ioctl1(sc, cmd, data, flag, p);
+ error = wsdisplay_usl_ioctl1(sc, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return (error);
#endif
if (ISWSDISPLAYSTAT(dev))
- return (wsdisplay_stat_ioctl(sc, cmd, data, flag, p));
+ return (wsdisplay_stat_ioctl(sc, cmd, data, flag, l));
if (ISWSDISPLAYCTL(dev))
- return (wsdisplay_cfg_ioctl(sc, cmd, data, flag, p));
+ return (wsdisplay_cfg_ioctl(sc, cmd, data, flag, l));
scr = sc->sc_scr[WSDISPLAYSCREEN(dev)];
@@ -938,24 +938,24 @@ wsdisplayioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
/* printf("disc\n"); */
/* do the line discipline ioctls first */
- error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, p);
+ error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return (error);
/* printf("tty\n"); */
/* then the tty ioctls */
- error = ttioctl(tp, cmd, data, flag, p);
+ error = ttioctl(tp, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return (error);
}
#ifdef WSDISPLAY_COMPAT_USL
- error = wsdisplay_usl_ioctl2(sc, scr, cmd, data, flag, p);
+ error = wsdisplay_usl_ioctl2(sc, scr, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return (error);
#endif
- return (wsdisplay_internal_ioctl(sc, scr, cmd, data, flag, p));
+ return (wsdisplay_internal_ioctl(sc, scr, cmd, data, flag, l));
}
int
@@ -968,7 +968,7 @@ wsdisplay_param(struct device *dev, u_long cmd, struct wsdisplay_param *dp)
int
wsdisplay_internal_ioctl(struct wsdisplay_softc *sc, struct wsscreen *scr,
- u_long cmd, caddr_t data, int flag, struct proc *p)
+ u_long cmd, caddr_t data, int flag, struct lwp *l)
{
int error;
char namebuf[16];
@@ -991,7 +991,7 @@ wsdisplay_internal_ioctl(struct wsdisplay_softc *sc, struct wsscreen *scr,
inp = sc->sc_input;
if (inp == NULL)
return (ENXIO);
- error = wsevsrc_display_ioctl(inp, cmd, data, flag, p);
+ error = wsevsrc_display_ioctl(inp, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return (error);
#endif /* NWSKBD > 0 */
@@ -1017,7 +1017,7 @@ wsdisplay_internal_ioctl(struct wsdisplay_softc *sc, struct wsscreen *scr,
return (EINVAL);
(void)(*sc->sc_accessops->ioctl)(sc->sc_accesscookie, cmd, data,
- flag, p);
+ flag, l);
return (0);
#undef d
@@ -1065,12 +1065,12 @@ wsdisplay_internal_ioctl(struct wsdisplay_softc *sc, struct wsscreen *scr,
/* check ioctls for display */
return ((*sc->sc_accessops->ioctl)(sc->sc_accesscookie, cmd, data,
- flag, p));
+ flag, l));
}
int
wsdisplay_stat_ioctl(struct wsdisplay_softc *sc, u_long cmd, caddr_t data,
- int flag, struct proc *p)
+ int flag, struct lwp *l)
{
switch (cmd) {
case WSDISPLAYIO_GETACTIVESCREEN:
@@ -1083,7 +1083,7 @@ wsdisplay_stat_ioctl(struct wsdisplay_softc *sc, u_long cmd, caddr_t data,
int
wsdisplay_cfg_ioctl(struct wsdisplay_softc *sc, u_long cmd, caddr_t data,
- int flag, struct proc *p)
+ int flag, struct lwp *l)
{
int error;
char *type, typebuf[16], *emul, emulbuf[16];
@@ -1168,12 +1168,12 @@ wsdisplay_cfg_ioctl(struct wsdisplay_softc *sc, u_long cmd, caddr_t data,
wsmuxdata.type = WSMUX_KBD;
wsmuxdata.idx = d->idx;
return (wsevsrc_ioctl(inp, WSMUX_ADD_DEVICE,
- &wsmuxdata, flag, p));
+ &wsmuxdata, flag, l));
case _O_WSDISPLAY_KBD_DEL:
wsmuxdata.type = WSMUX_KBD;
wsmuxdata.idx = d->idx;
return (wsevsrc_ioctl(inp, WSMUX_REMOVE_DEVICE,
- &wsmuxdata, flag, p));
+ &wsmuxdata, flag, l));
default:
return (EINVAL);
}
@@ -1192,7 +1192,7 @@ wsdisplay_cfg_ioctl(struct wsdisplay_softc *sc, u_long cmd, caddr_t data,
inp = sc->sc_input;
if (inp == NULL)
return (ENXIO);
- return (wsevsrc_ioctl(inp, cmd, data, flag, p));
+ return (wsevsrc_ioctl(inp, cmd, data, flag, l));
#endif /* NWSKBD > 0 */
}
diff --git a/sys/dev/wscons/wsdisplay_compat_usl.c b/sys/dev/wscons/wsdisplay_compat_usl.c
index 496fa49ffc1..7450fd9e1a3 100644
--- a/sys/dev/wscons/wsdisplay_compat_usl.c
+++ b/sys/dev/wscons/wsdisplay_compat_usl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay_compat_usl.c,v 1.21 2003/01/18 10:38:38 thorpej Exp $ */
+/* $NetBSD: wsdisplay_compat_usl.c,v 1.22 2003/06/28 14:21:47 darrenr Exp $ */
/*
* Copyright (c) 1998
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsdisplay_compat_usl.c,v 1.21 2003/01/18 10:38:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsdisplay_compat_usl.c,v 1.22 2003/06/28 14:21:47 darrenr Exp $");
#include "opt_compat_freebsd.h"
#include "opt_compat_netbsd.h"
@@ -287,7 +287,7 @@ usl_attachtimeout(void *arg)
int
wsdisplay_usl_ioctl1(struct wsdisplay_softc *sc, u_long cmd, caddr_t data,
- int flag, struct proc *p)
+ int flag, struct lwp *l)
{
int idx, maxidx;
@@ -349,8 +349,9 @@ wsdisplay_usl_ioctl1(struct wsdisplay_softc *sc, u_long cmd, caddr_t data,
int
wsdisplay_usl_ioctl2(struct wsdisplay_softc *sc, struct wsscreen *scr,
- u_long cmd, caddr_t data, int flag, struct proc *p)
+ u_long cmd, caddr_t data, int flag, struct lwp *l)
{
+ struct proc *p = l->l_proc;
int intarg, res;
u_long req;
void *arg;
@@ -503,7 +504,7 @@ wsdisplay_usl_ioctl2(struct wsdisplay_softc *sc, struct wsscreen *scr,
#endif
}
- res = wsdisplay_internal_ioctl(sc, scr, req, arg, flag, p);
+ res = wsdisplay_internal_ioctl(sc, scr, req, arg, flag, l);
if (res != EPASSTHROUGH)
return (res);
diff --git a/sys/dev/wscons/wsdisplayvar.h b/sys/dev/wscons/wsdisplayvar.h
index c8bd8f54fe9..7769927b57f 100644
--- a/sys/dev/wscons/wsdisplayvar.h
+++ b/sys/dev/wscons/wsdisplayvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplayvar.h,v 1.23 2002/10/15 17:38:08 junyoung Exp $ */
+/* $NetBSD: wsdisplayvar.h,v 1.24 2003/06/28 14:21:47 darrenr Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -100,7 +100,7 @@ struct wsdisplay_char;
*/
struct wsdisplay_accessops {
int (*ioctl)(void *v, u_long cmd, caddr_t data, int flag,
- struct proc *p);
+ struct lwp *l);
paddr_t (*mmap)(void *v, off_t off, int prot);
int (*alloc_screen)(void *, const struct wsscreen_descr *,
void **, int *, int *, long *);
@@ -182,19 +182,19 @@ int wsdisplay_getactivescreen(struct wsdisplay_softc *);
int wsscreen_switchwait(struct wsdisplay_softc *, int);
int wsdisplay_internal_ioctl(struct wsdisplay_softc *sc, struct wsscreen *,
- u_long cmd, caddr_t data,int flag, struct proc *p);
+ u_long cmd, caddr_t data,int flag, struct lwp *l);
int wsdisplay_usl_ioctl1(struct wsdisplay_softc *,
- u_long, caddr_t, int, struct proc *);
+ u_long, caddr_t, int, struct lwp *);
int wsdisplay_usl_ioctl2(struct wsdisplay_softc *, struct wsscreen *,
- u_long, caddr_t, int, struct proc *);
+ u_long, caddr_t, int, struct lwp *);
int wsdisplay_stat_ioctl(struct wsdisplay_softc *sc, u_long cmd, caddr_t data,
- int flag, struct proc *p);
+ int flag, struct lwp *l);
int wsdisplay_cfg_ioctl(struct wsdisplay_softc *sc, u_long cmd, caddr_t data,
- int flag, struct proc *p);
+ int flag, struct lwp *l);
int wsdisplay_stat_inject(struct device *dev, u_int type, int value);
diff --git a/sys/dev/wscons/wsevent.c b/sys/dev/wscons/wsevent.c
index 368db280dda..e3045be5b63 100644
--- a/sys/dev/wscons/wsevent.c
+++ b/sys/dev/wscons/wsevent.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsevent.c,v 1.13 2002/12/26 12:01:42 christos Exp $ */
+/* $NetBSD: wsevent.c,v 1.14 2003/06/28 14:21:47 darrenr Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsevent.c,v 1.13 2002/12/26 12:01:42 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsevent.c,v 1.14 2003/06/28 14:21:47 darrenr Exp $");
#include <sys/param.h>
#include <sys/fcntl.h>
@@ -187,7 +187,7 @@ wsevent_read(struct wseventvar *ev, struct uio *uio, int flags)
}
int
-wsevent_poll(struct wseventvar *ev, int events, struct proc *p)
+wsevent_poll(struct wseventvar *ev, int events, struct lwp *l)
{
int revents = 0;
int s = splwsevent();
@@ -196,7 +196,7 @@ wsevent_poll(struct wseventvar *ev, int events, struct proc *p)
if (ev->get != ev->put)
revents |= events & (POLLIN | POLLRDNORM);
else
- selrecord(p, &ev->sel);
+ selrecord(l, &ev->sel);
}
splx(s);
diff --git a/sys/dev/wscons/wseventvar.h b/sys/dev/wscons/wseventvar.h
index f019f61c3fb..89d8f473039 100644
--- a/sys/dev/wscons/wseventvar.h
+++ b/sys/dev/wscons/wseventvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wseventvar.h,v 1.5 2002/10/23 09:14:07 jdolecek Exp $ */
+/* $NetBSD: wseventvar.h,v 1.6 2003/06/28 14:21:47 darrenr Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -108,7 +108,7 @@ struct wseventvar {
void wsevent_init(struct wseventvar *);
void wsevent_fini(struct wseventvar *);
int wsevent_read(struct wseventvar *, struct uio *, int);
-int wsevent_poll(struct wseventvar *, int, struct proc *);
+int wsevent_poll(struct wseventvar *, int, struct lwp *);
int wsevent_kqfilter(struct wseventvar *ev, struct knote *kn);
/*
diff --git a/sys/dev/wscons/wskbd.c b/sys/dev/wscons/wskbd.c
index 2f533fdc534..13a1fe28ba1 100644
--- a/sys/dev/wscons/wskbd.c
+++ b/sys/dev/wscons/wskbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wskbd.c,v 1.67 2003/01/01 00:10:27 thorpej Exp $ */
+/* $NetBSD: wskbd.c,v 1.68 2003/06/28 14:21:47 darrenr Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -83,7 +83,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.67 2003/01/01 00:10:27 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.68 2003/06/28 14:21:47 darrenr Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -205,7 +205,7 @@ static int wskbd_detach(struct device *, int);
static int wskbd_activate(struct device *, enum devact);
static int wskbd_displayioctl(struct device *, u_long, caddr_t, int,
- struct proc *);
+ struct lwp *);
#if NWSDISPLAY > 0
static int wskbd_set_display(struct device *, struct wsevsrc *);
#else
@@ -223,7 +223,7 @@ static void wskbd_holdscreen(struct wskbd_softc *, int);
#endif
static int wskbd_do_ioctl_sc(struct wskbd_softc *, u_long, caddr_t, int,
- struct proc *);
+ struct lwp *);
#if NWSMUX > 0
static int wskbd_mux_open(struct wsevsrc *, struct wseventvar *);
@@ -234,7 +234,7 @@ static int wskbd_mux_close(struct wsevsrc *);
#endif
static int wskbd_do_open(struct wskbd_softc *, struct wseventvar *);
-static int wskbd_do_ioctl(struct device *, u_long, caddr_t, int, struct proc *);
+static int wskbd_do_ioctl(struct device *, u_long, caddr_t, int, struct lwp *);
CFATTACH_DECL(wskbd, sizeof (struct wskbd_softc),
wskbd_match, wskbd_attach, wskbd_detach, wskbd_activate);
@@ -716,7 +716,7 @@ wskbd_mux_open(struct wsevsrc *me, struct wseventvar *evp)
#endif
int
-wskbdopen(dev_t dev, int flags, int mode, struct proc *p)
+wskbdopen(dev_t dev, int flags, int mode, struct lwp *l)
{
struct wskbd_softc *sc;
struct wseventvar *evar;
@@ -752,7 +752,7 @@ wskbdopen(dev_t dev, int flags, int mode, struct proc *p)
evar = &sc->sc_base.me_evar;
wsevent_init(evar);
- evar->io = p;
+ evar->io = l->l_proc;
error = wskbd_do_open(sc, evar);
if (error) {
@@ -774,7 +774,7 @@ wskbd_do_open(struct wskbd_softc *sc, struct wseventvar *evp)
}
int
-wskbdclose(dev_t dev, int flags, int mode, struct proc *p)
+wskbdclose(dev_t dev, int flags, int mode, struct lwp *l)
{
struct wskbd_softc *sc =
(struct wskbd_softc *)wskbd_cd.cd_devs[minor(dev)];
@@ -832,21 +832,21 @@ wskbdread(dev_t dev, struct uio *uio, int flags)
}
int
-wskbdioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+wskbdioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
- return (wskbd_do_ioctl(wskbd_cd.cd_devs[minor(dev)], cmd, data, flag,p));
+ return (wskbd_do_ioctl(wskbd_cd.cd_devs[minor(dev)], cmd, data, flag,l));
}
/* A wrapper around the ioctl() workhorse to make reference counting easy. */
int
wskbd_do_ioctl(struct device *dv, u_long cmd, caddr_t data, int flag,
- struct proc *p)
+ struct lwp *l)
{
struct wskbd_softc *sc = (struct wskbd_softc *)dv;
int error;
sc->sc_refcnt++;
- error = wskbd_do_ioctl_sc(sc, cmd, data, flag, p);
+ error = wskbd_do_ioctl_sc(sc, cmd, data, flag, l);
if (--sc->sc_refcnt < 0)
wakeup(sc);
return (error);
@@ -854,7 +854,7 @@ wskbd_do_ioctl(struct device *dv, u_long cmd, caddr_t data, int flag,
int
wskbd_do_ioctl_sc(struct wskbd_softc *sc, u_long cmd, caddr_t data, int flag,
- struct proc *p)
+ struct lwp *l)
{
/*
@@ -882,7 +882,7 @@ wskbd_do_ioctl_sc(struct wskbd_softc *sc, u_long cmd, caddr_t data, int flag,
* Try the keyboard driver for WSKBDIO ioctls. It returns EPASSTHROUGH
* if it didn't recognize the request.
*/
- return (wskbd_displayioctl(&sc->sc_base.me_dv, cmd, data, flag, p));
+ return (wskbd_displayioctl(&sc->sc_base.me_dv, cmd, data, flag, l));
}
/*
@@ -891,13 +891,14 @@ wskbd_do_ioctl_sc(struct wskbd_softc *sc, u_long cmd, caddr_t data, int flag,
*/
static int
wskbd_displayioctl(struct device *dev, u_long cmd, caddr_t data, int flag,
- struct proc *p)
+ struct lwp *l)
{
struct wskbd_softc *sc = (struct wskbd_softc *)dev;
struct wskbd_bell_data *ubdp, *kbdp;
struct wskbd_keyrepeat_data *ukdp, *kkdp;
struct wskbd_map_data *umdp;
struct wskbd_mapdata md;
+ struct proc *p = l ? l->l_proc : NULL;
kbd_t enc;
void *buf;
int len, error;
@@ -1082,13 +1083,13 @@ getkeyrepeat:
}
int
-wskbdpoll(dev_t dev, int events, struct proc *p)
+wskbdpoll(dev_t dev, int events, struct lwp *l)
{
struct wskbd_softc *sc = wskbd_cd.cd_devs[minor(dev)];
if (sc->sc_base.me_evp == NULL)
return (EINVAL);
- return (wsevent_poll(sc->sc_base.me_evp, events, p));
+ return (wsevent_poll(sc->sc_base.me_evp, events, l));
}
int
diff --git a/sys/dev/wscons/wsmouse.c b/sys/dev/wscons/wsmouse.c
index 336cb4e4b9e..4464b54f87a 100644
--- a/sys/dev/wscons/wsmouse.c
+++ b/sys/dev/wscons/wsmouse.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsmouse.c,v 1.29 2003/01/01 00:10:27 thorpej Exp $ */
+/* $NetBSD: wsmouse.c,v 1.30 2003/06/28 14:21:48 darrenr Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsmouse.c,v 1.29 2003/01/01 00:10:27 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsmouse.c,v 1.30 2003/06/28 14:21:48 darrenr Exp $");
#include "wsmouse.h"
#include "wsdisplay.h"
@@ -141,14 +141,14 @@ static int wsmouse_detach(struct device *, int);
static int wsmouse_activate(struct device *, enum devact);
static int wsmouse_do_ioctl(struct wsmouse_softc *, u_long, caddr_t,
- int, struct proc *);
+ int, struct lwp *);
#if NWSMUX > 0
static int wsmouse_mux_open(struct wsevsrc *, struct wseventvar *);
static int wsmouse_mux_close(struct wsevsrc *);
#endif
-static int wsmousedoioctl(struct device *, u_long, caddr_t, int, struct proc *);
+static int wsmousedoioctl(struct device *, u_long, caddr_t, int, struct lwp *);
static int wsmousedoopen(struct wsmouse_softc *, struct wseventvar *);
@@ -448,7 +448,7 @@ out:
}
int
-wsmouseopen(dev_t dev, int flags, int mode, struct proc *p)
+wsmouseopen(dev_t dev, int flags, int mode, struct lwp *l)
{
struct wsmouse_softc *sc;
struct wseventvar *evar;
@@ -461,7 +461,7 @@ wsmouseopen(dev_t dev, int flags, int mode, struct proc *p)
#if NWSMUX > 0
DPRINTF(("wsmouseopen: %s mux=%p p=%p\n", sc->sc_base.me_dv.dv_xname,
- sc->sc_base.me_parent, p));
+ sc->sc_base.me_parent, l));
#endif
if (sc->sc_dying)
@@ -477,7 +477,7 @@ wsmouseopen(dev_t dev, int flags, int mode, struct proc *p)
evar = &sc->sc_base.me_evar;
wsevent_init(evar);
sc->sc_base.me_evp = evar;
- evar->io = p;
+ evar->io = l->l_proc;
error = wsmousedoopen(sc, evar);
if (error) {
@@ -490,7 +490,7 @@ wsmouseopen(dev_t dev, int flags, int mode, struct proc *p)
}
int
-wsmouseclose(dev_t dev, int flags, int mode, struct proc *p)
+wsmouseclose(dev_t dev, int flags, int mode, struct lwp *l)
{
struct wsmouse_softc *sc =
(struct wsmouse_softc *)wsmouse_cd.cd_devs[minor(dev)];
@@ -544,22 +544,22 @@ wsmouseread(dev_t dev, struct uio *uio, int flags)
}
int
-wsmouseioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+wsmouseioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
return (wsmousedoioctl(wsmouse_cd.cd_devs[minor(dev)],
- cmd, data, flag, p));
+ cmd, data, flag, l));
}
/* A wrapper around the ioctl() workhorse to make reference counting easy. */
int
wsmousedoioctl(struct device *dv, u_long cmd, caddr_t data, int flag,
- struct proc *p)
+ struct lwp *l)
{
struct wsmouse_softc *sc = (struct wsmouse_softc *)dv;
int error;
sc->sc_refcnt++;
- error = wsmouse_do_ioctl(sc, cmd, data, flag, p);
+ error = wsmouse_do_ioctl(sc, cmd, data, flag, l);
if (--sc->sc_refcnt < 0)
wakeup(sc);
return (error);
@@ -567,7 +567,7 @@ wsmousedoioctl(struct device *dv, u_long cmd, caddr_t data, int flag,
int
wsmouse_do_ioctl(struct wsmouse_softc *sc, u_long cmd, caddr_t data,
- int flag, struct proc *p)
+ int flag, struct lwp *l)
{
int error;
@@ -600,18 +600,18 @@ wsmouse_do_ioctl(struct wsmouse_softc *sc, u_long cmd, caddr_t data,
* if it didn't recognize the request.
*/
error = (*sc->sc_accessops->ioctl)(sc->sc_accesscookie, cmd,
- data, flag, p);
+ data, flag, l->l_proc);
return (error != -1 ? error : ENOTTY);
}
int
-wsmousepoll(dev_t dev, int events, struct proc *p)
+wsmousepoll(dev_t dev, int events, struct lwp *l)
{
struct wsmouse_softc *sc = wsmouse_cd.cd_devs[minor(dev)];
if (sc->sc_base.me_evp == NULL)
return (EINVAL);
- return (wsevent_poll(sc->sc_base.me_evp, events, p));
+ return (wsevent_poll(sc->sc_base.me_evp, events, l));
}
int
diff --git a/sys/dev/wscons/wsmux.c b/sys/dev/wscons/wsmux.c
index de4693c114f..e106d63731b 100644
--- a/sys/dev/wscons/wsmux.c
+++ b/sys/dev/wscons/wsmux.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsmux.c,v 1.31 2002/10/23 09:14:09 jdolecek Exp $ */
+/* $NetBSD: wsmux.c,v 1.32 2003/06/28 14:21:48 darrenr Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsmux.c,v 1.31 2002/10/23 09:14:09 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsmux.c,v 1.32 2003/06/28 14:21:48 darrenr Exp $");
#include "wsdisplay.h"
#include "wsmux.h"
@@ -108,8 +108,8 @@ static int wsmux_evsrc_set_display(struct device *, struct wsevsrc *);
#endif
static int wsmux_do_displayioctl(struct device *dev, u_long cmd,
- caddr_t data, int flag, struct proc *p);
-static int wsmux_do_ioctl(struct device *, u_long, caddr_t,int,struct proc *);
+ caddr_t data, int flag, struct lwp *l);
+static int wsmux_do_ioctl(struct device *, u_long, caddr_t,int,struct lwp *);
static int wsmux_add_mux(int, struct wsmux_softc *);
@@ -189,7 +189,7 @@ wsmux_getmux(int n)
* open() of the pseudo device from device table.
*/
int
-wsmuxopen(dev_t dev, int flags, int mode, struct proc *p)
+wsmuxopen(dev_t dev, int flags, int mode, struct lwp *l)
{
struct wsmux_softc *sc;
struct wseventvar *evar;
@@ -226,7 +226,7 @@ wsmuxopen(dev_t dev, int flags, int mode, struct proc *p)
evar = &sc->sc_base.me_evar;
wsevent_init(evar);
- evar->io = p;
+ evar->io = l->l_proc;
#ifdef WSDISPLAY_COMPAT_RAWKBD
sc->sc_rawkbd = 0;
#endif
@@ -298,7 +298,7 @@ wsmux_do_open(struct wsmux_softc *sc, struct wseventvar *evar)
* close() of the pseudo device from device table.
*/
int
-wsmuxclose(dev_t dev, int flags, int mode, struct proc *p)
+wsmuxclose(dev_t dev, int flags, int mode, struct lwp *l)
{
int minr = minor(dev);
struct wsmux_softc *sc = wsmuxdevs[WSMUXDEV(minr)];
@@ -388,11 +388,11 @@ wsmuxread(dev_t dev, struct uio *uio, int flags)
* ioctl of the pseudo device from device table.
*/
int
-wsmuxioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+wsmuxioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
int u = WSMUXDEV(minor(dev));
- return wsmux_do_ioctl(&wsmuxdevs[u]->sc_base.me_dv, cmd, data, flag, p);
+ return wsmux_do_ioctl(&wsmuxdevs[u]->sc_base.me_dv, cmd, data, flag, l);
}
/*
@@ -400,7 +400,7 @@ wsmuxioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
*/
int
wsmux_do_ioctl(struct device *dv, u_long cmd, caddr_t data, int flag,
- struct proc *p)
+ struct lwp *lwp)
{
struct wsmux_softc *sc = (struct wsmux_softc *)dv;
struct wsevsrc *me;
@@ -538,7 +538,7 @@ wsmux_do_ioctl(struct device *dv, u_long cmd, caddr_t data, int flag,
continue;
}
#endif
- error = wsevsrc_ioctl(me, cmd, data, flag, p);
+ error = wsevsrc_ioctl(me, cmd, data, flag, lwp);
DPRINTF(("wsmux_do_ioctl: %s: me=%p dev=%s ==> %d\n",
sc->sc_base.me_dv.dv_xname, me, me->me_dv.dv_xname,
error));
@@ -555,7 +555,7 @@ wsmux_do_ioctl(struct device *dv, u_long cmd, caddr_t data, int flag,
* poll() of the pseudo device from device table.
*/
int
-wsmuxpoll(dev_t dev, int events, struct proc *p)
+wsmuxpoll(dev_t dev, int events, struct lwp *l)
{
int minr = minor(dev);
struct wsmux_softc *sc = wsmuxdevs[WSMUXDEV(minr)];
@@ -572,7 +572,7 @@ wsmuxpoll(dev_t dev, int events, struct proc *p)
return (EACCES);
}
- return (wsevent_poll(sc->sc_base.me_evp, events, p));
+ return (wsevent_poll(sc->sc_base.me_evp, events, l));
}
/*
@@ -748,7 +748,7 @@ wsmux_detach_sc(struct wsevsrc *me)
*/
int
wsmux_do_displayioctl(struct device *dv, u_long cmd, caddr_t data, int flag,
- struct proc *p)
+ struct lwp *l)
{
struct wsmux_softc *sc = (struct wsmux_softc *)dv;
struct wsevsrc *me;
@@ -779,7 +779,7 @@ wsmux_do_displayioctl(struct device *dv, u_long cmd, caddr_t data, int flag,
}
#endif
if (me->me_ops->ddispioctl != NULL) {
- error = wsevsrc_display_ioctl(me, cmd, data, flag, p);
+ error = wsevsrc_display_ioctl(me, cmd, data, flag, l);
DPRINTF(("wsmux_displayioctl: me=%p dev=%s ==> %d\n",
me, me->me_dv.dv_xname, error));
if (!error)
diff --git a/sys/dev/wscons/wsmuxvar.h b/sys/dev/wscons/wsmuxvar.h
index bc6df8dfe3f..a7d62e4dd62 100644
--- a/sys/dev/wscons/wsmuxvar.h
+++ b/sys/dev/wscons/wsmuxvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wsmuxvar.h,v 1.7 2002/03/02 08:22:28 takemura Exp $ */
+/* $NetBSD: wsmuxvar.h,v 1.8 2003/06/28 14:21:48 darrenr Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -61,8 +61,8 @@ struct wssrcops {
int type; /* device type: WSMUX_{MOUSE,KBD,MUX} */
int (*dopen)(struct wsevsrc *, struct wseventvar *);
int (*dclose)(struct wsevsrc *);
- int (*dioctl)(struct device *, u_long, caddr_t, int, struct proc *);
- int (*ddispioctl)(struct device *, u_long, caddr_t, int, struct proc *);
+ int (*dioctl)(struct device *, u_long, caddr_t, int, struct lwp *);
+ int (*ddispioctl)(struct device *, u_long, caddr_t, int, struct lwp *);
int (*dsetdisplay)(struct device *, struct wsevsrc *);
};
@@ -70,10 +70,10 @@ struct wssrcops {
((me)->me_ops->dopen((me), evp))
#define wsevsrc_close(me) \
((me)->me_ops->dclose((me)))
-#define wsevsrc_ioctl(me, cmd, data, flag, p) \
- ((me)->me_ops->dioctl(&(me)->me_dv, cmd, (caddr_t)data, flag, p))
-#define wsevsrc_display_ioctl(me, cmd, data, flag, p) \
- ((me)->me_ops->ddispioctl(&(me)->me_dv, cmd, (caddr_t)data, flag, p))
+#define wsevsrc_ioctl(me, cmd, data, flag, l) \
+ ((me)->me_ops->dioctl(&(me)->me_dv, cmd, (caddr_t)data, flag, l))
+#define wsevsrc_display_ioctl(me, cmd, data, flag, l) \
+ ((me)->me_ops->ddispioctl(&(me)->me_dv, cmd, (caddr_t)data, flag, l))
#define wsevsrc_set_display(me, arg) \
((me)->me_ops->dsetdisplay(&(me)->me_dv, arg))
diff --git a/sys/dev/wsfont/wsfontdev.c b/sys/dev/wsfont/wsfontdev.c
index 48d07bd9ab3..3b22dad8b6c 100644
--- a/sys/dev/wsfont/wsfontdev.c
+++ b/sys/dev/wsfont/wsfontdev.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsfontdev.c,v 1.6 2002/10/23 09:14:10 jdolecek Exp $ */
+/* $NetBSD: wsfontdev.c,v 1.7 2003/06/28 14:21:48 darrenr Exp $ */
/*
* Copyright (c) 2001
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsfontdev.c,v 1.6 2002/10/23 09:14:10 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsfontdev.c,v 1.7 2003/06/28 14:21:48 darrenr Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -60,7 +60,7 @@ wsfontattach(int n)
}
int
-wsfontopen(dev_t dev, int flag, int mode, struct proc *p)
+wsfontopen(dev_t dev, int flag, int mode, struct lwp *l)
{
if (wsfont_isopen)
@@ -70,7 +70,7 @@ wsfontopen(dev_t dev, int flag, int mode, struct proc *p)
}
int
-wsfontclose(dev_t dev, int flag, int mode, struct proc *p)
+wsfontclose(dev_t dev, int flag, int mode, struct lwp *l)
{
wsfont_isopen = 0;
@@ -78,7 +78,7 @@ wsfontclose(dev_t dev, int flag, int mode, struct proc *p)
}
int
-wsfontioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+wsfontioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
char nbuf[16];
void *buf;