From owner-p4-projects Mon Jul 29 21:29:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0CE0E37B401; Mon, 29 Jul 2002 21:28:27 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AE1CA37B400 for ; Mon, 29 Jul 2002 21:28:26 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C714943E42 for ; Mon, 29 Jul 2002 21:28:25 -0700 (PDT) (envelope-from bmilekic@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6U4SPJU078305 for ; Mon, 29 Jul 2002 21:28:25 -0700 (PDT) (envelope-from bmilekic@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6U4SOBJ078302 for perforce@freebsd.org; Mon, 29 Jul 2002 21:28:24 -0700 (PDT) Date: Mon, 29 Jul 2002 21:28:24 -0700 (PDT) Message-Id: <200207300428.g6U4SOBJ078302@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bmilekic@freebsd.org using -f From: Bosko Milekic Subject: PERFORCE change 15168 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15168 Change 15168 by bmilekic@bmilekic_euclid on 2002/07/29 21:27:46 We are we are we are we are the engineers we can we can we can we can demolish forty beers so come so come so come so come alooong with us for we don't give a damn for any old man who don't give a damn for us (also: integ) Affected files ... .. //depot/projects/interrupt/sys/alpha/conf/gethints.awk#2 integrate .. //depot/projects/interrupt/sys/alpha/include/_stdint.h#1 branch .. //depot/projects/interrupt/sys/alpha/include/ansi.h#5 integrate .. //depot/projects/interrupt/sys/alpha/include/limits.h#2 integrate .. //depot/projects/interrupt/sys/arm/include/_stdint.h#1 branch .. //depot/projects/interrupt/sys/arm/include/ansi.h#4 integrate .. //depot/projects/interrupt/sys/arm/include/limits.h#2 integrate .. //depot/projects/interrupt/sys/boot/i386/boot2/Makefile#4 integrate .. //depot/projects/interrupt/sys/boot/pc98/boot2/Makefile#4 integrate .. //depot/projects/interrupt/sys/conf/NOTES#4 integrate .. //depot/projects/interrupt/sys/conf/files#12 integrate .. //depot/projects/interrupt/sys/conf/files.sparc64#8 integrate .. //depot/projects/interrupt/sys/conf/gethints.awk#2 delete .. //depot/projects/interrupt/sys/conf/kern.post.mk#6 integrate .. //depot/projects/interrupt/sys/conf/kmod.mk#7 integrate .. //depot/projects/interrupt/sys/conf/options#9 integrate .. //depot/projects/interrupt/sys/dev/an/if_an.c#5 integrate .. //depot/projects/interrupt/sys/dev/ata/atapi-all.c#7 integrate .. //depot/projects/interrupt/sys/dev/ata/atapi-cd.c#6 integrate .. //depot/projects/interrupt/sys/dev/ata/atapi-fd.c#7 integrate .. //depot/projects/interrupt/sys/dev/ata/atapi-tape.c#6 integrate .. //depot/projects/interrupt/sys/dev/bge/if_bge.c#7 integrate .. //depot/projects/interrupt/sys/dev/bge/if_bgereg.h#5 integrate .. //depot/projects/interrupt/sys/dev/ed/if_ed_isa.c#3 integrate .. //depot/projects/interrupt/sys/dev/exca/exca.c#3 integrate .. //depot/projects/interrupt/sys/dev/exca/excareg.h#2 integrate .. //depot/projects/interrupt/sys/dev/exca/excavar.h#2 integrate .. //depot/projects/interrupt/sys/dev/fxp/if_fxp.c#6 integrate .. //depot/projects/interrupt/sys/dev/isp/isp_pci.c#6 integrate .. //depot/projects/interrupt/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/interrupt/sys/dev/pccbb/pccbb.c#6 integrate .. //depot/projects/interrupt/sys/dev/pccbb/pccbbdevid.h#3 integrate .. //depot/projects/interrupt/sys/dev/pccbb/pccbbreg.h#4 integrate .. //depot/projects/interrupt/sys/dev/pccbb/pccbbvar.h#4 integrate .. //depot/projects/interrupt/sys/dev/pci/pci.c#5 integrate .. //depot/projects/interrupt/sys/dev/si/si.c#3 integrate .. //depot/projects/interrupt/sys/dev/si/si_isa.c#2 integrate .. //depot/projects/interrupt/sys/dev/wi/if_wi.c#9 integrate .. //depot/projects/interrupt/sys/dev/wi/if_wivar.h#4 integrate .. //depot/projects/interrupt/sys/dev/wi/wi_hostap.c#3 integrate .. //depot/projects/interrupt/sys/fs/devfs/devfs.h#4 integrate .. //depot/projects/interrupt/sys/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/interrupt/sys/fs/procfs/procfs_ctl.c#5 integrate .. //depot/projects/interrupt/sys/fs/specfs/spec_vnops.c#6 integrate .. //depot/projects/interrupt/sys/i386/conf/NOTES#7 integrate .. //depot/projects/interrupt/sys/i386/conf/gethints.awk#2 integrate .. //depot/projects/interrupt/sys/i386/i386/db_trace.c#4 integrate .. //depot/projects/interrupt/sys/i386/i386/exception.s#9 integrate .. //depot/projects/interrupt/sys/i386/i386/pmap.c#9 integrate .. //depot/projects/interrupt/sys/i386/include/_stdint.h#1 branch .. //depot/projects/interrupt/sys/i386/include/ansi.h#5 integrate .. //depot/projects/interrupt/sys/i386/include/limits.h#3 integrate .. //depot/projects/interrupt/sys/ia64/include/_stdint.h#1 branch .. //depot/projects/interrupt/sys/ia64/include/ansi.h#5 integrate .. //depot/projects/interrupt/sys/ia64/include/limits.h#2 integrate .. //depot/projects/interrupt/sys/kern/init_sysent.c#7 integrate .. //depot/projects/interrupt/sys/kern/kern_condvar.c#5 integrate .. //depot/projects/interrupt/sys/kern/kern_descrip.c#8 integrate .. //depot/projects/interrupt/sys/kern/kern_exec.c#9 integrate .. //depot/projects/interrupt/sys/kern/kern_fork.c#7 integrate .. //depot/projects/interrupt/sys/kern/kern_mac.c#1 branch .. //depot/projects/interrupt/sys/kern/kern_mutex.c#6 integrate .. //depot/projects/interrupt/sys/kern/kern_proc.c#6 integrate .. //depot/projects/interrupt/sys/kern/kern_synch.c#7 integrate .. //depot/projects/interrupt/sys/kern/kern_sysctl.c#6 integrate .. //depot/projects/interrupt/sys/kern/syscalls.c#7 integrate .. //depot/projects/interrupt/sys/kern/syscalls.master#7 integrate .. //depot/projects/interrupt/sys/kern/uipc_socket2.c#6 integrate .. //depot/projects/interrupt/sys/kern/vfs_default.c#5 integrate .. //depot/projects/interrupt/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/interrupt/sys/kern/vfs_subr.c#11 integrate .. //depot/projects/interrupt/sys/net/netisr.h#3 integrate .. //depot/projects/interrupt/sys/netinet/in_pcb.c#6 integrate .. //depot/projects/interrupt/sys/netinet/tcp_subr.c#8 integrate .. //depot/projects/interrupt/sys/netinet/tcp_usrreq.c#5 integrate .. //depot/projects/interrupt/sys/netinet/udp_usrreq.c#7 integrate .. //depot/projects/interrupt/sys/netinet6/in6.h#5 integrate .. //depot/projects/interrupt/sys/netinet6/ip6_var.h#2 integrate .. //depot/projects/interrupt/sys/netinet6/udp6_usrreq.c#7 integrate .. //depot/projects/interrupt/sys/netipx/spx_debug.h#3 integrate .. //depot/projects/interrupt/sys/netncp/ncp_conn.c#2 integrate .. //depot/projects/interrupt/sys/netncp/ncp_lib.h#3 integrate .. //depot/projects/interrupt/sys/netsmb/smb_conn.c#3 integrate .. //depot/projects/interrupt/sys/pc98/conf/gethints.awk#2 integrate .. //depot/projects/interrupt/sys/pccard/pcic_pci.c#8 integrate .. //depot/projects/interrupt/sys/pccard/pcic_pci.h#4 integrate .. //depot/projects/interrupt/sys/powerpc/include/_stdint.h#1 branch .. //depot/projects/interrupt/sys/powerpc/include/ansi.h#5 integrate .. //depot/projects/interrupt/sys/powerpc/include/limits.h#2 integrate .. //depot/projects/interrupt/sys/sparc64/conf/GENERIC#8 integrate .. //depot/projects/interrupt/sys/sparc64/include/_stdint.h#1 branch .. //depot/projects/interrupt/sys/sparc64/include/ansi.h#5 integrate .. //depot/projects/interrupt/sys/sparc64/include/asmacros.h#4 integrate .. //depot/projects/interrupt/sys/sparc64/include/cpu.h#2 integrate .. //depot/projects/interrupt/sys/sparc64/include/limits.h#2 integrate .. //depot/projects/interrupt/sys/sparc64/include/pmap.h#6 integrate .. //depot/projects/interrupt/sys/sparc64/include/profile.h#3 integrate .. //depot/projects/interrupt/sys/sparc64/include/smp.h#7 integrate .. //depot/projects/interrupt/sys/sparc64/include/tlb.h#5 integrate .. //depot/projects/interrupt/sys/sparc64/include/tte.h#4 integrate .. //depot/projects/interrupt/sys/sparc64/sbus/sbus.c#4 integrate .. //depot/projects/interrupt/sys/sparc64/sparc64/cache.c#4 integrate .. //depot/projects/interrupt/sys/sparc64/sparc64/exception.s#6 integrate .. //depot/projects/interrupt/sys/sparc64/sparc64/genassym.c#9 integrate .. //depot/projects/interrupt/sys/sparc64/sparc64/locore.s#4 integrate .. //depot/projects/interrupt/sys/sparc64/sparc64/mp_exception.s#5 integrate .. //depot/projects/interrupt/sys/sparc64/sparc64/mp_locore.s#3 integrate .. //depot/projects/interrupt/sys/sparc64/sparc64/pmap.c#10 integrate .. //depot/projects/interrupt/sys/sparc64/sparc64/prof_machdep.c#1 branch .. //depot/projects/interrupt/sys/sparc64/sparc64/support.s#6 integrate .. //depot/projects/interrupt/sys/sparc64/sparc64/tlb.c#2 integrate .. //depot/projects/interrupt/sys/sparc64/sparc64/tsb.c#6 integrate .. //depot/projects/interrupt/sys/sys/mutex.h#5 integrate .. //depot/projects/interrupt/sys/sys/proc.h#7 integrate .. //depot/projects/interrupt/sys/sys/socketvar.h#8 integrate .. //depot/projects/interrupt/sys/sys/stdint.h#3 integrate .. //depot/projects/interrupt/sys/sys/syscall.h#7 integrate .. //depot/projects/interrupt/sys/sys/syscall.mk#7 integrate .. //depot/projects/interrupt/sys/sys/sysproto.h#7 integrate .. //depot/projects/interrupt/sys/sys/ucred.h#8 integrate .. //depot/projects/interrupt/sys/sys/vnode.h#7 integrate .. //depot/projects/interrupt/sys/ufs/ufs/ufs_readwrite.c#8 integrate .. //depot/projects/interrupt/sys/vm/vm_contig.c#6 integrate .. //depot/projects/interrupt/sys/vm/vm_fault.c#8 integrate .. //depot/projects/interrupt/sys/vm/vm_glue.c#8 integrate .. //depot/projects/interrupt/sys/vm/vm_kern.c#8 integrate .. //depot/projects/interrupt/sys/vm/vm_object.c#9 integrate .. //depot/projects/interrupt/sys/vm/vm_page.c#8 integrate .. //depot/projects/interrupt/sys/vm/vm_page.h#9 integrate .. //depot/projects/interrupt/sys/vm/vm_pageout.c#7 integrate .. //depot/projects/interrupt/sys/vm/vnode_pager.c#7 integrate .. //depot/projects/interrupt/sys/x86_64/include/_stdint.h#1 branch .. //depot/projects/interrupt/sys/x86_64/include/ansi.h#2 integrate .. //depot/projects/interrupt/sys/x86_64/include/limits.h#2 integrate Differences ... ==== //depot/projects/interrupt/sys/alpha/conf/gethints.awk#2 (text+ko) ==== @@ -6,7 +6,7 @@ # 'hints' directive. See how GENERIC and GENERIC.hints fit together for # a static example. You should use loader(8) if at all possible. # -# $FreeBSD: src/sys/alpha/conf/gethints.awk,v 1.1 2002/07/16 09:28:24 markm Exp $ +# $FreeBSD: src/sys/alpha/conf/gethints.awk,v 1.2 2002/07/26 03:52:29 peter Exp $ # skip commented lines, empty lines and not "device" lines /^[ \t]*#/ || /^[ \t]*$/ || !/[ \t]*device/ { next; } ==== //depot/projects/interrupt/sys/alpha/include/ansi.h#5 (text+ko) ==== @@ -32,7 +32,7 @@ * * @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: NetBSD: ansi.h,v 1.9 1997/11/23 20:20:53 kleink Exp - * $FreeBSD: src/sys/alpha/include/ansi.h,v 1.30 2002/07/08 16:41:46 mike Exp $ + * $FreeBSD: src/sys/alpha/include/ansi.h,v 1.31 2002/07/29 17:41:06 mike Exp $ */ #ifndef _MACHINE_ANSI_H_ @@ -155,19 +155,6 @@ typedef long __intmax_t; typedef unsigned long __uintmax_t; -#define __INT8_C(c) (c) -#define __INT16_C(c) (c) -#define __INT32_C(c) (c) -#define __INT64_C(c) (c ## L) - -#define __UINT8_C(c) (c) -#define __UINT16_C(c) (c) -#define __UINT32_C(c) (c ## U) -#define __UINT64_C(c) (c ## UL) - -#define __INTMAX_C(c) (c ## L) -#define __UINTMAX_C(c) (c ## UL) - /* * mbstate_t is an opaque object to keep conversion state, during multibyte * stream conversions. The content must not be referenced by user programs. ==== //depot/projects/interrupt/sys/alpha/include/limits.h#2 (text+ko) ==== @@ -32,7 +32,7 @@ * * @(#)limits.h 8.3 (Berkeley) 1/4/94 * From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp - * $FreeBSD: src/sys/alpha/include/limits.h,v 1.8 2001/11/02 18:05:42 mike Exp $ + * $FreeBSD: src/sys/alpha/include/limits.h,v 1.9 2002/07/29 17:41:06 mike Exp $ */ #ifndef _MACHINE_LIMITS_H_ @@ -89,115 +89,6 @@ #define UQUAD_MAX (ULONG_MAX) /* max value for a uquad_t */ #define QUAD_MAX (LONG_MAX) /* max value for a quad_t */ #define QUAD_MIN (LONG_MIN) /* min value for a quad_t */ - -#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) -/* - * ISO/IEC 9899:1999 - * 7.18.2.1 Limits of exact-width integer types - */ -/* Minimum values of exact-width signed integer types. */ -#define INT8_MIN (-0x7f-1) -#define INT16_MIN (-0x7fff-1) -#define INT32_MIN (-0x7fffffff-1) -#define INT64_MIN (-0x7fffffffffffffffL-1) - -/* Maximum values of exact-width signed integer types. */ -#define INT8_MAX 0x7f -#define INT16_MAX 0x7fff -#define INT32_MAX 0x7fffffff -#define INT64_MAX 0x7fffffffffffffffL - -/* Maximum values of exact-width unsigned integer types. */ -#define UINT8_MAX 0xff -#define UINT16_MAX 0xffff -#define UINT32_MAX 0xffffffffU -#define UINT64_MAX 0xffffffffffffffffUL - -/* - * ISO/IEC 9899:1999 - * 7.18.2.2 Limits of minimum-width integer types - */ -/* Minimum values of minimum-width signed integer types. */ -#define INT_LEAST8_MIN SCHAR_MIN -#define INT_LEAST16_MIN SHRT_MIN -#define INT_LEAST32_MIN INT_MIN -#define INT_LEAST64_MIN LONG_MIN - -/* Maximum values of minimum-width signed integer types. */ -#define INT_LEAST8_MAX SCHAR_MAX -#define INT_LEAST16_MAX SHRT_MAX -#define INT_LEAST32_MAX INT_MAX -#define INT_LEAST64_MAX LONG_MAX - -/* Maximum values of minimum-width unsigned integer types. */ -#define UINT_LEAST8_MAX UCHAR_MAX -#define UINT_LEAST16_MAX USHRT_MAX -#define UINT_LEAST32_MAX UINT_MAX -#define UINT_LEAST64_MAX ULONG_MAX - -/* - * ISO/IEC 9899:1999 - * 7.18.2.3 Limits of fastest minimum-width integer types - */ -/* Minimum values of fastest minimum-width signed integer types. */ -#define INT_FAST8_MIN INT_MIN -#define INT_FAST16_MIN INT_MIN -#define INT_FAST32_MIN INT_MIN -#define INT_FAST64_MIN LONG_MIN - -/* Maximum values of fastest minimum-width signed integer types. */ -#define INT_FAST8_MAX INT_MAX -#define INT_FAST16_MAX INT_MAX -#define INT_FAST32_MAX INT_MAX -#define INT_FAST64_MAX LONG_MAX - -/* Maximum values of fastest minimum-width unsigned integer types. */ -#define UINT_FAST8_MAX UINT_MAX -#define UINT_FAST16_MAX UINT_MAX -#define UINT_FAST32_MAX UINT_MAX -#define UINT_FAST64_MAX ULONG_MAX - -/* - * ISO/IEC 9899:1999 - * 7.18.2.4 Limits of integer types capable of holding object pointers - */ -#define INTPTR_MIN LONG_MIN -#define INTPTR_MAX LONG_MAX -#define UINTPTR_MAX ULONG_MAX - -/* - * ISO/IEC 9899:1999 - * 7.18.2.5 Limits of greatest-width integer types - */ -#define INTMAX_MIN LONG_MIN -#define INTMAX_MAX LONG_MAX -#define UINTMAX_MAX ULONG_MAX - -/* - * ISO/IEC 9899:1999 - * 7.18.3 Limits of other integer types - */ -/* Limits of ptrdiff_t. */ -#define PTRDIFF_MIN LONG_MIN -#define PTRDIFF_MAX LONG_MAX - -/* Limits of sig_atomic_t. */ -#define SIG_ATOMIC_MIN INT_MIN -#define SIG_ATOMIC_MAX INT_MAX - -/* Limit of size_t. */ -#define SIZE_MAX ULONG_MAX - -#ifndef WCHAR_MIN /* Also possibly defined in */ -/* Limits of wchar_t. */ -#define WCHAR_MIN INT_MIN -#define WCHAR_MAX INT_MAX - -/* Limits of wint_t. */ -#define WINT_MIN INT_MIN -#define WINT_MAX INT_MAX -#endif -#endif /* !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) */ #endif /* !_POSIX_SOURCE && !_XOPEN_SOURCE */ #endif /* !_ANSI_SOURCE */ ==== //depot/projects/interrupt/sys/arm/include/ansi.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ansi.h 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/arm/include/ansi.h,v 1.18 2002/07/08 16:41:46 mike Exp $ + * $FreeBSD: src/sys/arm/include/ansi.h,v 1.19 2002/07/29 17:41:07 mike Exp $ */ #ifndef _MACHINE_ANSI_H_ @@ -162,19 +162,6 @@ typedef __int64_t __intmax_t; typedef __uint64_t __uintmax_t; -#define __INT8_C(c) (c) -#define __INT16_C(c) (c) -#define __INT32_C(c) (c) -#define __INT64_C(c) (c ## LL) - -#define __UINT8_C(c) (c) -#define __UINT16_C(c) (c) -#define __UINT32_C(c) (c ## U) -#define __UINT64_C(c) (c ## ULL) - -#define __INTMAX_C(c) (c ## LL) -#define __UINTMAX_C(c) (c ## ULL) - /* * mbstate_t is an opaque object to keep conversion state, during multibyte * stream conversions. The content must not be referenced by user programs. ==== //depot/projects/interrupt/sys/arm/include/limits.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)limits.h 8.3 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/arm/include/limits.h,v 1.1 2001/12/09 18:30:04 obrien Exp $ + * $FreeBSD: src/sys/arm/include/limits.h,v 1.2 2002/07/29 17:41:07 mike Exp $ */ #ifndef _MACHINE_LIMITS_H_ @@ -100,115 +100,6 @@ #define UQUAD_MAX ULLONG_MAX /* max value for a uquad_t */ #define QUAD_MAX LLONG_MAX /* max value for a quad_t */ #define QUAD_MIN LLONG_MIN /* min value for a quad_t */ - -#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) -/* - * ISO/IEC 9899:1999 - * 7.18.2.1 Limits of exact-width integer types - */ -/* Minimum values of exact-width signed integer types. */ -#define INT8_MIN (-0x7f-1) -#define INT16_MIN (-0x7fff-1) -#define INT32_MIN (-0x7fffffff-1) -#define INT64_MIN (-0x7fffffffffffffffLL-1) - -/* Maximum values of exact-width signed integer types. */ -#define INT8_MAX 0x7f -#define INT16_MAX 0x7fff -#define INT32_MAX 0x7fffffff -#define INT64_MAX 0x7fffffffffffffffLL - -/* Maximum values of exact-width unsigned integer types. */ -#define UINT8_MAX 0xff -#define UINT16_MAX 0xffff -#define UINT32_MAX 0xffffffffU -#define UINT64_MAX 0xffffffffffffffffULL - -/* - * ISO/IEC 9899:1999 - * 7.18.2.2 Limits of minimum-width integer types - */ -/* Minimum values of minimum-width signed integer types. */ -#define INT_LEAST8_MIN SCHAR_MIN -#define INT_LEAST16_MIN SHRT_MIN -#define INT_LEAST32_MIN INT_MIN -#define INT_LEAST64_MIN LLONG_MIN - -/* Maximum values of minimum-width signed integer types. */ -#define INT_LEAST8_MAX SCHAR_MAX -#define INT_LEAST16_MAX SHRT_MAX -#define INT_LEAST32_MAX INT_MAX -#define INT_LEAST64_MAX LLONG_MAX - -/* Maximum values of minimum-width unsigned integer types. */ -#define UINT_LEAST8_MAX UCHAR_MAX -#define UINT_LEAST16_MAX USHRT_MAX -#define UINT_LEAST32_MAX UINT_MAX -#define UINT_LEAST64_MAX ULLONG_MAX - -/* - * ISO/IEC 9899:1999 - * 7.18.2.3 Limits of fastest minimum-width integer types - */ -/* Minimum values of fastest minimum-width signed integer types. */ -#define INT_FAST8_MIN INT_MIN -#define INT_FAST16_MIN INT_MIN -#define INT_FAST32_MIN INT_MIN -#define INT_FAST64_MIN LLONG_MIN - -/* Maximum values of fastest minimum-width signed integer types. */ -#define INT_FAST8_MAX INT_MAX -#define INT_FAST16_MAX INT_MAX -#define INT_FAST32_MAX INT_MAX -#define INT_FAST64_MAX LLONG_MAX - -/* Maximum values of fastest minimum-width unsigned integer types. */ -#define UINT_FAST8_MAX UINT_MAX -#define UINT_FAST16_MAX UINT_MAX -#define UINT_FAST32_MAX UINT_MAX -#define UINT_FAST64_MAX ULLONG_MAX - -/* - * ISO/IEC 9899:1999 - * 7.18.2.4 Limits of integer types capable of holding object pointers - */ -#define INTPTR_MIN INT_MIN -#define INTPTR_MAX INT_MAX -#define UINTPTR_MAX UINT_MAX - -/* - * ISO/IEC 9899:1999 - * 7.18.2.5 Limits of greatest-width integer types - */ -#define INTMAX_MIN LLONG_MIN -#define INTMAX_MAX LLONG_MAX -#define UINTMAX_MAX ULLONG_MAX - -/* - * ISO/IEC 9899:1999 - * 7.18.3 Limits of other integer types - */ -/* Limits of ptrdiff_t. */ -#define PTRDIFF_MIN INT_MIN -#define PTRDIFF_MAX INT_MAX - -/* Limits of sig_atomic_t. */ -#define SIG_ATOMIC_MIN INT_MIN -#define SIG_ATOMIC_MAX INT_MAX - -/* Limit of size_t. */ -#define SIZE_MAX UINT_MAX - -#ifndef WCHAR_MIN /* Also possibly defined in */ -/* Limits of wchar_t. */ -#define WCHAR_MIN INT_MIN -#define WCHAR_MAX INT_MAX - -/* Limits of wint_t. */ -#define WINT_MIN INT_MIN -#define WINT_MAX INT_MAX -#endif -#endif /* !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) */ #endif /* !_POSIX_SOURCE */ #endif /* !_ANSI_SOURCE */ ==== //depot/projects/interrupt/sys/boot/i386/boot2/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.31 2002/06/21 11:00:00 phk Exp $ +# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.32 2002/07/29 09:40:14 ru Exp $ PROG= boot2 NOMAN= @@ -86,9 +86,9 @@ ${.IMPSRC} -o ${.TARGET} install: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ boot1 ${DESTDIR}${BINDIR}/boot1 - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ boot2 ${DESTDIR}${BINDIR}/boot2 .include ==== //depot/projects/interrupt/sys/boot/pc98/boot2/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/pc98/boot2/Makefile,v 1.9 2002/05/26 10:11:17 n_hibma Exp $ +# $FreeBSD: src/sys/boot/pc98/boot2/Makefile,v 1.10 2002/07/29 09:40:15 ru Exp $ # PROG= boot @@ -83,7 +83,7 @@ all: boot1 boot2 install: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ boot1 boot2 ${DESTDIR}${BINDIR} .include ==== //depot/projects/interrupt/sys/conf/NOTES#4 (text+ko) ==== @@ -14,7 +14,7 @@ # This file contains machine independent kernel configuration notes. For # machine dependent notes, look in /sys//conf/NOTES. # -# $FreeBSD: src/sys/conf/NOTES,v 1.1059 2002/07/21 23:20:29 peter Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1060 2002/07/27 19:50:28 rwatson Exp $ # # @@ -725,6 +725,14 @@ ##################################################################### +# SECURITY POLICY PARAMETERS + +# Support for Mandatory Access Control (MAC) +#options MAC +#options MAC_NONE # Statically link mac_none policy + + +##################################################################### # CLOCK OPTIONS # The granularity of operation is controlled by the kernel option HZ whose ==== //depot/projects/interrupt/sys/conf/files#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.674 2002/07/24 12:43:27 jhb Exp $ +# $FreeBSD: src/sys/conf/files,v 1.675 2002/07/30 02:04:56 rwatson Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -873,6 +873,7 @@ kern/kern_linker.c standard kern/kern_lock.c standard kern/kern_lockf.c standard +kern/kern_mac.c standard kern/kern_malloc.c standard kern/kern_mib.c standard kern/kern_module.c standard ==== //depot/projects/interrupt/sys/conf/files.sparc64#8 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.27 2002/07/24 12:43:27 jhb Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.28 2002/07/29 00:45:13 jake Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -56,6 +56,7 @@ sparc64/sparc64/ofw_bus.c standard sparc64/sparc64/ofw_machdep.c standard sparc64/sparc64/pmap.c standard +sparc64/sparc64/prof_machdep.c optional profiling-routine sparc64/sparc64/rwindow.c standard sparc64/sparc64/sparcbus_if.m standard sparc64/sparc64/support.s standard ==== //depot/projects/interrupt/sys/conf/kern.post.mk#6 (text+ko) ==== @@ -6,7 +6,7 @@ # should be defined in the kern.pre.mk so that port makefiles can # override or augment them. # -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.22 2002/07/18 12:02:20 ru Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.23 2002/07/29 09:40:15 ru Exp $ # # XXX why are only some phony targets marked phony? @@ -157,17 +157,17 @@ .endif mkdir -p ${DESTDIR}${KODIR} .if defined(DEBUG) && defined(INSTALL_DEBUG) - ${INSTALL} ${COPY} -m 555 -o root -g wheel ${FULLKERNEL} ${DESTDIR}${KODIR} + ${INSTALL} -m 555 -o root -g wheel ${FULLKERNEL} ${DESTDIR}${KODIR} .else - ${INSTALL} ${COPY} -m 555 -o root -g wheel ${KERNEL_KO} ${DESTDIR}${KODIR} + ${INSTALL} -m 555 -o root -g wheel ${KERNEL_KO} ${DESTDIR}${KODIR} .endif kernel-reinstall: @-chflags -R noschg ${DESTDIR}${KODIR} .if defined(DEBUG) && defined(INSTALL_DEBUG) - ${INSTALL} ${COPY} -m 555 -o root -g wheel ${FULLKERNEL} ${DESTDIR}${KODIR} + ${INSTALL} -m 555 -o root -g wheel ${FULLKERNEL} ${DESTDIR}${KODIR} .else - ${INSTALL} ${COPY} -m 555 -o root -g wheel ${KERNEL_KO} ${DESTDIR}${KODIR} + ${INSTALL} -m 555 -o root -g wheel ${KERNEL_KO} ${DESTDIR}${KODIR} .endif .if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists($S/modules) ==== //depot/projects/interrupt/sys/conf/kmod.mk#7 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.127 2002/07/17 08:21:50 ru Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.128 2002/07/29 09:40:15 ru Exp $ # # The include file handles installing Kernel Loadable Device # drivers (KLD's). @@ -205,11 +205,11 @@ .ORDER: beforeinstall _kmodinstall .if defined(DEBUG) && defined(INSTALL_DEBUG) _kmodinstall: - ${INSTALL} ${COPY} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \ + ${INSTALL} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \ ${_INSTALLFLAGS} ${FULLPROG} ${DESTDIR}${KMODDIR} .else _kmodinstall: - ${INSTALL} ${COPY} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \ + ${INSTALL} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \ ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${KMODDIR} .include ==== //depot/projects/interrupt/sys/conf/options#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.338 2002/07/21 21:37:09 peter Exp $ +# $FreeBSD: src/sys/conf/options,v 1.340 2002/07/27 19:50:28 rwatson Exp $ # # On the handling of kernel options # @@ -120,7 +120,12 @@ _KPOSIX_PRIORITY_SCHEDULING opt_posix.h _KPOSIX_VERSION opt_posix.h -# TrustedBSD and POSIX.1e Kernel Options +##################################################################### +# SECURITY POLICY PARAMETERS + +# Support for Mandatory Access Control (MAC) +MAC opt_mac.h +MAC_NONE opt_dontuse.h # Do we want the config file compiled into the kernel? INCLUDE_CONFIG_FILE opt_config.h @@ -443,7 +448,6 @@ MSGBUF_SIZE opt_msgbuf.h # PCI related options -PCI_ENABLE_IO_MODES opt_pci.h PCI_ALLOW_UNSUPPORTED_IO_RANGE opt_pci.h # NFS options ==== //depot/projects/interrupt/sys/dev/an/if_an.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/an/if_an.c,v 1.35 2002/04/04 21:03:14 jhb Exp $ + * $FreeBSD: src/sys/dev/an/if_an.c,v 1.36 2002/07/27 21:28:40 fenner Exp $ */ /* @@ -43,7 +43,7 @@ /* * The Aironet 4500/4800 series cards come in PCMCIA, ISA and PCI form. * This driver supports all three device types (PCI devices are supported - * through an extra PCI shim: /sys/pci/if_an_p.c). ISA devices can be + * through an extra PCI shim: /sys/dev/an/if_an_pci.c). ISA devices can be * supported either using hard-coded IO port/IRQ settings or via Plug * and Play. The 4500 series devices support 1Mbps and 2Mbps data rates. * The 4800 devices support 1, 2, 5.5 and 11Mbps rates. @@ -132,7 +132,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/an/if_an.c,v 1.35 2002/04/04 21:03:14 jhb Exp $"; + "$FreeBSD: src/sys/dev/an/if_an.c,v 1.36 2002/07/27 21:28:40 fenner Exp $"; #endif /* These are global because we need them in sys/pci/if_an_p.c. */ ==== //depot/projects/interrupt/sys/dev/ata/atapi-all.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/atapi-all.c,v 1.90 2002/07/22 18:36:14 sos Exp $ + * $FreeBSD: src/sys/dev/ata/atapi-all.c,v 1.91 2002/07/28 23:59:00 sos Exp $ */ #include "opt_ata.h" @@ -274,7 +274,9 @@ /* if DMA enabled setup DMA hardware */ request->flags &= ~ATPR_F_DMA_USED; if ((atadev->mode >= ATA_DMA) && - (request->ccb[0] == ATAPI_READ || request->ccb[0] == ATAPI_READ_BIG || + (request->ccb[0] == ATAPI_READ || + request->ccb[0] == ATAPI_READ_BIG || + request->ccb[0] == ATAPI_READ_CD || ((request->ccb[0] == ATAPI_WRITE || request->ccb[0] == ATAPI_WRITE_BIG) && !(atadev->channel->flags & ATA_ATAPI_DMA_RO))) && @@ -283,7 +285,8 @@ } /* start ATAPI operation */ - if (ata_command(atadev, ATA_C_PACKET_CMD, (request->bytecount << 8), 0, + if (ata_command(atadev, ATA_C_PACKET_CMD, + min(request->bytecount, 65534) << 8, 0, (request->flags & ATPR_F_DMA_USED) ? ATA_F_DMA : 0, ATA_IMMEDIATE)) ata_prtdev(atadev, "failure to send ATAPI packet command\n"); ==== //depot/projects/interrupt/sys/dev/ata/atapi-cd.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.119 2002/05/28 17:39:17 sos Exp $ + * $FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.122 2002/07/28 23:59:00 sos Exp $ */ #include "opt_ata.h" @@ -74,6 +74,7 @@ /* prototypes */ static struct acd_softc *acd_init_lun(struct ata_device *); static void acd_make_dev(struct acd_softc *); +static void acd_set_ioparm(struct acd_softc *); static void acd_describe(struct acd_softc *); static void lba2msf(u_int32_t, u_int8_t *, u_int8_t *, u_int8_t *); static u_int32_t msf2lba(u_int8_t, u_int8_t, u_int8_t); @@ -282,13 +283,19 @@ make_dev_alias(dev, "acd%da", cdp->lun); make_dev_alias(dev, "acd%dc", cdp->lun); dev->si_drv1 = cdp; - dev->si_iosize_max = 252 * DEV_BSIZE; - dev->si_bsize_phys = 2048; /* XXX SOS */ cdp->dev = dev; cdp->device->flags |= ATA_D_MEDIA_CHANGED; cdp->clone_evh = EVENTHANDLER_REGISTER(dev_clone, acd_clone, cdp, 1000); + acd_set_ioparm(cdp); } +static void +acd_set_ioparm(struct acd_softc *cdp) +{ + cdp->dev->si_iosize_max = ((256*DEV_BSIZE)/cdp->block_size)*cdp->block_size; + cdp->dev->si_bsize_phys = cdp->block_size; +} + static void acd_describe(struct acd_softc *cdp) { @@ -1011,6 +1018,7 @@ case CDRIOCSETBLOCKSIZE: cdp->block_size = *(int *)addr; + acd_set_ioparm(cdp); break; case CDRIOCGETPROGRESS: @@ -1255,6 +1263,7 @@ cdp->toc.hdr.len = ntohs(cdp->toc.hdr.len); cdp->block_size = (cdp->toc.tab[0].control & 4) ? 2048 : 2352; + acd_set_ioparm(cdp); bzero(ccb, sizeof(ccb)); ccb[0] = ATAPI_READ_CAPACITY; if (atapi_queue_cmd(cdp->device, ccb, (caddr_t)sizes, sizeof(sizes), @@ -1515,7 +1524,7 @@ param.session_format = CDR_SESS_CDROM_XA; break; } - + acd_set_ioparm(cdp); return acd_mode_select(cdp, (caddr_t)¶m, param.page_length + 10); } ==== //depot/projects/interrupt/sys/dev/ata/atapi-fd.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.74 2002/07/22 18:37:33 sos Exp $ + * $FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.77 2002/07/28 23:59:00 sos Exp $ */ #include @@ -107,13 +107,8 @@ dev = disk_create(fdp->lun, &fdp->disk, 0, &afd_cdevsw, &afddisk_cdevsw); dev->si_drv1 = fdp; fdp->dev = dev; + fdp->dev->si_iosize_max = 256 * DEV_BSIZE; - if (!strncmp(atadev->param->model, "IOMEGA ZIP", 10) || - !strncmp(atadev->param->model, "IOMEGA Clik!", 12)) - fdp->dev->si_iosize_max = 64 * DEV_BSIZE; - else - fdp->dev->si_iosize_max = 252 * DEV_BSIZE; - afd_describe(fdp); atadev->flags |= ATA_D_MEDIA_CHANGED; atadev->driver = fdp; @@ -328,7 +323,7 @@ } lba = bp->bio_pblkno; - count = min(bp->bio_bcount, fdp->dev->si_iosize_max) / fdp->cap.sector_size; + count = bp->bio_bcount / fdp->cap.sector_size; data_ptr = bp->bio_data; bp->bio_resid = bp->bio_bcount; ==== //depot/projects/interrupt/sys/dev/ata/atapi-tape.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.67 2002/04/05 13:13:56 sos Exp $ + * $FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.70 2002/07/28 23:59:00 sos Exp $ */ #include "opt_ata.h" @@ -132,12 +132,12 @@ dev = make_dev(&ast_cdevsw, dkmakeminor(stp->lun, 0, 0), UID_ROOT, GID_OPERATOR, 0640, "ast%d", stp->lun); dev->si_drv1 = stp; - dev->si_iosize_max = 252 * DEV_BSIZE; + dev->si_iosize_max = 256 * DEV_BSIZE; stp->dev1 = dev; dev = make_dev(&ast_cdevsw, dkmakeminor(stp->lun, 0, 1), UID_ROOT, GID_OPERATOR, 0640, "nast%d", stp->lun); dev->si_drv1 = stp; - dev->si_iosize_max = 252 * DEV_BSIZE; + dev->si_iosize_max = 256 * DEV_BSIZE; stp->dev2 = dev; stp->device->flags |= ATA_D_MEDIA_CHANGED; ast_describe(stp); ==== //depot/projects/interrupt/sys/dev/bge/if_bge.c#7 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bge/if_bge.c,v 1.17 2002/07/04 23:19:20 jdp Exp $ + * $FreeBSD: src/sys/dev/bge/if_bge.c,v 1.18 2002/07/26 03:47:07 jdp Exp $ */ /* @@ -122,7 +122,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.17 2002/07/04 23:19:20 jdp Exp $"; + "$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.18 2002/07/26 03:47:07 jdp Exp $"; #endif /* @@ -145,6 +145,8 @@ "SysKonnect Gigabit Ethernet" }, { ALTIMA_VENDORID, ALTIMA_DEVICE_AC1000, "Altima AC1000 Gigabit Ethernet" }, + { ALTIMA_VENDORID, ALTIMA_DEVICE_AC9100, + "Altima AC9100 Gigabit Ethernet" }, { 0, 0, NULL } }; ==== //depot/projects/interrupt/sys/dev/bge/if_bgereg.h#5 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.5 2002/06/24 22:04:15 jdp Exp $ + * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.6 2002/07/26 03:47:08 jdp Exp $ */ /* @@ -1811,6 +1811,7 @@ */ #define ALTIMA_VENDORID 0x173b #define ALTIMA_DEVICE_AC1000 0x03e8 +#define ALTIMA_DEVICE_AC9100 0x03ea /* * Offset of MAC address inside EEPROM. ==== //depot/projects/interrupt/sys/dev/ed/if_ed_isa.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ed/if_ed_isa.c,v 1.10 2002/03/20 02:07:18 alfred Exp $ + * $FreeBSD: src/sys/dev/ed/if_ed_isa.c,v 1.11 2002/07/26 17:33:58 takawata Exp $ */ #include @@ -56,6 +56,7 @@ { 0x19808c4a, NULL }, /* RTL8019 */ { 0x0090252a, NULL }, /* JQE9000 */ { 0x0020832e, NULL }, /* KTC2000 */ + { 0x4cf48906, NULL }, /* ATIf44c */ { 0, NULL } }; ==== //depot/projects/interrupt/sys/dev/exca/exca.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/exca/exca.c,v 1.4 2002/06/01 16:21:26 alfred Exp $ */ +/* $FreeBSD: src/sys/dev/exca/exca.c,v 1.5 2002/07/26 08:01:08 imp Exp $ */ /* * Copyright (c) 2002 M Warner Losh. All rights reserved. @@ -82,7 +82,6 @@ #define DPRINTF(fmt, args...) #endif - /* memory */ #define EXCA_MEMINFO(NUM) { \ @@ -198,6 +197,11 @@ } if (win >= EXCA_MEM_WINS) return (1); + if (((rman_get_start(res) >> EXCA_CARDMEM_ADDRX_SHIFT) & 0xff) != 0 && + (sc->flags & EXCA_HAS_MEMREG_WIN) == 0) { + device_printf(sc->dev, "Does not support mapping above 24M."); + return (1); + } sc->mem[win].cardaddr = 0; sc->mem[win].memt = rman_get_bustag(res); @@ -555,13 +559,10 @@ * Initialize the exca_softc data structure for the first time. */ void -exca_init(struct exca_softc *sc, device_t dev, exca_write_t *wrfn, - exca_read_t *rdfn, bus_space_tag_t bst, bus_space_handle_t bsh, - uint32_t offset) +exca_init(struct exca_softc *sc, device_t dev, + bus_space_tag_t bst, bus_space_handle_t bsh, uint32_t offset) { sc->dev = dev; - sc->write_exca = wrfn; - sc->read_exca = rdfn; sc->memalloc = 0; sc->ioalloc = 0; sc->bst = bst; @@ -580,8 +581,7 @@ * "exca" parameter. */ int -exca_probe_slots(device_t dev, struct exca_softc *exca, exca_write_t writefnp, - exca_read_t readfnp) +exca_probe_slots(device_t dev, struct exca_softc *exca) { int rid; struct resource *res; @@ -599,8 +599,7 @@ iot = rman_get_bustag(res); ioh = rman_get_bushandle(res); for (i = 0; i < EXCA_NSLOTS; i++) { - exca_init(&exca[i], dev, writefnp, readfnp, iot, ioh, - i * EXCA_SOCKET_SIZE); + exca_init(&exca[i], dev, iot, ioh, i * EXCA_SOCKET_SIZE); if (exca_is_pcic(&exca[i])) { err = 0; exca[i].flags |= EXCA_SOCKET_PRESENT; ==== //depot/projects/interrupt/sys/dev/exca/excareg.h#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message