diff --git a/sys/i386/i386/conf.c b/sys/i386/i386/conf.c index f66264fe6e6c..f8cc9739ef6b 100644 --- a/sys/i386/i386/conf.c +++ b/sys/i386/i386/conf.c @@ -42,7 +42,7 @@ * SUCH DAMAGE. * * from: @(#)conf.c 5.8 (Berkeley) 5/12/91 - * $Id: conf.c,v 1.107 1995/11/29 12:38:29 julian Exp $ + * $Id: conf.c,v 1.108 1995/11/29 14:39:22 julian Exp $ */ #include @@ -470,10 +470,6 @@ int nblkdev = sizeof (bdevsw) / sizeof (bdevsw[0]); #define sscopen nxopen #define sscclose nxclose #define sscioctl nxioctl -#define sscread nxread -#define sscwrite nxwrite -#define sscselect nxselect -#define sscstrategy nxstrategy #endif #include "cx.h" @@ -813,9 +809,9 @@ struct cdevsw cdevsw[] = { cyopen, cyclose, cyread, cywrite, /*48*/ cyioctl, cystop, nxreset, cydevtotty,/*cyclades*/ ttselect, nxmmap, NULL }, - { sscopen, sscclose, sscread, sscwrite, /*49*/ + { sscopen, sscclose, noread, nowrite, /*49*/ sscioctl, nostop, nullreset, nodevtotty,/* scsi super */ - sscselect, nxmmap, sscstrategy }, + noselect, nommap, nostrategy }, { crdopen, crdclose, crdread, crdwrite, /*50*/ crdioctl, nostop, nullreset, nodevtotty,/* pcmcia */ crdselect, nommap, NULL }, diff --git a/sys/scsi/ssc.c b/sys/scsi/ssc.c index 87f71f7faf81..d94def16d02d 100644 --- a/sys/scsi/ssc.c +++ b/sys/scsi/ssc.c @@ -49,7 +49,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. *End copyright - * $Id: ssc.c,v 1.5 1995/11/29 10:49:03 julian Exp $ + * $Id: ssc.c,v 1.6 1995/11/29 14:41:03 julian Exp $ */ #include @@ -116,21 +116,17 @@ int sscioctl(dev_t dev, int cmd, caddr_t data, int fflag, struct proc *p) return ENXIO; } -/* I've elected not to support any of these other entries. There - * really is no good reason other than I'm not sure how you would use - * them. +/* + * I've elected not to support any other entries. There really is no + * good reason other than I'm not sure how you would use them. */ -void sscstrategy(struct buf *bp) { } -int sscread(dev_t dev, struct uio *uio, int ioflag) { return ENXIO; } -int sscwrite(dev_t dev, struct uio *uio, int ioflag) { return ENXIO; } -int sscselect(dev_t dev, int which, struct proc *p) { return ENXIO; } #ifdef JREMOD struct cdevsw ssc_cdevsw = - { sscopen, sscclose, sscread, sscwrite, /*49*/ + { sscopen, sscclose, noread, nowrite, /*49*/ sscioctl, nostop, nullreset, nodevtotty,/* scsi super */ - sscselect, nxmmap, sscstrategy }; + noselect, nommap, nostrategy }; static ssc_devsw_installed = 0;