From 72688ad7fe6ac65cbfc2c4d260ba7d901bf1bcc2 Mon Sep 17 00:00:00 2001 From: phk Date: Thu, 20 Feb 2003 20:54:45 +0000 Subject: 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. --- sys/kern/tty_cons.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sys/kern/tty_cons.c') diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c index 361a5dd..e672eac 100644 --- a/sys/kern/tty_cons.c +++ b/sys/kern/tty_cons.c @@ -529,7 +529,7 @@ cncheckc(void) return (-1); STAILQ_FOREACH(cnd, &cn_devlist, cnd_next) { cn = cnd->cnd_cn; - c = cn->cn_checkc(cn->cn_dev); + c = cn->cn_checkc(cn); if (c != -1) { return (c); } @@ -549,8 +549,8 @@ cnputc(int c) STAILQ_FOREACH(cnd, &cn_devlist, cnd_next) { cn = cnd->cnd_cn; if (c == '\n') - cn->cn_putc(cn->cn_dev, '\r'); - cn->cn_putc(cn->cn_dev, c); + cn->cn_putc(cn, '\r'); + cn->cn_putc(cn, c); } #ifdef DDB if (console_pausing && !db_active && (c == '\n')) { @@ -581,7 +581,7 @@ cndbctl(int on) STAILQ_FOREACH(cnd, &cn_devlist, cnd_next) { cn = cnd->cnd_cn; if (cn->cn_dbctl != NULL) - cn->cn_dbctl(cn->cn_dev, on); + cn->cn_dbctl(cn, on); } if (on) refcount++; -- cgit v1.1