Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/thorpej-devvp]: src/sys Convert all remaining devices.
details: https://anonhg.NetBSD.org/src/rev/db398cd66031
branches: thorpej-devvp
changeset: 514628:db398cd66031
user: fvdl <fvdl%NetBSD.org@localhost>
date: Wed Oct 10 11:55:46 2001 +0000
description:
Convert all remaining devices.
diffstat:
sys/adosfs/advfsops.c | 4 +-
sys/altq/altq_afmap.c | 15 +-
sys/altq/altq_blue.c | 15 +-
sys/altq/altq_cbq.c | 15 +-
sys/altq/altq_cdnr.c | 19 +--
sys/altq/altq_conf.c | 24 ++--
sys/altq/altq_fifoq.c | 15 +-
sys/altq/altq_hfsc.c | 17 +-
sys/altq/altq_localq.c | 15 +-
sys/altq/altq_priq.c | 17 +-
sys/altq/altq_red.c | 14 +-
sys/altq/altq_rio.c | 14 +-
sys/altq/altq_wfq.c | 14 +-
sys/arch/algor/algor/disksubr.c | 38 ++++--
sys/arch/alpha/a12/a12dc.c | 69 +++++++------
sys/arch/alpha/alpha/disksubr.c | 16 ++-
sys/arch/alpha/alpha/promcons.c | 15 +-
sys/arch/alpha/tc/scc.c | 6 +-
sys/arch/amiga/amiga/autoconf.c | 28 +++-
sys/arch/amiga/amiga/disksubr.c | 39 ++++---
sys/arch/amiga/amiga/mem.c | 22 ++-
sys/arch/amiga/dev/fd.c | 76 ++++++++------
sys/arch/amiga/dev/grf.c | 97 ++++++++++--------
sys/arch/amiga/dev/ite.c | 61 +++++++---
sys/arch/amiga/dev/itevar.h | 12 +-
sys/arch/amiga/dev/kbd.c | 23 ++--
sys/arch/amiga/dev/mfc.c | 127 ++++++++++++++----------
sys/arch/amiga/dev/ms.c | 43 ++++----
sys/arch/amiga/dev/msc.c | 111 ++++++++++++--------
sys/arch/amiga/dev/par.c | 65 +++++++-----
sys/arch/amiga/dev/ser.c | 73 ++++++++------
sys/arch/amiga/dev/view.c | 35 +++--
sys/arch/amiga/dev/viewioctl.h | 4 +-
sys/arch/arc/arc/disksubr.c | 37 ++++--
sys/arch/arc/dev/pccons.c | 82 +++++++++------
sys/arch/arc/isa/joy.c | 51 +++++----
sys/arch/arc/jazz/fd.c | 44 +++++---
sys/arch/arm/arm/disksubr.c | 42 ++++---
sys/arch/arm/arm/disksubr_acorn.c | 15 +-
sys/arch/arm/arm/disksubr_mbr.c | 15 +-
sys/arch/arm/arm32/mem.c | 29 +++--
sys/arch/arm/footbridge/footbridge_com.c | 90 +++++++++++------
sys/arch/arm/include/disklabel.h | 7 +-
sys/arch/arm/include/disklabel_acorn.h | 7 +-
sys/arch/arm/sa11x0/sa11x0_com.c | 95 +++++++++++-------
sys/arch/arm26/arm26/mem.c | 28 ++--
sys/arch/arm26/ioc/arcpp.c | 29 +++-
sys/arch/arm32/dev/iic.c | 41 +++----
sys/arch/arm32/dev/kbd.c | 48 +++++---
sys/arch/arm32/dev/md_hooks.c | 14 ++-
sys/arch/arm32/dev/pms.c | 45 +++++---
sys/arch/arm32/dev/qms.c | 47 +++++---
sys/arch/arm32/dev/rtc.c | 34 +++--
sys/arch/arm32/isa/joy.c | 46 +++++---
sys/arch/arm32/mainbus/fd.c | 71 +++++++-----
sys/arch/arm32/ofw/ofrom.c | 32 +++--
sys/arch/arm32/shark/pccons.c | 73 +++++++++----
sys/arch/arm32/shark/pms.c | 42 +++++--
sys/arch/arm32/shark/profile.c | 22 ++-
sys/arch/arm32/shark/scr.c | 55 ++++++----
sys/arch/arm32/vidc/beep.c | 31 +++--
sys/arch/arm32/vidc/console/console.c | 51 +++++----
sys/arch/arm32/vidc/console/vidcconsole.c | 55 ++++++----
sys/arch/atari/atari/autoconf.c | 17 ++-
sys/arch/atari/atari/disksubr.c | 64 +++++++-----
sys/arch/atari/atari/mem.c | 20 ++-
sys/arch/atari/dev/clock.c | 27 ++--
sys/arch/atari/dev/fd.c | 46 +++++---
sys/arch/atari/dev/grf.c | 43 +++++--
sys/arch/atari/dev/hdfd.c | 60 ++++++-----
sys/arch/atari/dev/ite.c | 46 +++++---
sys/arch/atari/dev/kbd.c | 15 +-
sys/arch/atari/dev/md_root.c | 19 ++-
sys/arch/atari/dev/ser.c | 92 +++++++++++------
sys/arch/atari/vme/et4000.c | 30 +++--
sys/arch/atari/vme/leo.c | 51 +++++----
sys/arch/bebox/bebox/disksubr.c | 39 ++++--
sys/arch/bebox/isa/joy.c | 27 +++--
sys/arch/bebox/isa/lms.c | 36 ++++--
sys/arch/bebox/isa/mms.c | 40 ++++--
sys/arch/bebox/isa/pccons.c | 76 +++++++++-----
sys/arch/bebox/isa/pms.c | 39 ++++--
sys/arch/bebox/isa/spkr.c | 22 ++-
sys/arch/cesfic/cesfic/mem.c | 24 ++-
sys/arch/cobalt/cobalt/disksubr.c | 38 ++++--
sys/arch/dnard/dnard/profile.c | 20 +-
sys/arch/dnard/dnard/scr.c | 42 ++++---
sys/arch/dnard/ofw/ofrom.c | 32 ++---
sys/arch/dreamcast/dev/gdrom.c | 78 ++++++++------
sys/arch/dreamcast/dev/maple/maple.c | 33 ++++--
sys/arch/hp300/dev/ac.c | 68 +++++++-----
sys/arch/hp300/dev/acvar.h | 7 +-
sys/arch/hp300/dev/apci.c | 80 +++++++++------
sys/arch/hp300/dev/ct.c | 63 ++++++-----
sys/arch/hp300/dev/dca.c | 92 ++++++++++-------
sys/arch/hp300/dev/dcm.c | 132 +++++++++++-------------
sys/arch/hp300/dev/grf.c | 138 ++++++++++++++------------
sys/arch/hp300/dev/grfvar.h | 17 +-
sys/arch/hp300/dev/hil.c | 64 +++++++----
sys/arch/hp300/dev/hilvar.h | 5 +-
sys/arch/hp300/dev/ite.c | 53 +++++----
sys/arch/hp300/dev/mt.c | 71 +++++++------
sys/arch/hp300/dev/ppi.c | 52 +++++----
sys/arch/hp300/dev/rd.c | 99 +++++++++++--------
sys/arch/hp300/dev/sd.c | 120 ++++++++++++----------
sys/arch/hp300/dev/sdvar.h | 6 +-
sys/arch/hp300/dev/st.c | 78 ++++++++------
sys/arch/hp300/dev/stvar.h | 4 +-
sys/arch/hp300/hp300/disksubr.c | 44 ++++++--
sys/arch/hp300/hp300/mem.c | 24 ++-
sys/arch/hpc/hpc/disksubr.c | 39 ++++--
sys/arch/hpcarm/hpcarm/mem.c | 28 ++--
sys/arch/hpcarm/sa11x0/sa11x0_com.c | 112 +++++++++++++-------
sys/arch/hpcmips/dev/apm/apmdev.c | 28 +++-
sys/arch/hpcmips/dev/ucbsnd.c | 51 +++++----
sys/arch/hpcmips/tx/txcom.c | 45 +++++---
sys/arch/i386/i386/disksubr.c | 14 ++-
sys/arch/i386/isa/olms.c | 33 +++--
sys/arch/i386/isa/omms.c | 33 +++--
sys/arch/i386/isa/pccons.c | 41 ++++---
sys/arch/i386/isa/pms.c | 33 +++--
sys/arch/luna68k/dev/siotty.c | 57 ++++++-----
sys/arch/luna68k/luna68k/disksubr.c | 29 +++--
sys/arch/luna68k/luna68k/mem.c | 28 +++--
sys/arch/mac68k/dev/aed.c | 29 +++--
sys/arch/mac68k/dev/aedvar.h | 14 +-
sys/arch/mac68k/dev/grf_compat.c | 78 +++++++-------
sys/arch/mac68k/dev/ite_compat.c | 98 ++++++++++++++----
sys/arch/mac68k/dev/zs.c | 4 +-
sys/arch/mac68k/mac68k/disksubr.c | 33 ++++--
sys/arch/mac68k/mac68k/mem.c | 24 ++-
sys/arch/mac68k/obio/asc.c | 42 ++++---
sys/arch/mac68k/obio/ascvar.h | 16 +-
sys/arch/mac68k/obio/iwm_fd.c | 87 +++++++---------
sys/arch/macppc/dev/aed.c | 31 +++--
sys/arch/macppc/dev/aedvar.h | 14 +-
sys/arch/macppc/dev/nvram.c | 27 ++--
sys/arch/macppc/dev/ofcons.c | 51 +++++----
sys/arch/macppc/dev/z8530tty.c | 71 +++++++------
sys/arch/macppc/macppc/disksubr.c | 77 ++++++++------
sys/arch/mips/mips/mem.c | 22 ++-
sys/arch/mipsco/mipsco/disksubr.c | 44 +++++--
sys/arch/mipsco/obio/i82072.c | 8 +-
sys/arch/mvme68k/dev/lpt.c | 29 +++--
sys/arch/mvme68k/mvme68k/disksubr.c | 38 ++++--
sys/arch/mvme68k/mvme68k/mem.c | 24 ++-
sys/arch/news68k/news68k/disksubr.c | 36 ++++--
sys/arch/news68k/news68k/mem.c | 23 ++-
sys/arch/newsmips/newsmips/disksubr.c | 37 ++++--
sys/arch/next68k/dev/zs.c | 5 +-
sys/arch/next68k/next68k/disksubr.c | 40 +++++--
sys/arch/next68k/next68k/mem.c | 24 ++-
sys/arch/ofppc/ofppc/disksubr.c | 51 ++++++---
sys/arch/pc532/dev/lpt.c | 26 ++--
sys/arch/pc532/dev/scn.c | 85 ++++++++--------
sys/arch/pc532/pc532/disksubr.c | 40 +++++--
sys/arch/pc532/pc532/mem.c | 23 ++-
sys/arch/pmax/dev/dc.c | 155 +++++++++++++++--------------
sys/arch/pmax/dev/dtop.c | 59 ++++++-----
sys/arch/pmax/dev/fb.c | 3 +-
sys/arch/pmax/dev/fb_usrreq.c | 52 ++++-----
sys/arch/pmax/dev/fbreg.h | 6 +-
sys/arch/pmax/dev/px.c | 66 +++++-------
sys/arch/pmax/dev/qvss_compat.c | 13 +-
sys/arch/pmax/dev/rcons.c | 42 ++++----
sys/arch/pmax/pmax/disksubr.c | 53 ++++++---
sys/arch/pmax/tc/scc.c | 155 ++++++++++++++++-------------
sys/arch/powerpc/powerpc/mem.c | 32 +++--
sys/arch/powerpc/powerpc/ofw_machdep.c | 14 +-
sys/arch/prep/isa/joy.c | 41 ++++---
sys/arch/prep/isa/pccons.c | 47 ++++----
sys/arch/prep/prep/disksubr.c | 39 ++++--
sys/arch/sandpoint/isa/spkr.c | 60 ++++------
sys/arch/sandpoint/sandpoint/disksubr.c | 48 ++++----
sys/arch/sgimips/sgimips/disksubr.c | 28 +++-
sys/arch/sh3/dev/sci.c | 55 +++++-----
sys/arch/sh3/dev/scif.c | 56 +++++-----
sys/arch/sh3/dev/wdog.c | 16 +-
sys/arch/sh3/sh3/disksubr.c | 34 ++++--
sys/arch/sh3/sh3/mem.c | 47 ++++----
sys/arch/sparc/dev/cgeight.c | 36 ++++--
sys/arch/sparc/dev/cgfour.c | 36 ++++--
sys/arch/sparc/dev/cgfourteen.c | 34 +++--
sys/arch/sparc/dev/cgsix_obio.c | 3 +-
sys/arch/sparc/dev/cgtwo.c | 33 +++--
sys/arch/sparc/dev/fd.c | 93 +++++++++--------
sys/arch/sparc/dev/kd.c | 45 ++++---
sys/arch/sparc/dev/tctrl.c | 30 +++--
sys/arch/sparc/sparc/disksubr.c | 33 ++++--
sys/arch/sparc/sparc/mem.c | 22 ++-
sys/arch/sparc/sparc/openprom.c | 15 +-
sys/arch/sparc64/dev/fb.c | 35 +++---
sys/arch/sparc64/dev/fd.c | 86 ++++++++-------
sys/arch/sparc64/dev/kd.c | 46 ++++----
sys/arch/sparc64/dev/pcons.c | 86 ++++++++++------
sys/arch/sparc64/dev/zs.c | 5 +-
sys/arch/sparc64/sparc64/disksubr.c | 33 ++++--
sys/arch/sparc64/sparc64/mem.c | 22 ++-
sys/arch/sparc64/sparc64/openprom.c | 14 +-
sys/arch/sun2/sun2/mem.c | 24 ++-
sys/arch/sun3/dev/bw2.c | 25 ++--
sys/arch/sun3/dev/cg2.c | 25 ++--
sys/arch/sun3/dev/cg4.c | 25 ++--
sys/arch/sun3/dev/fb.c | 25 ++--
sys/arch/sun3/dev/fbvar.h | 10 +-
sys/arch/sun3/dev/fd.c | 85 ++++++++-------
sys/arch/sun3/dev/kd.c | 46 ++++----
sys/arch/sun3/dev/xd.c | 108 ++++++++++++--------
sys/arch/sun3/dev/xy.c | 105 ++++++++++++--------
sys/arch/sun3/include/intr.h | 4 +-
sys/arch/sun3/sun3/disksubr.c | 29 +++--
sys/arch/sun3/sun3/mem.c | 24 ++-
sys/arch/sun3/sun3x/mem.c | 26 +++-
sys/arch/sun68k/sun68k/disksubr.c | 30 +++--
sys/arch/vax/mba/hp.c | 56 ++++++---
sys/arch/vax/uba/ts.c | 86 +++++++++-------
sys/arch/vax/vax/cfl.c | 21 ++-
sys/arch/vax/vax/crl.c | 21 ++-
sys/arch/vax/vax/crx.c | 21 ++-
sys/arch/vax/vax/ctu.c | 12 +-
sys/arch/vax/vax/disksubr.c | 37 ++++--
sys/arch/vax/vax/gencons.c | 51 ++++++---
sys/arch/vax/vax/mem.c | 14 +-
sys/arch/vax/vsa/hdc9224.c | 52 ++++++---
sys/arch/walnut/walnut/disksubr.c | 29 +++-
sys/arch/x68k/dev/com.c | 56 +++++-----
sys/arch/x68k/dev/fd.c | 59 ++++++-----
sys/arch/x68k/dev/grf.c | 133 ++++++++++++------------
sys/arch/x68k/dev/ite.c | 48 +++++---
sys/arch/x68k/dev/itevar.h | 12 +-
sys/arch/x68k/dev/kbd.c | 52 +++++----
sys/arch/x68k/dev/ms.c | 40 ++++---
sys/arch/x68k/dev/opm.c | 15 +-
sys/arch/x68k/dev/opmbell.c | 25 ++--
sys/arch/x68k/dev/par.c | 40 ++++---
sys/arch/x68k/dev/pow.c | 21 ++-
sys/arch/x68k/dev/sram.c | 28 +++--
sys/arch/x68k/dev/zs.c | 4 +-
sys/arch/x68k/x68k/clock.c | 40 +++----
sys/arch/x68k/x68k/disksubr.c | 44 +++++---
sys/arch/x68k/x68k/mem.c | 24 ++-
sys/arch/x86_64/isa/pccons.c | 50 +++++----
sys/arch/x86_64/x86_64/disksubr.c | 37 ++++--
sys/arch/x86_64/x86_64/mem.c | 24 ++-
sys/dev/arcbios/arcbios_tty.c | 43 ++++----
sys/dev/clockctl.c | 15 +-
sys/dev/hpc/biconsdev.c | 21 ++-
sys/dev/hpc/btnmgr.c | 16 +-
sys/dev/ic/clmpcc.c | 58 ++++++----
sys/dev/ic/z8530tty.c | 10 +-
sys/dev/isa/mcd.c | 46 +++++---
sys/dev/isa/satlink.c | 39 ++++---
sys/dev/isa/wt.c | 36 +++---
sys/dev/mscp/mscp_disk.c | 137 ++++++++++++++-----------
sys/dev/mscp/mscp_tape.c | 56 +++++-----
sys/dev/ofw/ofcons.c | 54 +++++----
sys/dev/ofw/ofdisk.c | 72 ++++++++-----
sys/dev/ofw/ofrtc.c | 19 ++-
sys/dev/ofw/openfirmio.c | 10 +-
sys/dev/ofw/openfirmio.h | 8 +-
sys/dev/pci/agp.c | 21 ++-
sys/dev/qbus/dhu.c | 98 +++++++++++-------
sys/dev/qbus/dl.c | 42 ++++---
sys/dev/qbus/dz.c | 50 ++++++---
sys/dev/qbus/qd.c | 56 ++++++----
sys/dev/qbus/rl.c | 53 ++++++----
sys/dev/qbus/ts.c | 51 +++++----
sys/dev/sbus/bpp.c | 38 ++++---
sys/dev/sbus/magma.c | 116 ++++++++++++---------
sys/dev/sbus/magmareg.h | 4 +-
sys/dev/sbus/p9100.c | 23 ++-
sys/dev/sbus/tcx.c | 33 +++--
sys/dev/sun/bwtwo.c | 33 +++--
sys/dev/sun/cgsix.c | 33 +++--
sys/dev/sun/cgthree.c | 31 +++--
sys/dev/sun/fb.c | 36 +++---
sys/dev/sun/fbvar.h | 12 +-
sys/dev/sun/kbd.c | 38 ++++---
sys/dev/sun/ms.c | 39 ++++---
sys/dev/sun/sunkbd.c | 10 +-
sys/dev/sun/sunms.c | 10 +-
sys/dev/tc/stic.c | 15 +-
sys/dev/vme/xd.c | 112 ++++++++++++++-------
sys/dev/vme/xy.c | 110 +++++++++++++-------
sys/filecorefs/filecore_vnops.c | 4 +-
sys/netisdn/i4b_ctl.c | 19 ++-
sys/netisdn/i4b_i4bdrv.c | 31 +++--
sys/netisdn/i4b_rbch.c | 35 ++++--
sys/netisdn/i4b_tel.c | 34 ++++--
sys/netisdn/i4b_trace.c | 23 ++-
sys/netsmb/smb_dev.c | 17 +-
291 files changed, 6874 insertions(+), 5115 deletions(-)
diffs (truncated from 35658 to 300 lines):
diff -r 6125f44f7bc8 -r db398cd66031 sys/adosfs/advfsops.c
--- a/sys/adosfs/advfsops.c Mon Oct 01 12:46:48 2001 +0000
+++ b/sys/adosfs/advfsops.c Wed Oct 10 11:55:46 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: advfsops.c,v 1.46.4.3 2001/09/30 19:25:35 fvdl Exp $ */
+/* $NetBSD: advfsops.c,v 1.46.4.4 2001/10/10 11:55:46 fvdl Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -196,7 +196,7 @@
*/
vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY);
error = VOP_OPEN(devvp, FREAD, NOCRED, p, NULL);
- VOP_UNLOCK(vp, 0);
+ VOP_UNLOCK(devvp, 0);
if (error != 0)
return error;
error = VOP_IOCTL(devvp, DIOCGDINFO,(caddr_t)&dl, FREAD, NOCRED, p);
diff -r 6125f44f7bc8 -r db398cd66031 sys/altq/altq_afmap.c
--- a/sys/altq/altq_afmap.c Mon Oct 01 12:46:48 2001 +0000
+++ b/sys/altq/altq_afmap.c Wed Oct 10 11:55:46 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_afmap.c,v 1.3 2001/04/13 23:29:55 thorpej Exp $ */
+/* $NetBSD: altq_afmap.c,v 1.3.4.1 2001/10/10 11:55:46 fvdl Exp $ */
/* $KAME: altq_afmap.c,v 1.7 2000/12/14 08:12:45 thorpej Exp $ */
/*
@@ -56,6 +56,7 @@
#include <sys/errno.h>
#include <sys/time.h>
#include <sys/kernel.h>
+#include <sys/vnode.h>
#include <net/if.h>
#include <net/if_types.h>
@@ -333,8 +334,8 @@
altqdev_decl(afm);
int
-afmopen(dev, flag, fmt, p)
- dev_t dev;
+afmopen(devvp, flag, fmt, p)
+ struct vnode *devvp;
int flag, fmt;
struct proc *p;
{
@@ -342,8 +343,8 @@
}
int
-afmclose(dev, flag, fmt, p)
- dev_t dev;
+afmclose(devvp, flag, fmt, p)
+ struct vnode *devvp;
int flag, fmt;
struct proc *p;
{
@@ -370,8 +371,8 @@
}
int
-afmioctl(dev, cmd, addr, flag, p)
- dev_t dev;
+afmioctl(devvp, cmd, addr, flag, p)
+ struct vnode *devvp;
ioctlcmd_t cmd;
caddr_t addr;
int flag;
diff -r 6125f44f7bc8 -r db398cd66031 sys/altq/altq_blue.c
--- a/sys/altq/altq_blue.c Mon Oct 01 12:46:48 2001 +0000
+++ b/sys/altq/altq_blue.c Wed Oct 10 11:55:46 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_blue.c,v 1.3 2001/04/13 23:29:55 thorpej Exp $ */
+/* $NetBSD: altq_blue.c,v 1.3.4.1 2001/10/10 11:55:46 fvdl Exp $ */
/* $KAME: altq_blue.c,v 1.7 2000/12/14 08:12:45 thorpej Exp $ */
/*
@@ -80,6 +80,7 @@
#include <sys/proc.h>
#include <sys/errno.h>
#include <sys/kernel.h>
+#include <sys/vnode.h>
#include <net/if.h>
#include <net/if_types.h>
@@ -124,8 +125,8 @@
altqdev_decl(blue);
int
-blueopen(dev, flag, fmt, p)
- dev_t dev;
+blueopen(devvp, flag, fmt, p)
+ struct vnode *devvp;
int flag, fmt;
struct proc *p;
{
@@ -134,8 +135,8 @@
}
int
-blueclose(dev, flag, fmt, p)
- dev_t dev;
+blueclose(devvp, flag, fmt, p)
+ struct vnode *devvp;
int flag, fmt;
struct proc *p;
{
@@ -153,8 +154,8 @@
}
int
-blueioctl(dev, cmd, addr, flag, p)
- dev_t dev;
+blueioctl(devvp, cmd, addr, flag, p)
+ struct vnode *devvp;
ioctlcmd_t cmd;
caddr_t addr;
int flag;
diff -r 6125f44f7bc8 -r db398cd66031 sys/altq/altq_cbq.c
--- a/sys/altq/altq_cbq.c Mon Oct 01 12:46:48 2001 +0000
+++ b/sys/altq/altq_cbq.c Wed Oct 10 11:55:46 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_cbq.c,v 1.3.4.1 2001/10/01 12:36:50 fvdl Exp $ */
+/* $NetBSD: altq_cbq.c,v 1.3.4.2 2001/10/10 11:55:46 fvdl Exp $ */
/* $KAME: altq_cbq.c,v 1.9 2000/12/14 08:12:45 thorpej Exp $ */
/*
@@ -54,6 +54,7 @@
#include <sys/errno.h>
#include <sys/time.h>
#include <sys/kernel.h>
+#include <sys/vnode.h>
#include <net/if.h>
#include <net/if_types.h>
@@ -805,8 +806,8 @@
altqdev_decl(cbq);
int
-cbqopen(dev, flag, fmt, p)
- dev_t dev;
+cbqopen(devvp, flag, fmt, p)
+ struct vnode *devvp;
int flag, fmt;
struct proc *p;
{
@@ -814,8 +815,8 @@
}
int
-cbqclose(dev, flag, fmt, p)
- dev_t dev;
+cbqclose(devvp, flag, fmt, p)
+ struct vnode *devvp;
int flag, fmt;
struct proc *p;
{
@@ -840,8 +841,8 @@
}
int
-cbqioctl(dev, cmd, addr, flag, p)
- dev_t dev;
+cbqioctl(devvp, cmd, addr, flag, p)
+ struct vnode *devvp;
ioctlcmd_t cmd;
caddr_t addr;
int flag;
diff -r 6125f44f7bc8 -r db398cd66031 sys/altq/altq_cdnr.c
--- a/sys/altq/altq_cdnr.c Mon Oct 01 12:46:48 2001 +0000
+++ b/sys/altq/altq_cdnr.c Wed Oct 10 11:55:46 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_cdnr.c,v 1.3 2001/04/13 23:29:55 thorpej Exp $ */
+/* $NetBSD: altq_cdnr.c,v 1.3.4.1 2001/10/10 11:55:47 fvdl Exp $ */
/* $KAME: altq_cdnr.c,v 1.8 2000/12/14 08:12:45 thorpej Exp $ */
/*
@@ -47,6 +47,7 @@
#include <sys/errno.h>
#include <sys/kernel.h>
#include <sys/queue.h>
+#include <sys/vnode.h>
#include <net/if.h>
#include <net/if_types.h>
@@ -73,10 +74,6 @@
/* cdnr_list keeps all cdnr's allocated. */
static LIST_HEAD(, top_cdnr) tcb_list;
-int cdnropen __P((dev_t, int, int, struct proc *));
-int cdnrclose __P((dev_t, int, int, struct proc *));
-int cdnrioctl __P((dev_t, ioctlcmd_t, caddr_t, int, struct proc *));
-
static int altq_cdnr_input __P((struct mbuf *, int));
static struct top_cdnr *tcb_lookup __P((char *ifname));
static struct cdnr_block *cdnr_handle2cb __P((u_long));
@@ -1199,8 +1196,8 @@
* conditioner device interface
*/
int
-cdnropen(dev, flag, fmt, p)
- dev_t dev;
+cdnropen(devvp, flag, fmt, p)
+ struct vnode *devvp;
int flag, fmt;
struct proc *p;
{
@@ -1217,8 +1214,8 @@
}
int
-cdnrclose(dev, flag, fmt, p)
- dev_t dev;
+cdnrclose(devvp, flag, fmt, p)
+ struct vnode *devvp;
int flag, fmt;
struct proc *p;
{
@@ -1237,8 +1234,8 @@
}
int
-cdnrioctl(dev, cmd, addr, flag, p)
- dev_t dev;
+cdnrioctl(devvp, cmd, addr, flag, p)
+ struct vnode *devvp;
ioctlcmd_t cmd;
caddr_t addr;
int flag;
diff -r 6125f44f7bc8 -r db398cd66031 sys/altq/altq_conf.c
--- a/sys/altq/altq_conf.c Mon Oct 01 12:46:48 2001 +0000
+++ b/sys/altq/altq_conf.c Wed Oct 10 11:55:46 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_conf.c,v 1.4 2000/12/14 23:50:43 thorpej Exp $ */
+/* $NetBSD: altq_conf.c,v 1.4.8.1 2001/10/10 11:55:47 fvdl Exp $ */
/* $KAME: altq_conf.c,v 1.10 2000/12/14 08:12:45 thorpej Exp $ */
/*
@@ -200,17 +200,17 @@
static
#endif
int
-altqopen(dev, flag, fmt, p)
- dev_t dev;
+altqopen(devvp, flag, fmt, p)
+ struct vnode *devvp;
int flag, fmt;
struct proc *p;
{
- int unit = minor(dev);
+ int unit = minor(vdev_rdev(devvp));
if (unit == 0)
return (0);
if (unit < naltqsw)
- return (*altqsw[unit].d_open)(dev, flag, fmt, p);
+ return (*altqsw[unit].d_open)(devvp, flag, fmt, p);
return ENXIO;
}
@@ -219,17 +219,17 @@
static
#endif
int
-altqclose(dev, flag, fmt, p)
- dev_t dev;
+altqclose(devvp, flag, fmt, p)
+ struct vnode *devvp;
int flag, fmt;
struct proc *p;
{
- int unit = minor(dev);
+ int unit = minor(vdev_rdev(devvp));
if (unit == 0)
return (0);
if (unit < naltqsw)
- return (*altqsw[unit].d_close)(dev, flag, fmt, p);
+ return (*altqsw[unit].d_close)(devvp, flag, fmt, p);
return ENXIO;
}
@@ -238,14 +238,14 @@
static
#endif
int
-altqioctl(dev, cmd, addr, flag, p)
- dev_t dev;
+altqioctl(devvp, cmd, addr, flag, p)
+ struct vnode *devvp;
ioctlcmd_t cmd;
caddr_t addr;
int flag;
struct proc *p;
{
- int unit = minor(dev);
+ int unit = minor(vdev_rdev(devvp));
if (unit == 0) {
struct ifnet *ifp;
Home |
Main Index |
Thread Index |
Old Index