From b0405a2ad3b4f50d83a761baa7a9a232710127ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= Date: Tue, 28 May 2002 06:34:28 +0000 Subject: [PATCH] Back out part of previous commit; the dev_t union trick is still useful in the kvm case. --- sys/sys/tty.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/sys/tty.h b/sys/sys/tty.h index ad467a01629f..ce4b50a3e023 100644 --- a/sys/sys/tty.h +++ b/sys/sys/tty.h @@ -74,7 +74,11 @@ struct tty { struct clist t_outq; /* Device output queue. */ long t_outcc; /* Output queue statistics. */ int t_line; /* Interface to device drivers. */ - dev_t t_dev; /* Device. */ + union { + dev_t t_kdev; /* Device. */ + udev_t t_udev; /* Userland (sysctl) instance. */ + void *t_devp; /* Keep user/kernel size in sync. */ + } ttyu; int t_state; /* Device and driver (TS*) state. */ int t_flags; /* Tty flags. */ int t_timeout; /* Timeout for ttywait() */ @@ -107,6 +111,7 @@ struct tty { #define t_cc t_termios.c_cc #define t_cflag t_termios.c_cflag +#define t_dev ttyu.t_kdev #define t_iflag t_termios.c_iflag #define t_ispeed t_termios.c_ispeed #define t_lflag t_termios.c_lflag