Browse Source

Switch DEC 3000 (TURBOchannel) alpha serial code to MI z8530 code.

ttyB* minor numbers change; be sure to rerun MAKEDEV if you do not
upgrade with bsd.rd
Adapted from NetBSD by miod@
OPENBSD_6_3
mpi 7 years ago
parent
commit
210ce1b3fd
3 changed files with 9 additions and 13 deletions
  1. +2
    -5
      src/etc/MAKEDEV.common
  2. +4
    -5
      src/etc/etc.alpha/MAKEDEV.md
  3. +3
    -3
      src/etc/etc.alpha/ttys

+ 2
- 5
src/etc/MAKEDEV.common View File

@ -1,4 +1,4 @@
vers(a, {-$OpenBSD: MAKEDEV.common,v 1.96 2017/10/16 20:26:52 naddy Exp $-})dnl
vers(a, {-$OpenBSD: MAKEDEV.common,v 1.97 2017/11/02 14:04:24 mpi Exp $-})dnl
dnl dnl
dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
dnl dnl
@ -136,8 +136,6 @@ target(all, apm)dnl
target(all, acpi)dnl target(all, acpi)dnl
twrget(all, tth, ttyh, 0, 1)dnl twrget(all, tth, ttyh, 0, 1)dnl
target(all, ttyA, 0, 1)dnl target(all, ttyA, 0, 1)dnl
target(all, ttyB, 0, 1, 2, 3, 4, 5)dnl
twrget(all, attyB, ttyB, 0, 1, 2, 3, 4)dnl
twrget(all, mac_tty0, tty0, 0, 1)dnl twrget(all, mac_tty0, tty0, 0, 1)dnl
twrget(all, tzs, tty, a, b, c, d)dnl twrget(all, tzs, tty, a, b, c, d)dnl
twrget(all, czs, cua, a, b, c, d)dnl twrget(all, czs, cua, a, b, c, d)dnl
@ -409,8 +407,7 @@ __devitem(tty0, tty00, Standard serial port,com)dnl
__devitem(mac_tty0, tty00, Standard serial port,zsc)dnl __devitem(mac_tty0, tty00, Standard serial port,zsc)dnl
__devitem(ttyz, tty[a-d], On-board zs serial ports,zs)dnl __devitem(ttyz, tty[a-d], On-board zs serial ports,zs)dnl
__devitem(cuaz, cua[a-d], On-board zs serial ports,zs)dnl __devitem(cuaz, cua[a-d], On-board zs serial ports,zs)dnl
__devitem(ttyB, ttyB?, DEC 3000 ZS8530 ("scc") serial ports,scc)dnl
__devitem(scc, scc*, 82530 serial interface,scc)dnl
__devitem(ttyB, ttyB*, DEC 3000 serial ports,zs)dnl
__devtitle(spec, Special purpose devices)dnl __devtitle(spec, Special purpose devices)dnl
_mkdev(apm, apm*, {-M apm c major_apm_c 0 644 _mkdev(apm, apm*, {-M apm c major_apm_c 0 644
M apmctl c major_apm_c 8 644-})dnl M apmctl c major_apm_c 8 644-})dnl


+ 4
- 5
src/etc/etc.alpha/MAKEDEV.md View File

@ -1,6 +1,6 @@
define(MACHINE,alpha)dnl define(MACHINE,alpha)dnl
vers(__file__, vers(__file__,
{-$OpenBSD: MAKEDEV.md,v 1.70 2016/09/11 19:59:53 deraadt Exp $-},
{-$OpenBSD: MAKEDEV.md,v 1.71 2017/11/02 14:04:24 mpi Exp $-},
etc.MACHINE)dnl etc.MACHINE)dnl
dnl dnl
dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@ -17,7 +17,6 @@ dnl WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
dnl ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF dnl ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
dnl OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. dnl OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
dnl dnl
dnl
_TITLE(make) _TITLE(make)
_DEV(all) _DEV(all)
_DEV(ramdisk) _DEV(ramdisk)
@ -35,8 +34,8 @@ _DEV(ch, 14)
_DEV(st, 12) _DEV(st, 12)
_TITLE(term) _TITLE(term)
_DEV(com, 26) _DEV(com, 26)
_DEV(ttyB)
_DEV(ttyc, 38) _DEV(ttyc, 38)
_DEV(ttyB, 15)
_TITLE(pty) _TITLE(pty)
_DEV(ptm, 55) _DEV(ptm, 55)
_DEV(pty, 5) _DEV(pty, 5)
@ -96,7 +95,7 @@ _std(1, 2, 39, 6)
ttyB*|ttyc*) ttyB*|ttyc*)
U=${i##tty?} U=${i##tty?}
case $i in case $i in
ttyB*) type=B major=15 minor=Mult($U, 2);;
ttyB*) type=B major=15 minor=$U;;
ttyc*) type=c major=38 minor=$U;; ttyc*) type=c major=38 minor=$U;;
esac esac
M tty$type$U c $major $minor 660 dialer root M tty$type$U c $major $minor 660 dialer root
@ -115,7 +114,7 @@ twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
target(all, pty, 0)dnl target(all, pty, 0)dnl
target(all, tun, 0, 1, 2, 3)dnl target(all, tun, 0, 1, 2, 3)dnl
target(all, tap, 0, 1, 2, 3)dnl target(all, tap, 0, 1, 2, 3)dnl
target(all, xy, 0, 1, 2, 3)dnl
target(all, ttyB, 0, 1)dnl
target(all, rd, 0)dnl target(all, rd, 0)dnl
target(all, cd, 0, 1)dnl target(all, cd, 0, 1)dnl
target(all, sd, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl target(all, sd, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl


+ 3
- 3
src/etc/etc.alpha/ttys View File

@ -1,5 +1,5 @@
# #
# $OpenBSD: ttys,v 1.13 2008/01/09 17:39:41 miod Exp $
# $OpenBSD: ttys,v 1.14 2017/11/02 14:04:24 mpi Exp $
# #
# name getty type status comments # name getty type status comments
@ -19,8 +19,8 @@ ttyC5 "/usr/libexec/getty std.9600" vt220 off secure
# DEC 3000 Z8530 ("scc") serial ports # DEC 3000 Z8530 ("scc") serial ports
ttyB0 "/usr/libexec/getty std.9600" unknown off secure ttyB0 "/usr/libexec/getty std.9600" unknown off secure
ttyB1 "/usr/libexec/getty std.9600" unknown off
ttyB1 "/usr/libexec/getty std.9600" unknown off secure
# AlphaStation NS16550 ("com") serial ports # AlphaStation NS16550 ("com") serial ports
tty00 "/usr/libexec/getty std.9600" unknown off secure tty00 "/usr/libexec/getty std.9600" unknown off secure
tty01 "/usr/libexec/getty std.9600" unknown off
tty01 "/usr/libexec/getty std.9600" unknown off secure

Loading…
Cancel
Save