From 142d1cc356e1adb1d85ed02c44ab24f08eea772a Mon Sep 17 00:00:00 2001 From: Miod Vallat Date: Mon, 12 Aug 2002 10:45:07 +0000 Subject: MAKEDEV and /etc/* changes for wscons on sparc --- etc/MAKEDEV.mi | 3 ++- etc/etc.sparc/MAKEDEV.md | 56 ++++++++++++++++++++++++++++++++++++------------ etc/etc.sparc/fbtab | 2 ++ etc/etc.sparc/ttys | 10 +++++++-- 4 files changed, 54 insertions(+), 17 deletions(-) (limited to 'etc') diff --git a/etc/MAKEDEV.mi b/etc/MAKEDEV.mi index 8497b36b12b..49a862d2168 100644 --- a/etc/MAKEDEV.mi +++ b/etc/MAKEDEV.mi @@ -1,6 +1,6 @@ include(MAKEDEV.sub)dnl dnl -vers(a, {-$OpenBSD: MAKEDEV.mi,v 1.49 2002/06/18 00:53:45 fgsch Exp $-})dnl +vers(a, {-$OpenBSD: MAKEDEV.mi,v 1.50 2002/08/12 10:45:04 miod Exp $-})dnl dnl divert(1)dnl {-#-} @@ -328,6 +328,7 @@ target(ramd, bpf, 0)dnl target(ramd, rd, 0)dnl -})dnl ifelse(MACHINE, sparc, {-dnl +twrget(wscons, wscons, ttyD, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl target(all, ses, 0)dnl target(all, ch, 0)dnl target(all, ss, 0, 1)dnl diff --git a/etc/etc.sparc/MAKEDEV.md b/etc/etc.sparc/MAKEDEV.md index f722d68121d..b15a38a2ee2 100644 --- a/etc/etc.sparc/MAKEDEV.md +++ b/etc/etc.sparc/MAKEDEV.md @@ -1,5 +1,5 @@ vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.13 2002/07/31 16:47:50 jason Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.14 2002/08/12 10:45:06 miod Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001 Todd T. Fries @@ -25,6 +25,38 @@ dnl OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF dnl ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. dnl dnl +dnl +dnl *** some sparc-specific devices +dnl +twrget(all, s64_tzs, tty, a, b, c, d)dnl +twrget(all, s64_czs, cua, a, b, c, d)dnl +__devitem(s64_tzs, tty[a-z]*, Zilog 8530 Serial Port)dnl +__devitem(s64_czs, cua[a-z]*, Zilog 8530 Serial Port)dnl +_mkdev(s64_tzs, {-tty[a-z]-}, {-u=${i#tty*} + case $u in + a) n=0 ;; + b) n=1 ;; + c) n=2 ;; + d) n=3 ;; + e) n=4;; + f) n=5;; + *) echo unknown tty device $i ;; + esac + M tty$u c major_s64_tzs_c $n 660 dialer uucp-})dnl +_mkdev(s64_czs, cua[a-z], {-u=${i#cua*} + case $u in + a) n=0 ;; + b) n=1 ;; + c) n=2 ;; + d) n=3 ;; + e) n=4;; + f) n=5;; + *) echo unknown cua device $i ;; + esac + M cua$u c major_s64_czs_c Add($n, 128) 660 dialer uucp-})dnl +dnl +dnl *** MAKEDEV itself +dnl _TITLE(make) _DEV(all) _DEV(std) @@ -47,20 +79,19 @@ _TITLE(pty) _DEV(tty, 20) _DEV(pty, 21) _TITLE(prn) +_TITLE(cons) +_DEV(wscons) +_DEV(wsdisp, 78) +_DEV(wskbd, 79) +_DEV(wsmux, 81) +_TITLE(point) +_DEV(wsmouse, 80) _TITLE(term) -_DEV(tzs, 12) -_DEV(czs, 12) +_DEV(s64_tzs, 12) +_DEV(s64_czs, 12) _TITLE(spec) _DEV(au, 69) _DEV(oppr) -_DEV(btw, 27) -_DEV(ctw, 31) -_DEV(ctr, 55) -_DEV(cfr, 39) -_DEV(csx, 67) -_DEV(ceg, 64) -_DEV(cfo, 99) -_DEV(tcx, 109) _DEV(bpf, 105) _DEV(pf, 59) _DEV(altq, 125) @@ -87,7 +118,4 @@ ramdisk) _std(2, 3, 122, 7, 16) M eeprom c 3 11 640 kmem M openprom c 70 0 640 kmem - M fb c 22 0 - M mouse c 13 0 - M kbd c 29 0 ;; diff --git a/etc/etc.sparc/fbtab b/etc/etc.sparc/fbtab index e69de29bb2d..e259e8336aa 100644 --- a/etc/etc.sparc/fbtab +++ b/etc/etc.sparc/fbtab @@ -0,0 +1,2 @@ +/dev/ttyC0 0600 /dev/console:/dev/wskbd0:/dev/wsmouse0:/dev/wskbd:/dev/wsmouse:/dev/ttyCcfg + diff --git a/etc/etc.sparc/ttys b/etc/etc.sparc/ttys index d6f6458cc9a..4832b6dfd70 100644 --- a/etc/etc.sparc/ttys +++ b/etc/etc.sparc/ttys @@ -1,13 +1,19 @@ # -# $OpenBSD: ttys,v 1.7 2002/06/09 06:15:14 todd Exp $ +# $OpenBSD: ttys,v 1.8 2002/08/12 10:45:06 miod Exp $ # # name getty type status comments # +# main console device console "/usr/libexec/getty suncons" sun on secure +# graphics console +ttyC0 "/usr/libexec/getty std.9600" sun off secure +# on-board serial lines ttya "/usr/libexec/getty std.9600" unknown off secure ttyb "/usr/libexec/getty std.9600" unknown off secure -ttyc "/usr/libexec/getty std.9600" unknown off secure +# ttyc is usually the mouse port... +# ttyc "/usr/libexec/getty std.9600" unknown off secure ttyd "/usr/libexec/getty std.9600" unknown off secure +ttye "/usr/libexec/getty std.9600" unknown off secure # magma0 ttym0 "/usr/libexec/getty std.9600" unknown off secure ttym1 "/usr/libexec/getty std.9600" unknown off secure -- cgit v1.2.3