This patch clears the way for removing a number of tty related

fields in struct cdevsw:

        d_stop          moved to struct tty.
        d_reset         already unused.
        d_devtotty      linkage now provided by dev_t->si_tty.

These fields will be removed from struct cdevsw together with
d_params and d_maxio Real Soon Now.

The changes in this patch consist of:

        initialize dev->si_tty in *_open()
        initialize tty->t_stop
        remove devtotty functions
        rename ttpoll to ttypoll
        a few adjustments to these changes in the generic code
        a bump of __FreeBSD_version
        add a couple of FreeBSD tags

2 files changed, 13 insertions, 30 deletions

diff --git a/sys/alpha/alpha/promcons.c b/sys/alpha/alpha/promcons.c
index 7a2d0e46b8f9..3790021985c8 100644
--- a/sys/alpha/alpha/promcons.c
+++ b/sys/alpha/alpha/promcons.c
@@ -64,8 +64,6 @@ static	d_close_t	promclose;
 static	d_read_t	promread;
 static	d_write_t	promwrite;
 static	d_ioctl_t	promioctl;
-static	d_stop_t	promstop;
-static	d_devtotty_t	promdevtotty;
 
 #define CDEV_MAJOR 97
 static struct cdevsw prom_cdevsw = {
@@ -74,10 +72,10 @@ static struct cdevsw prom_cdevsw = {
 	/* read */	promread,
 	/* write */	promwrite,
 	/* ioctl */	promioctl,
-	/* stop */	promstop,
+	/* stop */	nostop,
 	/* reset */	noreset,
-	/* devtotty */	promdevtotty,
-	/* poll */	ttpoll,
+	/* devtotty */	nodevtotty,
+	/* poll */	ttypoll,
 	/* mmap */	nommap,
 	/* strategy */	nostrategy,
 	/* name */	"prom",
@@ -98,6 +96,7 @@ static struct callout_handle promtimeouthandle
 void	promstart __P((struct tty *));
 void	promtimeout __P((void *));
 int	promparam __P((struct tty *, struct termios *));
+void	promstop __P((struct tty *, int));
 
 int
 promopen(dev, flag, mode, p)
@@ -116,9 +115,11 @@ promopen(dev, flag, mode, p)
 	s = spltty();
 
 	tp = &prom_tty[unit];
+	dev->si_tty = tp;
 
 	tp->t_oproc = promstart;
 	tp->t_param = promparam;
+	tp->t_stop = promstop;
 	tp->t_dev = dev;
 	if ((tp->t_state & TS_ISOPEN) == 0) {
 		tp->t_state |= TS_CARR_ON;
@@ -246,6 +247,7 @@ promstart(tp)
 void
 promstop(tp, flag)
 	struct tty *tp;
+	int flag;
 {
 	int s;
 
@@ -270,17 +272,6 @@ promtimeout(v)
 	promtimeouthandle = timeout(promtimeout, tp, polltime);
 }
 
-struct tty *
-promdevtotty(dev)
-	dev_t dev;
-{
-
-	if (minor(dev) != 0)
-		panic("promtty: bogus");
-
-	return &prom_tty[0];
-}
-
 DEV_MODULE(prom, CDEV_MAJOR, NOMAJ, prom_cdevsw, 0, 0);
 
 #endif /* _PMAP_MAY_USE_PROM_CONSOLE */
diff --git a/sys/alpha/tlsb/zs_tlsb.c b/sys/alpha/tlsb/zs_tlsb.c
index 37a94676f676..9e2d7dcc91e0 100644
--- a/sys/alpha/tlsb/zs_tlsb.c
+++ b/sys/alpha/tlsb/zs_tlsb.c
@@ -67,8 +67,6 @@ static	d_close_t	zsclose;
 static	d_read_t	zsread;
 static	d_write_t	zswrite;
 static	d_ioctl_t	zsioctl;
-static	d_stop_t	zsstop;
-static	d_devtotty_t	zsdevtotty;
 
 #define CDEV_MAJOR 98
 static struct cdevsw zs_cdevsw = {
@@ -77,10 +75,10 @@ static struct cdevsw zs_cdevsw = {
 	/* read */	zsread,
 	/* write */	zswrite,
 	/* ioctl */	zsioctl,
-	/* stop */	zsstop,
+	/* stop */	nostop,
 	/* reset */	noreset,
-	/* devtotty */	zsdevtotty,
-	/* poll */	ttpoll,
+	/* devtotty */	nodevtotty,
+	/* poll */	ttypoll,
 	/* mmap */	nommap,
 	/* strategy */	nostrategy,
 	/* name */	"zs",
@@ -95,6 +93,7 @@ static struct cdevsw zs_cdevsw = {
 
 static void	zsstart __P((struct tty *));
 static int	zsparam __P((struct tty *, struct termios *));
+static void	zsstop __P((struct tty *tp, int flag));
 
 /*
  * Helpers for console support.
@@ -270,9 +269,11 @@ zsopen(dev_t dev, int flag, int mode, struct proc *p)
 	s = spltty();
 
 	tp = &sc->tty;
+	dev->si_tty = tp;
 
 	tp->t_oproc = zsstart;
 	tp->t_param = zsparam;
+	tp->t_stop = zsstop;
 	tp->t_dev = dev;
 	if ((tp->t_state & TS_ISOPEN) == 0) {
 		tp->t_state |= TS_CARR_ON;
@@ -381,15 +382,6 @@ zsstop(struct tty *tp, int flag)
 	splx(s);
 }
 
-static struct tty *
-zsdevtotty(dev_t dev)
-{
-	struct zs_softc* sc = ZS_SOFTC(minor(dev));
-	if (!sc)
-		return (NULL);
-	return (&sc->tty);
-}
-
 DEV_DRIVER_MODULE(zs, zsc, zs_driver, zs_devclass, zs_cdevsw, 0, 0);
 
 /*