- Hang the scr_stat struct from dev_t.

- Remove sc_get_scr_stat().  It's not necessary anymore.
- Call ttymalloc() to allocate the struct tty for each vty, rather than
  statically declaring an array of struct tty.  We still need a statically
  allocated struct tty for the first vty which is used for the kernel
  console I/O, though.
- Likewise, call ttymalloc() for /dev/sysmouse and /dev/consolectl.
- Delete unnecessary test on the pointer struct tty *tp in some functions.
- Delete unused code in scmouse.c.

WARNING: this change requires you to recompile screen savers!

1 files changed, 3 insertions, 3 deletions

diff --git a/sys/dev/syscons/syscons.h b/sys/dev/syscons/syscons.h
index 674371f1..df9fdf3 100644
--- a/sys/dev/syscons/syscons.h
+++ b/sys/dev/syscons/syscons.h
@@ -64,6 +64,8 @@
 
 #define SC_DRIVER_NAME	"sc"
 #define SC_VTY(dev)	minor(dev)
+#define SC_DEV(sc, vty)	((sc)->dev[(vty) - (sc)->first_vty])
+#define SC_STAT(dev)	((scr_stat *)(dev)->si_drv1)
 
 /* printable chars */
 #ifndef PRINTABLE
@@ -200,8 +202,7 @@ typedef struct sc_softc {
 
 	int		first_vty;
 	int		vtys;
-	struct tty	*tty;
-	struct scr_stat	**console;
+	dev_t		*dev;
 	struct scr_stat	*cur_scp;
 	struct scr_stat	*new_scp;
 	struct scr_stat	*old_scp;
@@ -407,7 +408,6 @@ int		sc_attach_unit(int unit, int flags);
 int		sc_resume_unit(int unit);
 
 int		set_mode(scr_stat *scp);
-scr_stat	*sc_get_scr_stat(dev_t dev);
 
 void		copy_font(scr_stat *scp, int operation, int font_size,
 			  u_char *font_image);