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

Use them in many tty drivers.

Reviewed by: julian, bde

2 files changed, 5 insertions, 103 deletions

diff --git a/sys/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c
index ea7b548..481eaf6 100644
--- a/sys/dev/dgb/dgb.c
+++ b/sys/dev/dgb/dgb.c
@@ -204,16 +204,14 @@ struct isa_driver	dgbdriver = {
 
 static	d_open_t	dgbopen;
 static	d_close_t	dgbclose;
-static	d_read_t	dgbread;
-static	d_write_t	dgbwrite;
 static	d_ioctl_t	dgbioctl;
 
 #define	CDEV_MAJOR	58
 static struct cdevsw dgb_cdevsw = {
 	/* open */	dgbopen,
 	/* close */	dgbclose,
-	/* read */	dgbread,
-	/* write */	dgbwrite,
+	/* read */	ttyread,
+	/* write */	ttywrite,
 	/* ioctl */	dgbioctl,
 	/* poll */	ttypoll,
 	/* mmap */	nommap,
@@ -1198,55 +1196,7 @@ static void
 dgb_pause(chan)
 	void *chan;
 {
-wakeup((caddr_t)chan);
-}
-
-
-static	int
-dgbread(dev, uio, flag)
-	dev_t		dev;
-	struct uio	*uio;
-	int		flag;
-{
-	int		mynor;
-	struct tty	*tp;
-	int error, unit, pnum;
-
-	mynor=minor(dev);
-	if (mynor & CONTROL_MASK)
-		return (ENODEV);
-	unit=MINOR_TO_UNIT(mynor);
-	pnum=MINOR_TO_PORT(mynor);
-
-	tp=&dgb_softc[unit].ttys[pnum];
-
-	error=linesw[tp->t_line].l_read(tp, uio, flag);
-	DPRINT4(DB_RD,"dgb%d: port%d: read() returns %d\n",unit,pnum,error);
-	return error;
-}
-
-static	int
-dgbwrite(dev, uio, flag)
-	dev_t		dev;
-	struct uio	*uio;
-	int		flag;
-{
-	int		mynor;
-	struct tty	*tp;
-	int error, unit, pnum;
-
-	mynor=minor(dev);
-	if (mynor & CONTROL_MASK)
-		return (ENODEV);
-
-	unit=MINOR_TO_UNIT(mynor);
-	pnum=MINOR_TO_PORT(mynor);
-
-	tp=&dgb_softc[unit].ttys[pnum];
-
-	error=linesw[tp->t_line].l_write(tp, uio, flag);
-	DPRINT4(DB_WR,"dgb%d: port%d: write() returns %d\n",unit,pnum,error);
-	return error;
+	wakeup((caddr_t)chan);
 }
 
 static void
diff --git a/sys/dev/dgb/dgm.c b/sys/dev/dgb/dgm.c
index 4a2ec53..3732302 100644
--- a/sys/dev/dgb/dgm.c
+++ b/sys/dev/dgb/dgm.c
@@ -208,16 +208,14 @@ struct isa_driver	dgmdriver = {
 
 static	d_open_t	dgmopen;
 static	d_close_t	dgmclose;
-static	d_read_t	dgmread;
-static	d_write_t	dgmwrite;
 static	d_ioctl_t	dgmioctl;
 
 #define	CDEV_MAJOR	101
 static struct cdevsw dgm_cdevsw = {
 	/* open */	dgmopen,
 	/* close */	dgmclose,
-	/* read */	dgmread,
-	/* write */	dgmwrite,
+	/* read */	ttyread,
+	/* write */	ttywrite,
 	/* ioctl */	dgmioctl,
 	/* poll */	ttypoll,
 	/* mmap */	nommap,
@@ -1005,52 +1003,6 @@ wakeup((caddr_t)chan);
 }
 
 
-static	int
-dgmread(dev, uio, flag)
-	dev_t		dev;
-	struct uio	*uio;
-	int		flag;
-{
-	int		mynor;
-	struct tty	*tp;
-	int error, unit, pnum;
-
-	mynor=minor(dev);
-	if (mynor & CONTROL_MASK)
-		return (ENODEV);
-	unit=MINOR_TO_UNIT(mynor);
-	pnum=MINOR_TO_PORT(mynor);
-
-	tp=&dgm_softc[unit].ttys[pnum];
-	error=linesw[tp->t_line].l_read(tp, uio, flag);
-	DPRINT4(DB_RD,"dgm%d: port%d: read() returns %d\n",unit,pnum,error);
-	return error;
-}
-
-static	int
-dgmwrite(dev, uio, flag)
-	dev_t		dev;
-	struct uio	*uio;
-	int		flag;
-{
-	int		mynor;
-	struct tty	*tp;
-	int error, unit, pnum;
-
-	mynor=minor(dev);
-	if (mynor & CONTROL_MASK)
-		return (ENODEV);
-
-	unit=MINOR_TO_UNIT(mynor);
-	pnum=MINOR_TO_PORT(mynor);
-
-	tp=&dgm_softc[unit].ttys[pnum];
-
-	error=linesw[tp->t_line].l_write(tp, uio, flag);
-	DPRINT4(DB_WR,"dgm%d: port%d: write() returns %d\n",unit,pnum,error);
-	return error;
-}
-
 static void
 dgmpoll(unit_c)
 	void *unit_c;