Added D_TTY to the cdevswitch flags for all tty drivers. This is required

for the Lite2 fix for always returning EIO in dead_read().

Cleaned up the cdevswitch initializers for all tty drivers.

Removed explicit calls to ttsetwater() from all (tty) drivers.  ttsetwater()
is now called centrally for opens, not just for parameter changes.

2 files changed, 18 insertions, 16 deletions

diff --git a/sys/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c
index 9537c12..aac2725 100644
--- a/sys/dev/dgb/dgb.c
+++ b/sys/dev/dgb/dgb.c
@@ -1,5 +1,5 @@
 /*-
- *  dgb.c $Id: dgb.c,v 1.38 1998/08/12 23:44:22 brian Exp $
+ *  dgb.c $Id: dgb.c,v 1.39 1998/08/16 01:21:49 bde Exp $
  *
  *  Digiboard driver.
  *
@@ -222,11 +222,14 @@ static	d_ioctl_t	dgbioctl;
 static	d_stop_t	dgbstop;
 static	d_devtotty_t	dgbdevtotty;
 
-#define CDEV_MAJOR 58
-static struct cdevsw dgb_cdevsw = 
-	{ dgbopen,	dgbclose,	dgbread,	dgbwrite,	/*58*/
-	  dgbioctl,	dgbstop,	noreset,	dgbdevtotty, /* dgb */
-	  ttpoll,	nommap,		NULL,	"dgb",	NULL,	-1 };
+#define	CDEV_MAJOR	58
+static	struct cdevsw	dgb_cdevsw = {
+	dgbopen,	dgbclose,	dgbread,	dgbwrite,
+	dgbioctl,	dgbstop,	noreset,	dgbdevtotty,
+	ttpoll,		nommap,		NULL,		"dgb",
+	NULL,		-1,		nodump,		nopsize,
+	D_TTY,
+};
 
 static	speed_t	dgbdefaultrate = TTYDEF_SPEED;
 
@@ -1071,8 +1074,6 @@ open_top:
 			goto out;
 		}
 
-		ttsetwater(tp);
-
 		/* handle fake DCD for callout devices */
 		/* and initial DCD */
 
diff --git a/sys/dev/dgb/dgm.c b/sys/dev/dgb/dgm.c
index 487b1aa..eca931a 100644
--- a/sys/dev/dgb/dgm.c
+++ b/sys/dev/dgb/dgm.c
@@ -1,5 +1,5 @@
 /*-
- *	$Id: dgm.c,v 1.3 1998/08/12 17:38:09 bde Exp $
+ *	$Id: dgm.c,v 1.4 1998/08/16 01:21:49 bde Exp $
  *
  *  This driver and the associated header files support the ISA PC/Xem
  *  Digiboards.  Its evolutionary roots are described below.
@@ -227,11 +227,14 @@ static	d_ioctl_t	dgmioctl;
 static	d_stop_t	dgmstop;
 static	d_devtotty_t	dgmdevtotty;
 
-#define CDEV_MAJOR 101
-static struct cdevsw dgm_cdevsw = 
-	{ dgmopen,	dgmclose,	dgmread,	dgmwrite,	
-	  dgmioctl,	dgmstop,	noreset,	dgmdevtotty, /* dgm */
-	  ttpoll,	nommap,		NULL,	"dgm",	NULL,	-1 };
+#define	CDEV_MAJOR	101
+static	struct cdevsw	dgm_cdevsw = {
+	dgmopen,	dgmclose,	dgmread,	dgmwrite,
+	dgmioctl,	dgmstop,	noreset,	dgmdevtotty,
+	ttpoll,		nommap,		NULL,		"dgm",
+	NULL,		-1,		nodump,		nopsize,
+	D_TTY,
+};
 
 static	speed_t	dgmdefaultrate = TTYDEF_SPEED;
 
@@ -876,8 +879,6 @@ open_top:
 			goto out;
 		}
 
-		ttsetwater(tp);
-
 		/* handle fake DCD for callout devices */
 		/* and initial DCD */