From 1dcb420b646ff6fd0ab578e340fd7f26b32ed79d Mon Sep 17 00:00:00 2001 From: pst Date: Sat, 25 Feb 1995 20:09:44 +0000 Subject: (a) remove the pointer to each driver's tty structure array from cdevsw (b) add a function callback vector to tty drivers that will return a pointer to a valid tty structure based upon a dev_t (c) make syscons structures the same size whether or not APM is enabled so utilities don't crash if NAPM changes (and make the damn kernel compile!) (d) rewrite /dev/snp ioctl interface so that it is device driver and i386 independant --- sys/isa/syscons.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'sys/isa/syscons.h') diff --git a/sys/isa/syscons.h b/sys/isa/syscons.h index 546b2de..60cf84e 100644 --- a/sys/isa/syscons.h +++ b/sys/isa/syscons.h @@ -25,9 +25,16 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id$ + * $Id: syscons.h,v 1.1 1995/02/22 13:40:21 sos Exp $ */ +/* + * The APM stuff is -not- under conditional compilation because we don't want + * the size of the scr_stat structure to vary depending upon if APM has been + * compiled in or not, that can cause utilities and lkms to crash! + */ +#include + /* vm things */ #define ISMAPPED(pa, width) \ (((pa) <= (u_long)0x1000 - (width)) \ @@ -140,9 +147,7 @@ typedef struct scr_stat { u_short *history_pos; /* position shown on screen */ u_short *history_save; /* save area index */ int history_size; /* size of history buffer */ -#if NAPM > 0 struct apmhook r_hook; /* reconfiguration support */ -#endif } scr_stat; typedef struct default_attr { -- cgit v1.1