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, 9 insertions, 9 deletions

diff --git a/sys/alpha/tlsb/zs_tlsb.c b/sys/alpha/tlsb/zs_tlsb.c
index 5a72a74..c22e4fc 100644
--- a/sys/alpha/tlsb/zs_tlsb.c
+++ b/sys/alpha/tlsb/zs_tlsb.c
@@ -216,9 +216,9 @@ zs_putc(caddr_t base, int chan, int c)
 /*
  * Console support
  */
-int		zs_cngetc(dev_t);
-int		zs_cncheckc(dev_t);
-void		zs_cnputc(dev_t, int);
+cn_getc_t	zs_cngetc;
+cn_checkc_t	zs_cncheckc;
+cn_putc_t	zs_cnputc;
 
 static caddr_t zs_console_addr;
 CONS_DRIVER(zs, NULL, NULL, NULL, zs_cngetc, zs_cncheckc, zs_cnputc, NULL);
@@ -237,28 +237,28 @@ zs_cnattach(vm_offset_t base, vm_offset_t offset)
 }
 
 int
-zs_cngetc(dev_t dev)
+zs_cngetc(struct consdev *cp)
 {
 	int s = spltty();
-	int c = zs_getc(zs_console_addr, minor(dev));
+	int c = zs_getc(zs_console_addr, minor(cp->cn_dev));
 	splx(s);
 	return c;
 }
 
 int
-zs_cncheckc(dev_t dev)
+zs_cncheckc(struct consdev *cp)
 {
 	int s = spltty();
-	int c = zs_maygetc(zs_console_addr, minor(dev));
+	int c = zs_maygetc(zs_console_addr, minor(cp->cn_dev));
 	splx(s);
 	return c;
 }
 
 void
-zs_cnputc(dev_t dev, int c)
+zs_cnputc(struct consdev *cp, int c)
 {
 	int s = spltty();
-	zs_putc(zs_console_addr, minor(dev), c);
+	zs_putc(zs_console_addr, minor(cp->cn_dev), c);
 	splx(s);
 }