summaryrefslogtreecommitdiff
path: root/sys/dev/syscons
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2006-05-12 05:04:46 +0000
committerJohn Baldwin <jhb@FreeBSD.org>2006-05-12 05:04:46 +0000
commit73dbd3da73d83f2bace8bfd2e4e33740ef82acf2 (patch)
tree9e7fa374ce86cf10beca9d2dca94fc077a700745 /sys/dev/syscons
parente93187482d667fe21125d66ac377260d73a11819 (diff)
Notes
Diffstat (limited to 'sys/dev/syscons')
-rw-r--r--sys/dev/syscons/scterm-sc.c12
-rw-r--r--sys/dev/syscons/scvgarndr.c8
-rw-r--r--sys/dev/syscons/syscons.h2
3 files changed, 4 insertions, 18 deletions
diff --git a/sys/dev/syscons/scterm-sc.c b/sys/dev/syscons/scterm-sc.c
index aa240aa46458..e89debbe403a 100644
--- a/sys/dev/syscons/scterm-sc.c
+++ b/sys/dev/syscons/scterm-sc.c
@@ -178,22 +178,10 @@ static void
scterm_scan_esc(scr_stat *scp, term_stat *tcp, u_char c)
{
static u_char ansi_col[16] = {
-#ifdef __alpha__
- /*
- * DEC is evil. They switch the red and blue attributes in
- * the palette in the system console. As a simple work-around,
- * re-map the ANSI colors appropriately.
- */
- FG_BLACK, FG_BLUE, FG_GREEN, FG_CYAN,
- FG_RED, FG_MAGENTA, FG_BROWN, FG_LIGHTGREY,
- FG_DARKGREY, FG_LIGHTBLUE, FG_LIGHTGREEN, FG_LIGHTCYAN,
- FG_LIGHTRED, FG_LIGHTMAGENTA, FG_YELLOW, FG_WHITE
-#else
FG_BLACK, FG_RED, FG_GREEN, FG_BROWN,
FG_BLUE, FG_MAGENTA, FG_CYAN, FG_LIGHTGREY,
FG_DARKGREY, FG_LIGHTRED, FG_LIGHTGREEN, FG_YELLOW,
FG_LIGHTBLUE, FG_LIGHTMAGENTA, FG_LIGHTCYAN, FG_WHITE
-#endif
};
static int cattrs[] = {
0, /* block */
diff --git a/sys/dev/syscons/scvgarndr.c b/sys/dev/syscons/scvgarndr.c
index 81498ecad167..5b056d396af0 100644
--- a/sys/dev/syscons/scvgarndr.c
+++ b/sys/dev/syscons/scvgarndr.c
@@ -1038,7 +1038,7 @@ draw_pxlmouse_planar(scr_stat *scp, int x, int y)
#if defined(__i386__) || defined(__amd64__)
*(u_char *)p &= m >> 8;
*(u_char *)(p + 1) &= m;
-#elif defined(__alpha__)
+#else
writeb(p, readb(p) & (m >> 8));
writeb(p + 1, readb(p + 1) & (m >> 8));
#endif
@@ -1050,7 +1050,7 @@ draw_pxlmouse_planar(scr_stat *scp, int x, int y)
m = ~(mouse_and_mask[j] >> xoff);
#if defined(__i386__) || defined(__amd64__)
*(u_char *)p &= m;
-#elif defined(__alpha__)
+#else
writeb(p, readb(p) & (m >> 8));
#endif
p += line_width;
@@ -1064,7 +1064,7 @@ draw_pxlmouse_planar(scr_stat *scp, int x, int y)
#if defined(__i386__) || defined(__amd64__)
*(u_char *)p &= m >> 8;
*(u_char *)(p + 1) &= m;
-#elif defined(__alpha__)
+#else
writeb(p, readb(p) & (m >> 8));
writeb(p + 1, readb(p + 1) & (m >> 8));
#endif
@@ -1075,7 +1075,7 @@ draw_pxlmouse_planar(scr_stat *scp, int x, int y)
m = mouse_or_mask[j] >> xoff;
#if defined(__i386__) || defined(__amd64__)
*(u_char *)p &= m;
-#elif defined(__alpha__)
+#else
writeb(p, readb(p) & (m >> 8));
#endif
p += line_width;
diff --git a/sys/dev/syscons/syscons.h b/sys/dev/syscons/syscons.h
index 45e96aec7a30..1cd33b251a05 100644
--- a/sys/dev/syscons/syscons.h
+++ b/sys/dev/syscons/syscons.h
@@ -40,8 +40,6 @@
#include <pc98/cbus/sc_machdep.h>
#elif defined(__i386__)
/* nothing for the moment */
-#elif defined(__alpha__)
-/* nothing for the moment */
#endif
/* default values for configuration options */