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, 4 deletions

diff --git a/sys/sys/cons.h b/sys/sys/cons.h
index 6f64edc..ee4fed7 100644
--- a/sys/sys/cons.h
+++ b/sys/sys/cons.h
@@ -46,10 +46,10 @@ struct consdev;
 typedef	void	cn_probe_t(struct consdev *);
 typedef	void	cn_init_t(struct consdev *);
 typedef	void	cn_term_t(struct consdev *);
-typedef	int	cn_getc_t(dev_t);
-typedef	int	cn_checkc_t(dev_t);
-typedef	void	cn_putc_t(dev_t, int);
-typedef	void	cn_dbctl_t(dev_t, int);
+typedef	int	cn_getc_t(struct consdev *);
+typedef	int	cn_checkc_t(struct consdev *);
+typedef	void	cn_putc_t(struct consdev *, int);
+typedef	void	cn_dbctl_t(struct consdev *, int);
 
 struct consdev {
 	cn_probe_t	*cn_probe;
@@ -69,6 +69,7 @@ struct consdev {
 	struct	tty *cn_tp;	/* tty structure for console device */
 	dev_t	cn_dev;		/* major/minor of device */
 	short	cn_pri;		/* pecking order; the higher the better */
+	void	*cn_arg;	/* drivers method argument */
 };
 
 /* values for cn_pri - reflect our policy for console selection */