PERFORCE change 154066 for review

[Ed Schouten]

http://perforce.freebsd.org/chv.cgi?CH=154066

Change 154066 by ed at ed_flippo on 2008/12/04 19:47:14

	Remove scterm-sc and scterm-dumb.
	
	Looking at the source code, scterm-dumb has been broken for a
	long time now. It even uses `struct proc *' where it should use
	`struct thread *' for the ioctl() handlers. I thought we made
	that change a very long time ago.
	
	I'm not saying scterm-teken is perfect yet... ;-)

Affected files ...

.. //depot/projects/mpsafetty/sys/conf/files#30 edit
.. //depot/projects/mpsafetty/sys/conf/files.amd64#7 edit
.. //depot/projects/mpsafetty/sys/conf/files.i386#12 edit
.. //depot/projects/mpsafetty/sys/conf/files.ia64#4 edit
.. //depot/projects/mpsafetty/sys/conf/files.pc98#6 edit
.. //depot/projects/mpsafetty/sys/conf/files.powerpc#9 edit
.. //depot/projects/mpsafetty/sys/conf/files.sparc64#8 edit
.. //depot/projects/mpsafetty/sys/dev/syscons/scterm-dumb.c#2 delete
.. //depot/projects/mpsafetty/sys/dev/syscons/scterm-sc.c#4 delete
.. //depot/projects/mpsafetty/sys/dev/syscons/scterm-teken.c#4 edit
.. //depot/projects/mpsafetty/sys/dev/syscons/scterm.c#2 edit
.. //depot/projects/mpsafetty/sys/dev/syscons/sctermvar.h#2 delete
.. //depot/projects/mpsafetty/sys/pc98/cbus/scterm-sck.c#3 edit

Differences ...

==== //depot/projects/mpsafetty/sys/conf/files#30 (text+ko) ====

@@ -1424,7 +1424,6 @@
 dev/syscons/rain/rain_saver.c	optional rain_saver
 dev/syscons/schistory.c		optional sc
 dev/syscons/scmouse.c		optional sc
-dev/syscons/scterm-dumb.c	optional sc
 dev/syscons/scterm.c		optional sc
 dev/syscons/scvidctl.c		optional sc
 dev/syscons/snake/snake_saver.c	optional snake_saver

==== //depot/projects/mpsafetty/sys/conf/files.amd64#7 (text+ko) ====

@@ -196,7 +196,6 @@
 dev/sio/sio_puc.c		optional	sio puc
 dev/speaker/spkr.c		optional	speaker
 dev/syscons/apm/apm_saver.c	optional	apm_saver apm
-#dev/syscons/scterm-sc.c	optional	sc
 dev/syscons/scterm-teken.c	optional	sc
 dev/syscons/scvgarndr.c		optional	sc vga
 dev/syscons/scvtb.c		optional	sc

==== //depot/projects/mpsafetty/sys/conf/files.i386#12 (text+ko) ====

@@ -220,8 +220,7 @@
 dev/speaker/spkr.c		optional speaker
 dev/sr/if_sr_isa.c		optional sr isa
 dev/syscons/apm/apm_saver.c	optional apm_saver apm
-#dev/syscons/scterm-sc.c	optional sc
-dev/syscons/scterm-teken.c	optional	sc
+dev/syscons/scterm-teken.c	optional sc
 dev/syscons/scvesactl.c		optional sc vga vesa
 dev/syscons/scvgarndr.c		optional sc vga
 dev/syscons/scvtb.c		optional sc

==== //depot/projects/mpsafetty/sys/conf/files.ia64#4 (text+ko) ====

@@ -57,7 +57,6 @@
 dev/fb/vga.c			optional	vga
 dev/hwpmc/hwpmc_ia64.c		optional	hwpmc
 dev/kbd/kbd.c			optional	atkbd | sc | ukbd
-#dev/syscons/scterm-sc.c	optional	sc
 dev/syscons/scterm-teken.c	optional	sc
 dev/syscons/scvgarndr.c		optional	sc vga
 dev/syscons/scvtb.c		optional	sc

==== //depot/projects/mpsafetty/sys/conf/files.pc98#6 (text+ko) ====


==== //depot/projects/mpsafetty/sys/conf/files.powerpc#9 (text+ko) ====

@@ -37,7 +37,6 @@
 dev/quicc/quicc_bfe_ocp.c	optional	quicc mpc85xx
 dev/scc/scc_bfe_macio.c		optional	scc powermac
 dev/syscons/scgfbrndr.c		optional	sc
-#dev/syscons/scterm-sc.c	optional	sc
 dev/syscons/scterm-teken.c	optional	sc
 dev/syscons/scvtb.c		optional	sc
 dev/tsec/if_tsec.c		optional	tsec

==== //depot/projects/mpsafetty/sys/conf/files.sparc64#8 (text+ko) ====

@@ -53,7 +53,6 @@
 dev/sound/sbus/cs4231.c		optional	snd_audiocs ebus | \
 						snd_audiocs sbus
 dev/syscons/scgfbrndr.c		optional	sc
-#dev/syscons/scterm-sc.c	optional	sc
 dev/syscons/scterm-teken.c	optional	sc
 dev/syscons/scvtb.c		optional	sc
 dev/uart/uart_cpu_sparc64.c	optional	uart

==== //depot/projects/mpsafetty/sys/dev/syscons/scterm-teken.c#4 (text+ko) ====

@@ -45,7 +45,6 @@
 #endif
 
 #include <dev/syscons/syscons.h>
-#include <dev/syscons/sctermvar.h>
 
 #include <dev/syscons/teken/teken.h>
 
@@ -210,17 +209,38 @@
  * libteken routines.
  */
 
-static unsigned char sccolors[8] = {
-	FG_BLACK, FG_RED, FG_GREEN, FG_BROWN, FG_BLUE, FG_MAGENTA, FG_CYAN, 
-	FG_LIGHTGREY,
+static const unsigned char fgcolors_normal[8] = {
+	FG_BLACK,     FG_RED,          FG_GREEN,      FG_BROWN,
+	FG_BLUE,      FG_MAGENTA,      FG_CYAN,       FG_LIGHTGREY,
+};
+
+static const unsigned char fgcolors_bold[8] = {
+	FG_DARKGREY,  FG_LIGHTRED,     FG_LIGHTGREEN, FG_YELLOW,
+	FG_LIGHTBLUE, FG_LIGHTMAGENTA, FG_LIGHTCYAN,  FG_WHITE,
+};
+
+static const unsigned char bgcolors[8] = {
+	BG_BLACK,     BG_RED,          BG_GREEN,      BG_BROWN,
+	BG_BLUE,      BG_MAGENTA,      BG_CYAN,       BG_LIGHTGREY,
 };
 
-static inline int
+static inline unsigned int
 scteken_attr(const teken_attr_t *a)
 {
+	unsigned int attr = 0;
+
+	if (a->ta_format & TF_BOLD)
+		attr |= fgcolors_bold[a->ta_fgcolor];
+	else
+		attr |= fgcolors_normal[a->ta_fgcolor];
+	attr |= bgcolors[a->ta_bgcolor];
 
-	return (((unsigned int)sccolors[a->ta_fgcolor]) << 8) |
-	    (((unsigned int)sccolors[a->ta_bgcolor]) << 12);
+	if (a->ta_format & TF_UNDERLINE)
+		attr |= FG_UNDERLINE;
+	if (a->ta_format & TF_BLINK)
+		attr |= FG_BLINK;
+
+	return (attr << 8);
 }
 
 static void

==== //depot/projects/mpsafetty/sys/dev/syscons/scterm.c#2 (text+ko) ====

@@ -36,7 +36,6 @@
 #include <sys/consio.h>
 
 #include <dev/syscons/syscons.h>
-#include <dev/syscons/sctermvar.h>
 
 SET_DECLARE(scterm_set, sc_term_sw_t);
 

==== //depot/projects/mpsafetty/sys/pc98/cbus/scterm-sck.c#3 (text+ko) ====

@@ -39,8 +39,6 @@
 #include <dev/syscons/syscons.h>
 #include <dev/syscons/sctermvar.h>
 
-#ifndef SC_DUMB_TERMINAL
-
 #define MAX_ESC_PAR	5
 
 #ifdef KANJI
@@ -1212,5 +1210,3 @@
 
 	return (attr << 8);
 }
-
-#endif /* SC_DUMB_TERMINAL */