svn commit: r196775 - in head/sys: conf dev/syscons dev/syscons/teken teken

[Ed Schouten]

Author: ed
Date: Thu Sep  3 09:33:57 2009
New Revision: 196775
URL: http://svn.freebsd.org/changeset/base/196775

Log:
  Move libteken out of the syscons directory.
  
  I initially committed libteken to sys/dev/syscons/teken, but now that
  I'm working on a console driver myself, I noticed this was not a good
  decision. Move it to sys/teken to make it easier for other drivers to
  use a terminal emulator.
  
  Also list teken.c in sys/conf/files, instead of listing it in all the
  files.arch files separately.

Added:
  head/sys/teken/
     - copied from r196552, head/sys/dev/syscons/teken/
Deleted:
  head/sys/dev/syscons/teken/
Modified:
  head/sys/conf/files
  head/sys/conf/files.amd64
  head/sys/conf/files.i386
  head/sys/conf/files.ia64
  head/sys/conf/files.powerpc
  head/sys/conf/files.sparc64
  head/sys/dev/syscons/scterm-teken.c

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Wed Sep  2 22:12:31 2009	(r196774)
+++ head/sys/conf/files	Thu Sep  3 09:33:57 2009	(r196775)
@@ -91,8 +91,8 @@ pccarddevs.h			standard				   \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"pccarddevs.h"
 teken_state.h		optional sc					   \
-	dependency	"$S/dev/syscons/teken/gensequences $S/dev/syscons/teken/sequences" \
-	compile-with	"${AWK} -f $S/dev/syscons/teken/gensequences $S/dev/syscons/teken/sequences > teken_state.h" \
+	dependency	"$S/teken/gensequences $S/teken/sequences" \
+	compile-with	"${AWK} -f $S/teken/gensequences $S/teken/sequences > teken_state.h" \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"teken_state.h"
 usbdevs.h			optional usb				   \
@@ -2616,6 +2616,7 @@ security/mac_portacl/mac_portacl.c optio
 security/mac_seeotheruids/mac_seeotheruids.c optional mac_seeotheruids
 security/mac_stub/mac_stub.c	optional mac_stub
 security/mac_test/mac_test.c	optional mac_test
+teken/teken.c			optional sc
 ufs/ffs/ffs_alloc.c		optional ffs
 ufs/ffs/ffs_balloc.c		optional ffs
 ufs/ffs/ffs_inode.c		optional ffs

Modified: head/sys/conf/files.amd64
==============================================================================
--- head/sys/conf/files.amd64	Wed Sep  2 22:12:31 2009	(r196774)
+++ head/sys/conf/files.amd64	Thu Sep  3 09:33:57 2009	(r196775)
@@ -219,7 +219,6 @@ dev/syscons/apm/apm_saver.c	optional	apm
 dev/syscons/scterm-teken.c	optional	sc
 dev/syscons/scvgarndr.c		optional	sc vga
 dev/syscons/scvtb.c		optional	sc
-dev/syscons/teken/teken.c	optional sc
 dev/uart/uart_cpu_amd64.c	optional	uart
 dev/wpi/if_wpi.c		optional	wpi
 isa/atrtc.c			standard

Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386	Wed Sep  2 22:12:31 2009	(r196774)
+++ head/sys/conf/files.i386	Thu Sep  3 09:33:57 2009	(r196775)
@@ -220,7 +220,6 @@ 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
-dev/syscons/teken/teken.c	optional sc
 dev/uart/uart_cpu_i386.c	optional uart
 dev/acpica/acpi_if.m		standard
 dev/acpi_support/acpi_wmi_if.m	standard

Modified: head/sys/conf/files.ia64
==============================================================================
--- head/sys/conf/files.ia64	Wed Sep  2 22:12:31 2009	(r196774)
+++ head/sys/conf/files.ia64	Thu Sep  3 09:33:57 2009	(r196775)
@@ -60,7 +60,6 @@ dev/kbd/kbd.c			optional	atkbd | sc | uk
 dev/syscons/scterm-teken.c	optional	sc
 dev/syscons/scvgarndr.c		optional	sc vga
 dev/syscons/scvtb.c		optional	sc
-dev/syscons/teken/teken.c	optional sc
 dev/uart/uart_cpu_ia64.c	optional	uart
 dev/acpica/acpi_if.m		standard
 ia64/acpica/OsdEnvironment.c	optional	acpi

Modified: head/sys/conf/files.powerpc
==============================================================================
--- head/sys/conf/files.powerpc	Wed Sep  2 22:12:31 2009	(r196774)
+++ head/sys/conf/files.powerpc	Thu Sep  3 09:33:57 2009	(r196775)
@@ -48,7 +48,6 @@ dev/sound/macio/tumbler.c	optional	snd_a
 dev/syscons/scgfbrndr.c		optional	sc
 dev/syscons/scterm-teken.c	optional	sc
 dev/syscons/scvtb.c		optional	sc
-dev/syscons/teken/teken.c	optional sc
 dev/tsec/if_tsec.c		optional	tsec
 dev/tsec/if_tsec_ocp.c		optional	tsec mpc85xx
 dev/uart/uart_bus_ocp.c		optional	uart mpc85xx

Modified: head/sys/conf/files.sparc64
==============================================================================
--- head/sys/conf/files.sparc64	Wed Sep  2 22:12:31 2009	(r196774)
+++ head/sys/conf/files.sparc64	Thu Sep  3 09:33:57 2009	(r196775)
@@ -57,7 +57,6 @@ dev/sound/sbus/cs4231.c		optional	snd_au
 dev/syscons/scgfbrndr.c		optional	sc
 dev/syscons/scterm-teken.c	optional	sc
 dev/syscons/scvtb.c		optional	sc
-dev/syscons/teken/teken.c	optional sc
 dev/uart/uart_cpu_sparc64.c	optional	uart
 dev/uart/uart_kbd_sun.c		optional	uart sc
 kern/syscalls.c			optional	ktr

Modified: head/sys/dev/syscons/scterm-teken.c
==============================================================================
--- head/sys/dev/syscons/scterm-teken.c	Wed Sep  2 22:12:31 2009	(r196774)
+++ head/sys/dev/syscons/scterm-teken.c	Thu Sep  3 09:33:57 2009	(r196775)
@@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/syscons/syscons.h>
 
-#include <dev/syscons/teken/teken.h>
+#include <teken/teken.h>
 
 static void scteken_revattr(unsigned char, teken_attr_t *);
 static unsigned int scteken_attr(const teken_attr_t *);