diff options
| author | ed <ed@FreeBSD.org> | 2009-11-13 11:28:54 +0000 |
|---|---|---|
| committer | ed <ed@FreeBSD.org> | 2009-11-13 11:28:54 +0000 |
| commit | a53dc193764a8928da88e20397e66f2899792aca (patch) | |
| tree | b86fe80f8a708abb928d56e967531b8056ab7e4e /sys | |
| parent | 4e6819803d8a0f9bc9f4706e17f512d154faaecc (diff) | |
| download | FreeBSD-src-a53dc193764a8928da88e20397e66f2899792aca.zip FreeBSD-src-a53dc193764a8928da88e20397e66f2899792aca.tar.gz | |
Convert syscons on i386 to TERM=xterm.
TEKEN_XTERM is now gone. Because we always use xterm mode now, we only
need a TEKEN_CONS25 switch to go back to cons25.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/conf/NOTES | 1 | ||||
| -rw-r--r-- | sys/conf/options | 1 | ||||
| -rw-r--r-- | sys/dev/syscons/scterm-teken.c | 9 |
3 files changed, 0 insertions, 11 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index d2059a4..91091b0 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1412,7 +1412,6 @@ options SC_NO_SUSPEND_VTYSWITCH # Enable experimental features of the syscons terminal emulator (teken). options TEKEN_CONS25 # cons25-style terminal emulation options TEKEN_UTF8 # UTF-8 output handling -#options TEKEN_XTERM # xterm-style terminal emulation # # Optional devices: diff --git a/sys/conf/options b/sys/conf/options index 9c1dc7d..756d75d 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -734,7 +734,6 @@ SC_TWOBUTTON_MOUSE opt_syscons.h # teken terminal emulator options TEKEN_CONS25 opt_teken.h TEKEN_UTF8 opt_teken.h -TEKEN_XTERM opt_teken.h # options for printf PRINTF_BUFR_SIZE opt_printf.h diff --git a/sys/dev/syscons/scterm-teken.c b/sys/dev/syscons/scterm-teken.c index fe8a186..1d110ab9 100644 --- a/sys/dev/syscons/scterm-teken.c +++ b/sys/dev/syscons/scterm-teken.c @@ -50,15 +50,6 @@ __FBSDID("$FreeBSD$"); #include <teken/teken.h> -#if defined(TEKEN_XTERM) && defined(TEKEN_CONS25) -#error "xterm and cons25 are mutually exclusive." -#endif - -/* XXX: Use cons25 on i386, for compatibility with pc98. */ -#if defined(__i386__) && !defined(TEKEN_XTERM) && !defined(TEKEN_CONS25) -#define TEKEN_CONS25 -#endif - static void scteken_revattr(unsigned char, teken_attr_t *); static unsigned int scteken_attr(const teken_attr_t *); |
