Introduce ttyread() and ttywrite() which do the canonical thing.

Use them in many tty drivers.

Reviewed by: julian, bde

1 files changed, 2 insertions, 18 deletions

diff --git a/sys/alpha/tlsb/zs_tlsb.c b/sys/alpha/tlsb/zs_tlsb.c
index 9c3944b..e13f196 100644
--- a/sys/alpha/tlsb/zs_tlsb.c
+++ b/sys/alpha/tlsb/zs_tlsb.c
@@ -64,16 +64,14 @@ struct zs_softc {
 
 static	d_open_t	zsopen;
 static	d_close_t	zsclose;
-static	d_read_t	zsread;
-static	d_write_t	zswrite;
 static	d_ioctl_t	zsioctl;
 
 #define CDEV_MAJOR 98
 static struct cdevsw zs_cdevsw = {
 	/* open */	zsopen,
 	/* close */	zsclose,
-	/* read */	zsread,
-	/* write */	zswrite,
+	/* read */	ttyread,
+	/* write */	ttywrite,
 	/* ioctl */	zsioctl,
 	/* poll */	ttypoll,
 	/* mmap */	nommap,
@@ -303,20 +301,6 @@ zsclose(dev_t dev, int flag, int mode, struct proc *p)
 }
  
 static int
-zsread(dev_t dev, struct uio *uio, int flag)
-{
-	struct tty *tp = &ZS_SOFTC(minor(dev))->tty;
-	return ((*linesw[tp->t_line].l_read)(tp, uio, flag));
-}
- 
-static int
-zswrite(dev_t dev, struct uio *uio, int flag)
-{
-	struct tty *tp = &ZS_SOFTC(minor(dev))->tty;
-	return ((*linesw[tp->t_line].l_write)(tp, uio, flag));
-}
- 
-static int
 zsioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 {
 	struct tty *tp = &ZS_SOFTC(minor(dev))->tty;