Permalink
Browse files

update from trunk

  • Loading branch information...
1 parent 09a5eea commit 479daaf762fc8c31d163e609a14f1fed5b2aae13 thorpej committed Jan 30, 1997
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.51.2.2 1997/01/18 04:17:45 thorpej Exp $
+# $NetBSD: GENERIC,v 1.51.2.3 1997/01/30 05:58:13 thorpej Exp $
#
# GENERIC
@@ -7,60 +7,68 @@ include "arch/mac68k/conf/std.mac68k"
maxusers 16
# Standard system options
-options DIAGNOSTIC # DEBUG for extra kernel debugging
-options KTRACE # system call tracing support
-#options KGDB # support for kernel gdb
-#options GDB # support for normal gdb
-#options KGDBDEV=0xc01, KGDBRATE=38400 # device & baud rate
-options DDB
+options KTRACE # system call tracing
+options SYSVMSG # System V message queues
+options SYSVSEM # System V semaphores
+options SYSVSHM # System V shared memory
+#options SHMMAXPGS=1024 # 1024 pages is the default
+options LKM # loadable kernel modules
+#options INSECURE # disable kernel security level
+options UCONSOLE # allow anyone to steal the virtual console
+
+# Debugging options
+options DDB # kernel dynamic debugger
+#options DEBUG # kernel debugging code
+options DIAGNOSTIC # extra kernel sanity checking
+#options KGDB # support for kernel gdb
+#options KGDBDEV=0xc01 # kgdb device number (dev_t)
+#options KGDBRATE=38400 # baud rate
+
+# Compatibility options
+options COMPAT_43 # 4.3BSD system interfaces
+options COMPAT_10 # NetBSD 1.0 binary compatibility
+options COMPAT_11 # NetBSD 1.1 binary compatibility
+options COMPAT_12 # NetBSD 1.2 binary compatibility
+options COMPAT_SUNOS # SunOS 4.x binary compatibility
+#options COMPAT_M68K4K # compatibility with NetBSD/m68k4k binaries
# File systems
-file-system FFS
-file-system MFS # memory-based filesystem
-file-system NFS # Sun NFS-compatible filesystem
-file-system NULLFS # Null (formerly loop-back) filesystem
-file-system CD9660 # ISO-9660 w/ RockRidge
+file-system FFS # Berkeley Fast Filesystem
+file-system NFS # Sun NFS-compatible filesystem client
file-system KERNFS # kernel data-structure filesystem
+file-system NULLFS # NULL layered filesystem
+file-system MFS # memory-based filesystem
file-system FDESC # user file descriptor filesystem
-#file-system UMAPFS # uid/gid remapping filesystem
-#file-system LFS # Log-based filesystem (still experimental)
-#file-system PORTAL # portal filesystem (still experimental)
-file-system PROCFS # Process filesystem
-
+file-system UMAPFS # uid/gid remapping filesystem
+file-system LFS # Log-based filesystem (still experimental)
+file-system PORTAL # portal filesystem (still experimental)
+file-system PROCFS # /proc
+file-system CD9660 # ISO 9660 + Rock Ridge file system
+file-system UNION # union file system
+file-system MSDOSFS # MS-DOS FAT filesystem(s).
+
+# File system options
+options QUOTA # FFS quotas
+options NFSSERVER # Sun NFS-compatible filesystem server
options FIFO # POSIX fifo support (in all filesystems)
-options QUOTA # fast filesystem with user and group quotas
-#options NFSSERVER # Sun NFS-compatible filesystem
-
-options SCSI
-#options SCSIDEBUG
# Networking options
-options INET
+options INET # IP stack
options TCP_COMPAT_42 # compatibility with 4.2BSD TCP/IP
options GATEWAY # IP packet forwarding
-#options ISO # OSI networking
-#options TPIP
-#options EON
-options COMPAT_42
-options COMPAT_43
-options NS
-options MAPMEM
-options SYSVSHM,SYSVSEM,SYSVMSG
-options PPP_BSDCOMP,PPP_DEFLATE
+#options ISO,TPIP # OSI networking
+#options EON # OSI tunneling over IP
+#options CCITT,LLC,HDLC # X.25
+options PPP_BSDCOMP # PPP header compression
+options PPP_DEFLATE # PPP-Deflate compression
+#options PFIL_HOOKS # pfil(9) packet filter hooks.
# Mac-specific options
options M68040
options M68030
options M68020 # Must have 68851 PMMU
options FPSP
options FPU_EMULATE
-options COMPAT_NOMID
-options COMPAT_SUNOS
-options COMPAT_09
-options COMPAT_10
-options COMPAT_11
-options COMPAT_12
-#options COMPAT_M68K4K # compatibility with NetBSD/m68k4k binaries
options ZS_CONSOLE_ABORT
options DISABLE_EXT_CACHE # Don't use IIci external cache
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mac68k,v 1.47 1997/01/13 07:06:51 scottr Exp $
+# $NetBSD: Makefile.mac68k,v 1.47.2.1 1997/01/30 05:58:14 thorpej Exp $
# Makefile for NetBSD
#
@@ -128,7 +128,7 @@ newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
-clean::
+clean:
rm -f eddep *netbsd netbsd.gdb tags *.[io] [a-z]*.s \
[Ee]rrs linterrs makelinks genassym genassym.o assym.h
@@ -151,7 +151,7 @@ links:
SRCS= ${MAC68K}/mac68k/locore.s \
param.c ioconf.c ${CFILES} ${SFILES}
-depend:: .depend
+depend: .depend
.depend: ${SRCS} assym.h param.c
${MKDEP} ${AFLAGS} ${CPPFLAGS} ${MAC68K}/mac68k/locore.s
${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
View
@@ -1,53 +1,78 @@
-# $NetBSD: SPOT,v 1.20.2.2 1997/01/18 04:17:46 thorpej Exp $
+# $NetBSD: SPOT,v 1.20.2.3 1997/01/30 05:58:15 thorpej Exp $
#
# SPOT
include "arch/mac68k/conf/std.mac68k"
maxusers 16
-makeoptions COPTS="-m68030 -O"
+makeoptions COPTS="-O2 -m68030"
# Standard system options
-options DIAGNOSTIC # DEBUG for extra kernel debugging
-options KTRACE # system call tracing support
-#options KGDB # support for kernel gdb
-#options GDB # support for normal gdb
-#options KGDBDEV=0xc01, KGDBRATE=38400 # device & baud rate
-options UCONSOLE # non-root can grab console
-options DDB
-
-# Filesystem options
-file-system FFS
-file-system MFS # memory-based filesystem
-file-system NFS # Sun NFS-compatible filesystem
-file-system CD9660 # ISO-9660 w/ RockRidge
+options KTRACE # system call tracing
+options SYSVMSG # System V message queues
+options SYSVSEM # System V semaphores
+options SYSVSHM # System V shared memory
+#options SHMMAXPGS=1024 # 1024 pages is the default
+options LKM # loadable kernel modules
+#options INSECURE # disable kernel security level
+options UCONSOLE # allow anyone to steal the virtual console
+
+# Debugging options
+options DDB # kernel dynamic debugger
+#options DEBUG # kernel debugging code
+options DIAGNOSTIC # extra kernel sanity checking
+#options KGDB # support for kernel gdb
+#options KGDBDEV=0xc01 # kgdb device number (dev_t)
+#options KGDBRATE=38400 # baud rate
+
+# Compatibility options
+options COMPAT_43 # 4.3BSD system interfaces
+options COMPAT_10 # NetBSD 1.0 binary compatibility
+options COMPAT_11 # NetBSD 1.1 binary compatibility
+options COMPAT_12 # NetBSD 1.2 binary compatibility
+options COMPAT_SUNOS # SunOS 4.x binary compatibility
+#options COMPAT_M68K4K # compatibility with NetBSD/m68k4k binaries
+
+# File systems
+file-system FFS # Berkeley Fast Filesystem
+file-system NFS # Sun NFS-compatible filesystem client
file-system KERNFS # kernel data-structure filesystem
-file-system FDESC # user file descriptor filesystem
-file-system PROCFS # Process filesystem
+file-system NULLFS # NULL layered filesystem
+file-system MFS # memory-based filesystem
+#file-system FDESC # user file descriptor filesystem
+#file-system UMAPFS # uid/gid remapping filesystem
+#file-system LFS # Log-based filesystem (still experimental)
+#file-system PORTAL # portal filesystem (still experimental)
+file-system PROCFS # /proc
+file-system CD9660 # ISO 9660 + Rock Ridge file system
+file-system UNION # union file system
+#file-system MSDOSFS # MS-DOS FAT filesystem(s).
+# Filesystem options
+options QUOTA # FFS quotas
+options NFSSERVER # Sun NFS-compatible filesystem server
options FIFO # POSIX fifo support (in all filesystems)
-options QUOTA # fast filesystem with user and group quotas
-options NFSSERVER # Sun NFS-compatible filesystem
-
-options SCSI
# Networking options
-options INET
+options INET # IP stack
options TCP_COMPAT_42 # compatibility with 4.2BSD TCP/IP
options GATEWAY # IP packet forwarding
-options PPP_BSDCOMP
-options PPP_DEFLATE
-options COMPAT_42
-options COMPAT_43
-options MAPMEM
-options SYSVSHM,SYSVSEM,SYSVMSG
+#options ISO,TPIP # OSI networking
+#options EON # OSI tunneling over IP
+#options CCITT,LLC,HDLC # X.25
+options PPP_BSDCOMP # PPP header compression
+options PPP_DEFLATE # PPP-Deflate compression
+options PFIL_HOOKS # pfil(9) packet filter hooks.
# Mac-specific options
+#options M68040
options M68030
-options COMPAT_10
-options COMPAT_11
-options COMPAT_12
+#options M68020 # Must have 68851 PMMU
+#options FPSP
+#options FPU_EMULATE
+options ZS_CONSOLE_ABORT
+options DISABLE_EXT_CACHE # Don't use IIci external cache
# SPOT-specific options
options RTC_OFFSET=360 # hardware clock is this many mins. west of GMT
@@ -74,3 +99,4 @@ pseudo-device bpfilter 16
pseudo-device vnd 2
pseudo-device ppp 2
pseudo-device loop
+pseudo-device ipfilter
@@ -1,4 +1,4 @@
-# $NetBSD: files.mac68k,v 1.53 1996/12/28 23:22:43 pk Exp $
+# $NetBSD: files.mac68k,v 1.53.2.1 1997/01/30 05:58:16 thorpej Exp $
# mac68k-specific configuration info
@@ -10,11 +10,11 @@ maxusers 2 8 64
device mainbus { } # no locators (yet?)
attach mainbus at root
-device obio {}
+device obio { }
attach obio at mainbus
file arch/mac68k/dev/obio.c obio
-device nubus {}
+device nubus { }
attach nubus at mainbus
file arch/mac68k/dev/nubus.c nubus
@@ -28,7 +28,7 @@ device asc
attach asc at obio
file arch/mac68k/dev/asc.c asc
-define grfbus {}
+define grfbus { }
file arch/mac68k/dev/grf_subr.c grfbus
device intvid: grfbus
@@ -39,7 +39,7 @@ device macvid: grfbus
attach macvid at nubus
file arch/mac68k/dev/grf_mv.c macvid
-device grf {} # eventually, we'll attach ITEs here
+device grf { }
attach grf at grfbus
file arch/mac68k/dev/grf.c grf needs-flag
@@ -110,8 +110,6 @@ file dev/cninit.c
# Memory Disk for installs
# These files are out of order
-pseudo-device md
-file dev/md.c md needs-flag
file arch/mac68k/dev/md_root.c memory_disk_hooks
major {sd = 4}
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.38.2.1 1997/01/18 04:18:17 thorpej Exp $ */
+/* $NetBSD: conf.c,v 1.38.2.2 1997/01/30 06:11:21 thorpej Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.44 1996/12/31 06:32:17 scottr Exp $ */
+/* $NetBSD: trap.c,v 1.44.2.1 1997/01/30 06:11:22 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -132,9 +132,8 @@ int mmupid = -1;
void trap __P((int, unsigned, register unsigned, struct frame));
void syscall __P((register_t, struct frame));
-static inline void userret __P((register struct proc *,
- register struct frame *,
- u_quad_t, u_int, int));
+static inline void userret __P((struct proc *p, struct frame *fp,
+ u_quad_t oticks, u_int faultaddr, int fromtrap));
#if defined(M68040)
static int writeback __P((struct frame *, int));
@@ -193,7 +192,7 @@ userret(p, fp, oticks, faultaddr, fromtrap)
extern int psratio;
addupc_task(p, fp->f_pc,
- (int)(p->p_sticks - oticks) * psratio);
+ (int)(p->p_sticks - oticks) * psratio);
}
#if defined(M68040)
/*
@@ -254,7 +253,8 @@ trap(type, code, v, frame)
type |= T_USER;
sticks = p->p_sticks;
p->p_md.md_regs = frame.f_regs;
- }
+ } else
+ sticks = 0;
/* I have verified that this DOES happen! -gwr */
if (p == NULL)
@@ -582,7 +582,8 @@ trap(type, code, v, frame)
break;
}
}
- if (i) trapsignal(p, i, ucode);
+ if (i)
+ trapsignal(p, i, ucode);
if ((type & T_USER) == 0)
return;
out:

0 comments on commit 479daaf

Please sign in to comment.