d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Introduce two functions: physread() and physwrite() and use these directly

Browse Source 
in *devsw[] rather than the 46 local copies of the same functions.

(grog will do the same for vinum when he has time)
This commit is contained in:
Poul-Henning Kamp 1999-05-07 07:03:47 +00:00
parent e244fe31d6
commit c48d17750f
38 changed files with 95 additions and 526 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/cam/scsi/scsi_cd.c
View File

@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: scsi_cd.c,v 1.17 1999/04/19 21:26:17 gibbs Exp $
* $Id: scsi_cd.c,v 1.18 1999/05/06 20:16:03 ken Exp $
*/
/*
* Portions of this driver taken from the original FreeBSD cd driver.
@ -177,7 +177,6 @@ static struct cd_quirk_entry cd_quirk_table[] =
#define CD_BDEV_MAJOR 6
static d_open_t cdopen;
static d_read_t cdread;
static d_close_t cdclose;
static d_ioctl_t cdioctl;
static d_strategy_t cdstrategy;
@ -248,7 +247,7 @@ static struct cdevsw cd_cdevsw =
{
/*d_open*/ cdopen,
/*d_close*/ cdclose,
/*d_read*/ cdread,
/*d_read*/ physread,
/*d_write*/ nowrite,
/*d_ioctl*/ cdioctl,
/*d_stop*/ nostop,
@ -1031,12 +1030,6 @@ cdclose(dev_t dev, int flag, int fmt, struct proc *p)
return (0);
}
static int
cdread(dev_t dev, struct uio *uio, int ioflag)
{
return(physio(cdstrategy, NULL, dev, 1, minphys, uio));
}
static void
cdshorttimeout(void *arg)
{

20
sys/cam/scsi/scsi_da.c
View File

@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: scsi_da.c,v 1.21 1999/03/05 23:20:20 gibbs Exp $
* $Id: scsi_da.c,v 1.22 1999/05/06 20:16:04 ken Exp $
*/
#include "opt_hw_wdog.h"
@ -178,8 +178,6 @@ static struct da_quirk_entry da_quirk_table[] =
};
static d_open_t daopen;
static d_read_t daread;
static d_write_t dawrite;
static d_close_t daclose;
static d_strategy_t dastrategy;
static d_ioctl_t daioctl;
@ -242,8 +240,8 @@ static struct cdevsw da_cdevsw =
{
/*d_open*/ daopen,
/*d_close*/ daclose,
/*d_read*/ daread,
/*d_write*/ dawrite,
/*d_read*/ physread,
/*d_write*/ physwrite,
/*d_ioctl*/ daioctl,
/*d_stop*/ nostop,
/*d_reset*/ noreset,
@ -497,18 +495,6 @@ daclose(dev_t dev, int flag, int fmt, struct proc *p)
return (0);
}
static int
daread(dev_t dev, struct uio *uio, int ioflag)
{
return(physio(dastrategy, NULL, dev, 1, minphys, uio));
}
static int
dawrite(dev_t dev, struct uio *uio, int ioflag)
{
return(physio(dastrategy, NULL, dev, 0, minphys, uio));
}
/*
* Actually translate the requested transfer into one the physical driver
* can understand. The transfer is described by a buf and will include

20
sys/cam/scsi/scsi_pass.c
View File

@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: scsi_pass.c,v 1.6 1999/02/10 00:03:15 ken Exp $
* $Id: scsi_pass.c,v 1.7 1999/05/06 20:16:05 ken Exp $
*/
#include <sys/param.h>
@ -95,8 +95,6 @@ struct pass_softc {
#define PASS_CDEV_MAJOR 31
static d_open_t passopen;
static d_read_t passread;
static d_write_t passwrite;
static d_close_t passclose;
static d_ioctl_t passioctl;
static d_strategy_t passstrategy;
@ -127,8 +125,8 @@ static struct cdevsw pass_cdevsw =
{
/*d_open*/ passopen,
/*d_close*/ passclose,
/*d_read*/ passread,
/*d_write*/ passwrite,
/*d_read*/ physread,
/*d_write*/ physwrite,
/*d_ioctl*/ passioctl,
/*d_stop*/ nostop,
/*d_reset*/ noreset,
@ -473,18 +471,6 @@ passclose(dev_t dev, int flag, int fmt, struct proc *p)
return (0);
}
static int
passread(dev_t dev, struct uio *uio, int ioflag)
{
return(physio(passstrategy, NULL, dev, 1, minphys, uio));
}
static int
passwrite(dev_t dev, struct uio *uio, int ioflag)
{
return(physio(passstrategy, NULL, dev, 0, minphys, uio));
}
/*
* Actually translate the requested transfer into one the physical driver
* can understand. The transfer is described by a buf and will include

20
sys/cam/scsi/scsi_pt.c
View File

@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: scsi_pt.c,v 1.4 1998/11/22 23:44:47 ken Exp $
* $Id: scsi_pt.c,v 1.5 1999/02/10 00:03:15 ken Exp $
*/
#include <sys/param.h>
@ -82,8 +82,6 @@ struct pt_softc {
};
static d_open_t ptopen;
static d_read_t ptread;
static d_write_t ptwrite;
static d_close_t ptclose;
static d_strategy_t ptstrategy;
static periph_init_t ptinit;
@ -118,8 +116,8 @@ static struct cdevsw pt_cdevsw =
{
/*d_open*/ ptopen,
/*d_close*/ ptclose,
/*d_read*/ ptread,
/*d_write*/ ptwrite,
/*d_read*/ physread,
/*d_write*/ physwrite,
/*d_ioctl*/ noioctl,
/*d_stop*/ nostop,
/*d_reset*/ noreset,
@ -207,18 +205,6 @@ ptclose(dev_t dev, int flag, int fmt, struct proc *p)
return (0);
}
static int
ptread(dev_t dev, struct uio *uio, int ioflag)
{
return(physio(ptstrategy, NULL, dev, 1, minphys, uio));
}
static int
ptwrite(dev_t dev, struct uio *uio, int ioflag)
{
return(physio(ptstrategy, NULL, dev, 0, minphys, uio));
}
/*
* Actually translate the requested transfer into one the physical driver
* can understand. The transfer is described by a buf and will include

26
sys/cam/scsi/scsi_sa.c
View File

@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: scsi_sa.c,v 1.20 1999/03/01 01:07:47 mjacob Exp $
* $Id: scsi_sa.c,v 1.21 1999/04/18 01:05:03 mjacob Exp $
*/
#include <sys/param.h>
@ -250,8 +250,6 @@ static struct sa_quirk_entry sa_quirk_table[] =
};
static d_open_t saopen;
static d_read_t saread;
static d_write_t sawrite;
static d_close_t saclose;
static d_strategy_t sastrategy;
static d_ioctl_t saioctl;
@ -324,8 +322,8 @@ static struct cdevsw sa_cdevsw =
{
/*d_open*/ saopen,
/*d_close*/ saclose,
/*d_read*/ saread,
/*d_write*/ sawrite,
/*d_read*/ physread,
/*d_write*/ physwrite,
/*d_ioctl*/ saioctl,
/*d_stop*/ nostop,
/*d_reset*/ noreset,
@ -521,24 +519,6 @@ saclose(dev_t dev, int flag, int fmt, struct proc *p)
return (0);
}
static int
saread(dev_t dev, struct uio *uio, int ioflag)
{
if (SA_IS_CTRL(dev)) {
return (EINVAL);
}
return(physio(sastrategy, NULL, dev, 1, minphys, uio));
}
static int
sawrite(dev_t dev, struct uio *uio, int ioflag)
{
if (SA_IS_CTRL(dev)) {
return (EINVAL);
}
return(physio(sastrategy, NULL, dev, 0, minphys, uio));
}
/*
* Actually translate the requested transfer into one the physical driver
* can understand. The transfer is described by a buf and will include

6
sys/cam/scsi/scsi_target.c
View File

@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: scsi_target.c,v 1.9 1999/03/05 23:25:10 gibbs Exp $
* $Id: scsi_target.c,v 1.10 1999/05/04 19:24:21 gibbs Exp $
*/
#include <stddef.h> /* For offsetof */
@ -1012,7 +1012,7 @@ targread(dev_t dev, struct uio *uio, int ioflag)
targrunqueue(periph, softc);
return (0);
}
return(physio(targstrategy, NULL, dev, 1, minphys, uio));
return(physread(dev, uio, ioflag));
}
static int
@ -1042,7 +1042,7 @@ targwrite(dev_t dev, struct uio *uio, int ioflag)
targrunqueue(periph, softc);
return (0);
}
return(physio(targstrategy, NULL, dev, 0, minphys, uio));
return(physwrite(dev, uio, ioflag));
}
/*

20
sys/dev/ata/ata-disk.c
View File

@ -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)
{

18
sys/dev/ata/atapi-cd.c
View File

@ -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)
{

18
sys/dev/ata/atapi-fd.c
View File

@ -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)
{

18
sys/dev/ata/atapi-tape.c
View File

@ -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)
{

18
sys/dev/ccd/ccd.c
View File

@ -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;

19
sys/dev/fdc/fdc.c
View File

@ -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 */
/****************************************************************************/

11
sys/dev/mcd/mcd.c
View File

@ -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)
{

11
sys/dev/scd/scd.c
View File

@ -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)
{

18
sys/dev/vn/vn.c
View File

@ -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:
*

18
sys/geom/geom_ccd.c
View File

@ -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;

18
sys/i386/isa/atapi-cd.c
View File

@ -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)
{

19
sys/i386/isa/fd.c
View File

@ -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 */
/****************************************************************************/

16
sys/i386/isa/labpc.c
View File

@ -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.
*/

11
sys/i386/isa/matcd/matcd.c
View File

@ -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

11
sys/i386/isa/mcd.c
View File

@ -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)
{

11
sys/i386/isa/scd.c
View File

@ -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)
{

20
sys/i386/isa/wd.c
View File

@ -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

18
sys/i386/isa/wd_cd.c
View File

@ -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)
{

18
sys/i386/isa/wfd.c
View File

@ -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)
{

18
sys/i386/isa/wst.c
View File

@ -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)
{

18
sys/i386/isa/wt.c
View File

@ -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.
*/

19
sys/isa/fd.c
View File

@ -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 */
/****************************************************************************/

14
sys/kern/kern_physio.c
View File

@ -16,7 +16,7 @@
* 4. Modifications may be freely made to this file if the above conditions
* are met.
*
* $Id: kern_physio.c,v 1.31 1999/04/06 03:04:47 peter Exp $
* $Id: kern_physio.c,v 1.32 1999/05/06 20:00:25 phk Exp $
*/
#include <sys/param.h>
@ -32,6 +32,18 @@
static void physwakeup __P((struct buf *bp));
static struct buf * phygetvpbuf(dev_t dev, int resid);
int
physread(dev_t dev, struct uio *uio, int ioflag)
{
return(physio(cdevsw[major(dev)]->d_strategy, NULL, dev, 1, minphys, uio));
}
int
physwrite(dev_t dev, struct uio *uio, int ioflag)
{
return(physio(cdevsw[major(dev)]->d_strategy, NULL, dev, 0, minphys, uio));
}
int
physio(strategy, bp, dev, rw, minp, uio)
d_strategy_t *strategy;

19
sys/pc98/cbus/fdc.c
View File

@ -47,7 +47,7 @@
* SUCH DAMAGE.
*
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
* $Id: fd.c,v 1.56 1999/05/05 03:43:00 kato Exp $
* $Id: fd.c,v 1.57 1999/05/06 20:00:31 phk Exp $
*
*/
@ -468,14 +468,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,
@ -1708,19 +1706,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 */
/****************************************************************************/

19
sys/pc98/pc98/fd.c
View File

@ -47,7 +47,7 @@
* SUCH DAMAGE.
*
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
* $Id: fd.c,v 1.56 1999/05/05 03:43:00 kato Exp $
* $Id: fd.c,v 1.57 1999/05/06 20:00:31 phk Exp $
*
*/
@ -468,14 +468,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,
@ -1708,19 +1706,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 */
/****************************************************************************/

20
sys/pc98/pc98/wd.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)wd.c 7.2 (Berkeley) 5/9/91
* $Id: wd.c,v 1.78 1999/04/18 14:42:20 kato Exp $
* $Id: wd.c,v 1.79 1999/04/28 10:54:00 dt Exp $
*/
/* TODO:
@ -276,8 +276,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;
@ -289,7 +287,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,
@ -704,20 +702,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

18
sys/pc98/pc98/wd_cd.c
View File

@ -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)
{

18
sys/pc98/pc98/wfd.c
View File

@ -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)
{

18
sys/pc98/pc98/wst.c
View File

@ -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)
{

4
sys/sys/bio.h
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)buf.h 8.9 (Berkeley) 3/30/95
* $Id: buf.h,v 1.67 1999/05/06 17:06:32 phk Exp $
* $Id: buf.h,v 1.68 1999/05/06 20:00:32 phk Exp $
*/
#ifndef _SYS_BUF_H_
@ -381,6 +381,8 @@ int cluster_wbuild __P((struct vnode *, long, daddr_t, int));
void cluster_write __P((struct buf *, u_quad_t));
int physio __P((void (*)(struct buf *), struct buf *, dev_t,
int, u_int (*)(struct buf *), struct uio *));
int physread __P((dev_t dev, struct uio *uio, int ioflag));
int physwrite __P((dev_t dev, struct uio *uio, int ioflag));
u_int minphys __P((struct buf *));
void vfs_bio_set_validclean __P((struct buf *, int base, int size));
void vfs_bio_clrbuf __P((struct buf *));

4
sys/sys/buf.h
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)buf.h 8.9 (Berkeley) 3/30/95
* $Id: buf.h,v 1.67 1999/05/06 17:06:32 phk Exp $
* $Id: buf.h,v 1.68 1999/05/06 20:00:32 phk Exp $
*/
#ifndef _SYS_BUF_H_
@ -381,6 +381,8 @@ int cluster_wbuild __P((struct vnode *, long, daddr_t, int));
void cluster_write __P((struct buf *, u_quad_t));
int physio __P((void (*)(struct buf *), struct buf *, dev_t,
int, u_int (*)(struct buf *), struct uio *));
int physread __P((dev_t dev, struct uio *uio, int ioflag));
int physwrite __P((dev_t dev, struct uio *uio, int ioflag));
u_int minphys __P((struct buf *));
void vfs_bio_set_validclean __P((struct buf *, int base, int size));
void vfs_bio_clrbuf __P((struct buf *));

18
sys/vm/vm_swap.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)vm_swap.c 8.5 (Berkeley) 2/17/94
* $Id: vm_swap.c,v 1.62 1999/04/27 11:18:52 phk Exp $
* $Id: vm_swap.c,v 1.63 1999/04/28 10:54:24 dt Exp $
*/
#include "opt_devfs.h"
@ -70,14 +70,12 @@
*/
static d_strategy_t swstrategy;
static d_read_t swread;
static d_write_t swwrite;
#define CDEV_MAJOR 4
#define BDEV_MAJOR 26
static struct cdevsw sw_cdevsw =
{ nullopen, nullclose, swread, swwrite, /*4*/
{ nullopen, nullclose, physread, physwrite, /*4*/
noioc, nostop, noreset, nodevtotty,/* swap */
seltrue, nommap, swstrategy, "sw",
NULL, -1, nodump, nopsize,
@ -99,18 +97,6 @@ static int nswap; /* first block after the interleaved devs */
static int nswdev = NSWAPDEV;
int vm_swap_size;
static int
swread(dev_t dev, struct uio *uio, int ioflag)
{
return (physio(swstrategy, NULL, dev, 1, minphys, uio));
}
static int
swwrite(dev_t dev, struct uio *uio, int ioflag)
{
return (physio(swstrategy, NULL, dev, 0, minphys, uio));
}
/*
* swstrategy:
*