Remove PCVT_SCROLLBACK option and make it on by default.

6 files changed, 6 insertions, 50 deletions

diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index d9e04e5c5b1..b9c9994af1c 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.127 1999/09/06 00:12:39 aaron Exp $
+#	$OpenBSD: GENERIC,v 1.128 1999/09/08 12:56:41 aaron Exp $
 #	$NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
 #
 #	GENERIC -- everything that's currently supported
@@ -31,8 +31,6 @@ option		COMPAT_LINUX	# binary compatibility with Linux
 option		COMPAT_FREEBSD	# binary compatibility with FreeBSD
 option		COMPAT_BSDOS	# binary compatibility with BSD/OS
 
-#option		PCVT_SCROLLBACK	# pcvt console scrollback support
-
 maxusers	32		# estimated number of users
 
 config		bsd	swap generic
diff --git a/sys/arch/i386/isa/pcvt/pcvt_drv.c b/sys/arch/i386/isa/pcvt/pcvt_drv.c
index 1ae909417d9..ead34c90411 100644
--- a/sys/arch/i386/isa/pcvt/pcvt_drv.c
+++ b/sys/arch/i386/isa/pcvt/pcvt_drv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcvt_drv.c,v 1.23 1999/09/06 00:12:39 aaron Exp $	*/
+/*	$OpenBSD: pcvt_drv.c,v 1.24 1999/09/08 12:56:41 aaron Exp $	*/
 
 /*
  * Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch.
@@ -707,10 +707,8 @@ pcstart(register struct tty *tp)
 
 	while ((len = q_to_b(&tp->t_outq, buf, PCVT_PCBURST)) != 0)
 	{
-#ifdef PCVT_SCROLLBACK
 		if (vs[minor(tp->t_dev)].scrolling)
 			sgetc(31337);
-#endif
 		sput(&buf[0], 0, len, minor(tp->t_dev));
 	}
 
diff --git a/sys/arch/i386/isa/pcvt/pcvt_ext.c b/sys/arch/i386/isa/pcvt/pcvt_ext.c
index 1bb3c492ff1..bb4322d4848 100644
--- a/sys/arch/i386/isa/pcvt/pcvt_ext.c
+++ b/sys/arch/i386/isa/pcvt/pcvt_ext.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcvt_ext.c,v 1.18 1999/09/06 00:12:40 aaron Exp $	*/
+/*	$OpenBSD: pcvt_ext.c,v 1.19 1999/09/08 12:56:42 aaron Exp $	*/
 
 /*
  * Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch.
@@ -2552,7 +2552,6 @@ vgapage(int new_screen)
 		{
 			/* we are committed */
 			vt_switch_pending = 0;
-#ifdef PCVT_SCROLLBACK
 			if (vsp->Scrollback)
 			{
 				vsp->scrolling = 0;
@@ -2563,7 +2562,6 @@ vgapage(int new_screen)
 				      vsp->screen_rows * vsp->maxcol * CHR);
 				vsp->scr_offset = vsp->row - 1;
 			}
-#endif
 		}
 	}
 	return 0;
diff --git a/sys/arch/i386/isa/pcvt/pcvt_hdr.h b/sys/arch/i386/isa/pcvt/pcvt_hdr.h
index 5d3bf399143..a064281dd69 100644
--- a/sys/arch/i386/isa/pcvt/pcvt_hdr.h
+++ b/sys/arch/i386/isa/pcvt/pcvt_hdr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcvt_hdr.h,v 1.22 1999/09/06 00:12:40 aaron Exp $	*/
+/*	$OpenBSD: pcvt_hdr.h,v 1.23 1999/09/08 12:56:42 aaron Exp $	*/
 
 /*
  * Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch.
@@ -603,13 +603,9 @@
 #define SYS_FKL		0	/* in hp mode, sys-fkls are active */
 #define USR_FKL		1	/* in hp mode, user-fkls are active */
 
-#ifdef PCVT_SCROLLBACK
-
 /* scrollback buffer size (in pages) */
 #define SCROLLBACK_PAGES	8
 
-#endif
-
 /* variables */
 
 #ifdef EXTERN
@@ -653,12 +649,10 @@ struct rgb {
 typedef struct video_state {
 	u_short	*Crtat;			/* video page start addr */
 	u_short *Memory;		/* malloc'ed memory start address */
-#ifdef PCVT_SCROLLBACK
 	u_short *Scrollback;		/* scrollback buffer */
 	u_short scr_offset;		/* current scrollback offset (lines) */
 	short scrolling;		/* current scrollback page */
 	u_short max_off;		/* maximum scrollback offset */
-#endif
 	struct tty *vs_tty;		/* pointer to this screen's tty */
 	u_char	maxcol;			/* 80 or 132 cols on screen */
 	u_char 	row, col;		/* current cursor position */
@@ -834,9 +828,7 @@ struct tty *pcconsp;		/* ptr to current device, see pcattach() */
 
 u_short *Crtat;			/* screen start address */
 
-#ifdef PCVT_SCROLLBACK
 u_short *Scrollbuffer;		/* scrollback buffer */
-#endif
 
 #if PCVT_EMU_MOUSE
 struct mousestat	mouse = {{0}};
@@ -995,9 +987,7 @@ extern u_char		vga_family;
 extern u_char		keyboard_is_initialized;
 extern u_char		kbd_polling;
 
-#ifdef PCVT_SCROLLBACK
 extern u_short		*Scrollbuffer;
-#endif
 
 #if PCVT_SHOWKEYS
 extern u_char		keyboard_show;
diff --git a/sys/arch/i386/isa/pcvt/pcvt_kbd.c b/sys/arch/i386/isa/pcvt/pcvt_kbd.c
index 369ff540929..74f4ace0f32 100644
--- a/sys/arch/i386/isa/pcvt/pcvt_kbd.c
+++ b/sys/arch/i386/isa/pcvt/pcvt_kbd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcvt_kbd.c,v 1.21 1999/09/06 00:12:40 aaron Exp $	*/
+/*	$OpenBSD: pcvt_kbd.c,v 1.22 1999/09/08 12:56:42 aaron Exp $	*/
 
 /*
  * Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch.
@@ -115,12 +115,10 @@ static int	tpmrate   = KBD_TPD500|KBD_TPM100;
 static u_char	altkpflag = 0;
 static u_short	altkpval  = 0;
 
-#ifdef PCVT_SCROLLBACK
 static u_short *scrollback_savedscreen = (u_short *)0;
 static size_t scrnsv_size = (size_t)-1;
 static void scrollback_save_screen ( void );
 static void scrollback_restore_screen ( void );
-#endif
 
 extern int kbd_reset;
 
@@ -1095,12 +1093,10 @@ loop:
 
 #if PCVT_KBD_FIFO
 
-#ifdef PCVT_SCROLLBACK
 	if (noblock == 31337) {
 		vsp->scrolling = 1;
 		goto scroll_reset;
 	}
-#endif
 
 	/* see if there is data from the keyboard available either from */
 	/* the keyboard fifo or from the 8042 keyboard controller	*/
@@ -1488,7 +1484,6 @@ regular:
 
 	kbd_status.extended = kbd_status.ext1 = 0;
 
-#ifdef PCVT_SCROLLBACK
 	if ((key == 85) && shift_down && kbd_lastkey != 85)
 	{
 		if (vsp->scr_offset >= (vsp->screen_rows - 1))
@@ -1578,7 +1573,6 @@ scroll_reset:
 			vsp->scrolling = 1;
 			goto scroll_reset;
 	     }
-#endif
 
 	if(kbd_reset && (key == 76) && ctrl_down && (meta_down||altgr_down)) {
 		printf("\nconsole halt requested: going down.\n");
@@ -3149,7 +3143,6 @@ cfkey12(void)
 
 #endif	/* NVT > 0 */
 
-#ifdef PCVT_SCROLLBACK
 static void
 scrollback_save_screen(void)
 {
@@ -3178,6 +3171,5 @@ scrollback_restore_screen(void)
 	if (scrollback_savedscreen)
 		bcopy(scrollback_savedscreen, vsp->Crtat, scrnsv_size);
 }
-#endif
 
 /* ------------------------------- EOF -------------------------------------*/
diff --git a/sys/arch/i386/isa/pcvt/pcvt_out.c b/sys/arch/i386/isa/pcvt/pcvt_out.c
index 734e19f2426..a4a4af53654 100644
--- a/sys/arch/i386/isa/pcvt/pcvt_out.c
+++ b/sys/arch/i386/isa/pcvt/pcvt_out.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcvt_out.c,v 1.8 1999/09/06 00:12:40 aaron Exp $	*/
+/*	$OpenBSD: pcvt_out.c,v 1.9 1999/09/08 12:56:42 aaron Exp $	*/
 
 /*
  * Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch.
@@ -80,9 +80,7 @@ static void wrfkl ( int num, u_char *string, struct video_state *svsp );
 static void writefkl ( int num, u_char *string, struct video_state *svsp );
 static __inline void write_char (struct	video_state *, u_short, u_short ch);
 
-#ifdef PCVT_SCROLLBACK
 static int check_scrollback ( struct video_state *svsp );
-#endif
 
 /*---------------------------------------------------------------------------*
  *	do character set transformation and write to display memory (inline)
@@ -150,9 +148,7 @@ void
 sput (u_char *s, U_char kernel, int len, int page)
 {
     register struct video_state *svsp;
-#ifdef PCVT_SCROLLBACK
     int		extra;
-#endif
     u_short	attrib;
     u_short	ch;
 
@@ -275,7 +271,6 @@ sput (u_char *s, U_char kernel, int len, int page)
 				case 0x0a:	/* LF */
 				case 0x0b:	/* VT */
 				case 0x0c:	/* FF */
-#ifdef PCVT_SCROLLBACK
 					if (check_scrollback(svsp))
 					{
 						extra = (svsp->cur_offset %
@@ -288,7 +283,6 @@ sput (u_char *s, U_char kernel, int len, int page)
 						      svsp->maxcol),
 						      svsp->maxcol * CHR);
 					}
-#endif
 					if(svsp->lnm)
 					{
 						svsp->cur_offset -= svsp->col;
@@ -441,7 +435,6 @@ sput (u_char *s, U_char kernel, int len, int page)
 					svsp->cur_offset++;
 					svsp->col = 0;
 					svsp->lastchar = 0;
-#ifdef PCVT_SCROLLBACK
 					if (check_scrollback(svsp))
 					{
 						bcopy(svsp->Crtat +
@@ -452,7 +445,6 @@ sput (u_char *s, U_char kernel, int len, int page)
 						      svsp->maxcol),
 		      				      svsp->maxcol * CHR);
 					}
-#endif
 					check_scroll(svsp);
 				}
 
@@ -845,11 +837,9 @@ sput (u_char *s, U_char kernel, int len, int page)
 					case 'K':	/* erase line */
 						vt_clreol(svsp);
 						svsp->state = STATE_INIT;
-#ifdef PCVT_SCROLLBACK
 						if (svsp->scr_offset > 0 &&
 						    svsp == vsp)
 							svsp->scr_offset--;
-#endif
 						break;
 
 					case 'L':	/* insert line */
@@ -1131,11 +1121,9 @@ vt_coldinit(void)
 	{
 		svsp->Crtat = Crtat;		/* all same until malloc'ed */
 		svsp->Memory = Crtat;		/* until malloc'ed */
-#ifdef PCVT_SCROLLBACK
 		svsp->Scrollback = 0;		/* until malloc'ed */
 		svsp->scr_offset = 0;		/* scrollback offset (lines) */
 		svsp->scrolling = 0;		/* current scrollback page */
-#endif
 		svsp->cur_offset = 0;		/* cursor offset */
 		svsp->c_attr = user_attr;	/* non-kernel attributes */
 		svsp->bell_on = 1;		/* enable bell */
@@ -1170,9 +1158,7 @@ vt_coldinit(void)
 #endif /* PCVT_24LINESDEF */
 
 		svsp->screen_rowsize = 25;	/* default 25 rows on screen */
-#ifdef PCVT_SCROLLBACK
 		svsp->max_off =  svsp->screen_rowsize * SCROLLBACK_PAGES - 1;
-#endif
 		svsp->scrr_beg = 0;		/* scrolling region begin row*/
 		svsp->scrr_len = svsp->screen_rows; /* scrolling region length*/
 		svsp->scrr_end = svsp->scrr_len - 1;/* scrolling region end */
@@ -1406,14 +1392,12 @@ vt_coldmalloc(void)
 					MAXROW_VGA * MAXCOL_VGA * CHR;
 	}
 
-#ifdef PCVT_SCROLLBACK
 	if ((Scrollbuffer = (u_short *)malloc(vs[0].maxcol *
 	     vs[0].screen_rowsize * SCROLLBACK_PAGES * CHR * 2, M_DEVBUF,
 	     M_WAITOK)) == NULL)
 	{
 		printf("pcvt: scrollback memory malloc failed\n");
 	}
-#endif
 
 	for(nscr = 0; nscr < PCVT_NSCREENS; nscr++)
 	{
@@ -1426,9 +1410,7 @@ vt_coldmalloc(void)
 			       PCVT_NSCREENS, nscr);
 			break;
 		}
-#ifdef PCVT_SCROLLBACK
 		vs[nscr].Scrollback = Scrollbuffer;
-#endif
 		if(nscr != 0)
 		{
 			vs[nscr].Crtat = vs[nscr].Memory;
@@ -1480,7 +1462,6 @@ check_scroll(struct video_state *svsp)
 	}
 }
 
-#ifdef PCVT_SCROLLBACK
 static int
 check_scrollback(struct video_state *svsp)
 {
@@ -1501,7 +1482,6 @@ check_scrollback(struct video_state *svsp)
 	}
 	return 1;
 }
-#endif
 
 /*---------------------------------------------------------------------------*
  *	write to one user function key label