aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/syscons
diff options
context:
space:
mode:
authorEd Schouten <ed@FreeBSD.org>2009-11-13 05:54:55 +0000
committerEd Schouten <ed@FreeBSD.org>2009-11-13 05:54:55 +0000
commite42fc368672e8c3f1d30fbbd7f1903e3baa69b7a (patch)
tree6e11d518cb9008f7a76b1c206c21c622e2874f34 /sys/dev/syscons
parent347c7f559c46fa6149efda89c468411d7912b456 (diff)
Notes
Diffstat (limited to 'sys/dev/syscons')
-rw-r--r--sys/dev/syscons/scterm-teken.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/sys/dev/syscons/scterm-teken.c b/sys/dev/syscons/scterm-teken.c
index 12b040e201f2d..fe8a18642d40b 100644
--- a/sys/dev/syscons/scterm-teken.c
+++ b/sys/dev/syscons/scterm-teken.c
@@ -50,6 +50,15 @@ __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 *);
@@ -132,9 +141,9 @@ scteken_init(scr_stat *scp, void **softc, int code)
#ifndef TEKEN_UTF8
teken_set_8bit(&ts->ts_teken);
#endif /* !TEKEN_UTF8 */
-#ifndef TEKEN_XTERM
+#ifdef TEKEN_CONS25
teken_set_cons25(&ts->ts_teken);
-#endif /* !TEKEN_XTERM */
+#endif /* TEKEN_CONS25 */
tp.tp_row = scp->ysize;
tp.tp_col = scp->xsize;