Change the console interface to pass a "struct consdev *" instead of a

dev_t to the method functions.

The dev_t can still be found at struct consdev *->cn_dev.

Add a void *cn_arg element to struct consdev which the drivers can use
for retrieving their softc.

1 files changed, 5 insertions, 5 deletions

diff --git a/sys/ia64/ia64/ssc.c b/sys/ia64/ia64/ssc.c
index 6c3cb35..e552ffd 100644
--- a/sys/ia64/ia64/ssc.c
+++ b/sys/ia64/ia64/ssc.c
@@ -116,13 +116,13 @@ ssccnattach(void *arg)
 SYSINIT(ssccnattach, SI_SUB_DRIVERS, SI_ORDER_ANY, ssccnattach, 0);
 
 static void
-ssccnputc(dev_t dev, int c)
+ssccnputc(struct consdev *cp, int c)
 {
 	ssc(c, 0, 0, 0, SSC_PUTCHAR);
 }
 
 static int
-ssccngetc(dev_t dev)
+ssccngetc(struct consdev *cp)
 {
 	int c;
 	do {
@@ -133,7 +133,7 @@ ssccngetc(dev_t dev)
 }
 
 static int
-ssccncheckc(dev_t dev)
+ssccncheckc(struct consdev *cp)
 {
     int c;
     c = ssc(0, 0, 0, 0, SSC_GETCHAR);
@@ -242,7 +242,7 @@ sscstart(struct tty *tp)
 
 	tp->t_state |= TS_BUSY;
 	while (tp->t_outq.c_cc != 0)
-		ssccnputc(tp->t_dev, getc(&tp->t_outq));
+		ssccnputc(NULL, getc(&tp->t_outq));
 	tp->t_state &= ~TS_BUSY;
 
 	ttwwakeup(tp);
@@ -270,7 +270,7 @@ ssctimeout(void *v)
 	struct tty *tp = v;
 	int c;
 
-	while ((c = ssccncheckc(tp->t_dev)) != -1) {
+	while ((c = ssccncheckc(NULL)) != -1) {
 		if (tp->t_state & TS_ISOPEN)
 			(*linesw[tp->t_line].l_rint)(c, tp);
 	}