Machine generated patch which changes linedisc calls from accessing

linesw[] directly to using the ttyld...() functions

The ttyld...() functions ar inline so there is no performance hit.

2 files changed, 7 insertions, 7 deletions

diff --git a/sys/alpha/alpha/promcons.c b/sys/alpha/alpha/promcons.c
index c968d28..3a127ea 100644
--- a/sys/alpha/alpha/promcons.c
+++ b/sys/alpha/alpha/promcons.c
@@ -124,7 +124,7 @@ promopen(dev, flag, mode, td)
 
 	splx(s);
 
-	error = (*linesw[tp->t_line].l_open)(dev, tp);
+	error = ttyld_open(tp, dev);
 
 	if (error == 0 && setuptimeout) {
 		polltime = hz / PROM_POLL_HZ;
@@ -148,7 +148,7 @@ promclose(dev, flag, mode, td)
 		return ENXIO;
 
 	untimeout(promtimeout, tp, promtimeouthandle);
-	(*linesw[tp->t_line].l_close)(tp, flag);
+	ttyld_close(tp, flag);
 	ttyclose(tp);
 	return 0;
 }
@@ -211,7 +211,7 @@ promtimeout(v)
 
 	while ((c = promcncheckc(NULL)) != -1) {
 		if (tp->t_state & TS_ISOPEN)
-			(*linesw[tp->t_line].l_rint)(c, tp);
+			ttyld_rint(tp, c);
 	}
 	promtimeouthandle = timeout(promtimeout, tp, polltime);
 }
diff --git a/sys/alpha/tlsb/zs_tlsb.c b/sys/alpha/tlsb/zs_tlsb.c
index 59d989c..1387f97 100644
--- a/sys/alpha/tlsb/zs_tlsb.c
+++ b/sys/alpha/tlsb/zs_tlsb.c
@@ -291,7 +291,7 @@ zsopen(dev_t dev, int flag, int mode, struct thread *td)
 
 	splx(s);
 
-	error = (*linesw[tp->t_line].l_open)(dev, tp);
+	error = ttyld_open(tp, dev);
 
 	if (error == 0 && setuptimeout) {
 		zspolltime = hz / 50;
@@ -318,7 +318,7 @@ zsclose(dev_t dev, int flag, int mode, struct thread *td)
 
 	s = spltty();
 	untimeout(zs_poll_intr, sc, sc->zst);
-	(*linesw[tp->t_line].l_close)(tp, flag);
+	ttyld_close(tp, flag);
 	ttyclose(tp);
 	splx(s);
 
@@ -502,7 +502,7 @@ zsc_tlsb_intr(void *arg)
 				Debugger("manual escape to debugger");
 #endif
 			if (tp && (tp->t_state & TS_ISOPEN))
-				(*linesw[tp->t_line].l_rint)(c, tp);
+				ttyld_rint(tp, c);
 			DELAY(5);
 		}
 	}
@@ -517,7 +517,7 @@ zsc_tlsb_intr(void *arg)
 				Debugger("manual escape to debugger");
 #endif
 			if (tp && (tp->t_state & TS_ISOPEN))
-				(*linesw[tp->t_line].l_rint)(c, tp);
+				ttyld_rint(tp, c);
 			DELAY(5);
 		}
 	}