From 17ec8edf98a0c8c1c3aba9935bdea3ca3df299b4 Mon Sep 17 00:00:00 2001
From: miod <>
Date: Fri, 13 Feb 2004 23:34:21 +0000
Subject: [PATCH] We have no such thing as non-wscons ttyE. "looks ok" drahn@
 deraadt@

---
 src/etc/MAKEDEV.mi             |  8 +-------
 src/etc/etc.alpha/MAKEDEV.md   |  3 +--
 src/etc/etc.cats/MAKEDEV.md    | 18 ++++--------------
 src/etc/etc.pegasos/MAKEDEV.md | 12 +-----------
 4 files changed, 7 insertions(+), 34 deletions(-)

diff --git a/src/etc/MAKEDEV.mi b/src/etc/MAKEDEV.mi
index 2af857aa..128f7511 100644
--- a/src/etc/MAKEDEV.mi
+++ b/src/etc/MAKEDEV.mi
@@ -1,6 +1,6 @@
 include(MAKEDEV.sub)dnl
 dnl
-vers(a, {-$OpenBSD: MAKEDEV.mi,v 1.69 2004/02/13 16:51:27 miod Exp $-})dnl
+vers(a, {-$OpenBSD: MAKEDEV.mi,v 1.70 2004/02/13 23:34:13 miod Exp $-})dnl
 dnl
 divert(1)dnl
 {-#-}
@@ -503,12 +503,6 @@ __devitem(ttyz, tty[a-d], onboard zs serial ports)dnl
 __devitem(cuaz, cua[a-d], onboard zs serial ports)dnl
 __devitem(ttyB, ttyB?, DEC 3000 ZS8530 ("scc") serial ports)dnl
 __devitem(scc, scc*, 82530 serial interface)dnl
-__devitem(arc_ttyC, ttyC0, pccons)dnl
-__devitem(i386_ttyC, ttyC*, pcvt)dnl
-__devitem(ttyC, ttyC?, {-AlphaStation NS16550 ("com serial ports")-})dnl
-__devitem(ttyE, ttyE?, Workstation console (framebuffer & keyboard) tty emulators)dnl
-__devitem(ser02, ser02, {-serial2 port (channel A on 8530)-})dnl
-__devitem(mdm02, mdm02, {-modem2 port (channel B on 8530)-})dnl
 __devtitle(spec, Special purpose devices)dnl
 __devitem(apm, apm	, power management device)dnl
 _mkdev(apm, apm*, {-M apm	c major_apm_c 0 644
diff --git a/src/etc/etc.alpha/MAKEDEV.md b/src/etc/etc.alpha/MAKEDEV.md
index f8f7f4b0..b47df2c6 100644
--- a/src/etc/etc.alpha/MAKEDEV.md
+++ b/src/etc/etc.alpha/MAKEDEV.md
@@ -1,5 +1,5 @@
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.18 2004/02/10 01:31:20 millert Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.19 2004/02/13 23:34:20 miod Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001,2002,2003 Todd T. Fries <todd@OpenBSD.org>
@@ -127,4 +127,3 @@ target(ramd, tty0, 0, 1)dnl
 target(ramd, st, 0)dnl
 target(ramd, cd, 0)dnl
 target(ramd, ttyB, 0, 1)dnl
-target(ramd, ttyE, 0, 1)dnl
diff --git a/src/etc/etc.cats/MAKEDEV.md b/src/etc/etc.cats/MAKEDEV.md
index 13da95c1..537d8882 100644
--- a/src/etc/etc.cats/MAKEDEV.md
+++ b/src/etc/etc.cats/MAKEDEV.md
@@ -1,5 +1,5 @@
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.3 2004/02/11 21:28:14 drahn Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.4 2004/02/13 23:34:21 miod Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
@@ -49,9 +49,8 @@ _DEV(wskbd, 61)
 _DEV(wsmouse, 62)
 _DEV(wsmux, 63)
 _TITLE(term)
-_DEV(ttyE)
-#_DEV(fcom, 54)
-#_DEV(com, 12)
+dnl _DEV(fcom, 54)
+dnl _DEV(com, 12)
 _DEV(com, 54)
 _TITLE(pty)
 _DEV(tty, 4)
@@ -91,16 +90,8 @@ _std(1, 2, 43, 3, 6)
 	M xf86		c 2 4 600
 	M reload	c 2 20 640 kmem
 	;;
-
-ttyE*)
-	type=E
-	case $type in
-	E)	major=25; minor=$unit ;;
-	esac
-	M tty$type$unit c $major $minor 660
-	;;
 dnl
-dnl *** pegasos specific targets
+dnl *** cats specific targets
 dnl
 target(all, ses, 0)dnl
 target(all, ch, 0)dnl
@@ -122,6 +113,5 @@ target(ramd, wd, 0, 1, 2, 3, 4)dnl
 target(ramd, st, 0, 1)dnl
 target(ramd, cd, 0, 1)dnl)dnl
 target(ramd, rd, 0)dnl
-target(ramd, ttyE, 0)dnl
 target(ramd, tty0, 0, 1)dnl
 target(ramd, pty, 0)dnl
diff --git a/src/etc/etc.pegasos/MAKEDEV.md b/src/etc/etc.pegasos/MAKEDEV.md
index 68509d6b..8486243a 100644
--- a/src/etc/etc.pegasos/MAKEDEV.md
+++ b/src/etc/etc.pegasos/MAKEDEV.md
@@ -1,5 +1,5 @@
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.3 2004/02/10 01:31:20 millert Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.4 2004/02/13 23:34:21 miod Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
@@ -49,7 +49,6 @@ _DEV(wskbd, 68)
 _DEV(wsmouse, 69)
 _DEV(wsmux, 70)
 _TITLE(term)
-_DEV(ttyE)
 _DEV(com, 7)
 _TITLE(pty)
 _DEV(tty, 4)
@@ -89,14 +88,6 @@ _std(1, 2, 43, 3, 6)
 	M xf86		c 2 4 600
 	M reload	c 2 20 640 kmem
 	;;
-
-ttyE*)
-	type=E
-	case $type in
-	E)	major=25; minor=$unit ;;
-	esac
-	M tty$type$unit c $major $minor 660
-	;;
 dnl
 dnl *** pegasos specific targets
 dnl
@@ -120,6 +111,5 @@ target(ramd, wd, 0, 1, 2, 3, 4)dnl
 target(ramd, st, 0, 1)dnl
 target(ramd, cd, 0, 1)dnl)dnl
 target(ramd, rd, 0)dnl
-target(ramd, ttyE, 0)dnl
 target(ramd, tty0, 0, 1)dnl
 target(ramd, pty, 0)dnl