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

Use them in many tty drivers.

Reviewed by: julian, bde

1 files changed, 2 insertions, 26 deletions

diff --git a/sys/i386/isa/pcvt/pcvt_drv.c b/sys/i386/isa/pcvt/pcvt_drv.c
index 601be1a..1d3936d 100644
--- a/sys/i386/isa/pcvt/pcvt_drv.c
+++ b/sys/i386/isa/pcvt/pcvt_drv.c
@@ -120,8 +120,6 @@ CONS_DRIVER(pc, pccnprobe, pccninit, pccnterm, pccngetc, pccncheckc, pccnputc);
 
 static	d_open_t	pcopen;
 static	d_close_t	pcclose;
-static	d_read_t	pcread;
-static	d_write_t	pcwrite;
 static	d_ioctl_t	pcioctl;
 static	d_mmap_t	pcmmap;
 
@@ -129,8 +127,8 @@ static	d_mmap_t	pcmmap;
 static struct cdevsw pc_cdevsw = {
 	/* open */	pcopen,
 	/* close */	pcclose,
-	/* read */	pcread,
-	/* write */	pcwrite,
+	/* read */	ttyread,
+	/* write */	ttywrite,
 	/* ioctl */	pcioctl,
 	/* poll */	ttypoll,
 	/* mmap */	pcmmap,
@@ -571,28 +569,6 @@ pcclose(Dev_t dev, int flag, int mode, struct proc *p)
 }
 
 int
-pcread(Dev_t dev, struct uio *uio, int flag)
-{
-	register struct tty *tp;
-
-	if((tp = get_pccons(dev)) == NULL)
-		return ENXIO;
-
-	return ((*linesw[tp->t_line].l_read)(tp, uio, flag));
-}
-
-int
-pcwrite(Dev_t dev, struct uio *uio, int flag)
-{
-	register struct tty *tp;
-
-	if((tp = get_pccons(dev)) == NULL)
-		return ENXIO;
-
-	return ((*linesw[tp->t_line].l_write)(tp, uio, flag));
-}
-
-int
 pcioctl(Dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 {
 	register int error;