summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ata/ata-disk.c20
-rw-r--r--sys/dev/ata/atapi-cd.c18
-rw-r--r--sys/dev/ata/atapi-fd.c18
-rw-r--r--sys/dev/ata/atapi-tape.c18
-rw-r--r--sys/dev/ccd/ccd.c18
-rw-r--r--sys/dev/fdc/fdc.c19
-rw-r--r--sys/dev/mcd/mcd.c11
-rw-r--r--sys/dev/scd/scd.c11
-rw-r--r--sys/dev/vn/vn.c18
9 files changed, 20 insertions, 131 deletions
diff --git a/sys/dev/ata/ata-disk.c b/sys/dev/ata/ata-disk.c
index c5efe55f58d4..ae7b94a72002 100644
--- a/sys/dev/ata/ata-disk.c
+++ b/sys/dev/ata/ata-disk.c
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: ata-disk.c,v 1.6 1999/04/10 18:53:35 sos Exp $
+ * $Id: ata-disk.c,v 1.7 1999/04/16 21:21:53 peter Exp $
*/
#include "ata.h"
@@ -59,8 +59,8 @@
static d_open_t adopen;
static d_close_t adclose;
-static d_read_t adread;
-static d_write_t adwrite;
+static d_read_t physread;
+static d_write_t physwrite;
static d_ioctl_t adioctl;
static d_strategy_t adstrategy;
static d_psize_t adpsize;
@@ -68,7 +68,7 @@ static d_psize_t adpsize;
#define BDEV_MAJOR 30
#define CDEV_MAJOR 116
static struct cdevsw ad_cdevsw = {
- adopen, adclose, adread, adwrite,
+ adopen, adclose, physread, physwrite,
adioctl, nostop, nullreset, nodevtotty,
#ifdef NOTYET /* the boot code needs to be fixed to boot arbitrary devices */
seltrue, nommap, adstrategy, "ad",
@@ -325,18 +325,6 @@ printf("adclose: lun=%d adnlun=%d\n", lun, adnlun);
return 0;
}
-static int
-adread(dev_t dev, struct uio *uio, int32_t ioflag)
-{
- return physio(adstrategy, NULL, dev, 1, minphys, uio);
-}
-
-static int
-adwrite(dev_t dev, struct uio *uio, int32_t ioflag)
-{
- return physio(adstrategy, NULL, dev, 0, minphys, uio);
-}
-
static int
adioctl(dev_t dev, u_long cmd, caddr_t addr, int32_t flags, struct proc *p)
{
diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c
index 38581cbaf67b..4bdfc2119789 100644
--- a/sys/dev/ata/atapi-cd.c
+++ b/sys/dev/ata/atapi-cd.c
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: atapi-cd.c,v 1.5 1999/04/10 18:53:35 sos Exp $
+ * $Id: atapi-cd.c,v 1.6 1999/04/27 11:13:54 phk Exp $
*/
#include "ata.h"
@@ -57,15 +57,13 @@
static d_open_t acdopen;
static d_close_t acdclose;
-static d_read_t acdread;
-static d_write_t acdwrite;
static d_ioctl_t acdioctl;
static d_strategy_t acdstrategy;
#define BDEV_MAJOR 31
#define CDEV_MAJOR 117
static struct cdevsw acd_cdevsw = {
- acdopen, acdclose, acdread, acdwrite,
+ acdopen, acdclose, physread, physwrite,
acdioctl, nostop, nullreset, nodevtotty,
seltrue, nommap, acdstrategy, "acd",
NULL, -1, nodump, nopsize,
@@ -456,18 +454,6 @@ acdclose(dev_t dev, int32_t flags, int32_t fmt, struct proc *p)
return 0;
}
-static int
-acdread(dev_t dev, struct uio *uio, int32_t ioflag)
-{
- return physio(acdstrategy, NULL, dev, 1, minphys, uio);
-}
-
-static int
-acdwrite(dev_t dev, struct uio *uio, int32_t ioflag)
-{
- return physio(acdstrategy, NULL, dev, 0, minphys, uio);
-}
-
static int
acdioctl(dev_t dev, u_long cmd, caddr_t addr, int32_t flag, struct proc *p)
{
diff --git a/sys/dev/ata/atapi-fd.c b/sys/dev/ata/atapi-fd.c
index 8d5469b866ed..41f92cf68eb5 100644
--- a/sys/dev/ata/atapi-fd.c
+++ b/sys/dev/ata/atapi-fd.c
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: atapi-fd.c,v 1.4 1999/03/28 18:57:19 sos Exp $
+ * $Id: atapi-fd.c,v 1.5 1999/04/10 18:53:35 sos Exp $
*/
#include "ata.h"
@@ -58,8 +58,6 @@
static d_open_t afdopen;
static d_close_t afdclose;
-static d_read_t afdread;
-static d_write_t afdwrite;
static d_ioctl_t afdioctl;
static d_strategy_t afdstrategy;
@@ -67,7 +65,7 @@ static d_strategy_t afdstrategy;
#define CDEV_MAJOR 118
static struct cdevsw afd_cdevsw = {
- afdopen, afdclose, afdread, afdwrite,
+ afdopen, afdclose, physread, physwrite,
afdioctl, nostop, nullreset, nodevtotty,
seltrue, nommap, afdstrategy, "afd",
NULL, -1, nodump, nopsize,
@@ -238,18 +236,6 @@ afdclose(dev_t dev, int32_t flags, int32_t fmt, struct proc *p)
return 0;
}
-static int
-afdread(dev_t dev, struct uio *uio, int32_t ioflag)
-{
- return physio(afdstrategy, NULL, dev, 1, minphys, uio);
-}
-
-static int
-afdwrite(dev_t dev, struct uio *uio, int32_t ioflag)
-{
- return physio(afdstrategy, NULL, dev, 0, minphys, uio);
-}
-
static int
afdioctl(dev_t dev, u_long cmd, caddr_t addr, int32_t flag, struct proc *p)
{
diff --git a/sys/dev/ata/atapi-tape.c b/sys/dev/ata/atapi-tape.c
index e2ecce1afb76..a4362246be7c 100644
--- a/sys/dev/ata/atapi-tape.c
+++ b/sys/dev/ata/atapi-tape.c
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: atapi-tape.c,v 1.5 1999/03/28 18:57:19 sos Exp $
+ * $Id: atapi-tape.c,v 1.6 1999/04/10 18:53:35 sos Exp $
*/
#include "ata.h"
@@ -54,8 +54,6 @@
static d_open_t astopen;
static d_close_t astclose;
-static d_read_t astread;
-static d_write_t astwrite;
static d_ioctl_t astioctl;
static d_strategy_t aststrategy;
@@ -63,7 +61,7 @@ static d_strategy_t aststrategy;
#define CDEV_MAJOR 119
static struct cdevsw ast_cdevsw = {
- astopen, astclose, astread, astwrite,
+ astopen, astclose, physread, physwrite,
astioctl, nostop, nullreset, nodevtotty,
seltrue, nommap, aststrategy, "ast",
NULL, -1, nodump, nopsize,
@@ -260,18 +258,6 @@ astclose(dev_t dev, int32_t flags, int32_t fmt, struct proc *p)
return 0;
}
-static int
-astread(dev_t dev, struct uio *uio, int32_t ioflag)
-{
- return physio(aststrategy, NULL, dev, 1, minphys, uio);
-}
-
-static int
-astwrite(dev_t dev, struct uio *uio, int32_t ioflag)
-{
- return physio(aststrategy, NULL, dev, 0, minphys, uio);
-}
-
static int
astioctl(dev_t dev, u_long cmd, caddr_t addr, int32_t flag, struct proc *p)
{
diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c
index 8b1436ded527..f2e9525facb0 100644
--- a/sys/dev/ccd/ccd.c
+++ b/sys/dev/ccd/ccd.c
@@ -1,4 +1,4 @@
-/* $Id: ccd.c,v 1.43 1999/03/11 18:50:39 dg Exp $ */
+/* $Id: ccd.c,v 1.44 1999/05/06 19:19:30 phk Exp $ */
/* $NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $ */
@@ -164,8 +164,6 @@ struct ccdbuf {
(makedev(major((dev)), dkmakeminor(ccdunit((dev)), 0, RAW_PART)))
static d_open_t ccdopen;
-static d_read_t ccdread;
-static d_write_t ccdwrite;
static d_close_t ccdclose;
static d_strategy_t ccdstrategy;
static d_ioctl_t ccdioctl;
@@ -176,7 +174,7 @@ static d_psize_t ccdsize;
#define BDEV_MAJOR 21
static struct cdevsw ccd_cdevsw = {
- ccdopen, ccdclose, ccdread, ccdwrite,
+ ccdopen, ccdclose, physread, physwrite,
ccdioctl, nostop, nullreset, nodevtotty,
seltrue, nommap, ccdstrategy, "ccd",
NULL, -1, ccddump, ccdsize,
@@ -713,18 +711,6 @@ ccdclose(dev, flags, fmt, p)
return (0);
}
-static int
-ccdread(dev_t dev, struct uio *uio, int ioflag)
-{
- return (physio(ccdstrategy, NULL, dev, 1, minphys, uio));
-}
-
-static int
-ccdwrite(dev_t dev, struct uio *uio, int ioflag)
-{
- return (physio(ccdstrategy, NULL, dev, 0, minphys, uio));
-}
-
static void
ccdstrategy(bp)
register struct buf *bp;
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index 845107c16cb7..b0f13ee2b4e9 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -47,7 +47,7 @@
* SUCH DAMAGE.
*
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
- * $Id: fd.c,v 1.137 1999/05/02 20:38:08 peter Exp $
+ * $Id: fd.c,v 1.138 1999/05/06 20:00:23 phk Exp $
*
*/
@@ -373,14 +373,12 @@ static int yeintr(struct pccard_devinfo *devi)
#endif /* FDC_YE */
static d_open_t Fdopen; /* NOTE, not fdopen */
-static d_read_t fdread;
-static d_write_t fdwrite;
static d_close_t fdclose;
static d_ioctl_t fdioctl;
static d_strategy_t fdstrategy;
static struct cdevsw fd_cdevsw = {
- Fdopen, fdclose, fdread, fdwrite,
+ Fdopen, fdclose, physread, physwrite,
fdioctl, nostop, nullreset, nodevtotty,
seltrue, nommap, fdstrategy, "fd",
NULL, -1, nodump, nopsize,
@@ -1393,19 +1391,6 @@ fdclose(dev_t dev, int flags, int mode, struct proc *p)
return (0);
}
-static int
-fdread(dev_t dev, struct uio *uio, int ioflag)
-{
- return (physio(fdstrategy, NULL, dev, 1, minphys, uio));
-}
-
-static int
-fdwrite(dev_t dev, struct uio *uio, int ioflag)
-{
- return (physio(fdstrategy, NULL, dev, 0, minphys, uio));
-}
-
-
/****************************************************************************/
/* fdstrategy */
/****************************************************************************/
diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c
index 9633c5d4718b..b53883ec4b22 100644
--- a/sys/dev/mcd/mcd.c
+++ b/sys/dev/mcd/mcd.c
@@ -40,7 +40,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: mcd.c,v 1.103 1999/05/06 18:44:00 peter Exp $
+ * $Id: mcd.c,v 1.104 1999/05/06 18:54:17 peter Exp $
*/
static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
@@ -210,7 +210,6 @@ static int mcd_attach(struct isa_device *dev);
struct isa_driver mcddriver = { mcd_probe, mcd_attach, "mcd" };
static d_open_t mcdopen;
-static d_read_t mcdread;
static d_close_t mcdclose;
static d_ioctl_t mcdioctl;
static d_psize_t mcdsize;
@@ -222,7 +221,7 @@ static d_strategy_t mcdstrategy;
static struct cdevsw mcd_cdevsw = {
- mcdopen, mcdclose, mcdread, nowrite,
+ mcdopen, mcdclose, physread, nowrite,
mcdioctl, nostop, nullreset, nodevtotty,
seltrue, nommap, mcdstrategy, "mcd",
NULL, -1, nodump, nopsize,
@@ -396,12 +395,6 @@ int mcdclose(dev_t dev, int flags, int fmt, struct proc *p)
return 0;
}
-static int
-mcdread(dev_t dev, struct uio *uio, int ioflag)
-{
- return (physio(mcdstrategy, NULL, dev, 1, minphys, uio));
-}
-
void
mcdstrategy(struct buf *bp)
{
diff --git a/sys/dev/scd/scd.c b/sys/dev/scd/scd.c
index 7152c6252d03..15251c708af4 100644
--- a/sys/dev/scd/scd.c
+++ b/sys/dev/scd/scd.c
@@ -41,7 +41,7 @@
*/
-/* $Id: scd.c,v 1.42 1999/04/28 10:52:51 dt Exp $ */
+/* $Id: scd.c,v 1.43 1999/05/06 18:54:19 peter Exp $ */
/* Please send any comments to micke@dynas.se */
@@ -186,7 +186,6 @@ struct isa_driver scddriver = { scd_probe, scd_attach, "scd" };
static struct callout_handle tohandle = CALLOUT_HANDLE_INITIALIZER(&tohanle);
static d_open_t scdopen;
-static d_read_t scdread;
static d_close_t scdclose;
static d_ioctl_t scdioctl;
static d_strategy_t scdstrategy;
@@ -194,7 +193,7 @@ static d_strategy_t scdstrategy;
#define CDEV_MAJOR 45
#define BDEV_MAJOR 16
static struct cdevsw scd_cdevsw = {
- scdopen, scdclose, scdread, nowrite,
+ scdopen, scdclose, physread, nowrite,
scdioctl, nostop, nullreset, nodevtotty,
seltrue, nommap, scdstrategy, "scd",
NULL, -1, nodump, nopsize,
@@ -320,12 +319,6 @@ scdclose(dev_t dev, int flags, int fmt, struct proc *p)
return 0;
}
-static int
-scdread(dev_t dev, struct uio *uio, int ioflag)
-{
- return (physio(scdstrategy, NULL, dev, 1, minphys, uio));
-}
-
static void
scdstrategy(struct buf *bp)
{
diff --git a/sys/dev/vn/vn.c b/sys/dev/vn/vn.c
index 11cbd01bc8f7..2037ee169121 100644
--- a/sys/dev/vn/vn.c
+++ b/sys/dev/vn/vn.c
@@ -38,7 +38,7 @@
* from: Utah Hdr: vn.c 1.13 94/04/02
*
* from: @(#)vn.c 8.6 (Berkeley) 4/1/94
- * $Id: vn.c,v 1.75 1999/03/14 09:20:00 julian Exp $
+ * $Id: vn.c,v 1.76 1999/04/27 11:14:13 phk Exp $
*/
/*
@@ -103,8 +103,6 @@
static d_ioctl_t vnioctl;
static d_open_t vnopen;
-static d_read_t vnread;
-static d_write_t vnwrite;
static d_close_t vnclose;
static d_dump_t vndump;
static d_psize_t vnsize;
@@ -122,7 +120,7 @@ static d_parms_t vnparms;
*/
static struct cdevsw vn_cdevsw = {
- vnopen, vnclose, vnread, vnwrite,
+ vnopen, vnclose, physread, physwrite,
vnioctl, nostop, nullreset, nodevtotty,
seltrue, nommap, vnstrategy, "vn",
vnparms, -1, vndump, vnsize,
@@ -234,18 +232,6 @@ vnopen(dev_t dev, int flags, int mode, struct proc *p)
return(0);
}
-static int
-vnread(dev_t dev, struct uio *uio, int ioflag)
-{
- return (physio(vnstrategy, NULL, dev, 1, minphys, uio));
-}
-
-static int
-vnwrite(dev_t dev, struct uio *uio, int ioflag)
-{
- return (physio(vnstrategy, NULL, dev, 0, minphys, uio));
-}
-
/*
* vnstrategy:
*
generated by cgit v1.3 (git 2.53.0) at 2026-07-28 20:18:40 +0000