summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authored <ed@FreeBSD.org>2009-09-03 09:33:57 +0000
committered <ed@FreeBSD.org>2009-09-03 09:33:57 +0000
commit8dfe0837b70aac483be1d7a7830fd76e22c9d4bb (patch)
tree8c7b95b132913ab642e62596193103184f59a64f
parent172921108be7aede073a58ba620b2e1734b4e701 (diff)
downloadFreeBSD-src-8dfe0837b70aac483be1d7a7830fd76e22c9d4bb.zip
FreeBSD-src-8dfe0837b70aac483be1d7a7830fd76e22c9d4bb.tar.gz
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.
-rw-r--r--sys/conf/files5
-rw-r--r--sys/conf/files.amd641
-rw-r--r--sys/conf/files.i3861
-rw-r--r--sys/conf/files.ia641
-rw-r--r--sys/conf/files.powerpc1
-rw-r--r--sys/conf/files.sparc641
-rw-r--r--sys/dev/syscons/scterm-teken.c2
-rw-r--r--sys/teken/Makefile (renamed from sys/dev/syscons/teken/Makefile)0
-rw-r--r--sys/teken/gensequences (renamed from sys/dev/syscons/teken/gensequences)0
-rw-r--r--sys/teken/sequences (renamed from sys/dev/syscons/teken/sequences)0
-rw-r--r--sys/teken/teken.c (renamed from sys/dev/syscons/teken/teken.c)0
-rw-r--r--sys/teken/teken.h (renamed from sys/dev/syscons/teken/teken.h)0
-rw-r--r--sys/teken/teken_demo.c (renamed from sys/dev/syscons/teken/teken_demo.c)0
-rw-r--r--sys/teken/teken_scs.h (renamed from sys/dev/syscons/teken/teken_scs.h)0
-rw-r--r--sys/teken/teken_stress.c (renamed from sys/dev/syscons/teken/teken_stress.c)0
-rw-r--r--sys/teken/teken_subr.h (renamed from sys/dev/syscons/teken/teken_subr.h)0
-rw-r--r--sys/teken/teken_subr_compat.h (renamed from sys/dev/syscons/teken/teken_subr_compat.h)0
-rw-r--r--sys/teken/teken_wcwidth.h (renamed from sys/dev/syscons/teken/teken_wcwidth.h)0
18 files changed, 4 insertions, 8 deletions
diff --git a/sys/conf/files b/sys/conf/files
index b5baade..41a34b1 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -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 optional mac_portacl
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
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index be1aff58..efd76c0 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -219,7 +219,6 @@ dev/syscons/apm/apm_saver.c optional apm_saver 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
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 88bd1f1..17cd70e 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -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
diff --git a/sys/conf/files.ia64 b/sys/conf/files.ia64
index 706d64e..864be05 100644
--- a/sys/conf/files.ia64
+++ b/sys/conf/files.ia64
@@ -60,7 +60,6 @@ dev/kbd/kbd.c optional atkbd | sc | ukbd | usb2_input_kbd
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
diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc
index 8a19155..c263ab5 100644
--- a/sys/conf/files.powerpc
+++ b/sys/conf/files.powerpc
@@ -48,7 +48,6 @@ dev/sound/macio/tumbler.c optional snd_ai2s iicbus powermac
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
diff --git a/sys/conf/files.sparc64 b/sys/conf/files.sparc64
index 53077bb..ef6efa6 100644
--- a/sys/conf/files.sparc64
+++ b/sys/conf/files.sparc64
@@ -57,7 +57,6 @@ dev/sound/sbus/cs4231.c optional snd_audiocs ebus | \
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
diff --git a/sys/dev/syscons/scterm-teken.c b/sys/dev/syscons/scterm-teken.c
index 36cfbb5..6f51ac1 100644
--- a/sys/dev/syscons/scterm-teken.c
+++ b/sys/dev/syscons/scterm-teken.c
@@ -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 *);
diff --git a/sys/dev/syscons/teken/Makefile b/sys/teken/Makefile
index cbdd12b..cbdd12b 100644
--- a/sys/dev/syscons/teken/Makefile
+++ b/sys/teken/Makefile
diff --git a/sys/dev/syscons/teken/gensequences b/sys/teken/gensequences
index 86c7979..86c7979 100644
--- a/sys/dev/syscons/teken/gensequences
+++ b/sys/teken/gensequences
diff --git a/sys/dev/syscons/teken/sequences b/sys/teken/sequences
index 8f7bfb4..8f7bfb4 100644
--- a/sys/dev/syscons/teken/sequences
+++ b/sys/teken/sequences
diff --git a/sys/dev/syscons/teken/teken.c b/sys/teken/teken.c
index 5a16f8d..5a16f8d 100644
--- a/sys/dev/syscons/teken/teken.c
+++ b/sys/teken/teken.c
diff --git a/sys/dev/syscons/teken/teken.h b/sys/teken/teken.h
index dd19e76..dd19e76 100644
--- a/sys/dev/syscons/teken/teken.h
+++ b/sys/teken/teken.h
diff --git a/sys/dev/syscons/teken/teken_demo.c b/sys/teken/teken_demo.c
index 02463a7..02463a7 100644
--- a/sys/dev/syscons/teken/teken_demo.c
+++ b/sys/teken/teken_demo.c
diff --git a/sys/dev/syscons/teken/teken_scs.h b/sys/teken/teken_scs.h
index baeb296..baeb296 100644
--- a/sys/dev/syscons/teken/teken_scs.h
+++ b/sys/teken/teken_scs.h
diff --git a/sys/dev/syscons/teken/teken_stress.c b/sys/teken/teken_stress.c
index 40d09bf..40d09bf 100644
--- a/sys/dev/syscons/teken/teken_stress.c
+++ b/sys/teken/teken_stress.c
diff --git a/sys/dev/syscons/teken/teken_subr.h b/sys/teken/teken_subr.h
index 21982e2..21982e2 100644
--- a/sys/dev/syscons/teken/teken_subr.h
+++ b/sys/teken/teken_subr.h
diff --git a/sys/dev/syscons/teken/teken_subr_compat.h b/sys/teken/teken_subr_compat.h
index 4e03c66..4e03c66 100644
--- a/sys/dev/syscons/teken/teken_subr_compat.h
+++ b/sys/teken/teken_subr_compat.h
diff --git a/sys/dev/syscons/teken/teken_wcwidth.h b/sys/teken/teken_wcwidth.h
index 838fb3d..838fb3d 100644
--- a/sys/dev/syscons/teken/teken_wcwidth.h
+++ b/sys/teken/teken_wcwidth.h
OpenPOWER on IntegriCloud