Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge netbsd-1-2 branch back into mainline.

This commit is contained in:
thorpej 1996-10-09 00:14:32 +00:00
parent 34d9f1513d
commit 401d011da6
9 changed files with 125 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sys/arch/sun3/conf/DISKLESS
View File

@ -1,4 +1,4 @@
# $NetBSD: DISKLESS,v 1.14 1996/10/08 18:01:47 jtc Exp $
# $NetBSD: DISKLESS,v 1.15 1996/10/09 00:14:32 thorpej Exp $
#
# DISKLESS Sun3 (3/50, 3/60, 3/110, 3/160, 3/260)
@ -18,32 +18,35 @@ maxusers 4
# Standard system options
options SWAPPAGER, VNODEPAGER, DEVPAGER # paging
options KTRACE # system call tracing support
#makeoptions DEBUG="-g" # symbols for kgdb + nm
# Debugging options. Uncomment either this:
#options DDB
# ... or these two: (for KGDB on another machine)
makeoptions DEBUG="-g" # symbols for kgdb + nm
options KGDB
# Filesystem options
options NFSCLIENT # nfs client support
options NFSCLIENT # nfs client support
#
options FDESC # /dev/fd/*
options FIFO # FIFOs; RECOMMENDED
options KERNFS # /kern
options NULLFS # loopback file system
#options PROCFS # /proc
#options UNION # union file system
options PROCFS # /proc
# Networking options
options INET # IP prototol stack support
options INET # IP prototol stack support
#options GATEWAY # IP packet forwarding
options TCP_COMPAT_42 # TCP bug compatibility with 4.2BSD
# XXX - Work-around for root on slow SunOS/Sun3 servers (sigh...)
options NFS_BOOT_RWSIZE=1024
# Compatability options
options COMPAT_SUNOS # can run SunOS 4.1.1 executables
#options COMPAT_09 # NetBSD 0.9,
options COMPAT_10 # NetBSD 1.0,
options COMPAT_11 # NetBSD 1.1,
options COMPAT_12 # NetBSD 1.2,
options COMPAT_43 # and 4.3BSD
options TCP_COMPAT_42 # TCP bug compatibility with 4.2BSD
options COMPAT_43 # and 4.3BSD and ...
options COMPAT_10 # NetBSD 1.0
options COMPAT_11 # NetBSD 1.1
options COMPAT_12 # NetBSD 1.2
options UCONSOLE # Allow non-root TIOCCONS
# Sun3-specific debugging options
@ -107,10 +110,5 @@ cgtwo0 at vmes0 addr 0xff400000 level 4 vect 0xA8
# Misc.
pseudo-device loop 1 # network loopback
#pseudo-device bpfilter 8 # packet filter
#pseudo-device sl 2 # CSLIP
#pseudo-device ppp 2 # PPP
#pseudo-device tun 2 # network tunneling over tty
pseudo-device pty 32 # pseudo-terminals
#pseudo-device vnd 4 # paging to files

29
sys/arch/sun3/conf/FOUR_TTYS
View File

@ -1,4 +1,4 @@
# $NetBSD: FOUR_TTYS,v 1.3 1996/10/08 18:01:48 jtc Exp $
# $NetBSD: FOUR_TTYS,v 1.4 1996/10/09 00:14:33 thorpej Exp $
#
# FOUR_TTYS Sun3 (3/50, 3/60, 3/110, 3/160, 3/260)
@ -18,13 +18,17 @@ maxusers 4
# Standard system options
options SWAPPAGER, VNODEPAGER, DEVPAGER # paging
options KTRACE # system call tracing support
#makeoptions DEBUG="-g" # symbols for kgdb + nm
# Debugging options. Uncomment either this:
options DDB
# ... or these two: (for KGDB on another machine)
#makeoptions DEBUG="-g" # symbols for kgdb + nm
#options KGDB
# Filesystem options
options NFSSERVER # nfs server support
options NFSCLIENT # nfs client support
options FFS # ufs file system
options NFSSERVER # nfs server support
options NFSCLIENT # nfs client support
options FFS # ufs file system
#
options CD9660 # ISO 9660 + Rock Ridge file system
options FDESC # /dev/fd/*
@ -33,20 +37,21 @@ options KERNFS # /kern
options NULLFS # loopback file system
options PROCFS # /proc
options UNION # union file system
options MFS # memory-based filesystem
# Networking options
options INET # IP prototol stack support
options INET # IP prototol stack support
#options GATEWAY # IP packet forwarding
options TCP_COMPAT_42 # TCP bug compatibility with 4.2BSD
# XXX - Work-around for root on slow SunOS/Sun3 servers (sigh...)
options NFS_BOOT_RWSIZE=1024
# Compatability options
options COMPAT_SUNOS # can run SunOS 4.1.1 executables
#options COMPAT_09 # NetBSD 0.9,
options COMPAT_10 # NetBSD 1.0,
options COMPAT_11 # NetBSD 1.1,
options COMPAT_12 # NetBSD 1.2,
options COMPAT_43 # and 4.3BSD
options TCP_COMPAT_42 # TCP bug compatibility with 4.2BSD
options COMPAT_43 # and 4.3BSD and ...
options COMPAT_10 # NetBSD 1.0
options COMPAT_11 # NetBSD 1.1
options COMPAT_12 # NetBSD 1.2
options UCONSOLE # Allow non-root TIOCCONS
# Sun3-specific debugging options

29
sys/arch/sun3/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.29 1996/10/08 18:01:48 jtc Exp $
# $NetBSD: GENERIC,v 1.30 1996/10/09 00:14:34 thorpej Exp $
#
# GENERIC Sun3 (3/50, 3/60, 3/110, 3/160, 3/260)
@ -18,13 +18,17 @@ maxusers 4
# Standard system options
options SWAPPAGER, VNODEPAGER, DEVPAGER # paging
options KTRACE # system call tracing support
#makeoptions DEBUG="-g" # symbols for kgdb + nm
# Debugging options. Uncomment either this:
options DDB
# ... or these two: (for KGDB on another machine)
#makeoptions DEBUG="-g" # symbols for kgdb + nm
#options KGDB
# Filesystem options
options NFSSERVER # nfs server support
options NFSCLIENT # nfs client support
options FFS # ufs file system
options NFSSERVER # nfs server support
options NFSCLIENT # nfs client support
options FFS # ufs file system
#
options CD9660 # ISO 9660 + Rock Ridge file system
options FDESC # /dev/fd/*
@ -33,20 +37,21 @@ options KERNFS # /kern
options NULLFS # loopback file system
options PROCFS # /proc
options UNION # union file system
options MFS # memory-based filesystem
# Networking options
options INET # IP prototol stack support
options INET # IP prototol stack support
#options GATEWAY # IP packet forwarding
options TCP_COMPAT_42 # TCP bug compatibility with 4.2BSD
# XXX - Work-around for root on slow SunOS/Sun3 servers (sigh...)
options NFS_BOOT_RWSIZE=1024
# Compatability options
options COMPAT_SUNOS # can run SunOS 4.1.1 executables
#options COMPAT_09 # NetBSD 0.9,
options COMPAT_10 # NetBSD 1.0,
options COMPAT_11 # NetBSD 1.1,
options COMPAT_12 # NetBSD 1.2,
options COMPAT_43 # and 4.3BSD
options TCP_COMPAT_42 # TCP bug compatibility with 4.2BSD
options COMPAT_43 # and 4.3BSD and ...
options COMPAT_10 # NetBSD 1.0
options COMPAT_11 # NetBSD 1.1
options COMPAT_12 # NetBSD 1.2
options UCONSOLE # Allow non-root TIOCCONS
# Sun3-specific debugging options

32
sys/arch/sun3/conf/GENERIC_KGDB
View File

@ -1,8 +1,8 @@
# $NetBSD: GENERIC_KGDB,v 1.3 1996/10/08 18:01:49 jtc Exp $
# $NetBSD: GENERIC_KGDB,v 1.4 1996/10/09 00:14:35 thorpej Exp $
#
# GENERIC Sun3 (3/50, 3/60, 3/110, 3/160, 3/260)
# Supports root on: ie0, le0, sd*, ...
# GENERIC_KGDB Sun3 (3/50, 3/60, 3/110, 3/160, 3/260)
# like GENERIC but supports KGDB (gdb -k on other machine)
#
include "arch/sun3/conf/std.sun3"
@ -18,13 +18,17 @@ maxusers 4
# Standard system options
options SWAPPAGER, VNODEPAGER, DEVPAGER # paging
options KTRACE # system call tracing support
# Debugging options. Uncomment either this:
#options DDB
# ... or these two: (for KGDB on another machine)
makeoptions DEBUG="-g" # symbols for kgdb + nm
options KGDB
# Filesystem options
options NFSSERVER # nfs server support
options NFSCLIENT # nfs client support
options FFS # ufs file system
options NFSSERVER # nfs server support
options NFSCLIENT # nfs client support
options FFS # ufs file system
#
options CD9660 # ISO 9660 + Rock Ridge file system
options FDESC # /dev/fd/*
@ -33,21 +37,21 @@ options KERNFS # /kern
options NULLFS # loopback file system
options PROCFS # /proc
options UNION # union file system
options MFS # memory-based filesystem
# Networking options
options INET # IP prototol stack support
options INET # IP prototol stack support
#options GATEWAY # IP packet forwarding
options TCP_COMPAT_42 # TCP bug compatibility with 4.2BSD
# XXX - Work-around for root on slow SunOS/Sun3 servers (sigh...)
options NFS_BOOT_RWSIZE=1024
options LANCE_REVC_BUG # Sun3 machines have the old, buggy LANCE
# Compatability options
options COMPAT_SUNOS # can run SunOS 4.1.1 executables
#options COMPAT_09 # NetBSD 0.9,
options COMPAT_10 # NetBSD 1.0,
options COMPAT_11 # NetBSD 1.1,
options COMPAT_12 # NetBSD 1.2,
options COMPAT_43 # and 4.3BSD
options TCP_COMPAT_42 # TCP bug compatibility with 4.2BSD
options COMPAT_43 # and 4.3BSD and ...
options COMPAT_10 # NetBSD 1.0
options COMPAT_11 # NetBSD 1.1
options COMPAT_12 # NetBSD 1.2
options UCONSOLE # Allow non-root TIOCCONS
# Sun3-specific debugging options

32
sys/arch/sun3/conf/KGDB
View File

@ -1,8 +1,8 @@
# $NetBSD: KGDB,v 1.3 1996/10/08 18:01:49 jtc Exp $
# $NetBSD: KGDB,v 1.4 1996/10/09 00:14:35 thorpej Exp $
#
# GENERIC Sun3 (3/50, 3/60, 3/110, 3/160, 3/260)
# Supports root on: ie0, le0, sd*, ...
# GENERIC_KGDB Sun3 (3/50, 3/60, 3/110, 3/160, 3/260)
# like GENERIC but supports KGDB (gdb -k on other machine)
#
include "arch/sun3/conf/std.sun3"
@ -18,13 +18,17 @@ maxusers 4
# Standard system options
options SWAPPAGER, VNODEPAGER, DEVPAGER # paging
options KTRACE # system call tracing support
# Debugging options. Uncomment either this:
#options DDB
# ... or these two: (for KGDB on another machine)
makeoptions DEBUG="-g" # symbols for kgdb + nm
options KGDB
# Filesystem options
options NFSSERVER # nfs server support
options NFSCLIENT # nfs client support
options FFS # ufs file system
options NFSSERVER # nfs server support
options NFSCLIENT # nfs client support
options FFS # ufs file system
#
options CD9660 # ISO 9660 + Rock Ridge file system
options FDESC # /dev/fd/*
@ -33,21 +37,21 @@ options KERNFS # /kern
options NULLFS # loopback file system
options PROCFS # /proc
options UNION # union file system
options MFS # memory-based filesystem
# Networking options
options INET # IP prototol stack support
options INET # IP prototol stack support
#options GATEWAY # IP packet forwarding
options TCP_COMPAT_42 # TCP bug compatibility with 4.2BSD
# XXX - Work-around for root on slow SunOS/Sun3 servers (sigh...)
options NFS_BOOT_RWSIZE=1024
options LANCE_REVC_BUG # Sun3 machines have the old, buggy LANCE
# Compatability options
options COMPAT_SUNOS # can run SunOS 4.1.1 executables
#options COMPAT_09 # NetBSD 0.9,
options COMPAT_10 # NetBSD 1.0,
options COMPAT_11 # NetBSD 1.1,
options COMPAT_12 # NetBSD 1.2,
options COMPAT_43 # and 4.3BSD
options TCP_COMPAT_42 # TCP bug compatibility with 4.2BSD
options COMPAT_43 # and 4.3BSD and ...
options COMPAT_10 # NetBSD 1.0
options COMPAT_11 # NetBSD 1.1
options COMPAT_12 # NetBSD 1.2
options UCONSOLE # Allow non-root TIOCCONS
# Sun3-specific debugging options

28
sys/arch/sun3/conf/RAMDISK
View File

@ -1,4 +1,4 @@
# $NetBSD: RAMDISK,v 1.5 1996/10/08 18:01:50 jtc Exp $
# $NetBSD: RAMDISK,v 1.6 1996/10/09 00:14:36 thorpej Exp $
#
# RAMDISK: Root/swap on ramdisk
@ -11,6 +11,7 @@
include "arch/sun3/conf/std.sun3"
# Machines to be supported by this kernel
options FPU_EMULATE # XXX - Should not be needed!
options HAVECACHE # Sun3/260 VAC
# Needs to be set per system. i.e change these as you see fit
@ -18,8 +19,12 @@ maxusers 2
# Standard system options
options SWAPPAGER, VNODEPAGER, DEVPAGER # paging
#makeoptions DEBUG="-g" # symbols for kgdb + nm
# Debugging options. Uncomment either this:
#options DDB
# ... or these two: (for KGDB on another machine)
makeoptions DEBUG="-g" # symbols for kgdb + nm
options KGDB
# Enable the hooks used for initializing the ram-disk.
options RAMDISK_HOOKS
@ -27,25 +32,24 @@ options MINIROOTSIZE=512 # 256K
# Filesystem options
# May need NFSCLIENT to get miniroot image
options NFSCLIENT # nfs client support
options NFSCLIENT # nfs client support
# Need FFS for the ramdisk image
options FFS # ufs file system
options FFS # ufs file system
options FIFO # FIFOs; RECOMMENDED
# Networking options
options INET # IP prototol stack support
options INET # IP prototol stack support
options TCP_COMPAT_42 # TCP bug compatibility with 4.2BSD
# XXX - Work-around for root on slow SunOS/Sun3 servers (sigh...)
options NFS_BOOT_RWSIZE=1024
# Compatability options
#options COMPAT_SUNOS # can run SunOS 4.1.1 executables
#options COMPAT_09 # NetBSD 0.9,
options COMPAT_10 # NetBSD 1.0,
options COMPAT_11 # NetBSD 1.1,
options COMPAT_12 # NetBSD 1.2,
options COMPAT_43 # and 4.3BSD
options TCP_COMPAT_42 # TCP bug compatibility with 4.2BSD
#options UCONSOLE # Allow non-root TIOCCONS
#options COMPAT_43 # and 4.3BSD and ...
#options COMPAT_10 # NetBSD 1.0
options COMPAT_11 # NetBSD 1.1
options COMPAT_12 # NetBSD 1.2
options UCONSOLE # Allow non-root TIOCCONS
# Sun3-specific debugging options
options DIAGNOSTIC

29
sys/arch/sun3/conf/SMD_TEST
View File

@ -1,4 +1,4 @@
# $NetBSD: SMD_TEST,v 1.4 1996/10/08 18:01:50 jtc Exp $
# $NetBSD: SMD_TEST,v 1.5 1996/10/09 00:14:38 thorpej Exp $
#
# SMD_TEST - for Sun3 (3/50, 3/60, 3/110, 3/160, 3/260)
@ -18,13 +18,17 @@ maxusers 4
# Standard system options
options SWAPPAGER, VNODEPAGER, DEVPAGER # paging
options KTRACE # system call tracing support
#makeoptions DEBUG="-g" # symbols for kgdb + nm
# Debugging options. Uncomment either this:
options DDB
# ... or these two: (for KGDB on another machine)
#makeoptions DEBUG="-g" # symbols for kgdb + nm
#options KGDB
# Filesystem options
options NFSSERVER # nfs server support
options NFSCLIENT # nfs client support
options FFS # ufs file system
options NFSSERVER # nfs server support
options NFSCLIENT # nfs client support
options FFS # ufs file system
#
options CD9660 # ISO 9660 + Rock Ridge file system
options FDESC # /dev/fd/*
@ -33,20 +37,21 @@ options KERNFS # /kern
options NULLFS # loopback file system
options PROCFS # /proc
options UNION # union file system
options MFS # memory-based filesystem
# Networking options
options INET # IP prototol stack support
options INET # IP prototol stack support
#options GATEWAY # IP packet forwarding
options TCP_COMPAT_42 # TCP bug compatibility with 4.2BSD
# XXX - Work-around for root on slow SunOS/Sun3 servers (sigh...)
options NFS_BOOT_RWSIZE=1024
# Compatability options
options COMPAT_SUNOS # can run SunOS 4.1.1 executables
#options COMPAT_09 # NetBSD 0.9,
options COMPAT_10 # NetBSD 1.0,
options COMPAT_11 # NetBSD 1.1,
options COMPAT_12 # NetBSD 1.2,
options COMPAT_43 # and 4.3BSD
options TCP_COMPAT_42 # TCP bug compatibility with 4.2BSD
options COMPAT_43 # and 4.3BSD and ...
options COMPAT_10 # NetBSD 1.0
options COMPAT_11 # NetBSD 1.1
options COMPAT_12 # NetBSD 1.2
options UCONSOLE # Allow non-root TIOCCONS
# Sun3-specific debugging options

9
sys/arch/sun3/conf/std.sun3
View File

@ -1,4 +1,4 @@
# $NetBSD: std.sun3,v 1.15 1996/03/26 15:16:02 gwr Exp $
# $NetBSD: std.sun3,v 1.16 1996/10/09 00:14:39 thorpej Exp $
# Standard information for sun3's.
machine sun3 m68k
@ -31,8 +31,7 @@ intreg0 at obio? addr ?
options NEWCONFIG
options MACHINE_NONCONTIG
# These are used ONLY when reading the hardware time/date clock.
# All Sun machines keep the hardware time/date clock on GMT.
options TIMEZONE=0 # minutes west of GMT (for param.c)
options DST=0 # daylight savings rules (for param.c)
# All Sun3 machines with an "le" (3/50, 3/60) should be
# presumed to have the old, buggy LANCE chip. (Rev. C)
options LANCE_REVC_BUG

6
sys/arch/sun3/dev/cg4.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cg4.c,v 1.7 1996/03/17 02:03:45 thorpej Exp $ */
/* $NetBSD: cg4.c,v 1.8 1996/10/09 00:15:18 thorpej Exp $ */
/*
* Copyright (c) 1992, 1993
@ -162,7 +162,7 @@ cg4attach(parent, self, args)
struct confargs *ca = args;
struct fbtype *fbt;
volatile struct bt_regs *bt;
int i, ramsize, pa;
int i;
fb->fb_driver = &cg4fbdriver;
fb->fb_private = sc;
@ -178,7 +178,7 @@ cg4attach(parent, self, args)
fbt->fb_size = CG4_MMAP_SIZE;
sc->sc_phys = ca->ca_paddr;
sc->sc_bt = (struct bt_regs *)
sc->sc_bt = bt = (volatile struct bt_regs *)
bus_mapin(ca->ca_bustype, ca->ca_paddr,
sizeof(struct bt_regs *));