Removed dummy routines sscstrategy(), sscread(), sscwrite() and

sscselect().  Use the standard dummies nostrategy(), noread(),
nowrite() and noselect() instead.

sscread() and sscwrite() returned bogus errnos.  It isn't possible
to return an error from a select routine so noselect() is just as
bogus as sscselect() (it's equivalent to nullselect()).
This commit is contained in:
Bruce Evans 1995-12-05 19:36:47 +00:00
parent c66c72d1b4
commit 7c3bc2bfe9
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=12637
2 changed files with 9 additions and 17 deletions

View File

@ -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 <sys/param.h>
@ -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 },

View File

@ -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 <sys/types.h>
@ -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;