Browse Source

Import NetBSD's direct adb code on mac68k, switching to real keyboard and mouse

drivers, and to wscons as the console; a few parts borrowed from OpenBSD/macppc
as well.
Currently only working with displays configured in 1bpp or 8bpp modes; this
limitation will be worked on ASAP.
Tested by claudio@ kettenis@ martin@ nick@ and I on various models. X11 changes
coming soon.
OPENBSD_3_9
miod 19 years ago
parent
commit
884086248e
3 changed files with 14 additions and 39 deletions
  1. +4
    -8
      src/etc/Makefile
  2. +7
    -22
      src/etc/etc.mac68k/MAKEDEV.md
  3. +3
    -9
      src/etc/etc.mac68k/ttys

+ 4
- 8
src/etc/Makefile View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.231 2005/12/28 04:55:35 david Exp $
# $OpenBSD: Makefile,v 1.232 2006/01/04 20:38:59 miod Exp $
TZDIR= /usr/share/zoneinfo TZDIR= /usr/share/zoneinfo
LOCALTIME= Canada/Mountain LOCALTIME= Canada/Mountain
@ -21,12 +21,8 @@ BIN1= changelist ccd.conf csh.cshrc csh.login csh.logout daily dhcpd.conf \
etc.${MACHINE}/disktab dhclient.conf mailer.conf ntpd.conf \ etc.${MACHINE}/disktab dhclient.conf mailer.conf ntpd.conf \
moduli pf.os sensorsd.conf ifstated.conf moduli pf.os sensorsd.conf ifstated.conf
.if ${MACHINE} == "alpha" || ${MACHINE} == "amd64" || \
${MACHINE} == "cats" || ${MACHINE} == "hp300" || \
${MACHINE} == "hppa" || ${MACHINE} == "hppa64" || \
${MACHINE} == "luna88k" || ${MACHINE} == "macppc" || \
${MACHINE} == "sparc" || ${MACHINE} == "sparc64" || \
${MACHINE} == "zaurus" || ${MACHINE} == "i386"
.if ${MACHINE} != "mvme68k" && ${MACHINE} != "mvme88k" && \
${MACHINE} != "vax"
BIN1+= wsconsctl.conf BIN1+= wsconsctl.conf
.endif .endif
@ -382,7 +378,7 @@ distrib:
DHSIZE=1024 1536 2048 3072 4096 DHSIZE=1024 1536 2048 3072 4096
update-moduli: update-moduli:
( \ ( \
echo '# $$OpenBSD: Makefile,v 1.231 2005/12/28 04:55:35 david Exp $$'; \
echo '# $$OpenBSD: Makefile,v 1.232 2006/01/04 20:38:59 miod Exp $$'; \
echo '# Time Type Tests Tries Size Generator Modulus'; \ echo '# Time Type Tests Tries Size Generator Modulus'; \
( for i in ${DHSIZE}; do \ ( for i in ${DHSIZE}; do \
ssh-keygen -b $$i -G /dev/stdout; \ ssh-keygen -b $$i -G /dev/stdout; \


+ 7
- 22
src/etc/etc.mac68k/MAKEDEV.md View File

@ -1,5 +1,5 @@
vers(__file__, vers(__file__,
{-$OpenBSD: MAKEDEV.md,v 1.20 2005/10/20 21:44:42 jmc Exp $-},
{-$OpenBSD: MAKEDEV.md,v 1.21 2006/01/04 20:39:03 miod Exp $-},
etc.MACHINE)dnl etc.MACHINE)dnl
dnl dnl
dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org> dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@ -37,15 +37,18 @@ _DEV(ch, 17)
_DEV(st, 14, 5) _DEV(st, 14, 5)
_TITLE(term) _TITLE(term)
_DEV(mac_tty0) _DEV(mac_tty0)
_DEV(ttye)
dnl _TITLE(call) dnl _TITLE(call)
_TITLE(pty) _TITLE(pty)
_DEV(ptm, 52) _DEV(ptm, 52)
_DEV(pty, 5) _DEV(pty, 5)
_DEV(tty, 4) _DEV(tty, 4)
_TITLE(cons) _TITLE(cons)
_DEV(adb, 23)
_DEV(grf_mac, 10)
_DEV(wscons)
_DEV(wsdisp, 38)
_DEV(wskbd, 39)
_DEV(wsmux, 41)
_TITLE(point)
_DEV(wsmouse, 40)
_TITLE(spec) _TITLE(spec)
_DEV(asc, 36) _DEV(asc, 36)
_DEV(bpf, 22) _DEV(bpf, 22)
@ -86,21 +89,6 @@ ttye*)
esac esac
;; ;;
grf*)
case $U in
0|1|2|3)
M grf$U c 10 $U
;;
*)
echo bad unit for grf in: $i
;;
esac
;;
adb)
M adb c 23 0
;;
asc*) asc*)
M asc$U c 36 $U M asc$U c 36 $U
;; ;;
@ -121,12 +109,9 @@ target(all, xy, 0, 1, 2, 3)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, ccd, 0, 1, 2, 3)dnl target(all, ccd, 0, 1, 2, 3)dnl
twrget(all, ttye, ttye, 0)dnl
target(ramd, sd, 0, 1, 2, 3)dnl target(ramd, sd, 0, 1, 2, 3)dnl
target(ramd, st, 0, 1)dnl target(ramd, st, 0, 1)dnl
target(ramd, rd, 0, 1)dnl target(ramd, rd, 0, 1)dnl
target(ramd, adb)dnl
target(ramd, asc, 0)dnl target(ramd, asc, 0)dnl
target(ramd, grf, 0, 1)dnl
twrget(ramd, mac_tty0, tty0, 0, 1)dnl twrget(ramd, mac_tty0, tty0, 0, 1)dnl
target(ramd, pty, 0)dnl target(ramd, pty, 0)dnl

+ 3
- 9
src/etc/etc.mac68k/ttys View File

@ -1,5 +1,5 @@
# #
# $OpenBSD: ttys,v 1.7 2002/06/09 06:15:14 todd Exp $
# $OpenBSD: ttys,v 1.8 2006/01/04 20:39:03 miod Exp $
# #
# name getty type status comments # name getty type status comments
# #
@ -9,18 +9,12 @@ console "/usr/libexec/getty Pc" vt220 off secure
#console "/usr/libexec/getty std.9600" vt220 on secure #console "/usr/libexec/getty std.9600" vt220 on secure
# Define the console that we actually run getty on. # Define the console that we actually run getty on.
# To enable the serial console, mark ttye0 'off' and turn on the
# To enable the serial console, mark ttyC0 'off' and turn on the
# console entry configuring it as though it were one of the serial # console entry configuring it as though it were one of the serial
# ports (e.g., setting the entry to 'std.9600'). # ports (e.g., setting the entry to 'std.9600').
ttye0 "/usr/libexec/getty Pc" vt100 on secure
ttyC0 "/usr/libexec/getty Pc" vt100 on secure
# Hardwired lines are marked off, by default, so getty(8) # Hardwired lines are marked off, by default, so getty(8)
# is quiet when they don't exist. # is quiet when they don't exist.
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 secure tty01 "/usr/libexec/getty std.9600" unknown off secure
tty02 "/usr/libexec/getty std.9600" unknown off secure
tty03 "/usr/libexec/getty std.9600" unknown off secure
tty04 "/usr/libexec/getty std.9600" unknown off secure
tty05 "/usr/libexec/getty std.9600" unknown off secure
tty06 "/usr/libexec/getty std.9600" unknown off secure
tty07 "/usr/libexec/getty std.9600" unknown off secure

Loading…
Cancel
Save