summaryrefslogtreecommitdiffstats
path: root/sys/i386/isa/matcd
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>1999-05-07 07:03:47 +0000
committerphk <phk@FreeBSD.org>1999-05-07 07:03:47 +0000
commit7f79e0b14a5e8b99418d156f26b7b4026a163eca (patch)
tree64910f3b88102ea4099d5b4c903f873d9a777b12 /sys/i386/isa/matcd
parent87d0bb82afc01a49a3747975f2dda83e9e025bd1 (diff)
downloadFreeBSD-src-7f79e0b14a5e8b99418d156f26b7b4026a163eca.zip
FreeBSD-src-7f79e0b14a5e8b99418d156f26b7b4026a163eca.tar.gz
Introduce two functions: physread() and physwrite() and use these directly
in *devsw[] rather than the 46 local copies of the same functions. (grog will do the same for vinum when he has time)
Diffstat (limited to 'sys/i386/isa/matcd')
-rw-r--r--sys/i386/isa/matcd/matcd.c11
1 files changed, 2 insertions, 9 deletions
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
OpenPOWER on IntegriCloud