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/dev/ofw/ofw_console.c b/sys/dev/ofw/ofw_console.c
index 149739f..379a753 100644
--- a/sys/dev/ofw/ofw_console.c
+++ b/sys/dev/ofw/ofw_console.c
@@ -224,7 +224,7 @@ ofw_tty_start(struct tty *tp)
 
 	tp->t_state |= TS_BUSY;
 	while (tp->t_outq.c_cc != 0) {
-		ofw_cons_putc(tp->t_dev, getc(&tp->t_outq));
+		ofw_cons_putc(NULL, getc(&tp->t_outq));
 	}
 	tp->t_state &= ~TS_BUSY;
 
@@ -250,7 +250,7 @@ ofw_timeout(void *v)
 
 	tp = (struct tty *)v;
 
-	while ((c = ofw_cons_checkc(tp->t_dev)) != -1) {
+	while ((c = ofw_cons_checkc(NULL)) != -1) {
 		if (tp->t_state & TS_ISOPEN) {
 			(*linesw[tp->t_line].l_rint)(c, tp);
 		}
@@ -292,7 +292,7 @@ ofw_cons_init(struct consdev *cp)
 }
 
 static int
-ofw_cons_getc(dev_t dev)
+ofw_cons_getc(struct consdev *cp)
 {
 	unsigned char ch;
 	int l;
@@ -314,7 +314,7 @@ ofw_cons_getc(dev_t dev)
 }
 
 static int
-ofw_cons_checkc(dev_t dev)
+ofw_cons_checkc(struct consdev *cp)
 {
 	unsigned char ch;
 
@@ -330,7 +330,7 @@ ofw_cons_checkc(dev_t dev)
 }
 
 static void
-ofw_cons_putc(dev_t dev, int c)
+ofw_cons_putc(struct consdev *cp, int c)
 {
 	char cbuf;