Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/mac68k Merge wscons work onto the main development ...
details: https://anonhg.NetBSD.org/src/rev/8ee6504c7835
branches: trunk
changeset: 482100:8ee6504c7835
user: scottr <scottr%NetBSD.org@localhost>
date: Mon Feb 14 07:01:44 2000 +0000
description:
Merge wscons work onto the main development branch.
diffstat:
sys/arch/mac68k/conf/GENERIC | 32 +-
sys/arch/mac68k/conf/files.mac68k | 48 +-
sys/arch/mac68k/dev/adb.c | 17 +-
sys/arch/mac68k/dev/adbsysasm.s | 10 +-
sys/arch/mac68k/dev/aed.c | 14 +-
sys/arch/mac68k/dev/aedvar.h | 4 +-
sys/arch/mac68k/dev/akbd.c | 598 +++++++++++++
sys/arch/mac68k/dev/akbdmap.h | 154 +++
sys/arch/mac68k/dev/akbdvar.h | 61 +
sys/arch/mac68k/dev/ams.c | 584 +++++++++++++
sys/arch/mac68k/dev/amsvar.h | 65 +
sys/arch/mac68k/dev/grf.c | 421 ---------
sys/arch/mac68k/dev/grf_compat.c | 398 +++++++++
sys/arch/mac68k/dev/grf_subr.c | 4 +-
sys/arch/mac68k/dev/grfvar.h | 31 +-
sys/arch/mac68k/dev/ite.c | 1367 -------------------------------
sys/arch/mac68k/dev/ite_compat.c | 194 ++++
sys/arch/mac68k/dev/itevar.h | 55 -
sys/arch/mac68k/dev/kbd.c | 415 ---------
sys/arch/mac68k/dev/kbdvar.h | 59 -
sys/arch/mac68k/dev/mac68k5380.c | 3 +-
sys/arch/mac68k/dev/maccons.c | 133 +++
sys/arch/mac68k/dev/macfb.c | 416 +++++++++
sys/arch/mac68k/dev/macfbvar.h | 70 +
sys/arch/mac68k/dev/ms.c | 551 ------------
sys/arch/mac68k/dev/msvar.h | 64 -
sys/arch/mac68k/dev/sbcvar.h | 3 +-
sys/arch/mac68k/include/adbsys.h | 4 +-
sys/arch/mac68k/include/grfioctl.h | 10 +-
sys/arch/mac68k/mac68k/conf.c | 40 +-
sys/arch/mac68k/mac68k/machdep.c | 118 +-
sys/arch/mac68k/mac68k/pmap_bootstrap.c | 28 +-
sys/arch/mac68k/nubus/grf_nubus.c | 4 +-
sys/arch/mac68k/obio/grf_obio.c | 31 +-
34 files changed, 2899 insertions(+), 3107 deletions(-)
diffs (truncated from 6707 to 300 lines):
diff -r 0c7660d21ee9 -r 8ee6504c7835 sys/arch/mac68k/conf/GENERIC
--- a/sys/arch/mac68k/conf/GENERIC Mon Feb 14 06:55:36 2000 +0000
+++ b/sys/arch/mac68k/conf/GENERIC Mon Feb 14 07:01:44 2000 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: GENERIC,v 1.95 2000/01/23 23:46:13 hubertf Exp $
+# $NetBSD: GENERIC,v 1.96 2000/02/14 07:01:44 scottr Exp $
#
# GENERIC
include "arch/mac68k/conf/std.mac68k"
-#ident "GENERIC-$Revision: 1.95 $"
+#ident "GENERIC-$Revision: 1.96 $"
maxusers 16 # estimated number of users
@@ -82,7 +82,7 @@
# File system options
options QUOTA # UFS quotas
#options FFS_EI # FFS Endian Independant support
-#options SOFTDEP # FFS soft updates support.
+#options SOFTDEP # FFS soft updates support.
options NFSSERVER # Network File System server
#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
# immutable) behave as system flags.
@@ -126,6 +126,16 @@
# Warning, these may compile large string tables into the kernel!
options SCSIVERBOSE # human readable SCSI error messages
+# wscons options
+#options WSEMUL_SUN # sun terminal emulation
+options WSEMUL_VT100 # VT100 / VT220 emulation
+options WSDISPLAY_COMPAT_ITEFONT # use ite font (6x10)
+
+# rcons options; note that 1-bit and 8-bit displays are supported by default.
+options RCONS_2BPP # Support for 2-bit display
+options RCONS_4BPP # Support for 4-bit display
+options RCONS_16BPP # Support for 16-bit display
+
# Mac-specific options
#options ALTXBUTTONS # Map Opt-{1,2,3} to mouse buttons
#options DISABLE_EXT_CACHE # If really paranoid, disable IIci ext. cache
@@ -161,19 +171,21 @@
# Apple Desktop Bus interface
adb0 at obio?
aed* at adb? # ADB event device
-kbd* at adb? # ADB keyboard
-ms* at adb? # ADB mouse
+akbd* at adb? # ADB keyboard
+ams* at adb? # ADB mouse
# Basic frame buffer support
intvid0 at obio? # Internal video hardware
macvid* at nubus? # NuBus video card
# Device-independent frame buffer interface
-grf* at intvid?
-grf* at macvid?
+macfb* at intvid?
+macfb* at macvid?
-# Integrated Terminal Emulator (console) support
-ite0 at grf?
+# Workstation Console devices
+wsdisplay0 at macfb? console ?
+wskbd0 at akbd? console ?
+wsmouse0 at ams?
# Serial Devices
@@ -250,6 +262,8 @@
#pseudo-device faith 1 # IPv[46] tcp relay translation i/f
# miscellaneous pseudo-devices
+pseudo-device grf 2 # grf emulation for wscons
+pseudo-device ite 1 # ite emulation for wscons
pseudo-device pty 64 # pseudo-terminals
#pseudo-device tb 1 # tablet line discipline
diff -r 0c7660d21ee9 -r 8ee6504c7835 sys/arch/mac68k/conf/files.mac68k
--- a/sys/arch/mac68k/conf/files.mac68k Mon Feb 14 06:55:36 2000 +0000
+++ b/sys/arch/mac68k/conf/files.mac68k Mon Feb 14 07:01:44 2000 +0000
@@ -1,13 +1,14 @@
-# $NetBSD: files.mac68k,v 1.92 1999/06/28 08:20:44 itojun Exp $
+# $NetBSD: files.mac68k,v 1.93 2000/02/14 07:01:44 scottr Exp $
# mac68k-specific configuration info
# options understood by the mac68k-specific part of the kernel
# (note, these are case-sensitive)
defopt opt_adb.h ADB_DEBUG MRG_ADB ALTXBUTTONS
-defopt opt_grf.h GRF_COMPAT
defopt opt_mac68k.h DISABLE_EXT_CACHE ZS_CONSOLE_ABORT
+defopt opt_wsdisplay_compat.h WSDISPLAY_COMPAT_ITEFONT
+
# maxpartitions must be first item in files.${ARCH}.newconf
maxpartitions 8
@@ -16,16 +17,14 @@
device mainbus { } # no locators (yet?)
attach mainbus at root
+include "dev/wscons/files.wscons"
+
define obio_norm { [addr = -1], ["no drq" = -1], ["no hsk" = -1] }
define obio_scsi5380 { [addr = -1], [drq = -1], [hsk = -1] }
device obio: obio_norm, obio_scsi5380
attach obio at mainbus
file arch/mac68k/obio/obio.c obio
-device nubus { }
-attach nubus at mainbus
-file arch/mac68k/nubus/nubus.c nubus
-
device adb { }
attach adb at obio_norm
file arch/mac68k/dev/adb.c adb
@@ -37,18 +36,22 @@
attach aed at adb
file arch/mac68k/dev/aed.c aed needs-flag
-device kbd
-attach kbd at adb
-file arch/mac68k/dev/kbd.c kbd needs-flag
+device akbd: wskbddev
+attach akbd at adb
+file arch/mac68k/dev/akbd.c akbd needs-flag
-device ms
-attach ms at adb
-file arch/mac68k/dev/ms.c ms needs-flag
+device ams: wsmousedev
+attach ams at adb
+file arch/mac68k/dev/ams.c ams needs-flag
device asc
attach asc at obio_norm
file arch/mac68k/obio/asc.c asc needs-flag
+device nubus { }
+attach nubus at mainbus
+file arch/mac68k/nubus/nubus.c nubus
+
define grfbus { }
file arch/mac68k/dev/grf_subr.c grfbus
@@ -60,13 +63,15 @@
attach macvid at nubus
file arch/mac68k/nubus/grf_nubus.c macvid
-device grf { }
-attach grf at grfbus
-file arch/mac68k/dev/grf.c grf needs-flag
+device macfb: wsemuldisplaydev, wsrasteremulops
+attach macfb at grfbus
+file arch/mac68k/dev/macfb.c macfb needs-flag
-device ite: tty
-attach ite at grf
-file arch/mac68k/dev/ite.c ite needs-flag
+file arch/mac68k/dev/maccons.c akbd & macfb
+
+#device ite: wsemuldisplaydev
+#attach ite at wsdisplay
+#file arch/mac68k/dev/ite_compat.c ite needs-flag
device ae: ifnet, ether, arp, dp8390nic
attach ae at nubus with ae_nubus
@@ -130,6 +135,10 @@
file arch/m68k/m68k/db_memrw.c ddb | kgdb
include "arch/m68k/fpe/files.fpe"
+# legitimate pseudo-devices
+defpseudo grf
+defpseudo ite
+
file arch/mac68k/mac68k/autoconf.c
file arch/mac68k/mac68k/bus_space.c
file arch/mac68k/mac68k/clock.c
@@ -153,6 +162,9 @@
file arch/mac68k/mac68k/via.c
file arch/mac68k/mac68k/vm_machdep.c
+file arch/mac68k/dev/grf_compat.c grf needs-flag
+file arch/mac68k/dev/ite_compat.c ite needs-flag
+
file dev/cons.c
file dev/cninit.c
diff -r 0c7660d21ee9 -r 8ee6504c7835 sys/arch/mac68k/dev/adb.c
--- a/sys/arch/mac68k/dev/adb.c Mon Feb 14 06:55:36 2000 +0000
+++ b/sys/arch/mac68k/dev/adb.c Mon Feb 14 07:01:44 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: adb.c,v 1.33 1999/11/28 10:10:51 scottr Exp $ */
+/* $NetBSD: adb.c,v 1.34 2000/02/14 07:01:45 scottr Exp $ */
/*
* Copyright (C) 1994 Bradley A. Grantham
@@ -46,8 +46,7 @@
#include <mac68k/mac68k/macrom.h>
#include <mac68k/dev/adbvar.h>
-#include <mac68k/dev/itevar.h>
-#include <mac68k/dev/kbdvar.h>
+#include <mac68k/dev/akbdvar.h>
#include "aed.h" /* ADB Event Device for compatibility */
@@ -66,7 +65,11 @@
*/
int adb_polling = 0; /* Are we polling? (Debugger mode) */
#ifdef ADB_DEBUG
+#if 1
+int adb_debug = 0xff;
+#else
int adb_debug = 0; /* Output debugging messages */
+#endif
#endif /* ADB_DEBUG */
extern struct mac68k_machine_S mac68k_machine;
@@ -124,7 +127,7 @@
#ifdef MRG_ADB
/*
* Even if serial console only, some models require the
- * ADB in order to get the date/time and do soft power.
+ * ADB in order to get the date/time and do soft power.
*/
if ((mac68k_machine.serial_console & 0x03)) {
printf(": using serial console\n");
@@ -197,8 +200,8 @@
int
adbprint(args, name)
- void *args;
- const char *name;
+ void *args;
+ const char *name;
{
struct adb_attach_args *aa_args = (struct adb_attach_args *)args;
int rv = UNCONF;
@@ -261,7 +264,7 @@
#endif /* DIAGNOSTIC */
}
} else /* a device matched and was configured */
- printf(" addr %d: ", aa_args->origaddr);
+ printf(" addr %d: ", aa_args->origaddr);
return (rv);
}
diff -r 0c7660d21ee9 -r 8ee6504c7835 sys/arch/mac68k/dev/adbsysasm.s
--- a/sys/arch/mac68k/dev/adbsysasm.s Mon Feb 14 06:55:36 2000 +0000
+++ b/sys/arch/mac68k/dev/adbsysasm.s Mon Feb 14 07:01:44 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: adbsysasm.s,v 1.9 1999/02/11 06:41:08 ender Exp $ */
+/* $NetBSD: adbsysasm.s,v 1.10 2000/02/14 07:01:45 scottr Exp $ */
/*-
* Copyright (C) 1994 Bradley A. Grantham
@@ -31,8 +31,8 @@
*/
#include "opt_adb.h"
-#include "kbd.h"
-#include "ms.h"
+#include "akbd.h"
+#include "ams.h"
#include <machine/asm.h>
/*
@@ -42,7 +42,7 @@
/* This routine is called when a keyboard has sent us some data. */
/* (provided it has been set up with SetADBInfo) */
GLOBAL(adb_kbd_asmcomplete)
-#if NKBD > 0
+#if NAKBD > 0
moveml #0x80e0, sp@- | save scratch regs
movl d0, sp@- /* ADB command byte */
movl a2, sp@- /* data area pointer */
@@ -57,7 +57,7 @@
/* This routine is called when a mouse has sent us some data. */
/* (provided it has been set up with SetADBInfo) */
GLOBAL(adb_ms_asmcomplete)
-#if NMS > 0
+#if NAMS > 0
moveml #0x80e0, sp@- | save scratch regs
movl d0, sp@- /* ADB command byte */
movl a2, sp@- /* data area pointer */
diff -r 0c7660d21ee9 -r 8ee6504c7835 sys/arch/mac68k/dev/aed.c
--- a/sys/arch/mac68k/dev/aed.c Mon Feb 14 06:55:36 2000 +0000
+++ b/sys/arch/mac68k/dev/aed.c Mon Feb 14 07:01:44 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: aed.c,v 1.8 1999/11/07 00:12:55 scottr Exp $ */
+/* $NetBSD: aed.c,v 1.9 2000/02/14 07:01:45 scottr Exp $ */
/*
* Copyright (C) 1994 Bradley A. Grantham
@@ -48,8 +48,7 @@
#include <mac68k/mac68k/macrom.h>
#include <mac68k/dev/adbvar.h>
Home |
Main Index |
Thread Index |
Old Index