summaryrefslogtreecommitdiffstats
path: root/sys/i386/isa
diff options
context:
space:
mode:
Diffstat (limited to 'sys/i386/isa')
-rw-r--r--sys/i386/isa/atapi-cd.c18
-rw-r--r--sys/i386/isa/fd.c19
-rw-r--r--sys/i386/isa/labpc.c16
-rw-r--r--sys/i386/isa/matcd/matcd.c11
-rw-r--r--sys/i386/isa/mcd.c11
-rw-r--r--sys/i386/isa/scd.c11
-rw-r--r--sys/i386/isa/wd.c20
-rw-r--r--sys/i386/isa/wd_cd.c18
-rw-r--r--sys/i386/isa/wfd.c18
-rw-r--r--sys/i386/isa/wst.c18
-rw-r--r--sys/i386/isa/wt.c18
11 files changed, 21 insertions, 157 deletions
diff --git a/sys/i386/isa/atapi-cd.c b/sys/i386/isa/atapi-cd.c
index c5a9097..0e10e20 100644
--- a/sys/i386/isa/atapi-cd.c
+++ b/sys/i386/isa/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.15 1999/04/27 11:14:51 phk Exp $
+ * $Id: atapi-cd.c,v 1.16 1999/04/28 10:52:16 dt Exp $
*/
#include "wdc.h"
@@ -55,15 +55,13 @@
static d_open_t acdopen;
static d_close_t acdclose;
-static d_write_t acdwrite;
-static d_read_t acdread;
static d_ioctl_t acdioctl;
static d_strategy_t acdstrategy;
#define CDEV_MAJOR 69
#define BDEV_MAJOR 19
static struct cdevsw acd_cdevsw = {
- acdopen, acdclose, acdread, acdwrite,
+ acdopen, acdclose, physread, physwrite,
acdioctl, nostop, nullreset, nodevtotty,
seltrue, nommap, acdstrategy, "wcd",
NULL, -1, nodump, nopsize,
@@ -458,18 +456,6 @@ acdclose(dev_t dev, int flags, int fmt, struct proc *p)
return 0;
}
-static int
-acdread(dev_t dev, struct uio *uio, int ioflag)
-{
- return physio(acdstrategy, NULL, dev, 1, minphys, uio);
-}
-
-static int
-acdwrite(dev_t dev, struct uio *uio, int ioflag)
-{
- return physio(acdstrategy, NULL, dev, 0, minphys, uio);
-}
-
void
acdstrategy(struct buf *bp)
{
diff --git a/sys/i386/isa/fd.c b/sys/i386/isa/fd.c
index 845107c..b0f13ee 100644
--- a/sys/i386/isa/fd.c
+++ b/sys/i386/isa/fd.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/i386/isa/labpc.c b/sys/i386/isa/labpc.c
index e893a21..28b91e7 100644
--- a/sys/i386/isa/labpc.c
+++ b/sys/i386/isa/labpc.c
@@ -285,8 +285,6 @@ static int labpcprobe(struct isa_device *dev);
struct isa_driver labpcdriver =
{ labpcprobe, labpcattach, "labpc", 0 };
-static d_read_t labpcread;
-static d_write_t labpcwrite;
static d_open_t labpcopen;
static d_close_t labpcclose;
static d_ioctl_t labpcioctl;
@@ -294,7 +292,7 @@ static d_strategy_t labpcstrategy;
#define CDEV_MAJOR 66
static struct cdevsw labpc_cdevsw =
- { labpcopen, labpcclose, labpcread, labpcwrite,
+ { labpcopen, labpcclose, physread, physwrite,
labpcioctl, nostop, nullreset, nodevtotty,
seltrue, nommap, labpcstrategy, "labpc", NULL, -1 };
@@ -762,18 +760,6 @@ labpcclose(dev_t dev, int flags, int fmt, struct proc *p)
return 0;
}
-static int
-labpcread( dev_t dev, struct uio *uio, int ioflag)
-{
- return (physio(labpcstrategy, NULL, dev, 1, minphys, uio));
-}
-
-static int
-labpcwrite ( dev_t dev, struct uio *uio, int ioflag)
-{
- return (physio(labpcstrategy, NULL, dev, 0, minphys, uio));
-}
-
/*
* Start: Start a frame going in or out.
*/
diff --git a/sys/i386/isa/matcd/matcd.c b/sys/i386/isa/matcd/matcd.c
index 515a3b7..6f0f8fe 100644
--- a/sys/i386/isa/matcd/matcd.c
+++ b/sys/i386/isa/matcd/matcd.c
@@ -337,7 +337,7 @@ static char MATCDVERSION[]="Version 1(26) 18-Oct-95";
static char MATCDCOPYRIGHT[] = "Matsushita CD-ROM driver, Copr. 1994,1995 Frank Durda IV";
/* The proceeding strings may not be changed*/
-/* $Id: matcd.c,v 1.37 1998/12/13 23:36:16 eivind Exp $ */
+/* $Id: matcd.c,v 1.38 1999/04/28 10:53:12 dt Exp $ */
/*---------------------------------------------------------------------------
Include declarations
@@ -515,7 +515,6 @@ struct isa_driver matcddriver={matcd_probe, matcd_attach,
static d_open_t matcdopen;
-static d_read_t matcdread;
static d_close_t matcdclose;
static d_ioctl_t matcdioctl;
static d_psize_t matcdsize;
@@ -525,7 +524,7 @@ static d_strategy_t matcdstrategy;
#define BDEV_MAJOR 17
static struct cdevsw matcd_cdevsw = {
- matcdopen, matcdclose, matcdread, nowrite,
+ matcdopen, matcdclose, physread, nowrite,
matcdioctl, nostop, nullreset, nodevtotty,
seltrue, nommap, matcdstrategy, "matcd",
NULL, -1, nodump, nopsize,
@@ -841,12 +840,6 @@ int matcdclose(dev_t dev, int flags, int fmt,
}
-static int
-matcdread(dev_t dev, struct uio *uio, int ioflag)
-{
- return (physio(matcdstrategy, NULL, dev, 1, minphys, uio));
-}
-
/*---------------------------------------------------------------------------
matcdstrategy - Accepts I/O requests from kernel for processing
diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c
index 9633c5d..b53883e 100644
--- a/sys/i386/isa/mcd.c
+++ b/sys/i386/isa/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/i386/isa/scd.c b/sys/i386/isa/scd.c
index 7152c62..15251c7 100644
--- a/sys/i386/isa/scd.c
+++ b/sys/i386/isa/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/i386/isa/wd.c b/sys/i386/isa/wd.c
index ae952a2..6b201e4 100644
--- a/sys/i386/isa/wd.c
+++ b/sys/i386/isa/wd.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)wd.c 7.2 (Berkeley) 5/9/91
- * $Id: wd.c,v 1.194 1999/04/16 21:22:25 peter Exp $
+ * $Id: wd.c,v 1.195 1999/04/28 10:53:01 dt Exp $
*/
/* TODO:
@@ -241,8 +241,6 @@ struct isa_driver wdcdriver = {
static d_open_t wdopen;
-static d_read_t wdread;
-static d_write_t wdwrite;
static d_close_t wdclose;
static d_strategy_t wdstrategy;
static d_ioctl_t wdioctl;
@@ -254,7 +252,7 @@ static d_psize_t wdsize;
static struct cdevsw wd_cdevsw = {
- wdopen, wdclose, wdread, wdwrite,
+ wdopen, wdclose, physread, physwrite,
wdioctl, nostop, nullreset, nodevtotty,
seltrue, nommap, wdstrategy, "wd",
NULL, -1, wddump, wdsize,
@@ -568,20 +566,6 @@ next: ;
return (1);
}
-
-
-static int
-wdread(dev_t dev, struct uio *uio, int ioflag)
-{
- return (physio(wdstrategy, NULL, dev, 1, minphys, uio));
-}
-
-static int
-wdwrite(dev_t dev, struct uio *uio, int ioflag)
-{
- return (physio(wdstrategy, NULL, dev, 0, minphys, uio));
-}
-
/* Read/write routine for a buffer. Finds the proper unit, range checks
* arguments, and schedules the transfer. Does not wait for the transfer
* to complete. Multi-page transfers are supported. All I/O requests must
diff --git a/sys/i386/isa/wd_cd.c b/sys/i386/isa/wd_cd.c
index c5a9097..0e10e20 100644
--- a/sys/i386/isa/wd_cd.c
+++ b/sys/i386/isa/wd_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.15 1999/04/27 11:14:51 phk Exp $
+ * $Id: atapi-cd.c,v 1.16 1999/04/28 10:52:16 dt Exp $
*/
#include "wdc.h"
@@ -55,15 +55,13 @@
static d_open_t acdopen;
static d_close_t acdclose;
-static d_write_t acdwrite;
-static d_read_t acdread;
static d_ioctl_t acdioctl;
static d_strategy_t acdstrategy;
#define CDEV_MAJOR 69
#define BDEV_MAJOR 19
static struct cdevsw acd_cdevsw = {
- acdopen, acdclose, acdread, acdwrite,
+ acdopen, acdclose, physread, physwrite,
acdioctl, nostop, nullreset, nodevtotty,
seltrue, nommap, acdstrategy, "wcd",
NULL, -1, nodump, nopsize,
@@ -458,18 +456,6 @@ acdclose(dev_t dev, int flags, int fmt, struct proc *p)
return 0;
}
-static int
-acdread(dev_t dev, struct uio *uio, int ioflag)
-{
- return physio(acdstrategy, NULL, dev, 1, minphys, uio);
-}
-
-static int
-acdwrite(dev_t dev, struct uio *uio, int ioflag)
-{
- return physio(acdstrategy, NULL, dev, 0, minphys, uio);
-}
-
void
acdstrategy(struct buf *bp)
{
diff --git a/sys/i386/isa/wfd.c b/sys/i386/isa/wfd.c
index 4f66643..8aa5e11 100644
--- a/sys/i386/isa/wfd.c
+++ b/sys/i386/isa/wfd.c
@@ -23,7 +23,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: wfd.c,v 1.21 1999/04/27 11:15:21 phk Exp $
+ * $Id: wfd.c,v 1.22 1999/04/28 10:53:04 dt Exp $
*/
/*
@@ -53,8 +53,6 @@
#include <i386/isa/atapi.h>
static d_open_t wfdopen;
-static d_read_t wfdread;
-static d_write_t wfdwrite;
static d_close_t wfdclose;
static d_ioctl_t wfdioctl;
static d_strategy_t wfdstrategy;
@@ -63,7 +61,7 @@ static d_strategy_t wfdstrategy;
#define BDEV_MAJOR 1
static struct cdevsw wfd_cdevsw = {
- wfdopen, wfdclose, wfdread, wfdwrite,
+ wfdopen, wfdclose, physread, physwrite,
wfdioctl, nostop, nullreset, nodevtotty,
seltrue, nommap, wfdstrategy, "wfd",
NULL, -1, nodump, nopsize,
@@ -408,18 +406,6 @@ int wfdclose (dev_t dev, int flags, int fmt, struct proc *p)
return (0);
}
-static int
-wfdread(dev_t dev, struct uio *uio, int ioflag)
-{
- return (physio(wfdstrategy, NULL, dev, 1, minphys, uio));
-}
-
-static int
-wfdwrite(dev_t dev, struct uio *uio, int ioflag)
-{
- return (physio(wfdstrategy, NULL, dev, 0, minphys, uio));
-}
-
static void
wfdstrategy1(struct buf *bp)
{
diff --git a/sys/i386/isa/wst.c b/sys/i386/isa/wst.c
index 2f442e3..67af539 100644
--- a/sys/i386/isa/wst.c
+++ b/sys/i386/isa/wst.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: wst.c,v 1.19 1999/05/06 18:44:10 peter Exp $
+ * $Id: wst.c,v 1.20 1999/05/06 18:50:10 peter Exp $
*/
#include "wdc.h"
@@ -49,8 +49,6 @@
#include <i386/isa/atapi.h>
static d_open_t wstopen;
-static d_read_t wstread;
-static d_write_t wstwrite;
static d_close_t wstclose;
static d_ioctl_t wstioctl;
static d_strategy_t wststrategy;
@@ -61,7 +59,7 @@ static d_strategy_t wststrategy;
static struct cdevsw wst_cdevsw = {
- wstopen, wstclose, wstread, wstwrite,
+ wstopen, wstclose, physread, physwrite,
wstioctl, nostop, nullreset, nodevtotty,
seltrue, nommap, wststrategy, "wst",
NULL, -1 };
@@ -387,18 +385,6 @@ wstclose(dev_t dev, int flags, int fmt, struct proc *p)
return(0);
}
-static int
-wstread(dev_t dev, struct uio *uio, int ioflag)
-{
- return (physio(wststrategy, NULL, dev, 1, minphys, uio));
-}
-
-static int
-wstwrite(dev_t dev, struct uio *uio, int ioflag)
-{
- return (physio(wststrategy, NULL, dev, 0, minphys, uio));
-}
-
void
wststrategy(struct buf *bp)
{
diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c
index 8efa720..40ee9a8 100644
--- a/sys/i386/isa/wt.c
+++ b/sys/i386/isa/wt.c
@@ -20,7 +20,7 @@
* the original CMU copyright notice.
*
* Version 1.3, Thu Nov 11 12:09:13 MSK 1993
- * $Id: wt.c,v 1.48 1999/04/28 10:53:07 dt Exp $
+ * $Id: wt.c,v 1.49 1999/05/06 18:44:11 peter Exp $
*
*/
@@ -185,8 +185,6 @@ static int wtwritefm (wtinfo_t *t);
static int wtpoll (wtinfo_t *t, int mask, int bits);
static d_open_t wtopen;
-static d_read_t wtread;
-static d_write_t wtwrite;
static d_close_t wtclose;
static d_ioctl_t wtioctl;
static d_strategy_t wtstrategy;
@@ -196,7 +194,7 @@ static d_strategy_t wtstrategy;
static struct cdevsw wt_cdevsw = {
- wtopen, wtclose, wtread, wtwrite,
+ wtopen, wtclose, physread, physwrite,
wtioctl, nostop, nullreset, nodevtotty,
seltrue, nommap, wtstrategy, "wt",
NULL, -1 };
@@ -504,18 +502,6 @@ wtioctl (dev_t dev, u_long cmd, caddr_t arg, int flags, struct proc *p)
return (EINVAL);
}
-static int
-wtread(dev_t dev, struct uio *uio, int ioflag)
-{
- return (physio(wtstrategy, NULL, dev, 1, minphys, uio));
-}
-
-static int
-wtwrite(dev_t dev, struct uio *uio, int ioflag)
-{
- return (physio(wtstrategy, NULL, dev, 0, minphys, uio));
-}
-
/*
* Strategy routine.
*/
OpenPOWER on IntegriCloud