From 796eb5ce0afbb92f7c829367cc09ec04472e0166 Mon Sep 17 00:00:00 2001
From: peter <peter@FreeBSD.org>
Date: Sun, 14 Sep 1997 03:19:42 +0000
Subject: Update select -> poll in drivers.

---
 sys/scsi/ch.c  |  4 ++--
 sys/scsi/ssc.c |  5 +++--
 sys/scsi/su.c  | 13 +++++++------
 3 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'sys/scsi')

diff --git a/sys/scsi/ch.c b/sys/scsi/ch.c
index f68f65a..53e598a 100644
--- a/sys/scsi/ch.c
+++ b/sys/scsi/ch.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: ch.c,v 1.40 1997/03/24 11:24:55 bde Exp $
+ *      $Id: ch.c,v 1.41 1997/09/02 20:06:31 bde Exp $
  */
 
 #include <sys/param.h>
@@ -108,7 +108,7 @@ static	d_ioctl_t	chioctl;
 static struct cdevsw ch_cdevsw = 
 	{ chopen,	chclose,	noread,		nowrite,	/*17*/
 	  chioctl,	nostop,		nullreset,	nodevtotty,/* ch */
-	  noselect,	nommap,		nostrat,	"ch",	NULL,	-1 };
+	  seltrue,	nommap,		nostrat,	"ch",	NULL,	-1 };
 
 /*
  * SCSI glue.
diff --git a/sys/scsi/ssc.c b/sys/scsi/ssc.c
index 5002d02..7d84406 100644
--- a/sys/scsi/ssc.c
+++ b/sys/scsi/ssc.c
@@ -49,10 +49,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *End copyright
- * $Id: ssc.c,v 1.14 1997/02/22 09:44:38 peter Exp $
+ * $Id: ssc.c,v 1.15 1997/08/02 14:33:16 bde Exp $
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/scsiio.h>
 #include <sys/kernel.h>
@@ -74,7 +75,7 @@ extern	d_ioctl_t	suioctl;
 static struct cdevsw ssc_cdevsw = 
 	{ sscopen,	sscclose,	noread,		nowrite,	/*49*/
 	  sscioctl,	nostop,		nullreset,	nodevtotty,
-	  noselect,	nommap,		nostrategy,	"ssc",	NULL,	-1 };
+	  seltrue,	nommap,		nostrategy,	"ssc",	NULL,	-1 };
 
 static dev_t sscdev = NODEV;
 
diff --git a/sys/scsi/su.c b/sys/scsi/su.c
index 434d9fd..6f22606 100644
--- a/sys/scsi/su.c
+++ b/sys/scsi/su.c
@@ -44,7 +44,7 @@
  * SUCH DAMAGE.
  *End copyright
  *
- *      $Id: su.c,v 1.16 1997/02/22 09:44:40 peter Exp $
+ *      $Id: su.c,v 1.17 1997/09/02 20:06:40 bde Exp $
  *
  * Tabstops 4
  * XXX devfs entries for this device should be handled by generic scsiconfig
@@ -52,6 +52,7 @@
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/stat.h>
 #include <sys/buf.h>
@@ -66,13 +67,13 @@ extern	d_ioctl_t	suioctl;
 
 static	d_read_t	suread;
 static	d_write_t	suwrite;
-static	d_select_t	suselect;
+static	d_poll_t	supoll;
 static	d_strategy_t	sustrategy;
 
 static struct cdevsw su_cdevsw = 
 	{ suopen,	suclose,	suread,		suwrite,	/*18*/
 	  suioctl,	nostop,		nullreset,	nodevtotty,/* scsi */
-	  suselect,	nommap,		sustrategy, "su",	NULL,	-1 };
+	  supoll,	nommap,		sustrategy, "su",	NULL,	-1 };
 
 
 /* Build an old style device number (unit encoded in the minor number)
@@ -112,7 +113,7 @@ static struct cdevsw cnxio = {
 	nxstop,
 	nxreset,
 	nxdevtotty,
-	nxselect,
+	seltrue,
 	nxmmap,
 	nxstrategy,
 	"NON",
@@ -278,14 +279,14 @@ suwrite(dev_t dev, struct uio *uio, int ioflag)
 }
 
 static	int
-suselect(dev_t dev, int which, struct proc *p)
+supoll(dev_t dev, int events, struct proc *p)
 {
 	dev_t base;
 	struct cdevsw *cdev;
 
 	(void)getsws(dev, S_IFCHR, 0, &cdev, &base);
 
-	return (*cdev->d_select)(base, which, p);
+	return (*cdev->d_poll)(base, events, p);
 }
 
 static su_devsw_installed = 0;
-- 
cgit v1.1