From owner-p4-projects@FreeBSD.ORG Sun Jul 13 16:34:20 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F291537B404; Sun, 13 Jul 2003 16:34:19 -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 9D44937B401 for ; Sun, 13 Jul 2003 16:34:19 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6462843F85 for ; Sun, 13 Jul 2003 16:34:18 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6DNYI0U094744 for ; Sun, 13 Jul 2003 16:34:18 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6DNYHmj094741 for perforce@freebsd.org; Sun, 13 Jul 2003 16:34:17 -0700 (PDT) Date: Sun, 13 Jul 2003 16:34:17 -0700 (PDT) Message-Id: <200307132334.h6DNYHmj094741@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 34452 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jul 2003 23:34:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=34452 Change 34452 by marcel@marcel_nfs on 2003/07/13 16:33:20 IFC @34451 NOTE: The merge removes the local modifications we had to the acpi contributed code. The merge conflict is expected to be caused by a fix to the problem for which we had the local changes anyway. This hasn't been verified yet, but Robert Moore did say he had a fix for it. We have to test it anyway... Affected files ... .. //depot/projects/ia64/contrib/opie/popen.c#3 integrate .. //depot/projects/ia64/games/fortune/datfiles/startrek#4 integrate .. //depot/projects/ia64/lib/libc/sys/ioctl.2#5 integrate .. //depot/projects/ia64/lib/libc_r/Makefile#6 integrate .. //depot/projects/ia64/release/scripts/print-cdrom-packages.sh#26 integrate .. //depot/projects/ia64/share/man/man4/ath.4#3 integrate .. //depot/projects/ia64/share/man/man5/config.5#2 integrate .. //depot/projects/ia64/share/mk/bsd.cpu.mk#16 integrate .. //depot/projects/ia64/sys/boot/i386/libi386/biosacpi.c#4 integrate .. //depot/projects/ia64/sys/boot/pc98/boot2/asm.h#3 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/CHANGES.txt#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acconfig.h#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acdebug.h#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acdisasm.h#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acevents.h#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acexcep.h#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acfreebsd.h#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acglobal.h#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/achware.h#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acinterp.h#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/aclocal.h#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acmacros.h#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acnamesp.h#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acobject.h#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acpi.h#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acpiosxf.h#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acpixf.h#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/actables.h#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/actbl.h#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/actypes.h#13 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acutils.h#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbcmds.c#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbdisply.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbexec.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbfileio.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbinput.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbstats.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbutils.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dmbuffer.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dmobject.c#1 branch .. //depot/projects/ia64/sys/contrib/dev/acpica/dmopcode.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dmresrc.c#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dmwalk.c#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dsfield.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dsinit.c#2 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dsmethod.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dsmthdat.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dsobject.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dsopcode.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dswexec.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evevent.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evgpe.c#2 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evgpeblk.c#2 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evmisc.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evregion.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evrgnini.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evsci.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evxface.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evxfevnt.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evxfregn.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exconfig.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exdump.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exfldio.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exoparg1.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exregion.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exstore.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exsystem.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exutils.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/hwacpi.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/hwgpe.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/hwregs.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/hwsleep.c#12 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/hwtimer.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsaccess.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsalloc.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsdumpdv.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsload.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsnames.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsparse.c#2 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nssearch.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsutils.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nswalk.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsxfeval.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsxfname.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/psargs.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/pswalk.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/psxface.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/rsaddr.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/rscalc.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/rsio.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/rsirq.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/rsmemory.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/rsmisc.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/rsxface.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbconvrt.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbget.c#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbgetall.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbinstal.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbutils.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbxface.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utcopy.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utdebug.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utdelete.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/uteval.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utglobal.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utinit.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utmisc.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utobject.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utxface.c#8 integrate .. //depot/projects/ia64/sys/dev/acpica/Osd/OsdHardware.c#9 integrate .. //depot/projects/ia64/sys/dev/acpica/Osd/OsdMemory.c#8 integrate .. //depot/projects/ia64/sys/dev/acpica/Osd/OsdSynch.c#8 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi.c#33 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_ec.c#11 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pci_link.c#6 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pcib.c#16 integrate .. //depot/projects/ia64/sys/dev/ath/if_ath.c#3 integrate .. //depot/projects/ia64/sys/dev/ath/if_athvar.h#2 integrate .. //depot/projects/ia64/sys/dev/kbd/atkbd.c#8 integrate .. //depot/projects/ia64/sys/net/if_ethersubr.c#31 integrate .. //depot/projects/ia64/sys/pc98/pc98/syscons.c#18 integrate .. //depot/projects/ia64/sys/vm/vm_init.c#9 integrate .. //depot/projects/ia64/usr.sbin/apm/apm.c#6 integrate .. //depot/projects/ia64/usr.sbin/ctm/ctm_smail/ctm_smail.c#2 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/options.c#3 integrate Differences ... ==== //depot/projects/ia64/contrib/opie/popen.c#3 (text+ko) ==== @@ -23,6 +23,7 @@ Modified at NRL for OPIE 2.0. Originally from BSD. +$FreeBSD: src/contrib/opie/popen.c,v 1.2 2003/07/13 05:59:50 kris Exp $ */ /* * Copyright (c) 1988, 1993, 1994 @@ -84,6 +85,9 @@ #include "opie.h" +#define MAXUSRARGS 100 +#define MAXGLOBARGS 1000 + char **ftpglob __P((register char *)); char **copyblk __P((char **)); VOIDRET blkfree __P((char **)); @@ -103,7 +107,7 @@ char *cp; FILE *iop; int argc, gargc, pdes[2]; - char **pop, *argv[100], *gargv[1000], *vv[2]; + char **pop, *argv[MAXUSRARGS], *gargv[MAXGLOBARGS], *vv[2]; if ((*type != 'r' && *type != 'w') || type[1]) return (NULL); @@ -112,13 +116,15 @@ return (NULL); /* break up string into pieces */ - for (argc = 0, cp = program;; cp = NULL) + for (argc = 0, cp = program; argc < MAXUSRARGS-1; cp = NULL) { if (!(argv[argc++] = strtok(cp, " \t\n"))) break; + } + argv[argc - 1] = NULL; /* glob each piece */ gargv[0] = argv[0]; - for (gargc = argc = 1; argv[argc]; argc++) { + for (gargc = argc = 1; argv[argc] && gargc < (MAXGLOBARGS-1); argc++) { if (!(pop = (char **) ftpglob(argv[argc]))) { /* globbing failed */ vv[0] = argv[argc]; @@ -126,7 +132,7 @@ pop = (char **) copyblk(vv); } argv[argc] = (char *) pop; /* save to free later */ - while (*pop && gargc < 1000) + while (*pop && gargc < MAXGLOBARGS-1) gargv[gargc++] = *pop++; } gargv[gargc] = NULL; ==== //depot/projects/ia64/games/fortune/datfiles/startrek#4 (text+ko) ==== @@ -1,4 +1,4 @@ -%% $FreeBSD: src/games/fortune/datfiles/startrek,v 1.3 2003/01/04 17:08:23 schweikh Exp $ +%% $FreeBSD: src/games/fortune/datfiles/startrek,v 1.4 2003/07/13 03:49:43 kris Exp $ A father doesn't destroy his children. -- Lt. Carolyn Palamas, "Who Mourns for Adonais?", stardate 3468.1. @@ -494,7 +494,7 @@ to know each other. -- Kirk, "Elaan of Troyius", stardate 4372.5 % -"The release of emotion is what keeps us health. Emotionally healthy." +"The release of emotion is what keeps us healthy. Emotionally healthy." "That may be, Doctor. However, I have noted that the healthy release of emotion is frequently unhealthy for those closest to you." @@ -735,7 +735,7 @@ -- Kor, the Klingon Commander, "Errand of Mercy", stardate 3201.7 % -You! What PLANET is this! +You! What PLANET is this?! -- McCoy, "The City on the Edge of Forever", stardate 3134.0 % You'll learn something about men and women -- the way they're supposed ==== //depot/projects/ia64/lib/libc/sys/ioctl.2#5 (text+ko) ==== @@ -31,7 +31,7 @@ .\" .\" @(#)ioctl.2 8.2 (Berkeley) 12/11/93 .\" -.\" $FreeBSD: src/lib/libc/sys/ioctl.2,v 1.21 2002/12/19 09:40:25 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/ioctl.2,v 1.22 2003/07/13 21:02:48 ceri Exp $ .\" .Dd December 11, 1993 .Dt IOCTL 2 @@ -85,7 +85,7 @@ Macros and defines used in specifying an ioctl .Fa request are located in the file -.Ao Pa sys/ioctl.h Ac . +.Ao Pa sys/ioccom.h Ac . .Sh RETURN VALUES If an error has occurred, a value of -1 is returned and .Va errno ==== //depot/projects/ia64/lib/libc_r/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc_r/Makefile,v 1.35 2003/07/02 13:27:54 ru Exp $ +# $FreeBSD: src/lib/libc_r/Makefile,v 1.36 2003/07/13 05:35:30 deischen Exp $ # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does @@ -9,7 +9,7 @@ # system call stubs. LIB=c_r SHLIB_MAJOR= 5 -CFLAGS+=-DPTHREAD_KERNEL -D_THREAD_SAFE +CFLAGS+=-DPTHREAD_KERNEL CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/uthread \ -I${.CURDIR}/../../include ==== //depot/projects/ia64/release/scripts/print-cdrom-packages.sh#26 (text+ko) ==== @@ -2,7 +2,7 @@ # # Author: Jordan Hubbard # Date: Mon Jul 10 01:18:20 2000 -# Version: $FreeBSD: src/release/scripts/print-cdrom-packages.sh,v 1.43 2003/07/12 15:35:06 trhodes Exp $ +# Version: $FreeBSD: src/release/scripts/print-cdrom-packages.sh,v 1.44 2003/07/13 07:20:24 murray Exp $ # # MAINTAINER: re # @@ -67,17 +67,17 @@ ## Start of set for CDROM #1 # This is the set required by sysinstall. CDROM_SET_1="" +CDROM_SET_1="${CDROM_SET_1} devel/pcre" if [ "X${PKG_ARCH}" = "Xalpha" ]; then CDROM_SET_1="${CDROM_SET_1} emulators/osf1_base" elif [ "X${PKG_ARCH}" = "Xi386" ]; then CDROM_SET_1="${CDROM_SET_1} emulators/linux_base" fi -CDROM_SET_1="${CDROM_SET_1} devel/pcre" CDROM_SET_1="${CDROM_SET_1} lang/perl5" +CDROM_SET_1="${CDROM_SET_1} mail/exim" +CDROM_SET_1="${CDROM_SET_1} mail/postfix" CDROM_SET_1="${CDROM_SET_1} net/pcnfsd" CDROM_SET_1="${CDROM_SET_1} net/rsync" -CDROM_SET_1="${CDROM_SET_1} mail/exim" -CDROM_SET_1="${CDROM_SET_1} mail/postfix" CDROM_SET_1="${CDROM_SET_1} x11-fonts/XFree86-4-font100dpi" CDROM_SET_1="${CDROM_SET_1} x11-fonts/XFree86-4-font75dpi" CDROM_SET_1="${CDROM_SET_1} x11-fonts/XFree86-4-fontCyrillic" ==== //depot/projects/ia64/share/man/man4/ath.4#3 (text+ko) ==== @@ -29,9 +29,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGES. .\" -.\" $FreeBSD: src/share/man/man4/ath.4,v 1.3 2003/06/28 17:59:37 sam Exp $ +.\" $FreeBSD: src/share/man/man4/ath.4,v 1.4 2003/07/13 17:03:39 sam Exp $ .\"/ -.Dd June 26, 2003 +.Dd July 13, 2003 .Dt ATH 4 .Os .Sh NAME @@ -112,9 +112,9 @@ D-Link DWL-AB650 AR5211 Cardbus D-Link DWL-AG520 AR5212 PCI D-Link DWL-AG650 AR5212 Cardbus -Linksys WMP55AG AR5212 Cardbus +Linksys WMP55AG AR5212 PCI Linksys WPC51AB AR5211 Cardbus -Linksys WPC55AG AR5212 PCI +Linksys WPC55AG AR5212 Cardbus Netgear WAB501 AR5211 Cardbus Netgear WAG511 AR5212 Cardbus .El ==== //depot/projects/ia64/share/man/man5/config.5#2 (text+ko) ==== @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/config.5,v 1.2 2003/07/08 01:39:02 jkoshy Exp $ +.\" $FreeBSD: src/share/man/man5/config.5,v 1.3 2003/07/13 09:11:10 jkoshy Exp $ .\" .Dd July 3, 2003 .Dt CONFIG 5 @@ -221,7 +221,7 @@ A value of 0 indicates that the kernel should configure its data structures according to the size of available physical memory. -If autoconfiguration is requested, the kernel will set +If auto configuration is requested, the kernel will set this tunable to a value between 32 and 384. .Pp As explained in ==== //depot/projects/ia64/share/mk/bsd.cpu.mk#16 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.28 2003/05/22 16:56:46 anholt Exp $ +# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.29 2003/07/13 10:34:09 mux Exp $ # Set default CPU compile flags and baseline CPUTYPE for each arch. The # compile flags must support the minimum CPU type for each architecture but @@ -50,9 +50,7 @@ . elif ${CPUTYPE} == "k5" _CPUCFLAGS = -march=pentium . elif ${CPUTYPE} == "p4" -# gcc 3.2 is known to produce broken code with -march=pentium4, so it is -# disabled for now. This is fixed in gcc 3.3. -_CPUCFLAGS = -march=pentium3 +_CPUCFLAGS = -march=pentium4 . elif ${CPUTYPE} == "p3" _CPUCFLAGS = -march=pentium3 . elif ${CPUTYPE} == "p2" ==== //depot/projects/ia64/sys/boot/i386/libi386/biosacpi.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.4 2003/04/29 18:50:34 njl Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.5 2003/07/13 22:54:53 njl Exp $ */ #include @@ -31,6 +31,7 @@ #include #include "acfreebsd.h" +#include "acconfig.h" #define ACPI_SYSTEM_XFACE #include "actypes.h" #include "actbl.h" ==== //depot/projects/ia64/sys/boot/pc98/boot2/asm.h#3 (text+ko) ==== @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.7 92/02/29 15:33:41 rpd - * $FreeBSD: src/sys/boot/pc98/boot2/asm.h,v 1.4 2002/05/14 12:34:03 nyan Exp $ + * $FreeBSD: src/sys/boot/pc98/boot2/asm.h,v 1.5 2003/07/13 08:13:52 nyan Exp $ */ #define S_ARG0 4(%esp) @@ -64,19 +64,19 @@ #define OUTL outl (%dx) #else /* wheeze */ + #define ALIGN #define LCL(x) x #define LB(x,n) n #ifdef __STDC__ #define EXT(x) x -#define LEXT(x) x ## : - +#define LEXT(x) .type EXT(x),@function; EXT(x): #define LBb(x,n) n ## b #define LBf(x,n) n ## f #else /* __STDC__ */ #define EXT(x) _/**/x -#define LEXT(x) _/**/x/**/: +#define LEXT(x) .type EXT(x),@function; EXT(x)/**/: #define LBb(x,n) n/**/b #define LBf(x,n) n/**/f #endif /* __STDC__ */ ==== //depot/projects/ia64/sys/contrib/dev/acpica/CHANGES.txt#5 (text+ko) ==== @@ -1,3 +1,268 @@ +---------------------------------------- +19 June 2003. Summary of changes for version 20030619: + +1) ACPI CA Core Subsystem: + +Fix To/FromBCD, eliminating the need for an arch-specific +#define. + +Do not acquire a semaphore in the S5 shutdown path. + +Fix ex_digits_needed for 0. (Takayoshi Kochi) + +Fix sleep/stall code reversal. (Andi Kleen) + +Revert a change having to do with control method calling +semantics. + +2) Linux: + +acpiphp update (Takayoshi Kochi) + +Export acpi_disabled for sonypi (Stelian Pop) + +Mention acpismp=force in config help + +Re-add acpitable.c and acpismp=force. This improves backwards +compatibility and also cleans up the code to a significant +degree. + +Add ASUS Value-add driver (Karol Kozimor and Julien Lerouge) + + + +---------------------------------------- +22 May 2003. Summary of changes for version 20030522: + +1) ACPI CA Core Subsystem: + +Found and fixed a reported problem where an AE_NOT_FOUND error +occurred occasionally during _BST evaluation. This turned out to +be an Owner ID allocation issue where a called method did not get +a new ID assigned to it. Eventually, (after 64k calls), the +Owner ID UINT16 would wraparound so that the ID would be the same +as the caller's and the called method would delete the caller's +namespace. + +Implemented extended error reporting for control methods that are +aborted due to a run-time exception. Output includes the exact +AML instruction that caused the method abort, a dump of the +method locals and arguments at the time of the abort, and a trace +of all nested control method calls. + +Modified the interpreter to allow the creation of buffers of zero +length from the AML code. Implemented new code to ensure that no +attempt is made to actually allocate a memory buffer (of length +zero) - instead, a simple buffer object with a NULL buffer +pointer and length zero is created. A warning is no longer +issued when the AML attempts to create a zero-length buffer. + +Implemented a workaround for the "leading asterisk issue" in +_HIDs, _UIDs, and _CIDs in the AML interpreter. One leading +asterisk is automatically removed if present in any HID, UID, or +CID strings. The iASL compiler will still flag this asterisk as +an error, however. + +Implemented full support for _CID methods that return a package +of multiple CIDs (Compatible IDs). The AcpiGetObjectInfo() +interface now additionally returns a device _CID list if present. +This required a change to the external interface in order to pass +an ACPI_BUFFER object as a parameter since the _CID list is of +variable length. + +Fixed a problem with the new AE_SAME_HANDLER exception where +handler initialization code did not know about this exception. + +Code and Data Size: Current and previous core subsystem library +sizes are shown below. These are the code and data sizes for the +acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and +these values do not include any ACPI driver or OSPM code. The +debug version of the code includes the debug output trace +mechanism and has a much larger code and data size. Note that +these values will vary depending on the efficiency of the +compiler and the compiler options used during generation. + + Previous Release (20030509): + Non-Debug Version: 73.4K Code, 9.7K Data, 83.1K Total + Debug Version: 156.1K Code, 63.9K Data, 220.0K Total + Current Release: + Non-Debug Version: 73.7K Code, 9.7K Data, 83.4K Total + Debug Version: 156.9K Code, 64.2K Data, 221.1K Total + + +2) Linux: + +Fixed a bug in which we would reinitialize the ACPI interrupt +after it was already working, thus disabling all ACPI and the +IRQs for any other device sharing the interrupt. (Thanks to Stian +Jordet) + +Toshiba driver update (John Belmonte) + +Return only 0 or 1 for our interrupt handler status (Andrew +Morton) + + +3) iASL Compiler: + +Fixed a reported problem where multiple (nested) ElseIf() +statements were not handled correctly by the compiler, resulting +in incorrect warnings and incorrect AML code. This was a problem +in both the ASL parser and the code generator. + + +4) Documentation: + +Added changes to existing interfaces, new exception codes, and +new text concerning reference count object management versus +garbage collection. + +---------------------------------------- +09 May 2003. Summary of changes for version 20030509. + + +1) ACPI CA Core Subsystem: + +Changed the subsystem initialization sequence to hold off +installation of address space handlers until the hardware has +been initialized and the system has entered ACPI mode. This is +because the installation of space handlers can cause _REG methods +to be run. Previously, the _REG methods could potentially be run +before ACPI mode was enabled. + +Fixed some memory leak issues related to address space handler +and notify handler installation. There were some problems with +the reference count mechanism caused by the fact that the handler +objects are shared across several namespace objects. + +Fixed a reported problem where reference counts within the +namespace were not properly updated when named objects created by +method execution were deleted. + +Fixed a reported problem where multiple SSDTs caused a deletion +issue during subsystem termination. Restructured the table data +structures to simplify the linked lists and the related code. + +Fixed a problem where the table ID associated with secondary +tables (SSDTs) was not being propagated into the namespace +objects created by those tables. This would only present a +problem for tables that are unloaded at run-time, however. + +Updated AcpiOsReadable and AcpiOsWritable to use the ACPI_SIZE +type as the length parameter (instead of UINT32). + +Solved a long-standing problem where an ALREADY_EXISTS error +appears on various systems. This problem could happen when there +are multiple PCI_Config operation regions under a single PCI root +bus. This doesn't happen very frequently, but there are some +systems that do this in the ASL. + +Fixed a reported problem where the internal DeleteNode function +was incorrectly handling the case where a namespace node was the +first in the parent's child list, and had additional peers (not +the only child, but first in the list of children.) + +Code and Data Size: Current core subsystem library sizes are +shown below. These are the code and data sizes for the +acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and +these values do not include any ACPI driver or OSPM code. The +debug version of the code includes the debug output trace +mechanism and has a much larger code and data size. Note that +these values will vary depending on the efficiency of the +compiler and the compiler options used during generation. + + Previous Release + Non-Debug Version: 73.7K Code, 9.5K Data, 83.2K Total + Debug Version: 156.1K Code, 63.6K Data, 219.7K Total + Current Release: + Non-Debug Version: 73.4K Code, 9.7K Data, 83.1K Total + Debug Version: 156.1K Code, 63.9K Data, 220.0K Total + + +2) Linux: + +Allow ":" in OS override string (Ducrot Bruno) + +Kobject fix (Greg KH) + + +3 iASL Compiler/Disassembler: + +Fixed a problem in the generation of the C source code files (AML +is emitted in C source statements for BIOS inclusion) where the +Ascii dump that appears within a C comment at the end of each +line could cause a compile time error if the AML sequence happens +to have an open comment or close comment sequence embedded. + + +---------------------------------------- +24 April 2003. Summary of changes for version 20030424. + + +1) ACPI CA Core Subsystem: + +Support for big-endian systems has been implemented. Most of the +support has been invisibly added behind big-endian versions of +the ACPI_MOVE_* macros. + +Fixed a problem in AcpiHwDisableGpeBlock() and +AcpiHwClearGpeBlock() where an incorrect offset was passed to the +low level hardware write routine. The offset parameter was +actually eliminated from the low level read/write routines +because they had become obsolete. + +Fixed a problem where a handler object was deleted twice during +the removal of a fixed event handler. + + +2) Linux: + +A fix for SMP systems with link devices was contributed by +Compaq's Dan Zink. + +(2.5) Return whether we handled the interrupt in our IRQ handler. +(Linux ISRs no longer return void, so we can propagate the +handler return value from the ACPI CA core back to the OS.) + + +3) Documentation: + +The ACPI CA Programmer Reference has been updated to reflect new +interfaces and changes to existing interfaces. + +---------------------------------------- +28 March 2003. Summary of changes for version 20030328. + +1) ACPI CA Core Subsystem: + +The GPE Block Device support has been completed. New interfaces +are AcpiInstallGpeBlock and AcpiRemoveGpeBlock. The Event +interfaces (enable, disable, clear, getstatus) have been split +into separate interfaces for Fixed Events and General Purpose +Events (GPEs) in order to support GPE Block Devices properly. + +Fixed a problem where the error message "Failed to acquire +semaphore" would appear during operations on the embedded +controller (EC). + +Code and Data Size: Current core subsystem library sizes are +shown below. These are the code and data sizes for the +acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and +these values do not include any ACPI driver or OSPM code. The +debug version of the code includes the debug output trace +mechanism and has a much larger code and data size. Note that +these values will vary depending on the efficiency of the +compiler and the compiler options used during generation. + + Previous Release + Non-Debug Version: 72.3K Code, 9.5K Data, 81.8K Total + Debug Version: 154.0K Code, 63.4K Data, 217.4K Total + Current Release: + Non-Debug Version: 73.7K Code, 9.5K Data, 83.2K Total + Debug Version: 156.1K Code, 63.6K Data, 219.7K Total + + +---------------------------------------- 28 February 2003. Summary of changes for version 20030228. @@ -82,6 +347,7 @@ Added support for the _PDC reserved name. +---------------------------------------- 22 January 2003. Summary of changes for version 20030122. ==== //depot/projects/ia64/sys/contrib/dev/acpica/acconfig.h#11 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acconfig.h - Global configuration constants - * $Revision: 129 $ + * $Revision: 139 $ * *****************************************************************************/ @@ -120,7 +120,7 @@ /****************************************************************************** * - * Compile-time options + * Configuration options * *****************************************************************************/ @@ -135,6 +135,24 @@ * */ +/* Version string */ + +#define ACPI_CA_VERSION 0x20030619 + +/* Maximum objects in the various object caches */ + +#define ACPI_MAX_STATE_CACHE_DEPTH 64 /* State objects for stacks */ +#define ACPI_MAX_PARSE_CACHE_DEPTH 96 /* Parse tree objects */ +#define ACPI_MAX_EXTPARSE_CACHE_DEPTH 64 /* Parse tree objects */ +#define ACPI_MAX_OBJECT_CACHE_DEPTH 64 /* Interpreter operand objects */ +#define ACPI_MAX_WALK_CACHE_DEPTH 4 /* Objects for parse tree walks */ + +/* + * Should the subystem abort the loading of an ACPI table if the + * table checksum is incorrect? + */ +#define ACPI_CHECKSUM_ABORT FALSE + /****************************************************************************** * @@ -142,23 +160,10 @@ * *****************************************************************************/ - -/* Version string */ - -#define ACPI_CA_VERSION 0x20030228 - /* Version of ACPI supported */ #define ACPI_CA_SUPPORT_LEVEL 2 -/* Maximum objects in the various object caches */ - -#define ACPI_MAX_STATE_CACHE_DEPTH 64 /* State objects for stacks */ -#define ACPI_MAX_PARSE_CACHE_DEPTH 96 /* Parse tree objects */ -#define ACPI_MAX_EXTPARSE_CACHE_DEPTH 64 /* Parse tree objects */ -#define ACPI_MAX_OBJECT_CACHE_DEPTH 64 /* Interpreter operand objects */ -#define ACPI_MAX_WALK_CACHE_DEPTH 4 /* Objects for parse tree walks */ - /* String size constants */ #define ACPI_MAX_STRING_LENGTH 512 @@ -179,20 +184,6 @@ /****************************************************************************** * - * Configuration of subsystem behavior - * - *****************************************************************************/ - - -/* - * Should the subystem abort the loading of an ACPI table if the - * table checksum is incorrect? - */ -#define ACPI_CHECKSUM_ABORT FALSE - - -/****************************************************************************** - * * ACPI Specification constants (Do not change unless the specification changes) * *****************************************************************************/ @@ -215,6 +206,11 @@ #define ACPI_MAX_STRING_CONVERSION 200 +/* Length of _HID, _UID, and _CID values */ + +#define ACPI_DEVICE_ID_LENGTH 0x09 +#define ACPI_MAX_CID_LENGTH 48 + /* * Operand Stack (in WALK_STATE), Must be large enough to contain METHOD_MAX_ARG */ @@ -269,7 +265,6 @@ * *****************************************************************************/ - #define ACPI_DEBUGGER_MAX_ARGS 8 /* Must be max method args + 1 */ #define ACPI_DEBUGGER_COMMAND_PROMPT '-' ==== //depot/projects/ia64/sys/contrib/dev/acpica/acdebug.h#8 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acdebug.h - ACPI/AML debugger - * $Revision: 70 $ + * $Revision: 72 $ * *****************************************************************************/ @@ -305,10 +305,6 @@ char *OutputType); void -AcpiDbDecodeNode ( - ACPI_NAMESPACE_NODE *Node); - -void AcpiDbDisplayResultObject ( ACPI_OPERAND_OBJECT *ObjDesc, ACPI_WALK_STATE *WalkState); @@ -318,11 +314,6 @@ char *DisplayCountArg); void -AcpiDbDisplayInternalObject ( - ACPI_OPERAND_OBJECT *ObjDesc, - ACPI_WALK_STATE *WalkState); - -void AcpiDbDisplayArguments ( void); @@ -339,6 +330,10 @@ void); void +AcpiDbDisplayObjectType ( + char *ObjectArg); + +void AcpiDbDisplayArgumentObject ( ACPI_OPERAND_OBJECT *ObjDesc, ACPI_WALK_STATE *WalkState); @@ -351,10 +346,6 @@ AcpiDbGetPointer ( void *Target); -void -AcpiDbDecodeInternalObject ( - ACPI_OPERAND_OBJECT *ObjDesc); - /* * dbexec - debugger control method execution ==== //depot/projects/ia64/sys/contrib/dev/acpica/acdisasm.h#5 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acdisasm.h - AML disassembler - * $Revision: 8 $ + * $Revision: 9 $ * *****************************************************************************/ @@ -277,6 +277,34 @@ /* + * dmobject + */ + +void +AcpiDmDecodeNode ( + ACPI_NAMESPACE_NODE *Node); + +void +AcpiDmDisplayInternalObject ( + ACPI_OPERAND_OBJECT *ObjDesc, + ACPI_WALK_STATE *WalkState); + +void +AcpiDmDisplayArguments ( + ACPI_WALK_STATE *WalkState); + +void +AcpiDmDisplayLocals ( + ACPI_WALK_STATE *WalkState); + +void +AcpiDmDumpMethodInfo ( + ACPI_STATUS Status, + ACPI_WALK_STATE *WalkState, + ACPI_PARSE_OBJECT *Op); + + +/* * dmbuffer */ ==== //depot/projects/ia64/sys/contrib/dev/acpica/acevents.h#8 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acevents.h - Event subcomponent prototypes and defines - * $Revision: 83 $ + * $Revision: 91 $ * *****************************************************************************/ @@ -182,21 +182,44 @@ * Evgpe - GPE handling and dispatch */ +ACPI_STATUS +AcpiEvWalkGpeList ( + ACPI_GPE_CALLBACK GpeWalkCallback); + +BOOLEAN +AcpiEvValidGpeEvent ( + ACPI_GPE_EVENT_INFO *GpeEventInfo); + ACPI_GPE_EVENT_INFO * AcpiEvGetGpeEventInfo ( + ACPI_HANDLE GpeDevice, UINT32 GpeNumber); ACPI_STATUS AcpiEvGpeInitialize ( void); +ACPI_STATUS +AcpiEvCreateGpeBlock ( + ACPI_NAMESPACE_NODE *GpeDevice, + ACPI_GENERIC_ADDRESS *GpeBlockAddress, + UINT32 RegisterCount, + UINT8 GpeBlockBaseNumber, + UINT32 InterruptLevel, + ACPI_GPE_BLOCK_INFO **ReturnGpeBlock); + +ACPI_STATUS +AcpiEvDeleteGpeBlock ( + ACPI_GPE_BLOCK_INFO *GpeBlock); + UINT32 AcpiEvGpeDispatch ( - ACPI_GPE_EVENT_INFO *GpeEventInfo); + ACPI_GPE_EVENT_INFO *GpeEventInfo, + UINT32 GpeNumber); UINT32 AcpiEvGpeDetect ( - void); + ACPI_GPE_XRUPT_INFO *GpeXruptList); /* * Evregion - Address Space handling @@ -215,7 +238,7 @@ void *Value); ACPI_STATUS -AcpiEvAddrHandlerHelper ( +AcpiEvInstallHandler ( ACPI_HANDLE ObjHandle, UINT32 Level, void *Context, @@ -289,6 +312,10 @@ * Evsci - SCI (System Control Interrupt) handling/dispatch */ +UINT32 ACPI_SYSTEM_XFACE +AcpiEvGpeXruptHandler ( + void *Context); + UINT32 AcpiEvInstallSciHandler ( void); ==== //depot/projects/ia64/sys/contrib/dev/acpica/acexcep.h#7 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acexcep.h - Exception codes returned by the ACPI subsystem >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jul 13 16:46:35 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F01B37B404; Sun, 13 Jul 2003 16:46:35 -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 E9DC037B401 for ; Sun, 13 Jul 2003 16:46:34 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8AC7043FAF for ; Sun, 13 Jul 2003 16:46:34 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6DNkY0U095217 for ; Sun, 13 Jul 2003 16:46:34 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6DNkYUU095214 for perforce@freebsd.org; Sun, 13 Jul 2003 16:46:34 -0700 (PDT) Date: Sun, 13 Jul 2003 16:46:34 -0700 (PDT) Message-Id: <200307132346.h6DNkYUU095214@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 34454 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jul 2003 23:46:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=34454 Change 34454 by marcel@marcel_nfs on 2003/07/13 16:46:21 IFC @34453 Affected files ... .. //depot/projects/ia64/lib/csu/ia64/Makefile#5 integrate .. //depot/projects/ia64/lib/csu/ia64/crt1.S#1 branch .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#104 integrate Differences ... ==== //depot/projects/ia64/lib/csu/ia64/Makefile#5 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/lib/csu/ia64/Makefile,v 1.11 2002/07/29 09:40:11 ru Exp $ +# $FreeBSD: src/lib/csu/ia64/Makefile,v 1.12 2003/07/13 23:11:37 marcel Exp $ .PATH: ${.CURDIR}/../common -SRCS= crt1.c crti.S crtn.S +SRCS= crt1.S crti.S crtn.S OBJS= ${SRCS:N*.h:R:S/$/.o/g} OBJS+= gcrt1.o CFLAGS+= -Wall -Wno-unused \ @@ -13,7 +13,7 @@ CLEANFILES= ${OBJS} -gcrt1.o: crt1.c +gcrt1.o: crt1.S ${CC} ${CFLAGS} -DGCRT -c -o gcrt1.o ${.ALLSRC} realinstall: ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#104 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.584 2003/07/12 07:41:39 hrs Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.585 2003/07/13 23:26:20 hrs Exp $ 2000 @@ -280,6 +280,9 @@ Contributed Software + The ACPI-CA code has been updated + from the 20030228 snapshot to the 20030619 snapshot. + BIND has been updated from 8.3.4 to 8.3.6. From owner-p4-projects@FreeBSD.ORG Sun Jul 13 16:53:45 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E7F3937B404; Sun, 13 Jul 2003 16:53:44 -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 93E9137B401 for ; Sun, 13 Jul 2003 16:53:44 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 27EA943FCB for ; Sun, 13 Jul 2003 16:53:44 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6DNrh0U000919 for ; Sun, 13 Jul 2003 16:53:43 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6DNrhgI000916 for perforce@freebsd.org; Sun, 13 Jul 2003 16:53:43 -0700 (PDT) Date: Sun, 13 Jul 2003 16:53:43 -0700 (PDT) Message-Id: <200307132353.h6DNrhgI000916@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 34455 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jul 2003 23:53:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=34455 Change 34455 by marcel@marcel_nfs on 2003/07/13 16:52:51 Revert to vendor code. Affected files ... .. //depot/projects/ia64/sys/contrib/dev/acpica/actables.h#8 edit Differences ... ==== //depot/projects/ia64/sys/contrib/dev/acpica/actables.h#8 (text+ko) ==== @@ -254,7 +254,7 @@ AcpiTbDeleteSingleTable ( ACPI_TABLE_DESC *TableDesc); -void +ACPI_TABLE_DESC * AcpiTbUninstallTable ( ACPI_TABLE_DESC *TableDesc); From owner-p4-projects@FreeBSD.ORG Sun Jul 13 17:04:59 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 159AB37B404; Sun, 13 Jul 2003 17:04:59 -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 A88CF37B401 for ; Sun, 13 Jul 2003 17:04:58 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5146F43F75 for ; Sun, 13 Jul 2003 17:04:58 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6E04w0U002178 for ; Sun, 13 Jul 2003 17:04:58 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6E04vbC002175 for perforce@freebsd.org; Sun, 13 Jul 2003 17:04:57 -0700 (PDT) Date: Sun, 13 Jul 2003 17:04:57 -0700 (PDT) Message-Id: <200307140004.h6E04vbC002175@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 34456 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jul 2003 00:05:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=34456 Change 34456 by marcel@marcel_nfs on 2003/07/13 17:04:45 Fix ACPI compilation breakage. AcpiOsReadable() and AcpiOsWritable() now take ACPI_SIZE as the second argument, not UINT32. Affected files ... .. //depot/projects/ia64/sys/dev/acpica/Osd/OsdMemory.c#9 edit Differences ... ==== //depot/projects/ia64/sys/dev/acpica/Osd/OsdMemory.c#9 (text+ko) ==== @@ -80,13 +80,13 @@ * that callers will not pass garbage to us. */ BOOLEAN -AcpiOsReadable (void *Pointer, UINT32 Length) +AcpiOsReadable (void *Pointer, ACPI_SIZE Length) { return(TRUE); } BOOLEAN -AcpiOsWritable (void *Pointer, UINT32 Length) +AcpiOsWritable (void *Pointer, ACPI_SIZE Length) { return(TRUE); } From owner-p4-projects@FreeBSD.ORG Sun Jul 13 22:41:51 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5863D37B404; Sun, 13 Jul 2003 22:41:49 -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 EB01F37B401 for ; Sun, 13 Jul 2003 22:41:48 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4EF5243F3F for ; Sun, 13 Jul 2003 22:41:48 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6E5fm0U027009 for ; Sun, 13 Jul 2003 22:41:48 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6E5fl99027006 for perforce@freebsd.org; Sun, 13 Jul 2003 22:41:47 -0700 (PDT) Date: Sun, 13 Jul 2003 22:41:47 -0700 (PDT) Message-Id: <200307140541.h6E5fl99027006@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 34463 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jul 2003 05:41:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=34463 Change 34463 by marcel@marcel_nfs on 2003/07/13 22:41:13 IFC @34462 Affected files ... .. //depot/projects/ia64/lib/csu/ia64/crt1.c#6 delete .. //depot/projects/ia64/sbin/dump/dump.8#17 integrate .. //depot/projects/ia64/share/man/man4/Makefile#52 integrate .. //depot/projects/ia64/share/man/man4/fla.4#1 branch .. //depot/projects/ia64/sys/contrib/dev/acpica/acdisasm.h#6 integrate .. //depot/projects/ia64/sys/dev/acpica/Osd/OsdMemory.c#10 integrate .. //depot/projects/ia64/usr.sbin/apm/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/apm/zzz.8#1 branch .. //depot/projects/ia64/usr.sbin/apm/zzz.sh#1 branch .. //depot/projects/ia64/usr.sbin/lpr/common_source/common.c#6 integrate .. //depot/projects/ia64/usr.sbin/lpr/common_source/ctlinfo.c#6 integrate .. //depot/projects/ia64/usr.sbin/lpr/common_source/ctlinfo.h#3 integrate .. //depot/projects/ia64/usr.sbin/lpr/common_source/displayq.c#2 integrate .. //depot/projects/ia64/usr.sbin/lpr/common_source/lp.cdefs.h#1 branch .. //depot/projects/ia64/usr.sbin/lpr/common_source/lp.h#5 integrate .. //depot/projects/ia64/usr.sbin/lpr/common_source/matchjobs.c#3 integrate .. //depot/projects/ia64/usr.sbin/lpr/common_source/matchjobs.h#2 integrate .. //depot/projects/ia64/usr.sbin/lpr/common_source/net.c#2 integrate .. //depot/projects/ia64/usr.sbin/lpr/common_source/printcap.c#3 integrate .. //depot/projects/ia64/usr.sbin/lpr/common_source/request.c#2 integrate .. //depot/projects/ia64/usr.sbin/lpr/common_source/rmjob.c#2 integrate .. //depot/projects/ia64/usr.sbin/lpr/common_source/startdaemon.c#3 integrate Differences ... ==== //depot/projects/ia64/sbin/dump/dump.8#17 (text+ko) ==== @@ -31,7 +31,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)dump.8 8.3 (Berkeley) 5/1/95 -.\" $FreeBSD: src/sbin/dump/dump.8,v 1.58 2003/06/08 12:49:53 charnier Exp $ +.\" $FreeBSD: src/sbin/dump/dump.8,v 1.59 2003/07/14 02:22:55 grog Exp $ .\" .Dd March 1, 2002 .Dt DUMP 8 @@ -133,11 +133,7 @@ This option overrides the calculation of tape size based on length and density. .It Fl b Ar blocksize -The number of kilobytes per output block, except that if it is -larger than 64, the command uses 64. -(See the -.Sx BUGS -section.) +The number of kilobytes per output block. The default block size is 10. .It Fl C Ar cachesize Specify the cache size in megabytes. @@ -445,14 +441,6 @@ reels already written just hang around until the entire tape is written. .Pp -Currently, -.Xr physio 9 -slices all requests into chunks of 64 KB. -Therefore, it is -impossible to use a larger output block size, so -.Nm -will prevent this from happening. -.Pp The .Nm utility with the ==== //depot/projects/ia64/share/man/man4/Makefile#52 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.213 2003/06/26 09:50:51 smkelly Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.214 2003/07/14 03:23:57 obrien Exp $ MAN= aac.4 \ acpi.4 \ @@ -59,6 +59,7 @@ fd.4 \ fdc.4 \ firewire.4 \ + fla.4 \ fpa.4 \ fwe.4 \ fwohci.4 \ ==== //depot/projects/ia64/sys/contrib/dev/acpica/acdisasm.h#6 (text+ko) ==== @@ -226,10 +226,6 @@ AcpiDmDecodeInternalObject ( ACPI_OPERAND_OBJECT *ObjDesc); -void -AcpiDmDecodeNode ( - ACPI_NAMESPACE_NODE *Node); - UINT32 AcpiDmBlockType ( ACPI_PARSE_OBJECT *Op); ==== //depot/projects/ia64/sys/dev/acpica/Osd/OsdMemory.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/Osd/OsdMemory.c,v 1.9 2003/07/13 22:57:16 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/Osd/OsdMemory.c,v 1.10 2003/07/14 02:42:15 marcel Exp $ */ /* ==== //depot/projects/ia64/usr.sbin/apm/Makefile#3 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/usr.sbin/apm/Makefile,v 1.13 2003/04/04 17:49:12 obrien Exp $ +# $FreeBSD: src/usr.sbin/apm/Makefile,v 1.14 2003/07/14 03:58:05 njl Exp $ PROG= apm -LINKS= ${BINDIR}/apm ${BINDIR}/zzz -MAN= apm.8 -MLINKS= apm.8 apmconf.8 apm.8 zzz.8 +SCRIPTS=zzz.sh +MAN= apm.8 zzz.8 +MLINKS= apm.8 apmconf.8 .include ==== //depot/projects/ia64/usr.sbin/lpr/common_source/common.c#6 (text+ko) ==== @@ -36,13 +36,11 @@ * SUCH DAMAGE. */ -#ifndef lint -/* +#if 0 static char sccsid[] = "@(#)common.c 8.5 (Berkeley) 4/28/95"; -*/ -static const char rcsid[] = - "$FreeBSD: src/usr.sbin/lpr/common_source/common.c,v 1.31 2002/07/12 01:37:06 gad Exp $"; -#endif /* not lint */ +#endif +#include "lp.cdefs.h" /* A cross-platform version of */ +__FBSDID("$FreeBSD: src/usr.sbin/lpr/common_source/common.c,v 1.32 2003/07/14 05:15:21 gad Exp $"); #include #include ==== //depot/projects/ia64/usr.sbin/lpr/common_source/ctlinfo.c#6 (text+ko) ==== @@ -31,10 +31,8 @@ * ------+---------+---------+---------+---------+---------+---------+---------* */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/usr.sbin/lpr/common_source/ctlinfo.c,v 1.8 2003/06/12 03:49:40 gad Exp $"; -#endif /* not lint */ +#include "lp.cdefs.h" /* A cross-platform version of */ +__FBSDID("$FreeBSD: src/usr.sbin/lpr/common_source/ctlinfo.c,v 1.9 2003/07/14 05:15:21 gad Exp $"); /* * ctlinfo - This collection of routines will know everything there is to ==== //depot/projects/ia64/usr.sbin/lpr/common_source/ctlinfo.h#3 (text+ko) ==== @@ -29,7 +29,7 @@ * official policies, either expressed or implied, of the FreeBSD Project. * * ------+---------+---------+---------+---------+---------+---------+---------* - * $FreeBSD: src/usr.sbin/lpr/common_source/ctlinfo.h,v 1.2 2002/07/12 00:33:07 gad Exp $ + * $FreeBSD: src/usr.sbin/lpr/common_source/ctlinfo.h,v 1.3 2003/07/14 05:15:21 gad Exp $ * ------+---------+---------+---------+---------+---------+---------+---------* */ @@ -64,7 +64,7 @@ struct cjprivate *cji_priv; }; -#include +#include "lp.cdefs.h" /* A cross-platform version of */ __BEGIN_DECLS void ctl_freeinf(struct cjobinfo *_cjinf); ==== //depot/projects/ia64/usr.sbin/lpr/common_source/displayq.c#2 (text+ko) ==== @@ -31,13 +31,11 @@ * SUCH DAMAGE. */ -#ifndef lint -/* +#if 0 static char sccsid[] = "@(#)displayq.c 8.4 (Berkeley) 4/28/95"; -*/ -static const char rcsid[] = - "$FreeBSD: src/usr.sbin/lpr/common_source/displayq.c,v 1.23 2001/08/30 09:26:54 kris Exp $"; -#endif /* not lint */ +#endif +#include "lp.cdefs.h" /* A cross-platform version of */ +__FBSDID("$FreeBSD: src/usr.sbin/lpr/common_source/displayq.c,v 1.24 2003/07/14 05:15:21 gad Exp $"); #include #include ==== //depot/projects/ia64/usr.sbin/lpr/common_source/lp.h#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * From: @(#)lp.h 8.2 (Berkeley) 4/28/95 - * $FreeBSD: src/usr.sbin/lpr/common_source/lp.h,v 1.23 2002/07/12 01:31:46 gad Exp $ + * $FreeBSD: src/usr.sbin/lpr/common_source/lp.h,v 1.24 2003/07/14 05:15:21 gad Exp $ */ #include @@ -253,7 +253,7 @@ #define CMD_SHOWQ_LONG '\4' #define CMD_RMJOB '\5' -#include +#include "lp.cdefs.h" /* A cross-platform version of */ __BEGIN_DECLS struct dirent; ==== //depot/projects/ia64/usr.sbin/lpr/common_source/matchjobs.c#3 (text+ko) ==== @@ -32,10 +32,8 @@ * ------+---------+---------+---------+---------+---------+---------+---------* */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/usr.sbin/lpr/common_source/matchjobs.c,v 1.3 2002/08/11 13:05:29 schweikh Exp $"; -#endif /* not lint */ +#include "lp.cdefs.h" /* A cross-platform version of */ +__FBSDID("$FreeBSD: src/usr.sbin/lpr/common_source/matchjobs.c,v 1.4 2003/07/14 05:15:21 gad Exp $"); /* * movejobs.c - The lpc commands which move jobs around. ==== //depot/projects/ia64/usr.sbin/lpr/common_source/matchjobs.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * or FreeBSD, Inc. * * ------+---------+---------+---------+---------+---------+---------+---------* - * $FreeBSD: src/usr.sbin/lpr/common_source/matchjobs.h,v 1.1 2002/07/17 00:51:19 gad Exp $ + * $FreeBSD: src/usr.sbin/lpr/common_source/matchjobs.h,v 1.2 2003/07/14 05:15:21 gad Exp $ * ------+---------+---------+---------+---------+---------+---------+---------* */ @@ -84,7 +84,8 @@ #define SCQ_JSORDER 0x0001 /* follow the user-specified order */ #define SCQ_QORDER 0x0002 /* the order of jobs in the queue */ -#include +#include "lp.cdefs.h" /* A cross-platform version of */ + __BEGIN_DECLS struct jobqueue; ==== //depot/projects/ia64/usr.sbin/lpr/common_source/net.c#2 (text+ko) ==== @@ -38,10 +38,8 @@ * From: @(#)common.c 8.5 (Berkeley) 4/28/95 */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/usr.sbin/lpr/common_source/net.c,v 1.7 2001/06/15 22:03:03 gad Exp $"; -#endif /* not lint */ +#include "lp.cdefs.h" /* A cross-platform version of */ +__FBSDID("$FreeBSD: src/usr.sbin/lpr/common_source/net.c,v 1.8 2003/07/14 05:15:21 gad Exp $"); #include #include ==== //depot/projects/ia64/usr.sbin/lpr/common_source/printcap.c#3 (text+ko) ==== @@ -38,10 +38,8 @@ * From: @(#)common.c 8.5 (Berkeley) 4/28/95 */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD: src/usr.sbin/lpr/common_source/printcap.c,v 1.9 2002/04/23 00:06:10 gad Exp $"; -#endif /* not lint */ +#include "lp.cdefs.h" /* A cross-platform version of */ +__FBSDID("$FreeBSD: src/usr.sbin/lpr/common_source/printcap.c,v 1.10 2003/07/14 05:15:21 gad Exp $"); #include #include ==== //depot/projects/ia64/usr.sbin/lpr/common_source/request.c#2 (text+ko) ==== @@ -29,8 +29,8 @@ static const char copyright[] = "Copyright (C) 1997, Massachusetts Institute of Technology\r\n"; -static const char rcsid[] = - "$FreeBSD: src/usr.sbin/lpr/common_source/request.c,v 1.3 2000/12/30 20:56:04 phk Exp $"; +#include "lp.cdefs.h" /* A cross-platform version of */ +__FBSDID("$FreeBSD: src/usr.sbin/lpr/common_source/request.c,v 1.4 2003/07/14 05:15:21 gad Exp $"); #include #include ==== //depot/projects/ia64/usr.sbin/lpr/common_source/rmjob.c#2 (text+ko) ==== @@ -31,13 +31,11 @@ * SUCH DAMAGE. */ -#ifndef lint #if 0 static char sccsid[] = "@(#)rmjob.c 8.2 (Berkeley) 4/28/95"; #endif -static const char rcsid[] = - "$FreeBSD: src/usr.sbin/lpr/common_source/rmjob.c,v 1.17 2001/06/15 22:03:03 gad Exp $"; -#endif /* not lint */ +#include "lp.cdefs.h" /* A cross-platform version of */ +__FBSDID("$FreeBSD: src/usr.sbin/lpr/common_source/rmjob.c,v 1.18 2003/07/14 05:15:21 gad Exp $"); #include #include ==== //depot/projects/ia64/usr.sbin/lpr/common_source/startdaemon.c#3 (text+ko) ==== @@ -31,14 +31,11 @@ * SUCH DAMAGE. */ -#ifndef lint #if 0 static char sccsid[] = "@(#)startdaemon.c 8.2 (Berkeley) 4/17/94"; #endif -static const char rcsid[] = - "$FreeBSD: src/usr.sbin/lpr/common_source/startdaemon.c,v 1.10 2002/04/23 02:42:04 gad Exp $"; -#endif /* not lint */ - +#include "lp.cdefs.h" /* A cross-platform version of */ +__FBSDID("$FreeBSD: src/usr.sbin/lpr/common_source/startdaemon.c,v 1.11 2003/07/14 05:15:21 gad Exp $"); #include #include From owner-p4-projects@FreeBSD.ORG Mon Jul 14 05:16:50 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D980137B407; Mon, 14 Jul 2003 05:16:48 -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 7889737B401 for ; Mon, 14 Jul 2003 05:16:48 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 56BF443FA3 for ; Mon, 14 Jul 2003 05:16:47 -0700 (PDT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6ECGl0U058011 for ; Mon, 14 Jul 2003 05:16:47 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6ECGkBn058008 for perforce@freebsd.org; Mon, 14 Jul 2003 05:16:46 -0700 (PDT) Date: Mon, 14 Jul 2003 05:16:46 -0700 (PDT) Message-Id: <200307141216.h6ECGkBn058008@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 34468 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jul 2003 12:16:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=34468 Change 34468 by des@des.at.des.thinksec.com on 2003/07/14 05:15:45 Constify the msg field of struct pam_message, and realign. Affected files ... .. //depot/projects/openpam/include/security/pam_types.h#12 edit Differences ... ==== //depot/projects/openpam/include/security/pam_types.h#12 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/include/security/pam_types.h#11 $ + * $P4: //depot/projects/openpam/include/security/pam_types.h#12 $ */ #ifndef _PAM_TYPES_H_INCLUDED @@ -47,22 +47,22 @@ * XSSO 5.1.1 */ struct pam_message { - int msg_style; - char *msg; + int msg_style; + const char *msg; }; struct pam_response { - char *resp; - int resp_retcode; + char *resp; + int resp_retcode; }; /* * XSSO 5.1.2 */ struct pam_conv { - int (*conv)(int, const struct pam_message **, - struct pam_response **, void *); - void *appdata_ptr; + int (*conv)(int, const struct pam_message **, + struct pam_response **, void *); + void *appdata_ptr; }; /* @@ -75,9 +75,9 @@ * Solaris 9 */ typedef struct pam_repository { - char *type; - void *scope; - size_t scope_len; + char *type; + void *scope; + size_t scope_len; } pam_repository_t; #ifdef __cplusplus From owner-p4-projects@FreeBSD.ORG Mon Jul 14 05:17:52 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82FE137B404; Mon, 14 Jul 2003 05:17:50 -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 D074437B401 for ; Mon, 14 Jul 2003 05:17:49 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 62FA743F75 for ; Mon, 14 Jul 2003 05:17:49 -0700 (PDT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6ECHn0U058047 for ; Mon, 14 Jul 2003 05:17:49 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6ECHmnu058044 for perforce@freebsd.org; Mon, 14 Jul 2003 05:17:48 -0700 (PDT) Date: Mon, 14 Jul 2003 05:17:48 -0700 (PDT) Message-Id: <200307141217.h6ECHmnu058044@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 34469 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jul 2003 12:17:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=34469 Change 34469 by des@des.at.des.thinksec.com on 2003/07/14 05:17:47 Use read(2) on fileno(stdin) rather than fgets(3). This make timeout handling considerably simpler, eliminating the need for setjmp(3) and evil global variables. Portions submitted by: Dmitry V. Levin Affected files ... .. //depot/projects/openpam/configure.in#3 edit .. //depot/projects/openpam/include/security/openpam.h#25 edit .. //depot/projects/openpam/lib/openpam_ttyconv.c#22 edit Differences ... ==== //depot/projects/openpam/configure.in#3 (text+ko) ==== @@ -1,4 +1,4 @@ -dnl $P4: //depot/projects/openpam/configure.in#2 $ +dnl $P4: //depot/projects/openpam/configure.in#3 $ AC_PREREQ(2.53) AC_INIT([OpenPAM],[YYYYMMDD],[des@freebsd.org]) @@ -6,6 +6,7 @@ AM_CONFIG_HEADER([config.h]) AC_CANONICAL_SYSTEM +AC_C_VOLATILE AC_DISABLE_STATIC AC_PROG_LIBTOOL AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) @@ -63,9 +64,11 @@ AM_CONDITIONAL(WITH_PAM_SU, test "x$with_pam_su" = "xyes") AM_CONDITIONAL(WITH_PAM_UNIX, test "x$with_pam_unix" = "xyes") +AC_PROG_INSTALL + AC_CHECK_HEADERS(crypt.h) -AC_PROG_INSTALL +AC_CHECK_FUNCS(fpurge) DL_LIBS= AC_CHECK_LIB(dl, dlopen, DL_LIBS=-ldl) ==== //depot/projects/openpam/include/security/openpam.h#25 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/include/security/openpam.h#24 $ + * $P4: //depot/projects/openpam/include/security/openpam.h#25 $ */ #ifndef _SECURITY_OPENPAM_H_INCLUDED @@ -178,6 +178,8 @@ struct pam_response **_resp, void *_data); +extern int openpam_ttyconv_timeout; + /* * Null conversation function */ ==== //depot/projects/openpam/lib/openpam_ttyconv.c#22 (text+ko) ==== @@ -31,12 +31,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#21 $ + * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#22 $ */ #include #include +#include #include #include #include @@ -50,14 +51,12 @@ #include "openpam_impl.h" int openpam_ttyconv_timeout = 0; -static jmp_buf jmpenv; -static int timed_out; static void timeout(int sig) { - timed_out = 1; - longjmp(jmpenv, sig); + + (void)sig; } static char * @@ -67,8 +66,10 @@ struct sigaction action, saved_action; sigset_t saved_sigset, sigset; unsigned int saved_alarm; + int eof, error, fd, timed_out; size_t len; char *retval; + char ch; sigemptyset(&sigset); sigaddset(&sigset, SIGINT); @@ -79,18 +80,40 @@ sigemptyset(&action.sa_mask); sigaction(SIGALRM, &action, &saved_action); fputs(msg, stdout); + fflush(stdout); +#ifdef HAVE_FPURGE + fpurge(stdin); +#endif + fd = fileno(stdin); buf[0] = '\0'; timed_out = 0; + eof = error = timed_out = 0; saved_alarm = alarm(openpam_ttyconv_timeout); - if (setjmp(jmpenv) == 0) - fgets(buf, sizeof buf, stdin); - else - fputs(" timeout!\n", stderr); + ch = '\0'; + for (len = 0; ch != '\n' && !eof && !error; ++len) { + switch (read(fd, &ch, 1)) { + case 1: + if (len < PAM_MAX_RESP_SIZE - 1) { + buf[len + 1] = '\0'; + buf[len] = ch; + } + break; + case 0: + eof = 1; + break; + default: + error = errno; + break; + } + } alarm(0); sigaction(SIGALRM, &saved_action, NULL); sigprocmask(SIG_SETMASK, &saved_sigset, NULL); alarm(saved_alarm); - if (timed_out || ferror(stdin) || feof(stdin)) { + if (error == EINTR) + fputs(" timeout!", stderr); + if (error || eof) { + fputs("\n", stderr); memset(buf, 0, sizeof(buf)); return (NULL); } From owner-p4-projects@FreeBSD.ORG Mon Jul 14 06:07:53 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 48B2A37B404; Mon, 14 Jul 2003 06:07:53 -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 C3AFF37B401 for ; Mon, 14 Jul 2003 06:07:52 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 579F243FFB for ; Mon, 14 Jul 2003 06:07:52 -0700 (PDT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6ED7q0U060743 for ; Mon, 14 Jul 2003 06:07:52 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6ED7pCR060740 for perforce@freebsd.org; Mon, 14 Jul 2003 06:07:51 -0700 (PDT) Date: Mon, 14 Jul 2003 06:07:51 -0700 (PDT) Message-Id: <200307141307.h6ED7pCR060740@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 34472 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jul 2003 13:07:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=34472 Change 34472 by des@des.at.des.thinksec.com on 2003/07/14 06:07:23 Install headers in the right place. Affected files ... .. //depot/projects/openpam/include/security/Makefile.am#2 edit Differences ... ==== //depot/projects/openpam/include/security/Makefile.am#2 (text+ko) ==== @@ -1,4 +1,4 @@ -openpamdir = $(oldincludedir)/security +openpamdir = $(includedir)/security openpam_HEADERS = \ openpam.h \ From owner-p4-projects@FreeBSD.ORG Mon Jul 14 06:32:23 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3036137B404; Mon, 14 Jul 2003 06:32:23 -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 BB31837B401 for ; Mon, 14 Jul 2003 06:32:22 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 61B0C43FE0 for ; Mon, 14 Jul 2003 06:32:22 -0700 (PDT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6EDWM0U061655 for ; Mon, 14 Jul 2003 06:32:22 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6EDWL2Z061652 for perforce@freebsd.org; Mon, 14 Jul 2003 06:32:21 -0700 (PDT) Date: Mon, 14 Jul 2003 06:32:21 -0700 (PDT) Message-Id: <200307141332.h6EDWL2Z061652@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 34473 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jul 2003 13:32:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=34473 Change 34473 by des@des.at.des.thinksec.com on 2003/07/14 06:31:38 Solaris needs for NGROUPS_MAX. Don't bother making this conditional as it's a standard header. Affected files ... .. //depot/projects/openpam/lib/openpam_borrow_cred.c#10 edit .. //depot/projects/openpam/lib/openpam_restore_cred.c#9 edit Differences ... ==== //depot/projects/openpam/lib/openpam_borrow_cred.c#10 (text+ko) ==== @@ -31,12 +31,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_borrow_cred.c#9 $ + * $P4: //depot/projects/openpam/lib/openpam_borrow_cred.c#10 $ */ #include #include +#include #include #include #include ==== //depot/projects/openpam/lib/openpam_restore_cred.c#9 (text+ko) ==== @@ -31,12 +31,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_restore_cred.c#8 $ + * $P4: //depot/projects/openpam/lib/openpam_restore_cred.c#9 $ */ #include #include +#include #include #include #include From owner-p4-projects@FreeBSD.ORG Mon Jul 14 13:16:19 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A6D3D37B404; Mon, 14 Jul 2003 13:16:18 -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 576AB37B401; Mon, 14 Jul 2003 13:16:18 -0700 (PDT) Received: from canning.wemm.org (canning.wemm.org [192.203.228.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id D73AB43F75; Mon, 14 Jul 2003 13:16:17 -0700 (PDT) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by canning.wemm.org (Postfix) with ESMTP id C3DF12A7EA; Mon, 14 Jul 2003 13:16:17 -0700 (PDT) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Eric Anholt In-Reply-To: <1058006399.1464.52.camel@leguin> Date: Mon, 14 Jul 2003 13:16:17 -0700 From: Peter Wemm Message-Id: <20030714201617.C3DF12A7EA@canning.wemm.org> cc: Perforce Change Reviews cc: John Baldwin Subject: Re: PERFORCE change 33663 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jul 2003 20:16:19 -0000 Eric Anholt wrote: > On Thu, 2003-06-26 at 10:57, John Baldwin wrote: > > On 25-Jun-2003 Peter Wemm wrote: > > > http://perforce.freebsd.org/chv.cgi?CH=33663 > > > > > > Change 33663 by peter@peter_hammer on 2003/06/25 15:05:09 > > > > > > Port sym to amd64 > > > > This is possibly not correct. Do all hammer's support the P3+ > > SFENCE and related instructions? Even i386 should probably be > > using what bus_space_barrier() uses. Heck, sym should probably > > just be using bus_space_barrier anyways. > > It would sure be nice to have an MI call for the bus_space_barrier() > calls that don't need a bus_space_tag. The DRM unfortunately doesn't > (and won't ever, I think) do bus_space, so we have to have > platform-specific ifdefs for read, write, and read/write barriers. Yes, it has the *FENCE instructions, but it still has the same memory ordering semantics. *FENCE has most effect on the SSE/SSE2 instructions, not so much the regular x86* instruction stream, unless MTRR/PAT are in the middle of things as well. This is usually not the case for things like disk IO.. Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 From owner-p4-projects@FreeBSD.ORG Mon Jul 14 14:44:53 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8317237B404; Mon, 14 Jul 2003 14:44:52 -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 34DCF37B401 for ; Mon, 14 Jul 2003 14:44:52 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D20C943F75 for ; Mon, 14 Jul 2003 14:44:51 -0700 (PDT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6ELip0U099175 for ; Mon, 14 Jul 2003 14:44:51 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6ELipn4099172 for perforce@freebsd.org; Mon, 14 Jul 2003 14:44:51 -0700 (PDT) Date: Mon, 14 Jul 2003 14:44:51 -0700 (PDT) Message-Id: <200307142144.h6ELipn4099172@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 34511 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jul 2003 21:44:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=34511 Change 34511 by des@des.at.des.thinksec.com on 2003/07/14 14:44:14 Include all files listed in the manifest. Affected files ... .. //depot/projects/openpam/dist.sh#10 edit Differences ... ==== //depot/projects/openpam/dist.sh#10 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $P4: //depot/projects/openpam/dist.sh#9 $ +# $P4: //depot/projects/openpam/dist.sh#10 $ # set -e @@ -10,11 +10,11 @@ tarball="${distname}.tar.gz" install -d -m 0755 "${distname}" -grep '^[a-z].*/$' MANIFEST | while read dir; do +grep '^[A-Za-z].*/$' MANIFEST | while read dir; do echo "Creating ${dir}" install -d -m 0755 "${distname}/${dir}" || exit 1 done -grep '^[a-z].*[^/]$' MANIFEST | while read file; do +grep '^[A-Za-z].*[^/]$' MANIFEST | while read file; do echo "Adding ${file}" install -c -m 0644 "${file}" "${distname}/${file}" || exit 1 done From owner-p4-projects@FreeBSD.ORG Mon Jul 14 14:49:43 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F105537B405; Mon, 14 Jul 2003 14:49:42 -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 98C2137B401 for ; Mon, 14 Jul 2003 14:49:42 -0700 (PDT) Received: from mail.speakeasy.net (mail14.speakeasy.net [216.254.0.214]) by mx1.FreeBSD.org (Postfix) with ESMTP id 510FD43FA3 for ; Mon, 14 Jul 2003 14:49:41 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 26952 invoked from network); 14 Jul 2003 21:49:40 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender )encrypted SMTP for ; 14 Jul 2003 21:49:40 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.9/8.12.9) with ESMTP id h6ELnXGI017956; Mon, 14 Jul 2003 17:49:35 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.4 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <1058006399.1464.52.camel@leguin> Date: Mon, 14 Jul 2003 17:49:49 -0400 (EDT) From: John Baldwin To: Eric Anholt cc: Perforce Change Reviews cc: Peter Wemm Subject: RE: PERFORCE change 33663 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jul 2003 21:49:44 -0000 On 12-Jul-2003 Eric Anholt wrote: > On Thu, 2003-06-26 at 10:57, John Baldwin wrote: >> On 25-Jun-2003 Peter Wemm wrote: >> > http://perforce.freebsd.org/chv.cgi?CH=33663 >> > >> > Change 33663 by peter@peter_hammer on 2003/06/25 15:05:09 >> > >> > Port sym to amd64 >> >> This is possibly not correct. Do all hammer's support the P3+ >> SFENCE and related instructions? Even i386 should probably be >> using what bus_space_barrier() uses. Heck, sym should probably >> just be using bus_space_barrier anyways. > > It would sure be nice to have an MI call for the bus_space_barrier() > calls that don't need a bus_space_tag. The DRM unfortunately doesn't > (and won't ever, I think) do bus_space, so we have to have > platform-specific ifdefs for read, write, and read/write barriers. For simple memory barriers, you can probably get by with atomic(9) operations coupled with appropriate membars. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ From owner-p4-projects@FreeBSD.ORG Mon Jul 14 14:54:05 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB71B37B405; Mon, 14 Jul 2003 14:54:04 -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 5035237B404 for ; Mon, 14 Jul 2003 14:54:04 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BD44143F75 for ; Mon, 14 Jul 2003 14:54:03 -0700 (PDT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6ELs30U099461 for ; Mon, 14 Jul 2003 14:54:03 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6ELs3mA099458 for perforce@freebsd.org; Mon, 14 Jul 2003 14:54:03 -0700 (PDT) Date: Mon, 14 Jul 2003 14:54:03 -0700 (PDT) Message-Id: <200307142154.h6ELs3mA099458@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 34512 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jul 2003 21:54:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=34512 Change 34512 by des@des.at.des.thinksec.com on 2003/07/14 14:53:19 FOPEN_MAX wasn't such a reliable indicator after all, so use _IOFBF instead. Affected files ... .. //depot/projects/openpam/include/security/openpam.h#26 edit Differences ... ==== //depot/projects/openpam/include/security/openpam.h#26 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/include/security/openpam.h#25 $ + * $P4: //depot/projects/openpam/include/security/openpam.h#26 $ */ #ifndef _SECURITY_OPENPAM_H_INCLUDED @@ -120,10 +120,10 @@ /* * Read cooked lines. - * Checking for FOPEN_MAX is a fairly reliable way to detect the presence - * of + * Checking for _IOFBF is a fairly reliable way to detect the presence + * of , as SUSv3 requires it to be defined there. */ -#ifdef FOPEN_MAX +#ifdef _IOFBF char * openpam_readline(FILE *_f, int *_lineno, From owner-p4-projects@FreeBSD.ORG Mon Jul 14 14:54:06 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 01D4637B401; Mon, 14 Jul 2003 14:54:05 -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 52FDA37B41F for ; Mon, 14 Jul 2003 14:54:05 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7113543F3F for ; Mon, 14 Jul 2003 14:54:04 -0700 (PDT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6ELs40U099474 for ; Mon, 14 Jul 2003 14:54:04 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6ELs3mY099466 for perforce@freebsd.org; Mon, 14 Jul 2003 14:54:03 -0700 (PDT) Date: Mon, 14 Jul 2003 14:54:03 -0700 (PDT) Message-Id: <200307142154.h6ELs3mY099466@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 34513 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jul 2003 21:54:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=34513 Change 34513 by des@des.at.des.thinksec.com on 2003/07/14 14:53:57 Update the release notes and installation instructions. Affected files ... .. //depot/projects/openpam/INSTALL#4 edit .. //depot/projects/openpam/RELNOTES#19 edit Differences ... ==== //depot/projects/openpam/INSTALL#4 (text+ko) ==== @@ -7,8 +7,9 @@ See the release notes for a list of platforms OpenPAM has been tested on. - You will need GNU Make and the GNU C compiler to build OpenPAM. On - some platforms, you may have to install these separately. + You will need the GNU autotools, GNU make and the GNU compiler suite + to build OpenPAM. On some platforms, you may have to install these + separately. 2. CONFIGURATION @@ -26,22 +27,26 @@ --with-pam-unix Builds the sample PAM module. + For more information about configuration options, use the --help + option. + A typical invocation might look like this: # ./configure --with-pam-su --with-pam-unix 3. COMPILATION - To compile OpenPAM, simply run "make" in the top-level OpenPAM - directory: + To compile OpenPAM, simply run "make" (or "gmake" on platforms where + "make" is not GNU make) in the top-level OpenPAM directory: # make 4. INSTALLATION - To install OpenPAM, simply run "make install" in the top-level - OpenPAM directory: + To install OpenPAM, simply run "make install" (or "gmake install" on + platforms where "make" is not GNU make) in the top-level OpenPAM + directory: # make install -$P4: //depot/projects/openpam/INSTALL#3 $ +$P4: //depot/projects/openpam/INSTALL#4 $ ==== //depot/projects/openpam/RELNOTES#19 (text+ko) ==== @@ -1,18 +1,13 @@ - Release notes for OpenPAM Digitalis - =================================== + Release notes for OpenPAM Dogwood + ================================= -This release incorporates several major changes and improvements and -should be considered BETA QUALITY. - This release corresponds to the code used in FreeBSD-CURRENT as of the -release date. It is also known to build cleanly on NetBSD 1.6, -OpenBSD 3.1, and a number of glibc-based Linux platforms (with BSD -make installed). It may or may not build on other platforms; you will -need a BSD-compatible make(1) (NetBSD's make(1) is easy to port to -most POSIX platforms). Previous versions were successfully built on -MacOS X 10.1, but there seem to be issues with the heavily modified -version of GCC 3.1 that ships with MacOS X 10.2. +release date. It has also been tested on several other platforms, and +is expected to work on almost any POSIX-like platform that has GNU +autotools, GNU make and the GNU compiler suite installed. One notable +exception is MacOS X, which ships with a very weird, heavily modified +version of GCC. The library itself is complete. Documentation exists in the form of man pages for the library functions. These man pages are generated by @@ -31,4 +26,4 @@ Please direct bug reports and inquiries to des@freebsd.org. -$P4: //depot/projects/openpam/RELNOTES#18 $ +$P4: //depot/projects/openpam/RELNOTES#19 $ From owner-p4-projects@FreeBSD.ORG Mon Jul 14 15:32:53 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 30A8D37B404; Mon, 14 Jul 2003 15:32:53 -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 C5DD237B401 for ; Mon, 14 Jul 2003 15:32:52 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5ADA043FA3 for ; Mon, 14 Jul 2003 15:32:52 -0700 (PDT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6EMWq0U001901 for ; Mon, 14 Jul 2003 15:32:52 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6EMWpOw001898 for perforce@freebsd.org; Mon, 14 Jul 2003 15:32:51 -0700 (PDT) Date: Mon, 14 Jul 2003 15:32:51 -0700 (PDT) Message-Id: <200307142232.h6EMWpOw001898@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 34515 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jul 2003 22:32:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=34515 Change 34515 by des@des.at.des.thinksec.com on 2003/07/14 15:32:43 Postpone Dogwood until tomorrow. Affected files ... .. //depot/projects/openpam/HISTORY#21 edit Differences ... ==== //depot/projects/openpam/HISTORY#21 (text+ko) ==== @@ -1,4 +1,4 @@ -OpenPAM Dogwood 2003-07-14 +OpenPAM Dogwood 2003-07-15 - ENHANCE: Use the GNU autotools. @@ -263,4 +263,4 @@ First (beta) release. ============================================================================ -$P4: //depot/projects/openpam/HISTORY#20 $ +$P4: //depot/projects/openpam/HISTORY#21 $ From owner-p4-projects@FreeBSD.ORG Mon Jul 14 21:19:56 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A7FF37B404; Mon, 14 Jul 2003 21:19:56 -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 A3DAE37B401 for ; Mon, 14 Jul 2003 21:19:55 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9062943F93 for ; Mon, 14 Jul 2003 21:19:54 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6F4Js0U029589 for ; Mon, 14 Jul 2003 21:19:54 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6F4JrNO029586 for perforce@freebsd.org; Mon, 14 Jul 2003 21:19:53 -0700 (PDT) Date: Mon, 14 Jul 2003 21:19:53 -0700 (PDT) Message-Id: <200307150419.h6F4JrNO029586@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 34521 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jul 2003 04:19:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=34521 Change 34521 by marcel@marcel_nfs on 2003/07/14 21:19:14 IFC @34520 Affected files ... .. //depot/projects/ia64/Makefile.inc1#75 integrate .. //depot/projects/ia64/etc/rc.d/cleanvar#5 integrate .. //depot/projects/ia64/etc/rc.d/ipmon#6 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes#30 integrate .. //depot/projects/ia64/include/histedit.h#3 integrate .. //depot/projects/ia64/rescue/rescue/Makefile#5 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw2.c#22 integrate .. //depot/projects/ia64/sbin/ping/ping.c#24 integrate .. //depot/projects/ia64/share/man/man4/utopia.4#2 integrate .. //depot/projects/ia64/share/man/man9/utopia.9#2 integrate .. //depot/projects/ia64/sys/alpha/alpha/machdep.c#31 integrate .. //depot/projects/ia64/sys/amd64/amd64/machdep.c#9 integrate .. //depot/projects/ia64/sys/conf/files#87 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs#29 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs.h#29 integrate .. //depot/projects/ia64/sys/dev/usb/ohci.c#17 integrate .. //depot/projects/ia64/sys/dev/usb/ubsa.c#6 integrate .. //depot/projects/ia64/sys/dev/usb/ucom.c#10 integrate .. //depot/projects/ia64/sys/dev/usb/uftdi.c#8 integrate .. //depot/projects/ia64/sys/dev/usb/ugen.c#15 integrate .. //depot/projects/ia64/sys/dev/usb/uhci.c#18 integrate .. //depot/projects/ia64/sys/dev/usb/uhid.c#13 integrate .. //depot/projects/ia64/sys/dev/usb/uhub.c#8 integrate .. //depot/projects/ia64/sys/dev/usb/uplcom.c#8 integrate .. //depot/projects/ia64/sys/dev/usb/usb.c#14 integrate .. //depot/projects/ia64/sys/dev/usb/usb_port.h#12 integrate .. //depot/projects/ia64/sys/dev/usb/usb_subr.c#11 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs#43 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs.h#41 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs_data.h#41 integrate .. //depot/projects/ia64/sys/dev/usb/usbdi.c#11 integrate .. //depot/projects/ia64/sys/dev/usb/usbdi.h#7 integrate .. //depot/projects/ia64/sys/dev/usb/usbdi_util.c#7 integrate .. //depot/projects/ia64/sys/dev/usb/usbdivar.h#8 integrate .. //depot/projects/ia64/sys/dev/usb/uscanner.c#12 integrate .. //depot/projects/ia64/sys/dev/usb/uvisor.c#7 integrate .. //depot/projects/ia64/sys/dev/utopia/idtphy.h#2 integrate .. //depot/projects/ia64/sys/dev/utopia/utopia.c#2 integrate .. //depot/projects/ia64/sys/dev/utopia/utopia.h#2 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi_pccard.c#24 integrate .. //depot/projects/ia64/sys/i386/i386/machdep.c#42 integrate .. //depot/projects/ia64/sys/kern/uipc_socket.c#32 integrate .. //depot/projects/ia64/sys/modules/acpi/Makefile#11 integrate .. //depot/projects/ia64/sys/pc98/i386/machdep.c#38 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/machdep.c#29 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#42 integrate .. //depot/projects/ia64/sys/sys/proc.h#70 integrate .. //depot/projects/ia64/usr.sbin/Makefile#44 integrate .. //depot/projects/ia64/usr.sbin/apm/Makefile#4 integrate .. //depot/projects/ia64/usr.sbin/apm/zzz.8#2 delete .. //depot/projects/ia64/usr.sbin/apm/zzz.sh#2 delete .. //depot/projects/ia64/usr.sbin/lpr/common_source/common.c#7 integrate .. //depot/projects/ia64/usr.sbin/lpr/common_source/displayq.c#3 integrate .. //depot/projects/ia64/usr.sbin/lpr/common_source/printcap.c#4 integrate .. //depot/projects/ia64/usr.sbin/lpr/common_source/request.c#3 integrate .. //depot/projects/ia64/usr.sbin/lpr/common_source/rmjob.c#3 integrate .. //depot/projects/ia64/usr.sbin/lpr/common_source/startdaemon.c#4 integrate .. //depot/projects/ia64/usr.sbin/lpr/lpc/cmds.c#6 integrate .. //depot/projects/ia64/usr.sbin/lpr/lpc/cmdtab.c#4 integrate .. //depot/projects/ia64/usr.sbin/lpr/lpc/extern.h#4 integrate .. //depot/projects/ia64/usr.sbin/lpr/lpc/lpc.c#4 integrate .. //depot/projects/ia64/usr.sbin/lpr/lpc/movejobs.c#3 integrate .. //depot/projects/ia64/usr.sbin/lpr/lpd/extern.h#2 integrate .. //depot/projects/ia64/usr.sbin/lpr/lpd/lpd.c#7 integrate .. //depot/projects/ia64/usr.sbin/lpr/lpd/lpdchar.c#2 integrate .. //depot/projects/ia64/usr.sbin/lpr/lpd/modes.c#2 integrate .. //depot/projects/ia64/usr.sbin/lpr/lpd/printjob.c#8 integrate .. //depot/projects/ia64/usr.sbin/lpr/lpd/recvjob.c#4 integrate .. //depot/projects/ia64/usr.sbin/zzz/Makefile#1 branch .. //depot/projects/ia64/usr.sbin/zzz/zzz.8#1 branch .. //depot/projects/ia64/usr.sbin/zzz/zzz.sh#1 branch Differences ... ==== //depot/projects/ia64/Makefile.inc1#75 (text+ko) ==== @@ -1,14 +1,14 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.380 2003/07/11 17:01:58 gordon Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.381 2003/07/14 16:21:16 gordon Exp $ # # Make command line options: # -DNO_KERBEROS Do not build Heimdal (Kerberos 5) +# -DNO_RESCUE do not build rescue binaries # -DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir # -DNOCLEAN do not clean at all # -DNOCRYPT will prevent building of crypt versions # -DNOMAN do not build the manual pages # -DNOPROFILE do not build profiled libraries -# -DNORESCUE do not build rescue binaries # -DNOGAMES do not go into games subdir # -DNOSHARE do not go into share subdir # -DNOINFO do not make or install info files @@ -67,7 +67,7 @@ .if exists(${.CURDIR}/libexec) SUBDIR+= libexec .endif -.if exists(${.CURDIR}/rescue) && !defined(NORESCUE) +.if exists(${.CURDIR}/rescue) && !defined(NO_RESCUE) SUBDIR+= rescue .endif .if exists(${.CURDIR}/sbin) @@ -668,7 +668,7 @@ _yacc= usr.bin/yacc .endif -.if !defined(NORESCUE) && \ +.if !defined(NO_RESCUE) && \ ${BOOTSTRAPPING} < 501100 _crunchgen= usr.sbin/crunch/crunchgen .endif @@ -722,7 +722,7 @@ kerberos5/lib/libasn1 kerberos5/lib/libhdb kerberos5/lib/libsl .endif -.if exists(${.CURDIR}/rescue) && !defined(NORESCUE) +.if exists(${.CURDIR}/rescue) && !defined(NO_RESCUE) _rescue= rescue/rescue .endif @@ -758,7 +758,7 @@ _btxld= usr.sbin/btxld .endif -.if (!defined(NORESCUE) || \ +.if (!defined(NO_RESCUE) || \ defined(RELEASEDIR)) && \ ( ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 501101 ) _crunchide= usr.sbin/crunch/crunchide ==== //depot/projects/ia64/etc/rc.d/cleanvar#5 (text+ko) ==== @@ -1,11 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/cleanvar,v 1.4 2003/04/18 17:55:05 mtm Exp $ +# $FreeBSD: src/etc/rc.d/cleanvar,v 1.5 2003/07/14 13:02:36 mtm Exp $ # # PROVIDE: cleanvar -# REQUIRE: adjkerntz mountcritlocal -# BEFORE: netif +# REQUIRE: mountcritlocal # KEYWORD: FreeBSD purgedir() ==== //depot/projects/ia64/etc/rc.d/ipmon#6 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # # $NetBSD: ipmon,v 2002/04/18 05:02:01 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipmon,v 1.5 2003/04/24 08:20:47 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ipmon,v 1.6 2003/07/14 13:02:36 mtm Exp $ # # PROVIDE: ipmon -# REQUIRE: mountcritlocal hostname sysctl +# REQUIRE: mountcritlocal hostname sysctl cleanvar # BEFORE: SERVERS # KEYWORD: FreeBSD NetBSD ==== //depot/projects/ia64/games/fortune/datfiles/fortunes#30 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.112 2003/06/18 12:46:20 joerg Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.114 2003/07/14 22:22:56 mph Exp $ % -- Gifts for Children -- @@ -7164,10 +7164,6 @@ "I shot an arrow into the air, and it stuck." -- Graffito in Los Angeles % -"I stayed up all night playing poker with tarot cards. I got a full -house and four people died." - -- Steven Wright -% "I stopped believing in Santa Claus when I was six. Mother took me to see him in a department store and he asked for my autograph." -- Shirley Temple @@ -10564,6 +10560,13 @@ % Oh, wow! Look at the moon! % +Ok, note to all reading this: if I ask for information and you don't +have the information available, don't bother sending me an e-mail +just to tell me that you don't have the information available. Wait +until you do have the information available, and then e-mail me. You'll +save precious time and electrons. + -- Bill Paul +% "OK, now let's look at four dimensions on the blackboard." -- Dr. Joy % ==== //depot/projects/ia64/include/histedit.h#3 (text+ko) ==== @@ -35,7 +35,7 @@ * * @(#)histedit.h 8.2 (Berkeley) 1/3/94 * $NetBSD: histedit.h,v 1.15 2000/02/28 17:41:05 chopps Exp $ - * $FreeBSD: src/include/histedit.h,v 1.8 2002/06/16 08:29:33 mdodd Exp $ + * $FreeBSD: src/include/histedit.h,v 1.9 2003/07/14 16:31:20 imp Exp $ */ /* @@ -47,6 +47,8 @@ #include #include +__BEGIN_DECLS + /* * ==== Editing ==== */ @@ -194,4 +196,6 @@ #define H_SAVE 18 /* , const char *); */ #define H_CLEAR 19 /* , void); */ +__END_DECLS + #endif /* _HISTEDIT_H_ */ ==== //depot/projects/ia64/rescue/rescue/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/rescue/rescue/Makefile,v 1.6 2003/07/11 16:57:43 gordon Exp $ +#$FreeBSD: src/rescue/rescue/Makefile,v 1.7 2003/07/15 00:30:31 gordon Exp $ # @(#)Makefile 8.1 (Berkeley) 6/2/93 PROG= rescue @@ -66,9 +66,9 @@ # WARNING: Changing this list may require adjusting # /usr/include/paths.h as well! You were warned! # -CRUNCH_SRCDIRS+=$(.CURDIR)/../../bin $(.CURDIR)/../../usr.bin -CRUNCH_PROGS=cat chflags chio chmod cp date dd df domainname echo ed \ - expr getfacl hostname kenv kill ln ls mkdir mv pax ps pwd \ +CRUNCH_SRCDIRS+=bin +CRUNCH_PROGS_bin=cat chflags chio chmod cp date dd df domainname echo \ + ed expr getfacl hostname kenv kill ln ls mkdir mv pax ps pwd \ realpath rm rmdir setfacl sh sleep stty sync test CRUNCH_LIBS+=-lcrypt -lcrypto -ledit -lkvm -ll -lm -ltermcap -lutil @@ -82,18 +82,18 @@ CRUNCH_ALIAS_ed= red .if !defined(NO_RCMNDS) -CRUNCH_PROGS+= rcp +CRUNCH_PROGS_bin+= rcp .endif .if !defined(NO_TCSH) -CRUNCH_PROGS+= csh +CRUNCH_PROGS_bin+= csh CRUNCH_ALIAS_csh= -csh tcsh -tcsh CRUNCH_SUPPRESS_LINK_-csh=1 CRUNCH_SUPPRESS_LINK_-tcsh=1 .endif #Is rmail of any use at all here? I think not. -#CRUNCH_PROGS+= rmail +#CRUNCH_PROGS_bin+= rmail ################################################################### # Programs from standard /sbin @@ -104,8 +104,8 @@ # Note that mdmfs and shutdown have their own private 'pathnames.h' # headers in addition to the standard 'paths.h' header. # -CRUNCH_SRCDIRS+=$(.CURDIR)/../../sbin -CRUNCH_PROGS+=atm adjkerntz atacontrol badsect bsdlabel camcontrol \ +CRUNCH_SRCDIRS+=sbin +CRUNCH_PROGS_sbin=atm adjkerntz atacontrol badsect bsdlabel camcontrol \ ccdconfig clri comcontrol conscontrol devfs dmesg dump \ dumpfs dumpon fore_dnld fsck fsck_ffs fsck_msdosfs fsdb \ fsirand gbde growfs ifconfig ilmid init ip6fw ipf ipfs ipfstat \ @@ -124,7 +124,7 @@ -lgeom -lmd -lreadline -lsbuf -lufs -lz .if ${MACHINE_ARCH} == "i386" -CRUNCH_PROGS+= cxconfig fdisk +CRUNCH_PROGS_sbin+= cxconfig fdisk CRUNCH_ALIAS_bsdlabel= disklabel #CRUNCH_PROGS+= mount_nwfs mount_smbfs #CRUNCH_LIBS+= -lncp -lsmb @@ -135,11 +135,11 @@ .endif .if ${MACHINE_ARCH} == "ia64" -CRUNCH_PROGS+= mca gpt fdisk +CRUNCH_PROGS_sbin+= mca gpt fdisk .endif .if ${MACHINE_ARCH} == "sparc64" -CRUNCH_PROGS+= sunlabel +CRUNCH_PROGS_sbin+= sunlabel .endif .if ${MACHINE_ARCH} == "alpha" @@ -147,7 +147,7 @@ .endif .if ${MACHINE_ARCH} == "amd64" -CRUNCH_PROGS+= fdisk +CRUNCH_PROGS_sbin+= fdisk CRUNCH_ALIAS_bsdlabel= disklabel .endif @@ -162,26 +162,26 @@ CRUNCH_ALIAS_mount_std= mount_devfs mount_fdescfs mount_linprocfs mount_procfs # dhclient has historically been troublesome... -CRUNCH_PROGS+=dhclient +CRUNCH_PROGS_sbin+=dhclient CRUNCH_BUILDOPTS_dhclient=-DRELEASE_CRUNCH -Dlint ################################################################## # Programs from stock /usr/bin # -CRUNCH_SRCDIRS+=$(.CURDIR)/../../usr.bin -CRUNCH_SRCDIRS+=$(.CURDIR)/../../gnu/usr.bin +CRUNCH_SRCDIRS+=usr.bin +CRUNCH_SRCDIRS+=gnu/usr.bin -CRUNCH_PROGS+=wall +CRUNCH_PROGS_usr.bin+=wall -CRUNCH_PROGS+=gzip +CRUNCH_PROGS_gnu/usr.bin+=gzip CRUNCH_ALIAS_gzip=gunzip gzcat zcat -CRUNCH_PROGS+=bzip2 +CRUNCH_PROGS_usr.bin+=bzip2 CRUNCH_ALIAS_bzip2=bunzip2 bzcat CRUNCH_LIBS+=-lbz2 -CRUNCH_PROGS+=tar -CRUNCH_PROGS+=vi +CRUNCH_PROGS_gnu/usr.bin+=tar +CRUNCH_PROGS_usr.bin+=vi CRUNCH_ALIAS_vi=ex ################################################################## @@ -204,7 +204,8 @@ # Program names and their aliases contribute hardlinks to 'rescue' executable, # except for those that get suppressed. -.for P in $(CRUNCH_PROGS) +.for D in $(CRUNCH_SRCDIRS) +.for P in $(CRUNCH_PROGS_$(D)) .ifndef CRUNCH_SUPPRESS_LINK_${P} LINKS += $(BINDIR)/$(PROG) $(BINDIR)/$(P) .endif @@ -214,6 +215,7 @@ .endif .endfor .endfor +.endfor all: $(PROG) exe: $(PROG) @@ -221,7 +223,7 @@ $(CONF): Makefile echo \# Auto-generated, do not edit >$(.TARGET) .for D in $(CRUNCH_SRCDIRS) - echo srcdirs $(D) >>$(.TARGET) + echo srcdirs $(.CURDIR)/../../$(D) >>$(.TARGET) .endfor .ifdef CRUNCH_BUILDOPTS echo buildopts $(CRUNCH_BUILDOPTS) >>$(.TARGET) @@ -229,7 +231,8 @@ .ifdef CRUNCH_LIBS echo libs $(CRUNCH_LIBS) >>$(.TARGET) .endif -.for P in $(CRUNCH_PROGS) +.for D in $(CRUNCH_SRCDIRS) +.for P in $(CRUNCH_PROGS_$(D)) echo progs $(P) >>$(.TARGET) .ifdef CRUNCH_SRCDIR_${P} echo special $(P) srcdir $(CRUNCH_SRCDIR_${P}) >>$(.TARGET) @@ -241,6 +244,7 @@ echo ln $(P) $(A) >>$(.TARGET) .endfor .endfor +.endfor $(OUTPUTS): $(CONF) @@ -256,7 +260,7 @@ # shell scripts so we can remove this nonsense. build-tools: .for _tool in bin/csh bin/sh - cd ${.CURDIR}/../../${_tool}; \ + cd $(.CURDIR)/../../${_tool}; \ MAKEOBJDIRPREFIX=${CRUNCHOBJS} make DIRPRFX=rescue/${_tool} build-tools .endfor @@ -266,7 +270,15 @@ # targets should NOT be propagated into the components. cleandepend cleandir obj objlink: .for D in $(CRUNCH_SRCDIRS) - cd ${D} && MAKEOBJDIRPREFIX=${CANONICALOBJDIR} make ${.TARGET} +.for P in $(CRUNCH_PROGS_$(D)) +.ifdef CRUNCH_SRCDIR_${P} + cd ${CRUNCH_SRCDIR_$(P)} && \ + MAKEOBJDIRPREFIX=${CANONICALOBJDIR} make ${.TARGET} +.else + cd $(.CURDIR)/../../${D}/${P} && \ + MAKEOBJDIRPREFIX=${CANONICALOBJDIR} make ${.TARGET} +.endif +.endfor .endfor clean: @@ -274,8 +286,16 @@ if [ -e ${.OBJDIR}/$(OUTMK) ]; then \ MAKEOBJDIRPREFIX=${CRUNCHOBJS} make -f $(OUTMK) clean; \ fi -.for D in $(CRUNCH_SRCDIRS) $(EXTRA_SRCDIRS) - cd ${D} && MAKEOBJDIRPREFIX=${CRUNCHOBJS} make clean +.for D in $(CRUNCH_SRCDIRS) +.for P in $(CRUNCH_PROGS_$(D)) +.ifdef CRUNCH_SRCDIR_${P} + cd ${CRUNCH_SRCDIR_$(P)} && \ + MAKEOBJDIRPREFIX=${CANONICALOBJDIR} make ${.TARGET} +.else + cd $(.CURDIR)/../../${D}/${P} && \ + MAKEOBJDIRPREFIX=${CANONICALOBJDIR} make ${.TARGET} +.endif +.endfor .endfor .include ==== //depot/projects/ia64/sbin/ipfw/ipfw2.c#22 (text+ko) ==== @@ -17,7 +17,7 @@ * * NEW command line interface for IP firewall facility * - * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.33 2003/07/12 08:35:25 luigi Exp $ + * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.35 2003/07/14 18:57:41 luigi Exp $ */ #include @@ -59,7 +59,6 @@ do_resolv, /* Would try to resolve all */ do_time, /* Show time stamps */ do_quiet, /* Be quiet in add and flush */ - do_force, /* Don't ask for confirmation */ do_pipe, /* this cmd refers to a pipe */ do_sort, /* field to sort results (0 = no) */ do_dynamic, /* display dynamic rules */ @@ -368,7 +367,7 @@ { static int s = -1; /* the socket */ int i; - + if (test_only) return 0; @@ -501,7 +500,7 @@ int i; *end = s; /* default - not found */ - if ( *s == '\0') + if (*s == '\0') return 0; /* not found */ if (isdigit(*s)) @@ -522,7 +521,7 @@ * copy into a buffer skipping backslashes */ for (p = s, i = 0; p != s1 ; p++) - if ( *p != '\\') + if (*p != '\\') buf[i++] = *p; buf[i++] = '\0'; @@ -646,9 +645,10 @@ * len is the max length in bits. */ static int -contigmask(u_char *p, int len) +contigmask(uint8_t *p, int len) { int i, n; + for (i=0; iarg1 & 0xff; - u_char clear = (cmd->arg1 >> 8) & 0xff; + uint8_t set = cmd->arg1 & 0xff; + uint8_t clear = (cmd->arg1 >> 8) & 0xff; if (list == f_tcpflags && set == TH_SYN && clear == TH_ACK) { printf(" setup"); @@ -715,7 +715,7 @@ x = htonl( ~x ); cmd->addr.s_addr = htonl(cmd->addr.s_addr); printf("%s/%d", inet_ntoa(cmd->addr), - contigmask((u_char *)&x, 32)); + contigmask((uint8_t *)&x, 32)); x = cmd->addr.s_addr = htonl(cmd->addr.s_addr); x &= 0xff; /* base */ /* @@ -747,7 +747,7 @@ for (len = len / 2; len > 0; len--, a += 2) { int mb = /* mask length */ (cmd->o.opcode == O_IP_SRC || cmd->o.opcode == O_IP_DST) ? - 32 : contigmask((u_char *)&(a[1]), 32); + 32 : contigmask((uint8_t *)&(a[1]), 32); if (mb == 32 && do_resolv) he = gethostbyaddr((char *)&(a[0]), sizeof(u_long), AF_INET); if (he != NULL) /* resolved to name */ @@ -764,14 +764,13 @@ if (len > 1) printf(","); } - } /* * prints a MAC address/mask pair */ static void -print_mac(u_char *addr, u_char *mask) +print_mac(uint8_t *addr, uint8_t *mask) { int l = contigmask(mask, 48); @@ -1039,7 +1038,7 @@ show_prerequisites(&flags, 0, cmd->opcode); switch(cmd->opcode) { - case O_PROB: + case O_PROB: break; /* done already */ case O_PROBE_STATE: @@ -1054,8 +1053,8 @@ printf(" not"); printf(" MAC"); flags |= HAVE_MAC; - print_mac( m->addr, m->mask); - print_mac( m->addr + 6, m->mask + 6); + print_mac(m->addr, m->mask); + print_mac(m->addr + 6, m->mask + 6); } break; @@ -1279,7 +1278,7 @@ char const *comma = " "; printf(" limit"); - for ( ; p->x != 0 ; p++) + for (; p->x != 0 ; p++) if ((x & p->x) == p->x) { x &= ~p->x; printf("%s%s", comma, p->s); @@ -1561,13 +1560,13 @@ &set_disable, sizeof(set_disable)); for (i = 0, msg = "disable" ; i < 31; i++) - if ( (set_disable & (1< where is one of:\n" "add [num] [set N] [prob x] RULE-BODY\n" "{pipe|queue} N config PIPE-BODY\n" "[pipe|queue] {zero|delete|show} [N{,N}]\n" @@ -1855,10 +1853,10 @@ "ACTION: check-state | allow | count | deny | reject | skipto N |\n" " {divert|tee} PORT | forward ADDR | pipe N | queue N\n" "ADDR: [ MAC dst src ether_type ] \n" -" [ from IPLIST [ PORT ] to IPLIST [ PORTLIST ] ]\n" -"IPLIST: IPADDR[,IPADDR] | { IPADDR or ... or IPADDR }\n" -"IPADDR: [not] { any | me | ip | ip/bits | ip:mask | ip/bits{x,y,z} }\n" -"OPTION_LIST: OPTION [,OPTION_LIST]\n" +" [ from IPADDR [ PORT ] to IPADDR [ PORTLIST ] ]\n" +"IPADDR: [not] { any | me | ip/bits{x,y,z} | IPLIST }\n" +"IPLIST: { ip | ip/bits | ip:mask }[,IPLIST]\n" +"OPTION_LIST: OPTION [OPTION_LIST]\n" "OPTION: bridged | {dst-ip|src-ip} ADDR | {dst-port|src-port} LIST |\n" " estab | frag | {gid|uid} N | icmptypes LIST | in | out | ipid LIST |\n" " iplen LIST | ipoptions SPEC | ipprecedence | ipsec | iptos SPEC |\n" @@ -1972,7 +1970,7 @@ */ uint32_t *map = (uint32_t *)&cmd->mask; int low, high; - int i = contigmask((u_char *)&(d[1]), 32); + int i = contigmask((uint8_t *)&(d[1]), 32); if (len > 0) errx(EX_DATAERR, "address set cannot be in a list"); @@ -2508,7 +2506,7 @@ } static void -get_mac_addr_mask(char *p, u_char *addr, u_char *mask) +get_mac_addr_mask(char *p, uint8_t *addr, uint8_t *mask) { int i, l; @@ -2561,7 +2559,7 @@ { int i, l; char *p = (char *)(cmd + 1); - + cmd->opcode = O_NOP; cmd->len = (cmd->len & (F_NOT | F_OR)); @@ -2582,7 +2580,7 @@ } *(--p) = '\0'; } - + /* * A function to fill simple commands of size 1. * Existing flags are preserved. @@ -3477,7 +3475,7 @@ * put back O_LOG if necessary */ src = (ipfw_insn *)cmdbuf; - if ( src->opcode == O_LOG ) { + if (src->opcode == O_LOG) { i = F_LEN(src); bcopy(src, dst, i * sizeof(uint32_t)); dst += i; @@ -3542,11 +3540,11 @@ } static void -flush(void) +flush(int force) { int cmd = do_pipe ? IP_DUMMYNET_FLUSH : IP_FW_FLUSH; - if (!do_force && !do_quiet) { /* need to ask user */ + if (!force && !do_quiet) { /* need to ask user */ int c; printf("Are you sure? [yn] "); @@ -3569,7 +3567,21 @@ } /* - * called with the arguments (excluding program name). + * Free a the (locally allocated) copy of command line arguments. + */ +static void +free_args(int ac, char **av) +{ + int i; + + for (i=0; i < ac; i++) + free(av[i]); + free(av); +} + +/* + * Called with the arguments (excluding program name). + * Returns 0 if successful, 1 if empty command, errx() in case of errors. */ static int ipfw_main(int oldac, char **oldav) @@ -3577,9 +3589,12 @@ int ch, ac, save_ac; char **av, **save_av; int do_acct = 0; /* Show packet/byte count */ + int do_force = 0; /* Don't ask for confirmation */ #define WHITESP " \t\f\v\n\r" - if (oldac == 1) { + if (oldac == 0) + return 1; + else if (oldac == 1) { /* * If we are called with a single string, try to split it into * arguments for subsequent parsing. @@ -3607,7 +3622,7 @@ l = j; /* the new argument length */ arg[j++] = '\0'; if (l == 0) /* empty string! */ - show_usage(); + return 1; /* * First, count number of arguments. Because of the previous @@ -3658,9 +3673,6 @@ } } - if (ac == 0) - show_usage(); - /* Set the force flag for non-interactive processes */ do_force = !isatty(STDIN_FILENO); @@ -3692,6 +3704,7 @@ break; case 'h': /* help */ + free_args(save_ac, save_av); help(); break; /* NOTREACHED */ @@ -3728,7 +3741,8 @@ break; default: - show_usage(); + free_args(save_ac, save_av); + return 1; } ac -= optind; @@ -3736,14 +3750,25 @@ NEED1("bad arguments, for usage summary ``ipfw''"); /* + * An undocumented behaviour of ipfw1 was to allow rule numbers first, + * e.g. "100 add allow ..." instead of "add 100 allow ...". + * In case, swap first and second argument to get the normal form. + */ + if (ac > 1 && isdigit(*av[0])) { + char *p = av[0]; + + av[0] = av[1]; + av[1] = p; + } + + /* * optional: pipe or queue */ - if (!strncmp(*av, "pipe", strlen(*av))) { + if (!strncmp(*av, "pipe", strlen(*av))) do_pipe = 1; - ac--; - av++; - } else if (!strncmp(*av, "queue", strlen(*av))) { + else if (!strncmp(*av, "queue", strlen(*av))) do_pipe = 2; + if (do_pipe) { ac--; av++; } @@ -3756,6 +3781,7 @@ */ if (do_pipe > 0 && ac > 1 && isdigit(*av[0])) { char *p = av[0]; + av[0] = av[1]; av[1] = p; } @@ -3767,7 +3793,7 @@ else if (!strncmp(*av, "delete", strlen(*av))) delete(ac, av); else if (!strncmp(*av, "flush", strlen(*av))) - flush(); + flush(do_force); else if (!strncmp(*av, "zero", strlen(*av))) zero(ac, av, IP_FW_ZERO); else if (!strncmp(*av, "resetlog", strlen(*av))) @@ -3787,9 +3813,7 @@ errx(EX_USAGE, "bad command `%s'", *av); /* Free memory allocated in the argument parsing. */ - for (ch=0; ch < save_ac; ch++) - free(save_av[ch]); - free(save_av); + free_args(save_ac, save_av); return 0; } @@ -3868,7 +3892,7 @@ if (preproc == -1) err(EX_OSERR, "cannot fork"); - if (preproc == 0) { + if (preproc == 0) { /* * Child, will run the preprocessor with the * file on stdin and the pipe on stdout. @@ -3931,7 +3955,9 @@ if (ac > 1 && av[ac - 1][0] == '/' && access(av[ac - 1], R_OK) == 0) ipfw_readfile(ac, av); - else - ipfw_main(ac-1, av+1); + else { + if (ipfw_main(ac-1, av+1)) + show_usage(); + } return EX_OK; } ==== //depot/projects/ia64/sbin/ping/ping.c#24 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/ping/ping.c,v 1.98 2003/06/02 10:01:59 maxim Exp $"); +__FBSDID("$FreeBSD: src/sbin/ping/ping.c,v 1.101 2003/07/14 12:43:48 maxim Exp $"); /* * P I N G . C @@ -105,7 +105,6 @@ /* runs out of buffer space */ #define MAXIPLEN (sizeof(struct ip) + MAX_IPOPTLEN) #define MAXICMPLEN (ICMP_ADVLENMIN + MAX_IPOPTLEN) -#define MINICMPLEN ICMP_MINLEN #define MAXWAIT 10 /* max seconds to wait for response */ #define MAXALARM (60 * 60) /* max seconds for alarm timeout */ #define MAXTOS 255 @@ -168,6 +167,7 @@ u_char icmp_type = ICMP_ECHO; u_char icmp_type_rsp = ICMP_ECHOREPLY; int phdr_len = 0; +int send_len; /* counters */ long nmissedmax; /* max value of ntransmitted - nreceived - 1 */ @@ -227,7 +227,7 @@ struct sockaddr_in *to; double t; u_long alarmtimeout, ultmp; - int almost_done, ch, df, hold, i, mib[4], packlen, preload, sockerrno, + int almost_done, ch, df, hold, i, icmp_len, mib[4], preload, sockerrno, tos, ttl; char ctrl[CMSG_SPACE(sizeof(struct timeval))]; char hnamebuf[MAXHOSTNAMELEN], snamebuf[MAXHOSTNAMELEN]; @@ -458,13 +458,15 @@ errx(EX_USAGE, "ICMP_TSTAMP and ICMP_MASKREQ are exclusive."); break; } - maxpayload = IP_MAXPACKET - sizeof(struct ip) - MINICMPLEN - phdr_len; + icmp_len = sizeof(struct ip) + ICMP_MINLEN + phdr_len; if (options & F_RROUTE) - maxpayload -= MAX_IPOPTLEN; + icmp_len += MAX_IPOPTLEN; + maxpayload = IP_MAXPACKET - icmp_len; if (datalen > maxpayload) errx(EX_USAGE, "packet size too large: %d > %d", datalen, maxpayload); - datap = &outpack[MINICMPLEN + phdr_len + TIMEVAL_LEN]; + send_len = icmp_len + datalen; + datap = &outpack[ICMP_MINLEN + phdr_len + TIMEVAL_LEN]; if (options & F_PINGFILLED) { fill((char *)datap, payload); } @@ -527,8 +529,6 @@ if (datalen >= TIMEVAL_LEN) /* can we time transfer */ timing = 1; - packlen = MAXIPLEN + MAXICMPLEN + datalen; - packlen = packlen > IP_MAXPACKET ? IP_MAXPACKET : packlen; if (!(options & F_PINGFILLED)) for (i = TIMEVAL_LEN; i < datalen; ++i) @@ -706,7 +706,7 @@ msg.msg_control = (caddr_t)ctrl; #endif iov.iov_base = packet; - iov.iov_len = packlen; + iov.iov_len = IP_MAXPACKET; if (tcgetattr(STDOUT_FILENO, &ts) != -1) { reset_kerninfo = !(ts.c_lflag & NOKERNINFO); @@ -868,11 +868,11 @@ * 1000 + now.tv_usec / 1000); if (timing) bcopy((void *)&now, - (void *)&outpack[MINICMPLEN + phdr_len], + (void *)&outpack[ICMP_MINLEN + phdr_len], sizeof(struct timeval)); } - cc = MINICMPLEN + phdr_len + datalen; + cc = ICMP_MINLEN + phdr_len + datalen; /* compute ICMP checksum here */ icp->icmp_cksum = in_cksum((u_short *)icp, cc); @@ -924,13 +924,14 @@ struct ip *ip; const void *tp; double triptime; - int dupflag, hlen, i, j, seq; + int dupflag, hlen, i, j, recv_len, seq; static int old_rrlen; static char old_rr[MAX_IPOPTLEN]; /* Check the IP header */ ip = (struct ip *)buf; hlen = ip->ip_hl << 2; + recv_len = cc; if (cc < hlen + ICMP_MINLEN) { if (options & F_VERBOSE) warn("packet too short (%d bytes) from %s", cc, @@ -1008,9 +1009,14 @@ (void)printf(" tsr=%s", pr_ntime(icp->icmp_rtime)); (void)printf(" tst=%s", pr_ntime(icp->icmp_ttime)); } + if (recv_len != send_len) { + (void)printf( + "\nwrong total length %d instead of %d", + recv_len, send_len); + } /* check the data */ cp = (u_char*)&icp->icmp_data[phdr_len]; - dp = &outpack[MINICMPLEN + phdr_len]; + dp = &outpack[ICMP_MINLEN + phdr_len]; cc -= ICMP_MINLEN + phdr_len; i = 0; if (timing) { /* don't check variable timestamp */ @@ -1026,16 +1032,16 @@ (void)printf("\ncp:"); cp = (u_char*)&icp->icmp_data[0]; for (i = 0; i < datalen; ++i, ++cp) { - if ((i % 32) == 8) + if ((i % 16) == 8) (void)printf("\n\t"); - (void)printf("%x ", *cp); + (void)printf("%2x ", *cp); } (void)printf("\ndp:"); - cp = &outpack[MINICMPLEN]; + cp = &outpack[ICMP_MINLEN]; for (i = 0; i < datalen; ++i, ++cp) { - if ((i % 32) == 8) + if ((i % 16) == 8) (void)printf("\n\t"); - (void)printf("%x ", *cp); + (void)printf("%2x ", *cp); } break; } @@ -1539,17 +1545,17 @@ } static char * -pr_ntime (n_time time) +pr_ntime (n_time timestamp) { static char buf[10]; - int h, m, s; + int hour, min, sec; - s = ntohl(time) / 1000; - h = s / 60 / 60; - m = (s % (60 * 60)) / 60; - s = (s % (60 * 60)) % 60; + sec = ntohl(timestamp) / 1000; + hour = sec / 60 / 60; + min = (sec % (60 * 60)) / 60; + sec = (sec % (60 * 60)) % 60; - (void)snprintf(buf, sizeof(buf), "%02d:%02d:%02d", h, m, s); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jul 14 21:35:17 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2BFCB37B404; Mon, 14 Jul 2003 21:35:16 -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 83E8937B401 for ; Mon, 14 Jul 2003 21:35:15 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 16CAE43F3F for ; Mon, 14 Jul 2003 21:35:15 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6F4ZE0U030208 for ; Mon, 14 Jul 2003 21:35:14 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6F4ZEkF030205 for perforce@freebsd.org; Mon, 14 Jul 2003 21:35:14 -0700 (PDT) Date: Mon, 14 Jul 2003 21:35:14 -0700 (PDT) Message-Id: <200307150435.h6F4ZEkF030205@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 34524 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jul 2003 04:35:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=34524 Change 34524 by marcel@marcel_nfs on 2003/07/14 21:34:37 s/thread_siginfo/cpu_thread_siginfo/ Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#80 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/machdep.c#80 (text+ko) ==== @@ -959,7 +959,7 @@ * Build siginfo_t for SA thread */ void -thread_siginfo(int sig, u_long code, siginfo_t *si) +cpu_thread_siginfo(int sig, u_long code, siginfo_t *si) { struct proc *p; struct thread *td; From owner-p4-projects@FreeBSD.ORG Mon Jul 14 21:53:41 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6264C37B404; Mon, 14 Jul 2003 21:53:40 -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 DC2D537B401 for ; Mon, 14 Jul 2003 21:53:39 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7256443F3F for ; Mon, 14 Jul 2003 21:53:39 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6F4rd0U030898 for ; Mon, 14 Jul 2003 21:53:39 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6F4rcYC030895 for perforce@freebsd.org; Mon, 14 Jul 2003 21:53:38 -0700 (PDT) Date: Mon, 14 Jul 2003 21:53:38 -0700 (PDT) Message-Id: <200307150453.h6F4rcYC030895@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 34527 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jul 2003 04:53:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=34527 Change 34527 by marcel@marcel_nfs on 2003/07/14 21:52:47 IFC @34526 Affected files ... .. //depot/projects/ia64/lib/csu/ia64/crt1.S#2 integrate .. //depot/projects/ia64/share/man/man4/wi.4#25 integrate .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#81 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#59 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#58 integrate .. //depot/projects/ia64/usr.sbin/Makefile#45 edit Differences ... ==== //depot/projects/ia64/lib/csu/ia64/crt1.S#2 (text+ko) ==== @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - .ident "$FreeBSD: src/lib/csu/ia64/crt1.S,v 1.1 2003/07/13 23:11:37 marcel Exp $" + .ident "$FreeBSD: src/lib/csu/ia64/crt1.S,v 1.2 2003/07/15 03:50:38 marcel Exp $" .text @@ -169,7 +169,7 @@ } { .mib mov gp=GP - mov out2=r8 + mov out0=r8 br.call.sptk b0=exit ;; } ==== //depot/projects/ia64/share/man/man4/wi.4#25 (text+ko) ==== @@ -28,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/wi.4,v 1.47 2003/07/11 09:25:18 imp Exp $ +.\" $FreeBSD: src/share/man/man4/wi.4,v 1.48 2003/07/15 03:41:13 imp Exp $ .\" $OpenBSD: wi.4tbl,v 1.14 2002/04/29 19:53:50 jsyn Exp $ .\" .Dd February 17, 2003 @@ -202,6 +202,7 @@ Proxim Harmony Prism-II PCMCIA Proxim RangeLAN-DS Prism-II PCMCIA Samsung MagicLAN SWL-2000N Prism-II PCMCIA +Siemens SpeedStream SS1021 Prism-II PCMCIA SMC 2602 EZ Connect (3.3V) Prism-II PCI or PCMCIA SMC 2632 EZ Connect Prism-II PCMCIA Socket Low Power WLAN-CF Prism-II CF ==== //depot/projects/ia64/sys/ia64/ia64/machdep.c#81 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.141 2003/06/28 06:34:07 davidxu Exp $ + * $FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.142 2003/07/15 04:43:33 marcel Exp $ */ #include "opt_compat.h" ==== //depot/projects/ia64/sys/kern/kern_sig.c#59 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.250 2003/07/11 13:42:23 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.251 2003/07/15 04:24:11 davidxu Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -1509,7 +1509,7 @@ ps->ps_sigact[_SIG_IDX(sig)], sig, &td->td_sigmask, code); else { - thread_siginfo(sig, code, &siginfo); + cpu_thread_siginfo(sig, code, &siginfo); mtx_unlock(&ps->ps_mtx); PROC_UNLOCK(p); error = copyout(&siginfo, &td->td_mailbox->tm_syncsig, ==== //depot/projects/ia64/sys/kern/kern_thread.c#58 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.150 2003/07/04 01:41:32 mtm Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.151 2003/07/15 04:26:26 davidxu Exp $"); #include #include @@ -1492,7 +1492,7 @@ ps = p->p_sigacts; mtx_assert(&ps->ps_mtx, MA_OWNED); - thread_siginfo(sig, 0, &siginfo); + cpu_thread_siginfo(sig, 0, &siginfo); mtx_unlock(&ps->ps_mtx); PROC_UNLOCK(p); error = copyout(&siginfo, &td->td_mailbox->tm_syncsig, sizeof(siginfo)); ==== //depot/projects/ia64/usr.sbin/Makefile#45 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Jul 14 22:34:30 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC7E437B404; Mon, 14 Jul 2003 22:34:29 -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 7C1DD37B401 for ; Mon, 14 Jul 2003 22:34:29 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 25CC143FBD for ; Mon, 14 Jul 2003 22:34:29 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6F5YS0U033087 for ; Mon, 14 Jul 2003 22:34:28 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6F5YSEr033084 for perforce@freebsd.org; Mon, 14 Jul 2003 22:34:28 -0700 (PDT) Date: Mon, 14 Jul 2003 22:34:28 -0700 (PDT) Message-Id: <200307150534.h6F5YSEr033084@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 34528 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jul 2003 05:34:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=34528 Change 34528 by marcel@marcel_nfs on 2003/07/14 22:34:02 Enable the UHCI host controller. We now attach the embedded SMC hub in the BigSur correctly and don't have lockups anymore. Affected files ... .. //depot/projects/ia64/sys/ia64/conf/GENERIC#32 edit Differences ... ==== //depot/projects/ia64/sys/ia64/conf/GENERIC#32 (text+ko) ==== @@ -93,10 +93,10 @@ device mlx # Mylex DAC960 family # USB host controllers and peripherals -#device uhci # UHCI PCI->USB interface device ehci # EHCI host controller device ohci # OHCI PCI->USB interface device ugen # Generic device +device uhci # UHCI PCI->USB interface device uhid # Human Interface Devices device ukbd # Keyboard device ulpt # Printer From owner-p4-projects@FreeBSD.ORG Mon Jul 14 23:08:14 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA7A837B425; Mon, 14 Jul 2003 23:08:13 -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 55D8C37B41E for ; Mon, 14 Jul 2003 23:08:13 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9B20343FAF for ; Mon, 14 Jul 2003 23:08:11 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6F68B0U035144 for ; Mon, 14 Jul 2003 23:08:11 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6F689ju035141 for perforce@freebsd.org; Mon, 14 Jul 2003 23:08:09 -0700 (PDT) Date: Mon, 14 Jul 2003 23:08:09 -0700 (PDT) Message-Id: <200307150608.h6F689ju035141@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 34529 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jul 2003 06:08:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=34529 Change 34529 by marcel@marcel_nfs on 2003/07/14 23:08:06 IFC @34526 Affected files ... .. //depot/projects/uart/alpha/alpha/machdep.c#3 integrate .. //depot/projects/uart/amd64/amd64/machdep.c#2 integrate .. //depot/projects/uart/boot/i386/libi386/biosacpi.c#2 integrate .. //depot/projects/uart/boot/pc98/boot2/asm.h#2 integrate .. //depot/projects/uart/boot/sparc64/loader/main.c#2 integrate .. //depot/projects/uart/conf/files#6 integrate .. //depot/projects/uart/conf/kern.pre.mk#2 integrate .. //depot/projects/uart/conf/options#2 integrate .. //depot/projects/uart/conf/options.ia64#2 integrate .. //depot/projects/uart/contrib/dev/acpica/CHANGES.txt#2 integrate .. //depot/projects/uart/contrib/dev/acpica/acconfig.h#2 integrate .. //depot/projects/uart/contrib/dev/acpica/acdebug.h#2 integrate .. //depot/projects/uart/contrib/dev/acpica/acdisasm.h#2 integrate .. //depot/projects/uart/contrib/dev/acpica/acevents.h#2 integrate .. //depot/projects/uart/contrib/dev/acpica/acexcep.h#2 integrate .. //depot/projects/uart/contrib/dev/acpica/acfreebsd.h#2 integrate .. //depot/projects/uart/contrib/dev/acpica/acglobal.h#2 integrate .. //depot/projects/uart/contrib/dev/acpica/achware.h#2 integrate .. //depot/projects/uart/contrib/dev/acpica/acinterp.h#2 integrate .. //depot/projects/uart/contrib/dev/acpica/aclocal.h#2 integrate .. //depot/projects/uart/contrib/dev/acpica/acmacros.h#2 integrate .. //depot/projects/uart/contrib/dev/acpica/acnamesp.h#2 integrate .. //depot/projects/uart/contrib/dev/acpica/acobject.h#2 integrate .. //depot/projects/uart/contrib/dev/acpica/acpi.h#2 integrate .. //depot/projects/uart/contrib/dev/acpica/acpiosxf.h#2 integrate .. //depot/projects/uart/contrib/dev/acpica/acpixf.h#2 integrate .. //depot/projects/uart/contrib/dev/acpica/actables.h#2 integrate .. //depot/projects/uart/contrib/dev/acpica/actbl.h#2 integrate .. //depot/projects/uart/contrib/dev/acpica/actypes.h#2 integrate .. //depot/projects/uart/contrib/dev/acpica/acutils.h#2 integrate .. //depot/projects/uart/contrib/dev/acpica/dbcmds.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/dbdisply.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/dbexec.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/dbfileio.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/dbinput.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/dbstats.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/dbutils.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/dmbuffer.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/dmobject.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/dmopcode.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/dmresrc.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/dmwalk.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/dsfield.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/dsinit.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/dsmethod.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/dsmthdat.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/dsobject.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/dsopcode.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/dswexec.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/evevent.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/evgpe.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/evgpeblk.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/evmisc.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/evregion.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/evrgnini.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/evsci.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/evxface.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/evxfevnt.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/evxfregn.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/exconfig.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/exdump.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/exfldio.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/exoparg1.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/exregion.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/exstore.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/exsystem.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/exutils.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/hwacpi.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/hwgpe.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/hwregs.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/hwsleep.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/hwtimer.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/nsaccess.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/nsalloc.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/nsdumpdv.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/nsload.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/nsnames.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/nsparse.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/nssearch.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/nsutils.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/nswalk.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/nsxfeval.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/nsxfname.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/psargs.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/pswalk.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/psxface.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/rsaddr.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/rscalc.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/rsio.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/rsirq.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/rsmemory.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/rsmisc.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/rsxface.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/tbconvrt.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/tbget.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/tbgetall.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/tbinstal.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/tbutils.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/tbxface.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/utcopy.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/utdebug.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/utdelete.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/uteval.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/utglobal.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/utinit.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/utmisc.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/utobject.c#2 integrate .. //depot/projects/uart/contrib/dev/acpica/utxface.c#2 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src/Makefile#2 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_trace.c#2 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_trace.h#2 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_uinfo.c#2 integrate .. //depot/projects/uart/dev/acpica/Osd/OsdHardware.c#2 integrate .. //depot/projects/uart/dev/acpica/Osd/OsdMemory.c#2 integrate .. //depot/projects/uart/dev/acpica/Osd/OsdSynch.c#2 integrate .. //depot/projects/uart/dev/acpica/acpi.c#3 integrate .. //depot/projects/uart/dev/acpica/acpi_ec.c#2 integrate .. //depot/projects/uart/dev/acpica/acpi_pci_link.c#2 integrate .. //depot/projects/uart/dev/acpica/acpi_pcib.c#2 integrate .. //depot/projects/uart/dev/ath/if_ath.c#3 integrate .. //depot/projects/uart/dev/ath/if_athvar.h#2 integrate .. //depot/projects/uart/dev/bge/if_bge.c#2 integrate .. //depot/projects/uart/dev/ciss/ciss.c#3 integrate .. //depot/projects/uart/dev/firewire/fwdev.c#2 integrate .. //depot/projects/uart/dev/fxp/if_fxp.c#4 integrate .. //depot/projects/uart/dev/hatm/if_hatm.c#3 integrate .. //depot/projects/uart/dev/hatm/if_hatm_intr.c#2 integrate .. //depot/projects/uart/dev/hatm/if_hatm_ioctl.c#2 integrate .. //depot/projects/uart/dev/hatm/if_hatm_rx.c#2 integrate .. //depot/projects/uart/dev/hatm/if_hatm_tx.c#2 integrate .. //depot/projects/uart/dev/kbd/atkbd.c#3 integrate .. //depot/projects/uart/dev/kbd/atkbdcreg.h#2 integrate .. //depot/projects/uart/dev/pccard/pccarddevs#2 integrate .. //depot/projects/uart/dev/pccard/pccarddevs.h#2 integrate .. //depot/projects/uart/dev/sbni/if_sbni.c#2 integrate .. //depot/projects/uart/dev/usb/if_aue.c#2 integrate .. //depot/projects/uart/dev/usb/ohci.c#3 integrate .. //depot/projects/uart/dev/usb/ubsa.c#2 integrate .. //depot/projects/uart/dev/usb/ucom.c#3 integrate .. //depot/projects/uart/dev/usb/uftdi.c#3 integrate .. //depot/projects/uart/dev/usb/ugen.c#3 integrate .. //depot/projects/uart/dev/usb/uhci.c#3 integrate .. //depot/projects/uart/dev/usb/uhid.c#3 integrate .. //depot/projects/uart/dev/usb/uhub.c#3 integrate .. //depot/projects/uart/dev/usb/uplcom.c#3 integrate .. //depot/projects/uart/dev/usb/usb.c#2 integrate .. //depot/projects/uart/dev/usb/usb_port.h#3 integrate .. //depot/projects/uart/dev/usb/usb_subr.c#3 integrate .. //depot/projects/uart/dev/usb/usbdevs#4 integrate .. //depot/projects/uart/dev/usb/usbdevs.h#3 integrate .. //depot/projects/uart/dev/usb/usbdevs_data.h#3 integrate .. //depot/projects/uart/dev/usb/usbdi.c#3 integrate .. //depot/projects/uart/dev/usb/usbdi.h#3 integrate .. //depot/projects/uart/dev/usb/usbdi_util.c#3 integrate .. //depot/projects/uart/dev/usb/usbdivar.h#3 integrate .. //depot/projects/uart/dev/usb/uscanner.c#4 integrate .. //depot/projects/uart/dev/usb/uvisor.c#3 integrate .. //depot/projects/uart/dev/utopia/idtphy.h#2 integrate .. //depot/projects/uart/dev/utopia/utopia.c#2 integrate .. //depot/projects/uart/dev/utopia/utopia.h#2 integrate .. //depot/projects/uart/dev/wi/if_wi_pccard.c#3 integrate .. //depot/projects/uart/i386/i386/locore.s#2 integrate .. //depot/projects/uart/i386/i386/machdep.c#2 integrate .. //depot/projects/uart/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/uart/ia64/ia64/db_trace.c#3 integrate .. //depot/projects/uart/ia64/ia64/exception.S#2 integrate .. //depot/projects/uart/ia64/ia64/machdep.c#2 integrate .. //depot/projects/uart/ia64/ia64/syscall.S#2 integrate .. //depot/projects/uart/ia64/ia64/trap.c#2 integrate .. //depot/projects/uart/ia64/ia64/unwind.c#3 integrate .. //depot/projects/uart/ia64/include/ia64_cpu.h#2 integrate .. //depot/projects/uart/ia64/include/unwind.h#3 integrate .. //depot/projects/uart/isa/psm.c#4 integrate .. //depot/projects/uart/kern/kern_descrip.c#3 integrate .. //depot/projects/uart/kern/kern_lock.c#2 integrate .. //depot/projects/uart/kern/kern_malloc.c#2 integrate .. //depot/projects/uart/kern/kern_mtxpool.c#2 integrate .. //depot/projects/uart/kern/kern_proc.c#2 integrate .. //depot/projects/uart/kern/kern_prot.c#3 integrate .. //depot/projects/uart/kern/kern_resource.c#2 integrate .. //depot/projects/uart/kern/kern_sig.c#3 integrate .. //depot/projects/uart/kern/kern_sx.c#2 integrate .. //depot/projects/uart/kern/kern_thread.c#4 integrate .. //depot/projects/uart/kern/subr_param.c#3 integrate .. //depot/projects/uart/kern/uipc_socket.c#2 integrate .. //depot/projects/uart/modules/acpi/Makefile#3 integrate .. //depot/projects/uart/modules/mii/Makefile#2 integrate .. //depot/projects/uart/net/if_ethersubr.c#2 integrate .. //depot/projects/uart/netinet/ip_fw2.c#4 integrate .. //depot/projects/uart/pc98/i386/machdep.c#2 integrate .. //depot/projects/uart/pc98/pc98/syscons.c#2 integrate .. //depot/projects/uart/pci/if_dc.c#5 integrate .. //depot/projects/uart/pci/if_dcreg.h#4 integrate .. //depot/projects/uart/pci/if_rl.c#5 integrate .. //depot/projects/uart/pci/if_rlreg.h#2 integrate .. //depot/projects/uart/pci/if_xl.c#4 integrate .. //depot/projects/uart/pci/if_xlreg.h#2 integrate .. //depot/projects/uart/powerpc/powerpc/machdep.c#2 integrate .. //depot/projects/uart/sparc64/include/bus.h#3 integrate .. //depot/projects/uart/sparc64/include/bus_private.h#2 integrate .. //depot/projects/uart/sparc64/include/iommuvar.h#2 integrate .. //depot/projects/uart/sparc64/sparc64/bus_machdep.c#4 integrate .. //depot/projects/uart/sparc64/sparc64/iommu.c#2 integrate .. //depot/projects/uart/sparc64/sparc64/machdep.c#2 integrate .. //depot/projects/uart/sys/kernel.h#2 integrate .. //depot/projects/uart/sys/mutex.h#2 integrate .. //depot/projects/uart/sys/proc.h#2 integrate .. //depot/projects/uart/sys/sysctl.h#2 integrate .. //depot/projects/uart/sys/systm.h#2 integrate .. //depot/projects/uart/vm/vm_init.c#2 integrate Differences ... ==== //depot/projects/uart/alpha/alpha/machdep.c#3 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.204 2003/06/28 06:34:07 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.205 2003/07/15 00:11:03 davidxu Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -1474,7 +1474,7 @@ * Build siginfo_t for SA thread */ void -thread_siginfo(int sig, u_long code, siginfo_t *si) +cpu_thread_siginfo(int sig, u_long code, siginfo_t *si) { struct proc *p; struct thread *td; ==== //depot/projects/uart/amd64/amd64/machdep.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.583 2003/06/28 06:34:07 davidxu Exp $ + * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.584 2003/07/15 00:11:03 davidxu Exp $ */ #include "opt_atalk.h" @@ -303,7 +303,7 @@ * Build siginfo_t for SA thread */ void -thread_siginfo(int sig, u_long code, siginfo_t *si) +cpu_thread_siginfo(int sig, u_long code, siginfo_t *si) { struct proc *p; struct thread *td; ==== //depot/projects/uart/boot/i386/libi386/biosacpi.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.4 2003/04/29 18:50:34 njl Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.5 2003/07/13 22:54:53 njl Exp $ */ #include @@ -31,6 +31,7 @@ #include #include "acfreebsd.h" +#include "acconfig.h" #define ACPI_SYSTEM_XFACE #include "actypes.h" #include "actbl.h" ==== //depot/projects/uart/boot/pc98/boot2/asm.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.7 92/02/29 15:33:41 rpd - * $FreeBSD: src/sys/boot/pc98/boot2/asm.h,v 1.4 2002/05/14 12:34:03 nyan Exp $ + * $FreeBSD: src/sys/boot/pc98/boot2/asm.h,v 1.5 2003/07/13 08:13:52 nyan Exp $ */ #define S_ARG0 4(%esp) @@ -64,19 +64,19 @@ #define OUTL outl (%dx) #else /* wheeze */ + #define ALIGN #define LCL(x) x #define LB(x,n) n #ifdef __STDC__ #define EXT(x) x -#define LEXT(x) x ## : - +#define LEXT(x) .type EXT(x),@function; EXT(x): #define LBb(x,n) n ## b #define LBf(x,n) n ## f #else /* __STDC__ */ #define EXT(x) _/**/x -#define LEXT(x) _/**/x/**/: +#define LEXT(x) .type EXT(x),@function; EXT(x)/**/: #define LBb(x,n) n/**/b #define LBf(x,n) n/**/f #endif /* __STDC__ */ ==== //depot/projects/uart/boot/sparc64/loader/main.c#2 (text+ko) ==== @@ -6,7 +6,7 @@ * As long as the above copyright statement and this notice remain * unchanged, you can do what ever you want with this file. * - * $FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.20 2003/06/15 19:16:43 jake Exp $ + * $FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.21 2003/07/11 16:12:50 tmm Exp $ */ /* * FreeBSD/sparc64 kernel loader - machine dependent part @@ -115,7 +115,7 @@ #ifdef LOADER_BZIP2_SUPPORT &bzipfs_fsops, #endif -#ifdef LOADER_NET_SUPPORT +#ifdef LOADER_NFS_SUPPORT &nfs_fsops, #endif #ifdef LOADER_TFTP_SUPPORT ==== //depot/projects/uart/conf/files#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.803 2003/07/09 16:14:10 jhb Exp $ +# $FreeBSD: src/sys/conf/files,v 1.804 2003/07/14 17:43:09 njl Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -70,23 +70,24 @@ coda/coda_vfsops.c optional vcoda coda/coda_vnops.c optional vcoda compat/linprocfs/linprocfs.c optional linprocfs -contrib/dev/acpica/dbcmds.c optional acpi acpi_debug nowerror -contrib/dev/acpica/dbdisply.c optional acpi acpi_debug nowerror -contrib/dev/acpica/dbexec.c optional acpi acpi_debug nowerror -contrib/dev/acpica/dbfileio.c optional acpi acpi_debug nowerror -contrib/dev/acpica/dbhistry.c optional acpi acpi_debug nowerror +contrib/dev/acpica/dbcmds.c optional acpi acpi_debug +contrib/dev/acpica/dbdisply.c optional acpi acpi_debug +contrib/dev/acpica/dbexec.c optional acpi acpi_debug +contrib/dev/acpica/dbfileio.c optional acpi acpi_debug +contrib/dev/acpica/dbhistry.c optional acpi acpi_debug contrib/dev/acpica/dbinput.c optional acpi acpi_debug nowerror -contrib/dev/acpica/dbstats.c optional acpi acpi_debug nowerror +contrib/dev/acpica/dbstats.c optional acpi acpi_debug contrib/dev/acpica/dbutils.c optional acpi acpi_debug nowerror -contrib/dev/acpica/dbxface.c optional acpi acpi_debug nowerror -contrib/dev/acpica/dmbuffer.c optional acpi acpi_debug nowerror -contrib/dev/acpica/dmnames.c optional acpi acpi_debug nowerror +contrib/dev/acpica/dbxface.c optional acpi acpi_debug +contrib/dev/acpica/dmbuffer.c optional acpi acpi_debug +contrib/dev/acpica/dmnames.c optional acpi acpi_debug contrib/dev/acpica/dmopcode.c optional acpi acpi_debug nowerror -contrib/dev/acpica/dmresrc.c optional acpi acpi_debug nowerror -contrib/dev/acpica/dmresrcl.c optional acpi acpi_debug nowerror -contrib/dev/acpica/dmresrcs.c optional acpi acpi_debug nowerror -contrib/dev/acpica/dmutils.c optional acpi acpi_debug nowerror -contrib/dev/acpica/dmwalk.c optional acpi acpi_debug nowerror +contrib/dev/acpica/dmobject.c optional acpi acpi_debug +contrib/dev/acpica/dmresrc.c optional acpi acpi_debug +contrib/dev/acpica/dmresrcl.c optional acpi acpi_debug +contrib/dev/acpica/dmresrcs.c optional acpi acpi_debug +contrib/dev/acpica/dmutils.c optional acpi acpi_debug +contrib/dev/acpica/dmwalk.c optional acpi acpi_debug contrib/dev/acpica/dsfield.c optional acpi contrib/dev/acpica/dsinit.c optional acpi contrib/dev/acpica/dsmethod.c optional acpi ==== //depot/projects/uart/conf/kern.pre.mk#2 (text+ko) ==== @@ -3,7 +3,7 @@ # Unified Makefile for building kernels. This includes all the definitions # that need to be included before %BEFORE_DEPEND # -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.26 2003/06/25 14:51:20 sam Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.27 2003/07/11 07:13:42 kan Exp $ # # Can be overridden by makeoptions or /etc/make.conf @@ -52,7 +52,7 @@ .endif .endif DEFINED_PROF= ${PROF} -WERROR?= -Werror +# WERROR?= -Werror # Put configuration-specific C flags last (except for ${PROF}) so that they # can override the others. ==== //depot/projects/uart/conf/options#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.400 2003/06/26 09:50:51 smkelly Exp $ +# $FreeBSD: src/sys/conf/options,v 1.401 2003/07/11 17:04:37 imp Exp $ # # On the handling of kernel options # @@ -457,7 +457,7 @@ # These cause changes all over the kernel BLKDEV_IOSIZE opt_global.h -BURN_BRIDGES opt_gloabl.h +BURN_BRIDGES opt_global.h DEBUG opt_global.h DEBUG_LOCKS opt_global.h DEBUG_VFS_LOCKS opt_global.h ==== //depot/projects/uart/conf/options.ia64#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.ia64,v 1.19 2003/06/18 15:25:01 jake Exp $ +# $FreeBSD: src/sys/conf/options.ia64,v 1.20 2003/07/11 08:47:15 marcel Exp $ # Options specific to the ia64 platform kernels ITANIUM opt_global.h @@ -10,6 +10,8 @@ PAGE_SIZE_8K opt_global.h PAGE_SIZE_16K opt_global.h +UWX_TRACE_ENABLE opt_global.h + PPC_PROBE_CHIPSET opt_ppc.h PPC_DEBUG opt_ppc.h ==== //depot/projects/uart/contrib/dev/acpica/CHANGES.txt#2 (text+ko) ==== @@ -1,3 +1,268 @@ +---------------------------------------- +19 June 2003. Summary of changes for version 20030619: + +1) ACPI CA Core Subsystem: + +Fix To/FromBCD, eliminating the need for an arch-specific +#define. + +Do not acquire a semaphore in the S5 shutdown path. + +Fix ex_digits_needed for 0. (Takayoshi Kochi) + +Fix sleep/stall code reversal. (Andi Kleen) + +Revert a change having to do with control method calling +semantics. + +2) Linux: + +acpiphp update (Takayoshi Kochi) + +Export acpi_disabled for sonypi (Stelian Pop) + +Mention acpismp=force in config help + +Re-add acpitable.c and acpismp=force. This improves backwards +compatibility and also cleans up the code to a significant +degree. + +Add ASUS Value-add driver (Karol Kozimor and Julien Lerouge) + + + +---------------------------------------- +22 May 2003. Summary of changes for version 20030522: + +1) ACPI CA Core Subsystem: + +Found and fixed a reported problem where an AE_NOT_FOUND error +occurred occasionally during _BST evaluation. This turned out to +be an Owner ID allocation issue where a called method did not get +a new ID assigned to it. Eventually, (after 64k calls), the +Owner ID UINT16 would wraparound so that the ID would be the same +as the caller's and the called method would delete the caller's +namespace. + +Implemented extended error reporting for control methods that are +aborted due to a run-time exception. Output includes the exact +AML instruction that caused the method abort, a dump of the +method locals and arguments at the time of the abort, and a trace +of all nested control method calls. + +Modified the interpreter to allow the creation of buffers of zero +length from the AML code. Implemented new code to ensure that no +attempt is made to actually allocate a memory buffer (of length +zero) - instead, a simple buffer object with a NULL buffer +pointer and length zero is created. A warning is no longer +issued when the AML attempts to create a zero-length buffer. + +Implemented a workaround for the "leading asterisk issue" in +_HIDs, _UIDs, and _CIDs in the AML interpreter. One leading +asterisk is automatically removed if present in any HID, UID, or +CID strings. The iASL compiler will still flag this asterisk as +an error, however. + +Implemented full support for _CID methods that return a package +of multiple CIDs (Compatible IDs). The AcpiGetObjectInfo() +interface now additionally returns a device _CID list if present. +This required a change to the external interface in order to pass +an ACPI_BUFFER object as a parameter since the _CID list is of +variable length. + +Fixed a problem with the new AE_SAME_HANDLER exception where +handler initialization code did not know about this exception. + +Code and Data Size: Current and previous core subsystem library +sizes are shown below. These are the code and data sizes for the +acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and +these values do not include any ACPI driver or OSPM code. The +debug version of the code includes the debug output trace +mechanism and has a much larger code and data size. Note that +these values will vary depending on the efficiency of the +compiler and the compiler options used during generation. + + Previous Release (20030509): + Non-Debug Version: 73.4K Code, 9.7K Data, 83.1K Total + Debug Version: 156.1K Code, 63.9K Data, 220.0K Total + Current Release: + Non-Debug Version: 73.7K Code, 9.7K Data, 83.4K Total + Debug Version: 156.9K Code, 64.2K Data, 221.1K Total + + +2) Linux: + +Fixed a bug in which we would reinitialize the ACPI interrupt +after it was already working, thus disabling all ACPI and the +IRQs for any other device sharing the interrupt. (Thanks to Stian +Jordet) + +Toshiba driver update (John Belmonte) + +Return only 0 or 1 for our interrupt handler status (Andrew +Morton) + + +3) iASL Compiler: + +Fixed a reported problem where multiple (nested) ElseIf() +statements were not handled correctly by the compiler, resulting +in incorrect warnings and incorrect AML code. This was a problem +in both the ASL parser and the code generator. + + +4) Documentation: + +Added changes to existing interfaces, new exception codes, and +new text concerning reference count object management versus +garbage collection. + +---------------------------------------- +09 May 2003. Summary of changes for version 20030509. + + +1) ACPI CA Core Subsystem: + +Changed the subsystem initialization sequence to hold off +installation of address space handlers until the hardware has +been initialized and the system has entered ACPI mode. This is +because the installation of space handlers can cause _REG methods +to be run. Previously, the _REG methods could potentially be run +before ACPI mode was enabled. + +Fixed some memory leak issues related to address space handler +and notify handler installation. There were some problems with +the reference count mechanism caused by the fact that the handler +objects are shared across several namespace objects. + +Fixed a reported problem where reference counts within the +namespace were not properly updated when named objects created by +method execution were deleted. + +Fixed a reported problem where multiple SSDTs caused a deletion +issue during subsystem termination. Restructured the table data +structures to simplify the linked lists and the related code. + +Fixed a problem where the table ID associated with secondary +tables (SSDTs) was not being propagated into the namespace +objects created by those tables. This would only present a +problem for tables that are unloaded at run-time, however. + +Updated AcpiOsReadable and AcpiOsWritable to use the ACPI_SIZE +type as the length parameter (instead of UINT32). + +Solved a long-standing problem where an ALREADY_EXISTS error +appears on various systems. This problem could happen when there +are multiple PCI_Config operation regions under a single PCI root +bus. This doesn't happen very frequently, but there are some +systems that do this in the ASL. + +Fixed a reported problem where the internal DeleteNode function +was incorrectly handling the case where a namespace node was the +first in the parent's child list, and had additional peers (not +the only child, but first in the list of children.) + +Code and Data Size: Current core subsystem library sizes are +shown below. These are the code and data sizes for the +acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and +these values do not include any ACPI driver or OSPM code. The +debug version of the code includes the debug output trace +mechanism and has a much larger code and data size. Note that +these values will vary depending on the efficiency of the +compiler and the compiler options used during generation. + + Previous Release + Non-Debug Version: 73.7K Code, 9.5K Data, 83.2K Total + Debug Version: 156.1K Code, 63.6K Data, 219.7K Total + Current Release: + Non-Debug Version: 73.4K Code, 9.7K Data, 83.1K Total + Debug Version: 156.1K Code, 63.9K Data, 220.0K Total + + +2) Linux: + +Allow ":" in OS override string (Ducrot Bruno) + +Kobject fix (Greg KH) + + +3 iASL Compiler/Disassembler: + +Fixed a problem in the generation of the C source code files (AML +is emitted in C source statements for BIOS inclusion) where the +Ascii dump that appears within a C comment at the end of each +line could cause a compile time error if the AML sequence happens +to have an open comment or close comment sequence embedded. + + +---------------------------------------- +24 April 2003. Summary of changes for version 20030424. + + +1) ACPI CA Core Subsystem: + +Support for big-endian systems has been implemented. Most of the +support has been invisibly added behind big-endian versions of +the ACPI_MOVE_* macros. + +Fixed a problem in AcpiHwDisableGpeBlock() and +AcpiHwClearGpeBlock() where an incorrect offset was passed to the +low level hardware write routine. The offset parameter was +actually eliminated from the low level read/write routines +because they had become obsolete. + +Fixed a problem where a handler object was deleted twice during +the removal of a fixed event handler. + + +2) Linux: + +A fix for SMP systems with link devices was contributed by +Compaq's Dan Zink. + +(2.5) Return whether we handled the interrupt in our IRQ handler. +(Linux ISRs no longer return void, so we can propagate the +handler return value from the ACPI CA core back to the OS.) + + +3) Documentation: + +The ACPI CA Programmer Reference has been updated to reflect new +interfaces and changes to existing interfaces. + +---------------------------------------- +28 March 2003. Summary of changes for version 20030328. + +1) ACPI CA Core Subsystem: + +The GPE Block Device support has been completed. New interfaces +are AcpiInstallGpeBlock and AcpiRemoveGpeBlock. The Event +interfaces (enable, disable, clear, getstatus) have been split +into separate interfaces for Fixed Events and General Purpose +Events (GPEs) in order to support GPE Block Devices properly. + +Fixed a problem where the error message "Failed to acquire +semaphore" would appear during operations on the embedded +controller (EC). + +Code and Data Size: Current core subsystem library sizes are +shown below. These are the code and data sizes for the +acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and +these values do not include any ACPI driver or OSPM code. The +debug version of the code includes the debug output trace +mechanism and has a much larger code and data size. Note that +these values will vary depending on the efficiency of the +compiler and the compiler options used during generation. + + Previous Release + Non-Debug Version: 72.3K Code, 9.5K Data, 81.8K Total + Debug Version: 154.0K Code, 63.4K Data, 217.4K Total + Current Release: + Non-Debug Version: 73.7K Code, 9.5K Data, 83.2K Total + Debug Version: 156.1K Code, 63.6K Data, 219.7K Total + + +---------------------------------------- 28 February 2003. Summary of changes for version 20030228. @@ -82,6 +347,7 @@ Added support for the _PDC reserved name. +---------------------------------------- 22 January 2003. Summary of changes for version 20030122. ==== //depot/projects/uart/contrib/dev/acpica/acconfig.h#2 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acconfig.h - Global configuration constants - * $Revision: 129 $ + * $Revision: 139 $ * *****************************************************************************/ @@ -120,7 +120,7 @@ /****************************************************************************** * - * Compile-time options + * Configuration options * *****************************************************************************/ @@ -135,6 +135,24 @@ * */ +/* Version string */ + +#define ACPI_CA_VERSION 0x20030619 + +/* Maximum objects in the various object caches */ + +#define ACPI_MAX_STATE_CACHE_DEPTH 64 /* State objects for stacks */ +#define ACPI_MAX_PARSE_CACHE_DEPTH 96 /* Parse tree objects */ +#define ACPI_MAX_EXTPARSE_CACHE_DEPTH 64 /* Parse tree objects */ +#define ACPI_MAX_OBJECT_CACHE_DEPTH 64 /* Interpreter operand objects */ +#define ACPI_MAX_WALK_CACHE_DEPTH 4 /* Objects for parse tree walks */ + +/* + * Should the subystem abort the loading of an ACPI table if the + * table checksum is incorrect? + */ +#define ACPI_CHECKSUM_ABORT FALSE + /****************************************************************************** * @@ -142,23 +160,10 @@ * *****************************************************************************/ - -/* Version string */ - -#define ACPI_CA_VERSION 0x20030228 - /* Version of ACPI supported */ #define ACPI_CA_SUPPORT_LEVEL 2 -/* Maximum objects in the various object caches */ - -#define ACPI_MAX_STATE_CACHE_DEPTH 64 /* State objects for stacks */ -#define ACPI_MAX_PARSE_CACHE_DEPTH 96 /* Parse tree objects */ -#define ACPI_MAX_EXTPARSE_CACHE_DEPTH 64 /* Parse tree objects */ -#define ACPI_MAX_OBJECT_CACHE_DEPTH 64 /* Interpreter operand objects */ -#define ACPI_MAX_WALK_CACHE_DEPTH 4 /* Objects for parse tree walks */ - /* String size constants */ #define ACPI_MAX_STRING_LENGTH 512 @@ -179,20 +184,6 @@ /****************************************************************************** * - * Configuration of subsystem behavior - * - *****************************************************************************/ - - -/* - * Should the subystem abort the loading of an ACPI table if the - * table checksum is incorrect? - */ -#define ACPI_CHECKSUM_ABORT FALSE - - -/****************************************************************************** - * * ACPI Specification constants (Do not change unless the specification changes) * *****************************************************************************/ @@ -215,6 +206,11 @@ #define ACPI_MAX_STRING_CONVERSION 200 +/* Length of _HID, _UID, and _CID values */ + +#define ACPI_DEVICE_ID_LENGTH 0x09 +#define ACPI_MAX_CID_LENGTH 48 + /* * Operand Stack (in WALK_STATE), Must be large enough to contain METHOD_MAX_ARG */ @@ -269,7 +265,6 @@ * *****************************************************************************/ - #define ACPI_DEBUGGER_MAX_ARGS 8 /* Must be max method args + 1 */ #define ACPI_DEBUGGER_COMMAND_PROMPT '-' ==== //depot/projects/uart/contrib/dev/acpica/acdebug.h#2 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acdebug.h - ACPI/AML debugger - * $Revision: 70 $ + * $Revision: 72 $ * *****************************************************************************/ @@ -305,10 +305,6 @@ char *OutputType); void -AcpiDbDecodeNode ( - ACPI_NAMESPACE_NODE *Node); - -void AcpiDbDisplayResultObject ( ACPI_OPERAND_OBJECT *ObjDesc, ACPI_WALK_STATE *WalkState); @@ -318,11 +314,6 @@ char *DisplayCountArg); void -AcpiDbDisplayInternalObject ( - ACPI_OPERAND_OBJECT *ObjDesc, - ACPI_WALK_STATE *WalkState); - -void AcpiDbDisplayArguments ( void); @@ -339,6 +330,10 @@ void); void +AcpiDbDisplayObjectType ( + char *ObjectArg); + +void AcpiDbDisplayArgumentObject ( ACPI_OPERAND_OBJECT *ObjDesc, ACPI_WALK_STATE *WalkState); @@ -351,10 +346,6 @@ AcpiDbGetPointer ( void *Target); -void -AcpiDbDecodeInternalObject ( - ACPI_OPERAND_OBJECT *ObjDesc); - /* * dbexec - debugger control method execution ==== //depot/projects/uart/contrib/dev/acpica/acdisasm.h#2 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acdisasm.h - AML disassembler - * $Revision: 8 $ + * $Revision: 9 $ * *****************************************************************************/ @@ -226,10 +226,6 @@ AcpiDmDecodeInternalObject ( ACPI_OPERAND_OBJECT *ObjDesc); -void -AcpiDmDecodeNode ( - ACPI_NAMESPACE_NODE *Node); - UINT32 AcpiDmBlockType ( ACPI_PARSE_OBJECT *Op); @@ -277,6 +273,34 @@ /* + * dmobject + */ + +void +AcpiDmDecodeNode ( + ACPI_NAMESPACE_NODE *Node); + +void +AcpiDmDisplayInternalObject ( + ACPI_OPERAND_OBJECT *ObjDesc, + ACPI_WALK_STATE *WalkState); + +void +AcpiDmDisplayArguments ( + ACPI_WALK_STATE *WalkState); + +void +AcpiDmDisplayLocals ( + ACPI_WALK_STATE *WalkState); + +void +AcpiDmDumpMethodInfo ( + ACPI_STATUS Status, + ACPI_WALK_STATE *WalkState, + ACPI_PARSE_OBJECT *Op); + + +/* * dmbuffer */ ==== //depot/projects/uart/contrib/dev/acpica/acevents.h#2 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acevents.h - Event subcomponent prototypes and defines - * $Revision: 83 $ + * $Revision: 91 $ * *****************************************************************************/ @@ -182,21 +182,44 @@ * Evgpe - GPE handling and dispatch */ +ACPI_STATUS +AcpiEvWalkGpeList ( + ACPI_GPE_CALLBACK GpeWalkCallback); + +BOOLEAN +AcpiEvValidGpeEvent ( + ACPI_GPE_EVENT_INFO *GpeEventInfo); + ACPI_GPE_EVENT_INFO * AcpiEvGetGpeEventInfo ( + ACPI_HANDLE GpeDevice, UINT32 GpeNumber); ACPI_STATUS AcpiEvGpeInitialize ( void); +ACPI_STATUS +AcpiEvCreateGpeBlock ( + ACPI_NAMESPACE_NODE *GpeDevice, + ACPI_GENERIC_ADDRESS *GpeBlockAddress, + UINT32 RegisterCount, + UINT8 GpeBlockBaseNumber, + UINT32 InterruptLevel, + ACPI_GPE_BLOCK_INFO **ReturnGpeBlock); + +ACPI_STATUS +AcpiEvDeleteGpeBlock ( + ACPI_GPE_BLOCK_INFO *GpeBlock); + UINT32 AcpiEvGpeDispatch ( - ACPI_GPE_EVENT_INFO *GpeEventInfo); + ACPI_GPE_EVENT_INFO *GpeEventInfo, + UINT32 GpeNumber); UINT32 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jul 15 03:32:39 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C926837B404; Tue, 15 Jul 2003 03:32:38 -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 527C137B401 for ; Tue, 15 Jul 2003 03:32:38 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C7B0943FCB for ; Tue, 15 Jul 2003 03:32:37 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6FAWb0U061331 for ; Tue, 15 Jul 2003 03:32:37 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6FAWbPx061328 for perforce@freebsd.org; Tue, 15 Jul 2003 03:32:37 -0700 (PDT) Date: Tue, 15 Jul 2003 03:32:37 -0700 (PDT) Message-Id: <200307151032.h6FAWbPx061328@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 34540 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jul 2003 10:32:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=34540 Change 34540 by marcel@marcel_nfs on 2003/07/15 03:31:52 Delay calling makedev() until after we called make_dev(). That way we can use MAJOR_AUTO even though we can be the console. While here, obsolete uart_tty.h. It only contains three prototypes now, which is not worth a seperate header file. Affected files ... .. //depot/projects/uart/dev/uart/uart_bus.h#5 edit .. //depot/projects/uart/dev/uart/uart_core.c#6 edit .. //depot/projects/uart/dev/uart/uart_cpu.h#2 edit .. //depot/projects/uart/dev/uart/uart_tty.c#4 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_bus.h#5 (text+ko) ==== @@ -107,6 +107,10 @@ int uart_bus_detach(device_t dev); int uart_bus_probe(device_t dev, int regshft, int rclk, int rid); +int uart_tty_attach(struct uart_softc *); +int uart_tty_detach(struct uart_softc *); +void uart_tty_intr(void *arg); + static __inline int uart_rx_put(struct uart_softc *sc, int xc) { ==== //depot/projects/uart/dev/uart/uart_core.c#6 (text+ko) ==== @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include @@ -45,13 +44,9 @@ #include #include #include -#include #include "uart_if.h" -extern struct uart_devinfo uart_console; -extern struct uart_devinfo uart_dbgport; - devclass_t uart_devclass; char uart_driver_name[] = "uart"; @@ -299,8 +294,6 @@ sep = ""; device_print_prettyname(dev); if (sc->sc_console) { - ((struct consdev *)uart_console.consdev)->cn_dev = - makedev(UART_CDEV_MAJOR, device_get_unit(dev)); printf("%sconsole", sep); sep = ", "; } ==== //depot/projects/uart/dev/uart/uart_cpu.h#2 (text+ko) ==== @@ -66,6 +66,9 @@ void *consdev; /* Yedi trick. See uart_cons.c */ }; +extern struct uart_devinfo uart_console; +extern struct uart_devinfo uart_dbgport; + #define UART_DEV_CONSOLE 0 #define UART_DEV_DBGPORT 1 ==== //depot/projects/uart/dev/uart/uart_tty.c#4 (text+ko) ==== @@ -36,13 +36,14 @@ #include #include #include +#include #include #include #include #include #include -#include +#include #define CALLOUT_MASK 0x80 #define CONTROL_MASK 0x60 @@ -61,7 +62,7 @@ .d_ioctl = uart_ioctl, .d_poll = ttypoll, .d_name = uart_driver_name, - .d_maj = UART_CDEV_MAJOR, + .d_maj = MAJOR_AUTO, .d_flags = D_TTY, .d_kqfilter = ttykqfilter, }; @@ -169,6 +170,11 @@ tp->t_dev = sc->sc_si; + if (sc->sc_console) { + ((struct consdev *)uart_console.consdev)->cn_dev = + makedev(uart_cdevsw.d_maj, device_get_unit(sc->sc_dev)); + } + swi_add(&tty_ithd, uart_driver_name, uart_tty_intr, sc, SWI_TTY, INTR_TYPE_TTY, &sc->sc_softih); From owner-p4-projects@FreeBSD.ORG Tue Jul 15 03:32:40 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF86537B404; Tue, 15 Jul 2003 03:32:39 -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 D834D37B407 for ; Tue, 15 Jul 2003 03:32:38 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4B50F43FD7 for ; Tue, 15 Jul 2003 03:32:38 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6FAWc0U061337 for ; Tue, 15 Jul 2003 03:32:38 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6FAWbGT061334 for perforce@freebsd.org; Tue, 15 Jul 2003 03:32:37 -0700 (PDT) Date: Tue, 15 Jul 2003 03:32:37 -0700 (PDT) Message-Id: <200307151032.h6FAWbGT061334@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 34541 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jul 2003 10:32:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=34541 Change 34541 by marcel@marcel_nfs on 2003/07/15 03:32:30 Remove uart_tty.h. The prototypes are moved to uart_bus.h. Affected files ... .. //depot/projects/uart/dev/uart/uart_tty.h#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jul 16 17:50:51 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C58137B404; Wed, 16 Jul 2003 17:50:50 -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 C89FF37B401 for ; Wed, 16 Jul 2003 17:50:49 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F5E443FAF for ; Wed, 16 Jul 2003 17:50:48 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6H0om0U033775 for ; Wed, 16 Jul 2003 17:50:48 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6H0oiIV033772 for perforce@freebsd.org; Wed, 16 Jul 2003 17:50:44 -0700 (PDT) Date: Wed, 16 Jul 2003 17:50:44 -0700 (PDT) Message-Id: <200307170050.h6H0oiIV033772@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 34602 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jul 2003 00:50:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=34602 Change 34602 by marcel@marcel_nfs on 2003/07/16 17:50:27 IFC @34601 Affected files ... .. //depot/projects/ia64/MAINTAINERS#33 integrate .. //depot/projects/ia64/contrib/openpam/CREDITS#9 integrate .. //depot/projects/ia64/contrib/openpam/HISTORY#17 integrate .. //depot/projects/ia64/contrib/openpam/INSTALL#8 integrate .. //depot/projects/ia64/contrib/openpam/MANIFEST#15 integrate .. //depot/projects/ia64/contrib/openpam/Makefile#10 delete .. //depot/projects/ia64/contrib/openpam/Makefile.am#1 branch .. //depot/projects/ia64/contrib/openpam/Makefile.in#1 branch .. //depot/projects/ia64/contrib/openpam/Makefile.inc#2 delete .. //depot/projects/ia64/contrib/openpam/RELNOTES#17 integrate .. //depot/projects/ia64/contrib/openpam/aclocal.m4#1 branch .. //depot/projects/ia64/contrib/openpam/autogen.sh#1 branch .. //depot/projects/ia64/contrib/openpam/bin/Makefile#10 delete .. //depot/projects/ia64/contrib/openpam/bin/Makefile.am#1 branch .. //depot/projects/ia64/contrib/openpam/bin/Makefile.in#1 branch .. //depot/projects/ia64/contrib/openpam/bin/Makefile.inc#2 delete .. //depot/projects/ia64/contrib/openpam/bin/su/Makefile#10 delete .. //depot/projects/ia64/contrib/openpam/bin/su/Makefile.am#1 branch .. //depot/projects/ia64/contrib/openpam/bin/su/Makefile.in#1 branch .. //depot/projects/ia64/contrib/openpam/config.guess#1 branch .. //depot/projects/ia64/contrib/openpam/config.h.in#1 branch .. //depot/projects/ia64/contrib/openpam/config.sub#1 branch .. //depot/projects/ia64/contrib/openpam/configure#1 branch .. //depot/projects/ia64/contrib/openpam/configure.in#1 branch .. //depot/projects/ia64/contrib/openpam/depcomp#1 branch .. //depot/projects/ia64/contrib/openpam/doc/Makefile#10 delete .. //depot/projects/ia64/contrib/openpam/doc/Makefile.am#1 branch .. //depot/projects/ia64/contrib/openpam/doc/Makefile.in#1 branch .. //depot/projects/ia64/contrib/openpam/doc/man/Makefile#12 delete .. //depot/projects/ia64/contrib/openpam/doc/man/Makefile.am#1 branch .. //depot/projects/ia64/contrib/openpam/doc/man/Makefile.in#1 branch .. //depot/projects/ia64/contrib/openpam/doc/man/openpam.3#7 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_borrow_cred.3#13 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_free_data.3#13 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_get_option.3#17 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_log.3#17 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_nullconv.3#8 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_readline.3#2 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_restore_cred.3#13 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_set_option.3#17 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_ttyconv.3#17 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam.3#17 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam.man#3 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_acct_mgmt.3#17 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_authenticate.3#17 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_chauthtok.3#17 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_close_session.3#17 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_end.3#17 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_error.3#17 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_get_authtok.3#18 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_get_data.3#17 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_get_item.3#17 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_get_user.3#17 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_getenv.3#17 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_getenvlist.3#18 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_info.3#17 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_open_session.3#17 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_prompt.3#17 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_putenv.3#17 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_set_data.3#17 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_set_item.3#17 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_setcred.3#17 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_setenv.3#17 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#17 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_authenticate.3#17 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_chauthtok.3#17 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_close_session.3#17 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_open_session.3#17 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_setcred.3#17 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_start.3#18 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_strerror.3#17 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_verror.3#17 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_vinfo.3#17 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_vprompt.3#17 integrate .. //depot/projects/ia64/contrib/openpam/include/Makefile.am#1 branch .. //depot/projects/ia64/contrib/openpam/include/Makefile.in#1 branch .. //depot/projects/ia64/contrib/openpam/include/security/Makefile.am#1 branch .. //depot/projects/ia64/contrib/openpam/include/security/Makefile.in#1 branch .. //depot/projects/ia64/contrib/openpam/include/security/openpam.h#17 integrate .. //depot/projects/ia64/contrib/openpam/include/security/openpam_version.h#7 integrate .. //depot/projects/ia64/contrib/openpam/include/security/pam_types.h#11 integrate .. //depot/projects/ia64/contrib/openpam/install-sh#1 branch .. //depot/projects/ia64/contrib/openpam/lib/Makefile#13 delete .. //depot/projects/ia64/contrib/openpam/lib/Makefile.am#1 branch .. //depot/projects/ia64/contrib/openpam/lib/Makefile.in#1 branch .. //depot/projects/ia64/contrib/openpam/lib/openpam_borrow_cred.c#9 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_impl.h#18 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_restore_cred.c#9 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_ttyconv.c#16 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_get_authtok.c#17 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_get_user.c#13 integrate .. //depot/projects/ia64/contrib/openpam/ltconfig#1 branch .. //depot/projects/ia64/contrib/openpam/ltmain.sh#1 branch .. //depot/projects/ia64/contrib/openpam/misc/gendoc.pl#13 integrate .. //depot/projects/ia64/contrib/openpam/missing#1 branch .. //depot/projects/ia64/contrib/openpam/mkinstalldirs#1 branch .. //depot/projects/ia64/contrib/openpam/modules/Makefile#11 delete .. //depot/projects/ia64/contrib/openpam/modules/Makefile.am#1 branch .. //depot/projects/ia64/contrib/openpam/modules/Makefile.in#1 branch .. //depot/projects/ia64/contrib/openpam/modules/pam_deny/Makefile#10 delete .. //depot/projects/ia64/contrib/openpam/modules/pam_deny/Makefile.am#1 branch .. //depot/projects/ia64/contrib/openpam/modules/pam_deny/Makefile.in#1 branch .. //depot/projects/ia64/contrib/openpam/modules/pam_deny/pam_deny.c#10 integrate .. //depot/projects/ia64/contrib/openpam/modules/pam_dummy/Makefile#9 delete .. //depot/projects/ia64/contrib/openpam/modules/pam_permit/Makefile#10 delete .. //depot/projects/ia64/contrib/openpam/modules/pam_permit/Makefile.am#1 branch .. //depot/projects/ia64/contrib/openpam/modules/pam_permit/Makefile.in#1 branch .. //depot/projects/ia64/contrib/openpam/modules/pam_permit/pam_permit.c#10 integrate .. //depot/projects/ia64/contrib/openpam/modules/pam_unix/Makefile#4 delete .. //depot/projects/ia64/contrib/openpam/modules/pam_unix/Makefile.am#1 branch .. //depot/projects/ia64/contrib/openpam/modules/pam_unix/Makefile.in#1 branch .. //depot/projects/ia64/contrib/openpam/modules/pam_unix/pam_unix.c#5 integrate .. //depot/projects/ia64/contrib/openpam/stamp-h.in#1 branch .. //depot/projects/ia64/contrib/telnet/arpa/telnet.h#1 branch .. //depot/projects/ia64/contrib/telnet/libtelnet/auth-proto.h#1 branch .. //depot/projects/ia64/contrib/telnet/libtelnet/auth.c#1 branch .. //depot/projects/ia64/contrib/telnet/libtelnet/auth.h#1 branch .. //depot/projects/ia64/contrib/telnet/libtelnet/enc-proto.h#1 branch .. //depot/projects/ia64/contrib/telnet/libtelnet/enc_des.c#1 branch .. //depot/projects/ia64/contrib/telnet/libtelnet/encrypt.c#1 branch .. //depot/projects/ia64/contrib/telnet/libtelnet/encrypt.h#1 branch .. //depot/projects/ia64/contrib/telnet/libtelnet/genget.c#1 branch .. //depot/projects/ia64/contrib/telnet/libtelnet/getent.c#1 branch .. //depot/projects/ia64/contrib/telnet/libtelnet/kerberos.c#1 branch .. //depot/projects/ia64/contrib/telnet/libtelnet/kerberos5.c#1 branch .. //depot/projects/ia64/contrib/telnet/libtelnet/key-proto.h#1 branch .. //depot/projects/ia64/contrib/telnet/libtelnet/krb4encpwd.c#1 branch .. //depot/projects/ia64/contrib/telnet/libtelnet/misc-proto.h#1 branch .. //depot/projects/ia64/contrib/telnet/libtelnet/misc.c#1 branch .. //depot/projects/ia64/contrib/telnet/libtelnet/misc.h#1 branch .. //depot/projects/ia64/contrib/telnet/libtelnet/pk.c#1 branch .. //depot/projects/ia64/contrib/telnet/libtelnet/pk.h#1 branch .. //depot/projects/ia64/contrib/telnet/libtelnet/read_password.c#1 branch .. //depot/projects/ia64/contrib/telnet/libtelnet/rsaencpwd.c#1 branch .. //depot/projects/ia64/contrib/telnet/libtelnet/sra.c#1 branch .. //depot/projects/ia64/contrib/telnet/telnet/authenc.c#1 branch .. //depot/projects/ia64/contrib/telnet/telnet/commands.c#1 branch .. //depot/projects/ia64/contrib/telnet/telnet/defines.h#1 branch .. //depot/projects/ia64/contrib/telnet/telnet/externs.h#1 branch .. //depot/projects/ia64/contrib/telnet/telnet/fdset.h#1 branch .. //depot/projects/ia64/contrib/telnet/telnet/general.h#1 branch .. //depot/projects/ia64/contrib/telnet/telnet/main.c#1 branch .. //depot/projects/ia64/contrib/telnet/telnet/network.c#1 branch .. //depot/projects/ia64/contrib/telnet/telnet/ring.c#1 branch .. //depot/projects/ia64/contrib/telnet/telnet/ring.h#1 branch .. //depot/projects/ia64/contrib/telnet/telnet/sys_bsd.c#1 branch .. //depot/projects/ia64/contrib/telnet/telnet/telnet.1#1 branch .. //depot/projects/ia64/contrib/telnet/telnet/telnet.c#1 branch .. //depot/projects/ia64/contrib/telnet/telnet/terminal.c#1 branch .. //depot/projects/ia64/contrib/telnet/telnet/types.h#1 branch .. //depot/projects/ia64/contrib/telnet/telnet/utilities.c#1 branch .. //depot/projects/ia64/contrib/telnet/telnetd/authenc.c#1 branch .. //depot/projects/ia64/contrib/telnet/telnetd/defs.h#1 branch .. //depot/projects/ia64/contrib/telnet/telnetd/ext.h#1 branch .. //depot/projects/ia64/contrib/telnet/telnetd/global.c#1 branch .. //depot/projects/ia64/contrib/telnet/telnetd/pathnames.h#1 branch .. //depot/projects/ia64/contrib/telnet/telnetd/slc.c#1 branch .. //depot/projects/ia64/contrib/telnet/telnetd/state.c#1 branch .. //depot/projects/ia64/contrib/telnet/telnetd/sys_term.c#1 branch .. //depot/projects/ia64/contrib/telnet/telnetd/telnetd.8#1 branch .. //depot/projects/ia64/contrib/telnet/telnetd/telnetd.c#1 branch .. //depot/projects/ia64/contrib/telnet/telnetd/telnetd.h#1 branch .. //depot/projects/ia64/contrib/telnet/telnetd/termstat.c#1 branch .. //depot/projects/ia64/contrib/telnet/telnetd/utility.c#1 branch .. //depot/projects/ia64/crypto/telnet/arpa/telnet.h#4 delete .. //depot/projects/ia64/crypto/telnet/libtelnet/auth-proto.h#3 delete .. //depot/projects/ia64/crypto/telnet/libtelnet/auth.c#5 delete .. //depot/projects/ia64/crypto/telnet/libtelnet/auth.h#3 delete .. //depot/projects/ia64/crypto/telnet/libtelnet/enc-proto.h#3 delete .. //depot/projects/ia64/crypto/telnet/libtelnet/enc_des.c#5 delete .. //depot/projects/ia64/crypto/telnet/libtelnet/encrypt.c#4 delete .. //depot/projects/ia64/crypto/telnet/libtelnet/encrypt.h#3 delete .. //depot/projects/ia64/crypto/telnet/libtelnet/genget.c#3 delete .. //depot/projects/ia64/crypto/telnet/libtelnet/getent.c#3 delete .. //depot/projects/ia64/crypto/telnet/libtelnet/kerberos.c#4 delete .. //depot/projects/ia64/crypto/telnet/libtelnet/kerberos5.c#5 delete .. //depot/projects/ia64/crypto/telnet/libtelnet/key-proto.h#3 delete .. //depot/projects/ia64/crypto/telnet/libtelnet/krb4encpwd.c#3 delete .. //depot/projects/ia64/crypto/telnet/libtelnet/misc-proto.h#3 delete .. //depot/projects/ia64/crypto/telnet/libtelnet/misc.c#4 delete .. //depot/projects/ia64/crypto/telnet/libtelnet/misc.h#2 delete .. //depot/projects/ia64/crypto/telnet/libtelnet/pk.c#4 delete .. //depot/projects/ia64/crypto/telnet/libtelnet/pk.h#3 delete .. //depot/projects/ia64/crypto/telnet/libtelnet/read_password.c#3 delete .. //depot/projects/ia64/crypto/telnet/libtelnet/rsaencpwd.c#3 delete .. //depot/projects/ia64/crypto/telnet/libtelnet/sra.c#4 delete .. //depot/projects/ia64/crypto/telnet/telnet/authenc.c#4 delete .. //depot/projects/ia64/crypto/telnet/telnet/commands.c#10 delete .. //depot/projects/ia64/crypto/telnet/telnet/defines.h#3 delete .. //depot/projects/ia64/crypto/telnet/telnet/externs.h#4 delete .. //depot/projects/ia64/crypto/telnet/telnet/fdset.h#2 delete .. //depot/projects/ia64/crypto/telnet/telnet/general.h#2 delete .. //depot/projects/ia64/crypto/telnet/telnet/main.c#6 delete .. //depot/projects/ia64/crypto/telnet/telnet/network.c#5 delete .. //depot/projects/ia64/crypto/telnet/telnet/ring.c#4 delete .. //depot/projects/ia64/crypto/telnet/telnet/ring.h#3 delete .. //depot/projects/ia64/crypto/telnet/telnet/sys_bsd.c#7 delete .. //depot/projects/ia64/crypto/telnet/telnet/telnet.1#2 delete .. //depot/projects/ia64/crypto/telnet/telnet/telnet.c#6 delete .. //depot/projects/ia64/crypto/telnet/telnet/terminal.c#5 delete .. //depot/projects/ia64/crypto/telnet/telnet/types.h#2 delete .. //depot/projects/ia64/crypto/telnet/telnet/utilities.c#5 delete .. //depot/projects/ia64/crypto/telnet/telnetd/authenc.c#4 delete .. //depot/projects/ia64/crypto/telnet/telnetd/defs.h#2 delete .. //depot/projects/ia64/crypto/telnet/telnetd/ext.h#3 delete .. //depot/projects/ia64/crypto/telnet/telnetd/global.c#3 delete .. //depot/projects/ia64/crypto/telnet/telnetd/pathnames.h#2 delete .. //depot/projects/ia64/crypto/telnet/telnetd/slc.c#4 delete .. //depot/projects/ia64/crypto/telnet/telnetd/state.c#5 delete .. //depot/projects/ia64/crypto/telnet/telnetd/sys_term.c#7 delete .. //depot/projects/ia64/crypto/telnet/telnetd/telnetd.8#5 delete .. //depot/projects/ia64/crypto/telnet/telnetd/telnetd.c#5 delete .. //depot/projects/ia64/crypto/telnet/telnetd/telnetd.h#3 delete .. //depot/projects/ia64/crypto/telnet/telnetd/termstat.c#4 delete .. //depot/projects/ia64/crypto/telnet/telnetd/utility.c#4 delete .. //depot/projects/ia64/etc/rc.d/isdnd#8 integrate .. //depot/projects/ia64/kerberos5/Makefile#7 integrate .. //depot/projects/ia64/kerberos5/Makefile.inc#10 integrate .. //depot/projects/ia64/kerberos5/lib/Makefile#4 integrate .. //depot/projects/ia64/kerberos5/lib/libtelnet/Makefile#8 delete .. //depot/projects/ia64/kerberos5/libexec/Makefile#3 integrate .. //depot/projects/ia64/kerberos5/libexec/telnetd/Makefile#8 delete .. //depot/projects/ia64/kerberos5/usr.bin/Makefile#3 integrate .. //depot/projects/ia64/kerberos5/usr.bin/telnet/Makefile#8 delete .. //depot/projects/ia64/lib/Makefile#30 integrate .. //depot/projects/ia64/lib/libc/sys/ioctl.2#6 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_radius/pam_radius.c#9 integrate .. //depot/projects/ia64/lib/libtelnet/Makefile#4 integrate .. //depot/projects/ia64/lib/libtelnet/genget.c#3 delete .. //depot/projects/ia64/lib/libtelnet/getent.c#3 delete .. //depot/projects/ia64/lib/libtelnet/misc-proto.h#3 delete .. //depot/projects/ia64/lib/libtelnet/misc.c#3 delete .. //depot/projects/ia64/lib/libtelnet/misc.h#2 delete .. //depot/projects/ia64/libexec/Makefile#18 integrate .. //depot/projects/ia64/libexec/telnetd/Makefile#4 integrate .. //depot/projects/ia64/libexec/telnetd/defs.h#2 delete .. //depot/projects/ia64/libexec/telnetd/ext.h#3 delete .. //depot/projects/ia64/libexec/telnetd/global.c#3 delete .. //depot/projects/ia64/libexec/telnetd/pathnames.h#2 delete .. //depot/projects/ia64/libexec/telnetd/slc.c#4 delete .. //depot/projects/ia64/libexec/telnetd/state.c#5 delete .. //depot/projects/ia64/libexec/telnetd/sys_term.c#7 delete .. //depot/projects/ia64/libexec/telnetd/telnetd.8#4 delete .. //depot/projects/ia64/libexec/telnetd/telnetd.c#4 delete .. //depot/projects/ia64/libexec/telnetd/telnetd.h#3 delete .. //depot/projects/ia64/libexec/telnetd/termstat.c#4 delete .. //depot/projects/ia64/libexec/telnetd/utility.c#4 delete .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#105 integrate .. //depot/projects/ia64/release/doc/share/sgml/release.ent#10 integrate .. //depot/projects/ia64/rescue/librescue/Makefile#2 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw.8#24 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw2.c#23 integrate .. //depot/projects/ia64/secure/Makefile#4 integrate .. //depot/projects/ia64/secure/Makefile.inc#5 integrate .. //depot/projects/ia64/secure/lib/Makefile#8 integrate .. //depot/projects/ia64/secure/lib/libtelnet/Makefile#5 delete .. //depot/projects/ia64/secure/libexec/Makefile#6 integrate .. //depot/projects/ia64/secure/usr.bin/Makefile#8 integrate .. //depot/projects/ia64/secure/usr.bin/telnet/Makefile#3 delete .. //depot/projects/ia64/share/man/man4/Makefile#53 integrate .. //depot/projects/ia64/share/man/man4/fxp.4#7 integrate .. //depot/projects/ia64/share/man/man4/natm.4#6 integrate .. //depot/projects/ia64/share/man/man4/natmip.4#4 integrate .. //depot/projects/ia64/share/man/man4/patm.4#1 branch .. //depot/projects/ia64/share/man/man4/twe.4#2 integrate .. //depot/projects/ia64/share/man/man4/utopia.4#3 integrate .. //depot/projects/ia64/share/man/man4/wi.4#26 integrate .. //depot/projects/ia64/share/man/man9/Makefile#28 integrate .. //depot/projects/ia64/share/man/man9/mbpool.9#1 branch .. //depot/projects/ia64/share/man/man9/mtx_pool.9#3 integrate .. //depot/projects/ia64/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#3 integrate .. //depot/projects/ia64/sys/conf/NOTES#57 integrate .. //depot/projects/ia64/sys/conf/files#88 integrate .. //depot/projects/ia64/sys/conf/options#57 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acfreebsd.h#10 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_ec.c#12 integrate .. //depot/projects/ia64/sys/dev/acpica/acpivar.h#17 integrate .. //depot/projects/ia64/sys/dev/bge/if_bge.c#34 integrate .. //depot/projects/ia64/sys/dev/bge/if_bgereg.h#17 integrate .. //depot/projects/ia64/sys/dev/en/midway.c#19 integrate .. //depot/projects/ia64/sys/dev/mii/brgphy.c#13 integrate .. //depot/projects/ia64/sys/dev/mii/miidevs#8 integrate .. //depot/projects/ia64/sys/dev/patm/genrtab/Makefile#1 branch .. //depot/projects/ia64/sys/dev/patm/genrtab/genrtab.c#1 branch .. //depot/projects/ia64/sys/dev/patm/idt77252reg.h#1 branch .. //depot/projects/ia64/sys/dev/patm/if_patm.c#1 branch .. //depot/projects/ia64/sys/dev/patm/if_patm_attach.c#1 branch .. //depot/projects/ia64/sys/dev/patm/if_patm_intr.c#1 branch .. //depot/projects/ia64/sys/dev/patm/if_patm_ioctl.c#1 branch .. //depot/projects/ia64/sys/dev/patm/if_patm_rtables.c#1 branch .. //depot/projects/ia64/sys/dev/patm/if_patm_rx.c#1 branch .. //depot/projects/ia64/sys/dev/patm/if_patm_tx.c#1 branch .. //depot/projects/ia64/sys/dev/patm/if_patmvar.h#1 branch .. //depot/projects/ia64/sys/dev/pccard/pccarddevs#30 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs.h#30 integrate .. //depot/projects/ia64/sys/dev/usb/ehci.c#2 integrate .. //depot/projects/ia64/sys/dev/usb/ehci_pci.c#4 integrate .. //depot/projects/ia64/sys/dev/usb/if_aue.c#21 integrate .. //depot/projects/ia64/sys/dev/usb/if_axe.c#4 integrate .. //depot/projects/ia64/sys/dev/usb/if_cue.c#15 integrate .. //depot/projects/ia64/sys/dev/usb/if_kue.c#14 integrate .. //depot/projects/ia64/sys/dev/usb/if_rue.c#2 integrate .. //depot/projects/ia64/sys/dev/usb/ohci.c#18 integrate .. //depot/projects/ia64/sys/dev/usb/ohcireg.h#5 integrate .. //depot/projects/ia64/sys/dev/usb/ohcivar.h#7 integrate .. //depot/projects/ia64/sys/dev/usb/udbp.c#9 integrate .. //depot/projects/ia64/sys/dev/usb/uhci.c#19 integrate .. //depot/projects/ia64/sys/dev/usb/uhcivar.h#8 integrate .. //depot/projects/ia64/sys/dev/usb/usb_mem.c#1 branch .. //depot/projects/ia64/sys/dev/usb/usb_mem.h#5 integrate .. //depot/projects/ia64/sys/dev/usb/usb_port.h#13 integrate .. //depot/projects/ia64/sys/dev/usb/usbdi.c#12 integrate .. //depot/projects/ia64/sys/dev/usb/usbdivar.h#9 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi_pccard.c#25 integrate .. //depot/projects/ia64/sys/kern/kern_acct.c#21 integrate .. //depot/projects/ia64/sys/kern/kern_lock.c#19 integrate .. //depot/projects/ia64/sys/kern/kern_mtxpool.c#9 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#59 integrate .. //depot/projects/ia64/sys/kern/subr_mbpool.c#1 branch .. //depot/projects/ia64/sys/modules/Makefile#56 integrate .. //depot/projects/ia64/sys/modules/acpi/Makefile#12 integrate .. //depot/projects/ia64/sys/modules/libmbpool/Makefile#1 branch .. //depot/projects/ia64/sys/modules/patm/Makefile#1 branch .. //depot/projects/ia64/sys/modules/usb/Makefile#4 integrate .. //depot/projects/ia64/sys/net/if_atm.h#7 integrate .. //depot/projects/ia64/sys/net/if_atmsubr.c#13 integrate .. //depot/projects/ia64/sys/netgraph/atm/ng_atm.c#3 integrate .. //depot/projects/ia64/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#7 integrate .. //depot/projects/ia64/sys/netinet/ip_fw.h#15 integrate .. //depot/projects/ia64/sys/netinet/ip_fw2.c#25 integrate .. //depot/projects/ia64/sys/netinet/tcp_input.c#42 integrate .. //depot/projects/ia64/sys/netinet/tcp_seq.h#4 integrate .. //depot/projects/ia64/sys/netinet/tcp_timer.c#14 integrate .. //depot/projects/ia64/sys/netinet/tcp_var.h#13 integrate .. //depot/projects/ia64/sys/netnatm/natm.c#13 integrate .. //depot/projects/ia64/sys/sparc64/include/asmacros.h#10 integrate .. //depot/projects/ia64/sys/sparc64/include/elf.h#6 integrate .. //depot/projects/ia64/sys/sparc64/include/intr_machdep.h#6 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/exception.S#16 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/genassym.c#21 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/interrupt.S#6 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/intr_machdep.c#10 integrate .. //depot/projects/ia64/sys/sys/kernel.h#14 integrate .. //depot/projects/ia64/sys/sys/mbpool.h#1 branch .. //depot/projects/ia64/sys/sys/mutex.h#15 integrate .. //depot/projects/ia64/usr.bin/Makefile#50 integrate .. //depot/projects/ia64/usr.bin/telnet/Makefile#4 integrate .. //depot/projects/ia64/usr.bin/telnet/README#3 delete .. //depot/projects/ia64/usr.bin/telnet/commands.c#9 delete .. //depot/projects/ia64/usr.bin/telnet/defines.h#3 delete .. //depot/projects/ia64/usr.bin/telnet/externs.h#4 delete .. //depot/projects/ia64/usr.bin/telnet/fdset.h#2 delete .. //depot/projects/ia64/usr.bin/telnet/general.h#2 delete .. //depot/projects/ia64/usr.bin/telnet/main.c#6 delete .. //depot/projects/ia64/usr.bin/telnet/network.c#5 delete .. //depot/projects/ia64/usr.bin/telnet/ring.c#4 delete .. //depot/projects/ia64/usr.bin/telnet/ring.h#3 delete .. //depot/projects/ia64/usr.bin/telnet/sys_bsd.c#6 delete .. //depot/projects/ia64/usr.bin/telnet/telnet.1#4 delete .. //depot/projects/ia64/usr.bin/telnet/telnet.c#7 delete .. //depot/projects/ia64/usr.bin/telnet/terminal.c#5 delete .. //depot/projects/ia64/usr.bin/telnet/types.h#2 delete .. //depot/projects/ia64/usr.bin/telnet/utilities.c#5 delete .. //depot/projects/ia64/usr.sbin/inetd/Makefile#2 integrate .. //depot/projects/ia64/usr.sbin/inetd/inetd.c#15 integrate .. //depot/projects/ia64/usr.sbin/lpr/chkprintcap/chkprintcap.c#3 integrate .. //depot/projects/ia64/usr.sbin/lpr/chkprintcap/skimprintcap.c#3 integrate .. //depot/projects/ia64/usr.sbin/lpr/filters.ru/koi2855/Makefile#2 integrate .. //depot/projects/ia64/usr.sbin/lpr/filters.ru/koi2855/koi2855.c#4 integrate .. //depot/projects/ia64/usr.sbin/lpr/filters.ru/koi2alt/Makefile#2 integrate .. //depot/projects/ia64/usr.sbin/lpr/filters.ru/koi2alt/koi2alt.c#3 integrate .. //depot/projects/ia64/usr.sbin/lpr/filters/Makefile#2 integrate .. //depot/projects/ia64/usr.sbin/lpr/filters/lpf.c#2 integrate .. //depot/projects/ia64/usr.sbin/lpr/lpq/lpq.c#2 integrate .. //depot/projects/ia64/usr.sbin/lpr/lpr/lpr.c#3 integrate .. //depot/projects/ia64/usr.sbin/lpr/lprm/lprm.c#2 integrate .. //depot/projects/ia64/usr.sbin/lpr/lptest/Makefile#2 integrate .. //depot/projects/ia64/usr.sbin/lpr/lptest/lptest.c#2 integrate .. //depot/projects/ia64/usr.sbin/lpr/pac/pac.c#3 integrate Differences ... ==== //depot/projects/ia64/MAINTAINERS#33 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.73 2003/07/07 03:54:02 gshapiro Exp $ +$FreeBSD: src/MAINTAINERS,v 1.74 2003/07/15 16:52:08 dwmalone Exp $ subsystem login notes ----------------------------- @@ -78,6 +78,7 @@ nsdispatch(3) and its consumers. unifdef(1) fanf Pre-commit review requested. ntp roberto Pre-commit review requested. +inetd dwmalone Recommends pre-commit review. Following are the entries from the Makefiles, and a few other sources. Please remove stale entries from both their origin, and this file. @@ -137,7 +138,6 @@ sys/modules/uscanner/Makefile:MAINTAINER= n_hibma@freebsd.org usr.bin/chat/Makefile:MAINTAINER= peter@freebsd.org usr.bin/locate/Makefile:MAINTAINER= wosch@FreeBSD.org -usr.sbin/inetd/Makefile:MAINTAINER= dwmalone@FreeBSD.org usr.sbin/ipftest/Makefile:MAINTAINER= darrenr@freebsd.org usr.sbin/ipresend/Makefile:MAINTAINER= darrenr@freebsd.org usr.sbin/ipsend/Makefile:MAINTAINER= darrenr@freebsd.org ==== //depot/projects/ia64/contrib/openpam/CREDITS#9 (text) ==== @@ -17,7 +17,7 @@ Dmitry V. Levin Eric Melville Gary Winiger - Joe Marcus Clarke + Joe Marcus Clarke Juli Mallett Mark Murray Mike Petullo @@ -27,4 +27,4 @@ Solar Designer Takanori Saneto -$P4: //depot/projects/openpam/CREDITS#8 $ +$P4: //depot/projects/openpam/CREDITS#9 $ ==== //depot/projects/ia64/contrib/openpam/HISTORY#17 (text) ==== @@ -1,3 +1,24 @@ +OpenPAM Dogwood 2003-07-15 + + - ENHANCE: Use the GNU autotools. + + - ENHANCE: Constify the msg field in struct pam_message. + + - BUGFIX: Remove left-over debugging output + + - BUGFIX: Avoid side effects in arguments to the FREE() macro + + - ENHANCE: Make openpam_ttyconv(3) use read(2) rather than fgets(3). + + - BUGFIX: Staticize some variables which shouldn't be global. + + - BUGFIX: Correcly anticipate a NULL user in pam_get_user(3). + + - ENHANCE: Various minor documentation improvements. + +Thanks to Dmitry V. Levin for considerable +assistance with this release. +============================================================================ OpenPAM Digitalis 2003-06-01 - ENHANCE: Completely rewrite the configuration parser and add @@ -242,4 +263,4 @@ First (beta) release. ============================================================================ -$P4: //depot/projects/openpam/HISTORY#19 $ +$P4: //depot/projects/openpam/HISTORY#21 $ ==== //depot/projects/ia64/contrib/openpam/INSTALL#8 (text) ==== @@ -4,22 +4,49 @@ 1. REQUIREMENTS - This release of OpenPAM is targeted at FreeBSD-CURRENT, and has not - been tested on other platforms. It should, however, build with - little or no trouble other BSDs such as BSDI, Darwin, NetBSD or - OpenBSD, and should not prove much of a challenge to port to other - platforms, except for the static linking support. + See the release notes for a list of platforms OpenPAM has been + tested on. + + You will need the GNU autotools, GNU make and the GNU compiler suite + to build OpenPAM. On some platforms, you may have to install these + separately. 2. CONFIGURATION - No configuration is necessary or possible at this time. + Use the "configure" shell script to configure OpenPAM for your + system. Options include: + + --with-modules-dir=DIR + Indicates the directory where PAM modules will be installed. + This option should not be used if you intend to install PAM + modules in the system library directory. + + --with-pam-su + Builds the sample PAM application. + + --with-pam-unix + Builds the sample PAM module. + + For more information about configuration options, use the --help + option. + + A typical invocation might look like this: + + # ./configure --with-pam-su --with-pam-unix 3. COMPILATION - Change into the top-level OpenPAM directory and run 'make'. + To compile OpenPAM, simply run "make" (or "gmake" on platforms where + "make" is not GNU make) in the top-level OpenPAM directory: + + # make 4. INSTALLATION - - Change into the top-level OpenPAM directory and run 'make install'. + + To install OpenPAM, simply run "make install" (or "gmake install" on + platforms where "make" is not GNU make) in the top-level OpenPAM + directory: + + # make install -$P4: //depot/projects/openpam/INSTALL#2 $ +$P4: //depot/projects/openpam/INSTALL#4 $ ==== //depot/projects/ia64/contrib/openpam/MANIFEST#15 (text) ==== @@ -1,21 +1,42 @@ # -# $P4: //depot/projects/openpam/MANIFEST#16 $ +# $P4: //depot/projects/openpam/MANIFEST#18 $ # CREDITS HISTORY INSTALL LICENSE MANIFEST -Makefile -Makefile.inc +Makefile.am +Makefile.in README RELNOTES -bin/Makefile -bin/Makefile.inc -bin/su/Makefile +aclocal.m4 +autogen.sh +config.guess +config.h.in +config.sub +configure +configure.in +depcomp +install-sh +ltconfig +ltmain.sh +missing +mkinstalldirs +stamp-h.in +bin/ +bin/Makefile.am +bin/Makefile.in +bin/su/ +bin/su/Makefile.am +bin/su/Makefile.in bin/su/su.c -doc/Makefile -doc/man/Makefile +doc/ +doc/Makefile.am +doc/Makefile.in +doc/man/ +doc/man/Makefile.am +doc/man/Makefile.in doc/man/openpam.3 doc/man/openpam.man doc/man/openpam_borrow_cred.3 @@ -61,13 +82,21 @@ doc/man/pam_verror.3 doc/man/pam_vinfo.3 doc/man/pam_vprompt.3 +include/ +include/Makefile.am +include/Makefile.in +include/security/ +include/security/Makefile.am +include/security/Makefile.in include/security/openpam.h include/security/openpam_version.h include/security/pam_appl.h include/security/pam_constants.h include/security/pam_modules.h include/security/pam_types.h -lib/Makefile +lib/ +lib/Makefile.am +lib/Makefile.in lib/openpam_borrow_cred.c lib/openpam_configure.c lib/openpam_dispatch.c @@ -125,11 +154,20 @@ lib/pam_verror.c lib/pam_vinfo.c lib/pam_vprompt.c +misc/ misc/gendoc.pl -modules/Makefile -modules/pam_deny/Makefile +modules/ +modules/Makefile.am +modules/Makefile.in +modules/pam_deny/ +modules/pam_deny/Makefile.am +modules/pam_deny/Makefile.in modules/pam_deny/pam_deny.c -modules/pam_permit/Makefile +modules/pam_permit/ +modules/pam_permit/Makefile.am +modules/pam_permit/Makefile.in modules/pam_permit/pam_permit.c -modules/pam_unix/Makefile +modules/pam_unix/ +modules/pam_unix/Makefile.am +modules/pam_unix/Makefile.in modules/pam_unix/pam_unix.c ==== //depot/projects/ia64/contrib/openpam/RELNOTES#17 (text) ==== @@ -1,18 +1,13 @@ - Release notes for OpenPAM Digitalis - =================================== + Release notes for OpenPAM Dogwood + ================================= -This release incorporates several major changes and improvements and -should be considered BETA QUALITY. - This release corresponds to the code used in FreeBSD-CURRENT as of the -release date. It is also known to build cleanly on NetBSD 1.6, -OpenBSD 3.1, and a number of glibc-based Linux platforms (with BSD -make installed). It may or may not build on other platforms; you will -need a BSD-compatible make(1) (NetBSD's make(1) is easy to port to -most POSIX platforms). Previous versions were successfully built on -MacOS X 10.1, but there seem to be issues with the heavily modified -version of GCC 3.1 that ships with MacOS X 10.2. +release date. It has also been tested on several other platforms, and +is expected to work on almost any POSIX-like platform that has GNU +autotools, GNU make and the GNU compiler suite installed. One notable +exception is MacOS X, which ships with a very weird, heavily modified +version of GCC. The library itself is complete. Documentation exists in the form of man pages for the library functions. These man pages are generated by @@ -31,4 +26,4 @@ Please direct bug reports and inquiries to des@freebsd.org. -$P4: //depot/projects/openpam/RELNOTES#18 $ +$P4: //depot/projects/openpam/RELNOTES#19 $ ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam.3#7 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd June 1, 2003 +.Dd July 15, 2003 .Dt OPENPAM 3 .Os .Sh NAME @@ -59,39 +59,39 @@ .Lb libpam .Sh SYNOPSIS .In security/openpam.h -.Ft int +.Ft "int" .Fn openpam_borrow_cred "pam_handle_t *pamh" "const struct passwd *pwd" -.Ft void +.Ft "void" .Fn openpam_free_data "pam_handle_t *pamh" "void *data" "int status" -.Ft const char * +.Ft "const char *" .Fn openpam_get_option "pam_handle_t *pamh" "const char *option" -.Ft void +.Ft "void" .Fn openpam_log "int level" "const char *fmt" "..." -.Ft int +.Ft "int" .Fn openpam_nullconv "int n" "const struct pam_message **msg" "struct pam_response **resp" "void *data" -.Ft char * +.Ft "char *" .Fn openpam_readline "FILE *f" "int *lineno" "size_t *lenp" -.Ft int +.Ft "int" .Fn openpam_restore_cred "pam_handle_t *pamh" -.Ft int +.Ft "int" .Fn openpam_set_option "pam_handle_t *pamh" "const char *option" "const char *value" -.Ft int +.Ft "int" .Fn openpam_ttyconv "int n" "const struct pam_message **msg" "struct pam_response **resp" "void *data" -.Ft int +.Ft "int" .Fn pam_error "pam_handle_t *pamh" "const char *fmt" "..." -.Ft int +.Ft "int" .Fn pam_get_authtok "pam_handle_t *pamh" "int item" "const char **authtok" "const char *prompt" -.Ft int +.Ft "int" .Fn pam_info "pam_handle_t *pamh" "const char *fmt" "..." -.Ft int +.Ft "int" .Fn pam_prompt "pam_handle_t *pamh" "int style" "char **resp" "const char *fmt" "..." -.Ft int +.Ft "int" .Fn pam_setenv "pam_handle_t *pamh" "const char *name" "const char *value" "int overwrite" -.Ft int +.Ft "int" .Fn pam_verror "pam_handle_t *pamh" "const char *fmt" "va_list ap" -.Ft int +.Ft "int" .Fn pam_vinfo "pam_handle_t *pamh" "const char *fmt" "va_list ap" -.Ft int +.Ft "int" .Fn pam_vprompt "pam_handle_t *pamh" "int style" "char **resp" "const char *fmt" "va_list ap" .\" .\" $P4: //depot/projects/openpam/doc/man/openpam.man#1 $ @@ -130,8 +130,9 @@ .Re .Sh AUTHORS The OpenPAM library and this manual page were developed for the -FreeBSD Project by ThinkSec AS and Network Associates Laboratories, -the Security Research Division of Network Associates, Inc. under +.Fx +Project by ThinkSec AS and Network Associates Laboratories, the +Security Research Division of Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 .Pq Dq CBOSS , as part of the DARPA CHATS research program. ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_borrow_cred.3#13 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd June 1, 2003 +.Dd July 15, 2003 .Dt OPENPAM_BORROW_CRED 3 .Os .Sh NAME @@ -45,7 +45,7 @@ .In sys/types.h .In security/pam_appl.h .In security/openpam.h -.Ft int +.Ft "int" .Fn openpam_borrow_cred "pam_handle_t *pamh" "const struct passwd *pwd" .Sh DESCRIPTION The @@ -84,9 +84,10 @@ .Sh AUTHORS The .Nm -function and this manual page were developed for the FreeBSD Project -by ThinkSec AS and Network Associates Laboratories, the Security -Research Division of Network Associates, Inc. under DARPA/SPAWAR -contract N66001-01-C-8035 +function and this manual page were developed for the +.Fx +Project by ThinkSec AS and Network Associates Laboratories, the +Security Research Division of Network Associates, Inc. under +DARPA/SPAWAR contract N66001-01-C-8035 .Pq Dq CBOSS , as part of the DARPA CHATS research program. ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_free_data.3#13 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd June 1, 2003 +.Dd July 15, 2003 .Dt OPENPAM_FREE_DATA 3 .Os .Sh NAME @@ -45,7 +45,7 @@ .In sys/types.h .In security/pam_appl.h .In security/openpam.h -.Ft void +.Ft "void" .Fn openpam_free_data "pam_handle_t *pamh" "void *data" "int status" .Sh DESCRIPTION The @@ -67,9 +67,10 @@ .Sh AUTHORS The .Nm -function and this manual page were developed for the FreeBSD Project -by ThinkSec AS and Network Associates Laboratories, the Security -Research Division of Network Associates, Inc. under DARPA/SPAWAR -contract N66001-01-C-8035 +function and this manual page were developed for the +.Fx +Project by ThinkSec AS and Network Associates Laboratories, the +Security Research Division of Network Associates, Inc. under +DARPA/SPAWAR contract N66001-01-C-8035 .Pq Dq CBOSS , as part of the DARPA CHATS research program. ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_get_option.3#17 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd June 1, 2003 +.Dd July 15, 2003 .Dt OPENPAM_GET_OPTION 3 .Os .Sh NAME @@ -45,7 +45,7 @@ .In sys/types.h .In security/pam_appl.h .In security/openpam.h -.Ft const char * +.Ft "const char *" .Fn openpam_get_option "pam_handle_t *pamh" "const char *option" .Sh DESCRIPTION The @@ -71,9 +71,10 @@ .Sh AUTHORS The .Nm -function and this manual page were developed for the FreeBSD Project -by ThinkSec AS and Network Associates Laboratories, the Security -Research Division of Network Associates, Inc. under DARPA/SPAWAR -contract N66001-01-C-8035 +function and this manual page were developed for the +.Fx +Project by ThinkSec AS and Network Associates Laboratories, the +Security Research Division of Network Associates, Inc. under +DARPA/SPAWAR contract N66001-01-C-8035 .Pq Dq CBOSS , as part of the DARPA CHATS research program. ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_log.3#17 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd June 1, 2003 +.Dd July 15, 2003 .Dt OPENPAM_LOG 3 .Os .Sh NAME @@ -45,7 +45,7 @@ .In sys/types.h .In security/pam_appl.h .In security/openpam.h -.Ft void +.Ft "void" .Fn openpam_log "int level" "const char *fmt" "..." .Sh DESCRIPTION The @@ -105,9 +105,10 @@ .Sh AUTHORS The .Nm -function and this manual page were developed for the FreeBSD Project -by ThinkSec AS and Network Associates Laboratories, the Security -Research Division of Network Associates, Inc. under DARPA/SPAWAR -contract N66001-01-C-8035 +function and this manual page were developed for the +.Fx +Project by ThinkSec AS and Network Associates Laboratories, the +Security Research Division of Network Associates, Inc. under +DARPA/SPAWAR contract N66001-01-C-8035 .Pq Dq CBOSS , as part of the DARPA CHATS research program. ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_nullconv.3#8 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd June 1, 2003 +.Dd July 15, 2003 .Dt OPENPAM_NULLCONV 3 .Os .Sh NAME @@ -45,7 +45,7 @@ .In sys/types.h .In security/pam_appl.h .In security/openpam.h -.Ft int +.Ft "int" .Fn openpam_nullconv "int n" "const struct pam_message **msg" "struct pam_response **resp" "void *data" .Sh DESCRIPTION The @@ -92,9 +92,10 @@ .Sh AUTHORS The .Nm -function and this manual page were developed for the FreeBSD Project -by ThinkSec AS and Network Associates Laboratories, the Security -Research Division of Network Associates, Inc. under DARPA/SPAWAR -contract N66001-01-C-8035 +function and this manual page were developed for the +.Fx +Project by ThinkSec AS and Network Associates Laboratories, the +Security Research Division of Network Associates, Inc. under +DARPA/SPAWAR contract N66001-01-C-8035 .Pq Dq CBOSS , as part of the DARPA CHATS research program. ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_readline.3#2 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd June 1, 2003 +.Dd July 15, 2003 .Dt OPENPAM_READLINE 3 .Os .Sh NAME @@ -45,7 +45,7 @@ .In sys/types.h .In security/pam_appl.h .In security/openpam.h -.Ft char * +.Ft "char *" .Fn openpam_readline "FILE *f" "int *lineno" "size_t *lenp" .Sh DESCRIPTION The @@ -99,9 +99,10 @@ .Sh AUTHORS The .Nm -function and this manual page were developed for the FreeBSD Project -by ThinkSec AS and Network Associates Laboratories, the Security -Research Division of Network Associates, Inc. under DARPA/SPAWAR -contract N66001-01-C-8035 +function and this manual page were developed for the +.Fx +Project by ThinkSec AS and Network Associates Laboratories, the +Security Research Division of Network Associates, Inc. under +DARPA/SPAWAR contract N66001-01-C-8035 .Pq Dq CBOSS , as part of the DARPA CHATS research program. ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_restore_cred.3#13 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd June 1, 2003 +.Dd July 15, 2003 .Dt OPENPAM_RESTORE_CRED 3 .Os .Sh NAME @@ -45,7 +45,7 @@ .In sys/types.h .In security/pam_appl.h .In security/openpam.h -.Ft int +.Ft "int" .Fn openpam_restore_cred "pam_handle_t *pamh" .Sh DESCRIPTION The @@ -77,9 +77,10 @@ .Sh AUTHORS The .Nm -function and this manual page were developed for the FreeBSD Project -by ThinkSec AS and Network Associates Laboratories, the Security -Research Division of Network Associates, Inc. under DARPA/SPAWAR -contract N66001-01-C-8035 +function and this manual page were developed for the +.Fx +Project by ThinkSec AS and Network Associates Laboratories, the +Security Research Division of Network Associates, Inc. under +DARPA/SPAWAR contract N66001-01-C-8035 .Pq Dq CBOSS , as part of the DARPA CHATS research program. ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_set_option.3#17 (text) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jul 16 20:09:38 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E748437B404; Wed, 16 Jul 2003 20:09:37 -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 7540B37B401 for ; Wed, 16 Jul 2003 20:09:37 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E421B43FA3 for ; Wed, 16 Jul 2003 20:09:36 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6H39a0U040929 for ; Wed, 16 Jul 2003 20:09:36 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6H39aik040926 for perforce@freebsd.org; Wed, 16 Jul 2003 20:09:36 -0700 (PDT) Date: Wed, 16 Jul 2003 20:09:36 -0700 (PDT) Message-Id: <200307170309.h6H39aik040926@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 34604 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jul 2003 03:09:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=34604 Change 34604 by marcel@marcel_nfs on 2003/07/16 20:08:53 IFC @34603 Affected files ... .. //depot/projects/ia64/sys/boot/ia64/skiload/Makefile#12 integrate .. //depot/projects/ia64/sys/boot/ia64/skiload/ldscript.ia64#2 integrate .. //depot/projects/ia64/sys/boot/ia64/skiload/main.c#4 integrate .. //depot/projects/ia64/sys/boot/ia64/skiload/start.S#1 branch Differences ... ==== //depot/projects/ia64/sys/boot/ia64/skiload/Makefile#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/ia64/skiload/Makefile,v 1.10 2003/02/26 06:18:52 obrien Exp $ +# $FreeBSD: src/sys/boot/ia64/skiload/Makefile,v 1.11 2003/07/17 01:49:59 marcel Exp $ .PATH: ${.CURDIR}/../common @@ -7,7 +7,7 @@ NEWVERSWHAT= "ia64 SKI boot" ${MACHINE_ARCH} BINDIR?= /boot -SRCS+= main.c conf.c +SRCS+= conf.c main.c start.S CFLAGS+= -ffreestanding ==== //depot/projects/ia64/sys/boot/ia64/skiload/ldscript.ia64#2 (text+ko) ==== @@ -1,135 +1,61 @@ -/* $FreeBSD: src/sys/boot/ia64/skiload/ldscript.ia64,v 1.1 2001/09/12 08:34:27 dfr Exp $ */ +/* $FreeBSD: src/sys/boot/ia64/skiload/ldscript.ia64,v 1.2 2003/07/17 01:49:59 marcel Exp $ */ OUTPUT_FORMAT("elf64-ia64-little", "elf64-ia64-little", "elf64-ia64-little") OUTPUT_ARCH(ia64) -ENTRY(__start) +ENTRY(_start) SECTIONS { /* Read-only sections, merged into text segment: */ . = 0x100000; - - .text : - { - *(.text.ivt) - . += 8192; - *(.text) - *(.stub) - /* .gnu.warning sections are handled specially by elf32.em. */ + .text : { + *(.text .stub .text.* .gnu.linkonce.t.*) + /* .gnu.warning sections are handled specially by elf32.em. */ *(.gnu.warning) - *(.gnu.linkonce.t*) - } =0x47ff041f - .interp : { *(.interp) } - .hash : { *(.hash) } - .dynsym : { *(.dynsym) } - .dynstr : { *(.dynstr) } - .gnu.version : { *(.gnu.version) } - .gnu.version_d : { *(.gnu.version_d) } - .gnu.version_r : { *(.gnu.version_r) } - .rel.text : - { *(.rel.text) *(.rel.gnu.linkonce.t*) } - .rela.text : - { *(.rela.text) *(.rela.gnu.linkonce.t*) } - .rel.data : - { *(.rel.data) *(.rel.gnu.linkonce.d*) } - .rela.data : - { *(.rela.data) *(.rela.gnu.linkonce.d*) } - .rel.rodata : - { *(.rel.rodata) *(.rel.gnu.linkonce.r*) } - .rela.rodata : - { *(.rela.rodata) *(.rela.gnu.linkonce.r*) } - .rel.got : { *(.rel.got) } - .rela.got : { *(.rela.got) } - .rel.ctors : { *(.rel.ctors) } - .rela.ctors : { *(.rela.ctors) } - .rel.dtors : { *(.rel.dtors) } - .rela.dtors : { *(.rela.dtors) } - .rel.init : { *(.rel.init) } - .rela.init : { *(.rela.init) } - .rel.fini : { *(.rel.fini) } - .rela.fini : { *(.rela.fini) } - .rel.bss : { *(.rel.bss) } - .rela.bss : { *(.rela.bss) } - .rel.plt : { *(.rel.plt) } - .rela.plt : { *(.rela.plt) } - .init : { *(.init) } =0x47ff041f - _etext = .; - PROVIDE (etext = .); - .fini : { *(.fini) } =0x47ff041f - .rodata : { *(.rodata) *(.gnu.linkonce.r*) } - .rodata1 : { *(.rodata1) } - .reginfo : { *(.reginfo) } - /* Adjust the address for the data segment. We want to adjust up to - the same address within the page on the next page up. */ - . = .; - .data : - { - *(.data) - *(.gnu.linkonce.d*) - CONSTRUCTORS + *(.plt) + } =0x00300000010070000002000001000400 + .data : { + *(.rodata .rodata.* .gnu.linkonce.r.*) + *(.rodata1) + *(.sdata2 .sdata2.* .gnu.linkonce.s2.*) + *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) + *(.opd) + *(.IA_64.unwind_info* .gnu.linkonce.ia64unwi.*) + *(.IA_64.unwind* .gnu.linkonce.ia64unw.*) + __start_set_Xcommand_set = .; + *(set_Xcommand_set) + __stop_set_Xcommand_set = .; + *(.data .data.* .gnu.linkonce.d.*) + *(.data1) + *(.plabel) + *(.dynbss) + *(.bss .bss.* .gnu.linkonce.b.*) + *(COMMON) } - .data1 : { *(.data1) } - .ctors : - { - *(.ctors) + __gp = .; + .sdata : { + *(.got.plt .got) + *(.IA_64.pltoff) + *(.sdata .sdata.* .gnu.linkonce.s.*) + *(dynsbss) + *(.sbss .sbss.* .gnu.linkonce.sb.*) + *(.scommon) } - .dtors : - { - *(.dtors) + .dynamic : { *(.dynamic) } + .rela : { + *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) + *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) + *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) + *(.rela.got) + *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*) + *(.rela.sbss .rela.sbss.* .rela.gnu.linkonce.sb.*) + *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*) + *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) + *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) + *(.rela.plt) + *(.rela.IA_64.pltoff) + *(.relaset_*) + *(.rela.dyn .rela.dyn.*) } - .plt : { *(.plt) } - /* gp points at .got+(1<<21) */ - __gp = ALIGN(8) + 0x200000; - .got : { *(.got.plt) *(.got) } - .dynamic : { *(.dynamic) } - /* We want the small data sections together, so single-instruction offsets - can access them all, and initialized data all before uninitialized, so - we can shorten the on-disk segment size. */ - .sdata : { *(.sdata) } - _edata = .; - PROVIDE (edata = .); - __bss_start = .; - .sbss : { *(.sbss) *(.scommon) } - .bss : - { - *(.dynbss) - *(.bss) - *(COMMON) - } - . = ALIGN(64 / 8); - _end = . ; - PROVIDE (end = .); - /* Stabs debugging sections. */ - .stab 0 : { *(.stab) } - .stabstr 0 : { *(.stabstr) } - .stab.excl 0 : { *(.stab.excl) } - .stab.exclstr 0 : { *(.stab.exclstr) } - .stab.index 0 : { *(.stab.index) } - .stab.indexstr 0 : { *(.stab.indexstr) } - .comment 0 : { *(.comment) } - /* DWARF debug sections. - Symbols in the DWARF debugging sections are relative to the beginning - of the section so we begin them at 0. */ - /* DWARF 1 */ - .debug 0 : { *(.debug) } - .line 0 : { *(.line) } - /* GNU DWARF 1 extensions */ - .debug_srcinfo 0 : { *(.debug_srcinfo) } - .debug_sfnames 0 : { *(.debug_sfnames) } - /* DWARF 1.1 and DWARF 2 */ - .debug_aranges 0 : { *(.debug_aranges) } - .debug_pubnames 0 : { *(.debug_pubnames) } - /* DWARF 2 */ - .debug_info 0 : { *(.debug_info) } - .debug_abbrev 0 : { *(.debug_abbrev) } - .debug_line 0 : { *(.debug_line) } - .debug_frame 0 : { *(.debug_frame) } - .debug_str 0 : { *(.debug_str) } - .debug_loc 0 : { *(.debug_loc) } - .debug_macinfo 0 : { *(.debug_macinfo) } - /* SGI/MIPS DWARF 2 extensions */ - .debug_weaknames 0 : { *(.debug_weaknames) } - .debug_funcnames 0 : { *(.debug_funcnames) } - .debug_typenames 0 : { *(.debug_typenames) } - .debug_varnames 0 : { *(.debug_varnames) } - /* These must appear regardless of . */ + .hash : { *(.hash) } + .dynsym : { *(.dynsym) } + .dynstr : { *(.dynstr) } } - ==== //depot/projects/ia64/sys/boot/ia64/skiload/main.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/ia64/skiload/main.c,v 1.3 2003/04/03 21:36:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ia64/skiload/main.c,v 1.4 2003/07/17 01:49:59 marcel Exp $"); #include #include @@ -45,17 +45,11 @@ struct arch_switch archsw; /* MI/MD interface boundary */ void -__start(void) +ski_main(void) { - static char stack[16384] __aligned(16); static char malloc[512*1024]; int i; - __asm __volatile("movl gp=__gp;;"); - __asm __volatile("mov sp=%0" :: "r"(&stack[16384])); - __asm __volatile("bsw.1;;"); - __asm __volatile("mov ar.fpsr=%0" :: "r"(IA64_FPSR_DEFAULT)); - /* * initialise the heap as early as possible. Once this is done, * alloc() is usable. The stack is buried inside us, so this is From owner-p4-projects@FreeBSD.ORG Wed Jul 16 22:59:03 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 052BD37B404; Wed, 16 Jul 2003 22:59:03 -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 A57EC37B401 for ; Wed, 16 Jul 2003 22:59:02 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7253E43F85 for ; Wed, 16 Jul 2003 22:59:01 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6H5x10U054846 for ; Wed, 16 Jul 2003 22:59:01 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6H5x0dP054843 for perforce@freebsd.org; Wed, 16 Jul 2003 22:59:00 -0700 (PDT) Date: Wed, 16 Jul 2003 22:59:00 -0700 (PDT) Message-Id: <200307170559.h6H5x0dP054843@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 34605 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jul 2003 05:59:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=34605 Change 34605 by marcel@marcel_nfs on 2003/07/16 22:58:55 IFC @34603 Affected files ... .. //depot/projects/uart/boot/efi/libefi/arch/ia64/ldscript.ia64#2 integrate .. //depot/projects/uart/boot/ia64/skiload/Makefile#2 integrate .. //depot/projects/uart/boot/ia64/skiload/ldscript.ia64#2 integrate .. //depot/projects/uart/boot/ia64/skiload/main.c#2 integrate .. //depot/projects/uart/boot/ia64/skiload/start.S#1 branch .. //depot/projects/uart/conf/NOTES#3 integrate .. //depot/projects/uart/conf/files#7 integrate .. //depot/projects/uart/conf/options#3 integrate .. //depot/projects/uart/contrib/dev/acpica/acfreebsd.h#3 integrate .. //depot/projects/uart/dev/acpica/acpi_ec.c#3 integrate .. //depot/projects/uart/dev/acpica/acpivar.h#2 integrate .. //depot/projects/uart/dev/bge/if_bge.c#3 integrate .. //depot/projects/uart/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/uart/dev/en/midway.c#4 integrate .. //depot/projects/uart/dev/mii/brgphy.c#2 integrate .. //depot/projects/uart/dev/mii/miidevs#2 integrate .. //depot/projects/uart/dev/patm/genrtab/Makefile#1 branch .. //depot/projects/uart/dev/patm/genrtab/genrtab.c#1 branch .. //depot/projects/uart/dev/patm/idt77252reg.h#1 branch .. //depot/projects/uart/dev/patm/if_patm.c#1 branch .. //depot/projects/uart/dev/patm/if_patm_attach.c#1 branch .. //depot/projects/uart/dev/patm/if_patm_intr.c#1 branch .. //depot/projects/uart/dev/patm/if_patm_ioctl.c#1 branch .. //depot/projects/uart/dev/patm/if_patm_rtables.c#1 branch .. //depot/projects/uart/dev/patm/if_patm_rx.c#1 branch .. //depot/projects/uart/dev/patm/if_patm_tx.c#1 branch .. //depot/projects/uart/dev/patm/if_patmvar.h#1 branch .. //depot/projects/uart/dev/pccard/pccarddevs#3 integrate .. //depot/projects/uart/dev/pccard/pccarddevs.h#3 integrate .. //depot/projects/uart/dev/usb/ehci.c#2 integrate .. //depot/projects/uart/dev/usb/ehci_pci.c#3 integrate .. //depot/projects/uart/dev/usb/if_aue.c#3 integrate .. //depot/projects/uart/dev/usb/if_axe.c#3 integrate .. //depot/projects/uart/dev/usb/if_cue.c#3 integrate .. //depot/projects/uart/dev/usb/if_kue.c#2 integrate .. //depot/projects/uart/dev/usb/if_rue.c#2 integrate .. //depot/projects/uart/dev/usb/ohci.c#4 integrate .. //depot/projects/uart/dev/usb/ohcireg.h#3 integrate .. //depot/projects/uart/dev/usb/ohcivar.h#2 integrate .. //depot/projects/uart/dev/usb/udbp.c#3 integrate .. //depot/projects/uart/dev/usb/uhci.c#4 integrate .. //depot/projects/uart/dev/usb/uhcivar.h#3 integrate .. //depot/projects/uart/dev/usb/usb_mem.c#1 branch .. //depot/projects/uart/dev/usb/usb_mem.h#3 integrate .. //depot/projects/uart/dev/usb/usb_port.h#4 integrate .. //depot/projects/uart/dev/usb/usbdi.c#4 integrate .. //depot/projects/uart/dev/usb/usbdivar.h#4 integrate .. //depot/projects/uart/dev/wi/if_wi_pccard.c#4 integrate .. //depot/projects/uart/kern/kern_acct.c#2 integrate .. //depot/projects/uart/kern/kern_lock.c#3 integrate .. //depot/projects/uart/kern/kern_mtxpool.c#3 integrate .. //depot/projects/uart/kern/kern_thread.c#5 integrate .. //depot/projects/uart/kern/subr_mbpool.c#1 branch .. //depot/projects/uart/modules/Makefile#2 integrate .. //depot/projects/uart/modules/acpi/Makefile#4 integrate .. //depot/projects/uart/modules/libmbpool/Makefile#1 branch .. //depot/projects/uart/modules/patm/Makefile#1 branch .. //depot/projects/uart/modules/usb/Makefile#2 integrate .. //depot/projects/uart/net/if_atm.h#2 integrate .. //depot/projects/uart/net/if_atmsubr.c#2 integrate .. //depot/projects/uart/netgraph/atm/ng_atm.c#3 integrate .. //depot/projects/uart/netgraph/bluetooth/drivers/ubt/ng_ubt.c#2 integrate .. //depot/projects/uart/netinet/ip_fw.h#3 integrate .. //depot/projects/uart/netinet/ip_fw2.c#5 integrate .. //depot/projects/uart/netinet/tcp_input.c#2 integrate .. //depot/projects/uart/netinet/tcp_seq.h#2 integrate .. //depot/projects/uart/netinet/tcp_timer.c#2 integrate .. //depot/projects/uart/netinet/tcp_var.h#2 integrate .. //depot/projects/uart/netnatm/natm.c#2 integrate .. //depot/projects/uart/sparc64/include/asmacros.h#2 integrate .. //depot/projects/uart/sparc64/include/elf.h#2 integrate .. //depot/projects/uart/sparc64/include/intr_machdep.h#2 integrate .. //depot/projects/uart/sparc64/sparc64/exception.S#2 integrate .. //depot/projects/uart/sparc64/sparc64/genassym.c#2 integrate .. //depot/projects/uart/sparc64/sparc64/interrupt.S#2 integrate .. //depot/projects/uart/sparc64/sparc64/intr_machdep.c#2 integrate .. //depot/projects/uart/sys/kernel.h#3 integrate .. //depot/projects/uart/sys/mbpool.h#1 branch .. //depot/projects/uart/sys/mutex.h#3 integrate Differences ... ==== //depot/projects/uart/boot/efi/libefi/arch/ia64/ldscript.ia64#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/boot/efi/libefi/arch/ia64/ldscript.ia64,v 1.6 2002/04/06 03:39:22 peter Exp $ */ +/* $FreeBSD: src/sys/boot/efi/libefi/arch/ia64/ldscript.ia64,v 1.7 2003/07/17 00:32:08 marcel Exp $ */ OUTPUT_FORMAT("elf64-ia64-little", "elf64-ia64-little", "elf64-ia64-little") OUTPUT_ARCH(ia64) ENTRY(_start_plabel) @@ -7,74 +7,67 @@ /* Read-only sections, merged into text segment: */ . = 0; ImageBase = .; - . += 4096; - .text : - { - *(.text) - *(.stub) - /* .gnu.warning sections are handled specially by elf32.em. */ + . = SIZEOF_HEADERS; + . = ALIGN(4096); + .text : { + *(.text .stub .text.* .gnu.linkonce.t.*) + /* .gnu.warning sections are handled specially by elf32.em. */ *(.gnu.warning) - *(.gnu.linkonce.t*) *(.plt) - } + } =0x00300000010070000002000001000400 . = ALIGN(4096); - .hash : { *(.hash) } - . = ALIGN(4096); - .data : - { - *(.rodata*) + .data : { + *(.rodata .rodata.* .gnu.linkonce.r.*) + *(.rodata1) + *(.sdata2 .sdata2.* .gnu.linkonce.s2.*) + *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) + *(.opd) + *(.IA_64.unwind_info* .gnu.linkonce.ia64unwi.*) + *(.IA_64.unwind* .gnu.linkonce.ia64unw.*) __start_set_Xcommand_set = .; *(set_Xcommand_set) __stop_set_Xcommand_set = .; - *(.ctors) - *(.data) + *(.data .data.* .gnu.linkonce.d.*) *(.data1) - *(.gnu.linkonce.d*) *(.plabel) - *(.IA_64.unwind) - *(.IA_64.unwind_info) - *(.bss) *(.dynbss) + *(.bss .bss.* .gnu.linkonce.b.*) *(COMMON) } . = ALIGN(4096); __gp = .; - .sdata : - { - *(.got.plt) - *(.got) + .sdata : { + *(.got.plt .got) *(.IA_64.pltoff) - *(.sdata) - *(.sbss) + *(.sdata .sdata.* .gnu.linkonce.s.*) + *(dynsbss) + *(.sbss .sbss.* .gnu.linkonce.sb.*) *(.scommon) } . = ALIGN(4096); - .dynamic : { *(.dynamic) } + .dynamic : { *(.dynamic) } . = ALIGN(4096); - .rela : - { - *(.rela.text) - *(.rela.gnu.linkonce.t*) - *(.rela.set.*) - *(.rela.sdata) - *(.rela.data) - *(.rela.gnu.linkonce.d*) + .rela : { + *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) + *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) + *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) *(.rela.got) - *(.rela.stab) - *(.rela.ctors) + *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*) + *(.rela.sbss .rela.sbss.* .rela.gnu.linkonce.sb.*) + *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*) + *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) + *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) + *(.rela.plt) + *(.rela.IA_64.pltoff) *(.relaset_*) - *(.rela.IA_64.pltoff) + *(.rela.dyn .rela.dyn.*) } . = ALIGN(4096); - .reloc : { *(.reloc) } + .reloc : { *(.reloc) } + . = ALIGN(4096); + .hash : { *(.hash) } . = ALIGN(4096); - .dynsym : { *(.dynsym) } + .dynsym : { *(.dynsym) } . = ALIGN(4096); - .dynstr : { *(.dynstr) } - .ignored : - { - *(.rela.plabel) - *(.rela.reloc) - } + .dynstr : { *(.dynstr) } } - ==== //depot/projects/uart/boot/ia64/skiload/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/ia64/skiload/Makefile,v 1.10 2003/02/26 06:18:52 obrien Exp $ +# $FreeBSD: src/sys/boot/ia64/skiload/Makefile,v 1.11 2003/07/17 01:49:59 marcel Exp $ .PATH: ${.CURDIR}/../common @@ -7,7 +7,7 @@ NEWVERSWHAT= "ia64 SKI boot" ${MACHINE_ARCH} BINDIR?= /boot -SRCS+= main.c conf.c +SRCS+= conf.c main.c start.S CFLAGS+= -ffreestanding ==== //depot/projects/uart/boot/ia64/skiload/ldscript.ia64#2 (text+ko) ==== @@ -1,135 +1,61 @@ -/* $FreeBSD: src/sys/boot/ia64/skiload/ldscript.ia64,v 1.1 2001/09/12 08:34:27 dfr Exp $ */ +/* $FreeBSD: src/sys/boot/ia64/skiload/ldscript.ia64,v 1.2 2003/07/17 01:49:59 marcel Exp $ */ OUTPUT_FORMAT("elf64-ia64-little", "elf64-ia64-little", "elf64-ia64-little") OUTPUT_ARCH(ia64) -ENTRY(__start) +ENTRY(_start) SECTIONS { /* Read-only sections, merged into text segment: */ . = 0x100000; - - .text : - { - *(.text.ivt) - . += 8192; - *(.text) - *(.stub) - /* .gnu.warning sections are handled specially by elf32.em. */ + .text : { + *(.text .stub .text.* .gnu.linkonce.t.*) + /* .gnu.warning sections are handled specially by elf32.em. */ *(.gnu.warning) - *(.gnu.linkonce.t*) - } =0x47ff041f - .interp : { *(.interp) } - .hash : { *(.hash) } - .dynsym : { *(.dynsym) } - .dynstr : { *(.dynstr) } - .gnu.version : { *(.gnu.version) } - .gnu.version_d : { *(.gnu.version_d) } - .gnu.version_r : { *(.gnu.version_r) } - .rel.text : - { *(.rel.text) *(.rel.gnu.linkonce.t*) } - .rela.text : - { *(.rela.text) *(.rela.gnu.linkonce.t*) } - .rel.data : - { *(.rel.data) *(.rel.gnu.linkonce.d*) } - .rela.data : - { *(.rela.data) *(.rela.gnu.linkonce.d*) } - .rel.rodata : - { *(.rel.rodata) *(.rel.gnu.linkonce.r*) } - .rela.rodata : - { *(.rela.rodata) *(.rela.gnu.linkonce.r*) } - .rel.got : { *(.rel.got) } - .rela.got : { *(.rela.got) } - .rel.ctors : { *(.rel.ctors) } - .rela.ctors : { *(.rela.ctors) } - .rel.dtors : { *(.rel.dtors) } - .rela.dtors : { *(.rela.dtors) } - .rel.init : { *(.rel.init) } - .rela.init : { *(.rela.init) } - .rel.fini : { *(.rel.fini) } - .rela.fini : { *(.rela.fini) } - .rel.bss : { *(.rel.bss) } - .rela.bss : { *(.rela.bss) } - .rel.plt : { *(.rel.plt) } - .rela.plt : { *(.rela.plt) } - .init : { *(.init) } =0x47ff041f - _etext = .; - PROVIDE (etext = .); - .fini : { *(.fini) } =0x47ff041f - .rodata : { *(.rodata) *(.gnu.linkonce.r*) } - .rodata1 : { *(.rodata1) } - .reginfo : { *(.reginfo) } - /* Adjust the address for the data segment. We want to adjust up to - the same address within the page on the next page up. */ - . = .; - .data : - { - *(.data) - *(.gnu.linkonce.d*) - CONSTRUCTORS + *(.plt) + } =0x00300000010070000002000001000400 + .data : { + *(.rodata .rodata.* .gnu.linkonce.r.*) + *(.rodata1) + *(.sdata2 .sdata2.* .gnu.linkonce.s2.*) + *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) + *(.opd) + *(.IA_64.unwind_info* .gnu.linkonce.ia64unwi.*) + *(.IA_64.unwind* .gnu.linkonce.ia64unw.*) + __start_set_Xcommand_set = .; + *(set_Xcommand_set) + __stop_set_Xcommand_set = .; + *(.data .data.* .gnu.linkonce.d.*) + *(.data1) + *(.plabel) + *(.dynbss) + *(.bss .bss.* .gnu.linkonce.b.*) + *(COMMON) } - .data1 : { *(.data1) } - .ctors : - { - *(.ctors) + __gp = .; + .sdata : { + *(.got.plt .got) + *(.IA_64.pltoff) + *(.sdata .sdata.* .gnu.linkonce.s.*) + *(dynsbss) + *(.sbss .sbss.* .gnu.linkonce.sb.*) + *(.scommon) } - .dtors : - { - *(.dtors) + .dynamic : { *(.dynamic) } + .rela : { + *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) + *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) + *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) + *(.rela.got) + *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*) + *(.rela.sbss .rela.sbss.* .rela.gnu.linkonce.sb.*) + *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*) + *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) + *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) + *(.rela.plt) + *(.rela.IA_64.pltoff) + *(.relaset_*) + *(.rela.dyn .rela.dyn.*) } - .plt : { *(.plt) } - /* gp points at .got+(1<<21) */ - __gp = ALIGN(8) + 0x200000; - .got : { *(.got.plt) *(.got) } - .dynamic : { *(.dynamic) } - /* We want the small data sections together, so single-instruction offsets - can access them all, and initialized data all before uninitialized, so - we can shorten the on-disk segment size. */ - .sdata : { *(.sdata) } - _edata = .; - PROVIDE (edata = .); - __bss_start = .; - .sbss : { *(.sbss) *(.scommon) } - .bss : - { - *(.dynbss) - *(.bss) - *(COMMON) - } - . = ALIGN(64 / 8); - _end = . ; - PROVIDE (end = .); - /* Stabs debugging sections. */ - .stab 0 : { *(.stab) } - .stabstr 0 : { *(.stabstr) } - .stab.excl 0 : { *(.stab.excl) } - .stab.exclstr 0 : { *(.stab.exclstr) } - .stab.index 0 : { *(.stab.index) } - .stab.indexstr 0 : { *(.stab.indexstr) } - .comment 0 : { *(.comment) } - /* DWARF debug sections. - Symbols in the DWARF debugging sections are relative to the beginning - of the section so we begin them at 0. */ - /* DWARF 1 */ - .debug 0 : { *(.debug) } - .line 0 : { *(.line) } - /* GNU DWARF 1 extensions */ - .debug_srcinfo 0 : { *(.debug_srcinfo) } - .debug_sfnames 0 : { *(.debug_sfnames) } - /* DWARF 1.1 and DWARF 2 */ - .debug_aranges 0 : { *(.debug_aranges) } - .debug_pubnames 0 : { *(.debug_pubnames) } - /* DWARF 2 */ - .debug_info 0 : { *(.debug_info) } - .debug_abbrev 0 : { *(.debug_abbrev) } - .debug_line 0 : { *(.debug_line) } - .debug_frame 0 : { *(.debug_frame) } - .debug_str 0 : { *(.debug_str) } - .debug_loc 0 : { *(.debug_loc) } - .debug_macinfo 0 : { *(.debug_macinfo) } - /* SGI/MIPS DWARF 2 extensions */ - .debug_weaknames 0 : { *(.debug_weaknames) } - .debug_funcnames 0 : { *(.debug_funcnames) } - .debug_typenames 0 : { *(.debug_typenames) } - .debug_varnames 0 : { *(.debug_varnames) } - /* These must appear regardless of . */ + .hash : { *(.hash) } + .dynsym : { *(.dynsym) } + .dynstr : { *(.dynstr) } } - ==== //depot/projects/uart/boot/ia64/skiload/main.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/ia64/skiload/main.c,v 1.3 2003/04/03 21:36:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ia64/skiload/main.c,v 1.4 2003/07/17 01:49:59 marcel Exp $"); #include #include @@ -45,17 +45,11 @@ struct arch_switch archsw; /* MI/MD interface boundary */ void -__start(void) +ski_main(void) { - static char stack[16384] __aligned(16); static char malloc[512*1024]; int i; - __asm __volatile("movl gp=__gp;;"); - __asm __volatile("mov sp=%0" :: "r"(&stack[16384])); - __asm __volatile("bsw.1;;"); - __asm __volatile("mov ar.fpsr=%0" :: "r"(IA64_FPSR_DEFAULT)); - /* * initialise the heap as early as possible. Once this is done, * alloc() is usable. The stack is buried inside us, so this is ==== //depot/projects/uart/conf/NOTES#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1161 2003/07/07 21:19:04 wollman Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1163 2003/07/15 11:57:23 harti Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1683,6 +1683,9 @@ # # The `fatm' device provides support for Fore PCA200E ATM PCI cards. # +# The `patm' device provides support for IDT77252 based cards like +# ProSum's ProATM-155 and ProATM-25 and IDT's evaluation boards. +# # atm device provides generic atm functions and is required for # atm devices. # NATM enables the netnatm protocol family that can be used to @@ -1699,9 +1702,12 @@ device en device fatm #Fore PCA200E device hatm #Fore/Marconi HE155/622 +device patm #IDT77252 cards (ProATM and IDT) device utopia #ATM PHY driver options NATM #native ATM +options LIBMBPOOL #needed by patm, iatm + # # Audio drivers: `pcm', `sbc', `gusc' # ==== //depot/projects/uart/conf/files#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.804 2003/07/14 17:43:09 njl Exp $ +# $FreeBSD: src/sys/conf/files,v 1.807 2003/07/15 22:42:36 jmg Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -539,6 +539,13 @@ dev/nge/if_nge.c optional nge dev/null/null.c standard dev/nmdm/nmdm.c optional nmdm +dev/patm/if_patm.c optional patm pci +dev/patm/if_patm_intr.c optional patm pci +dev/patm/if_patm_ioctl.c optional patm pci +dev/patm/if_patm_rx.c optional patm pci +dev/patm/if_patm_tx.c optional patm pci +dev/patm/if_patm_attach.c optional patm pci +dev/patm/if_patm_rtables.c optional patm pci dev/pccard/card_if.m standard dev/pccard/pccard.c optional pccard dev/pccard/pccard_cis.c optional pccard @@ -819,7 +826,7 @@ dev/usb/uvscom.c optional uvscom ucom dev/usb/usb.c optional usb dev/usb/usb_ethersubr.c optional usb -#dev/usb/usb_mem.c optional usb +dev/usb/usb_mem.c optional usb dev/usb/usb_quirks.c optional usb dev/usb/usb_subr.c optional usb dev/usb/usbdi.c optional usb @@ -1109,6 +1116,7 @@ kern/subr_hints.c standard kern/subr_kobj.c standard kern/subr_log.c standard +kern/subr_mbpool.c optional libmbpool kern/subr_mbuf.c standard kern/subr_mchain.c optional libmchain kern/subr_module.c standard ==== //depot/projects/uart/conf/options#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.401 2003/07/11 17:04:37 imp Exp $ +# $FreeBSD: src/sys/conf/options,v 1.402 2003/07/15 08:59:37 harti Exp $ # # On the handling of kernel options # @@ -346,6 +346,7 @@ IPSTEALTH IPX IPXIP opt_ipx.h +LIBMBPOOL LIBMCHAIN NCP NETATALK opt_atalk.h ==== //depot/projects/uart/contrib/dev/acpica/acfreebsd.h#3 (text+ko) ==== @@ -134,6 +134,7 @@ #ifdef ACPI_DEBUG #define ACPI_DEBUG_OUTPUT /* for backward compatibility */ +#define ACPI_DISASSEMBLER #endif #ifdef _KERNEL ==== //depot/projects/uart/dev/acpica/acpi_ec.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.32 2003/07/13 22:57:16 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.33 2003/07/15 19:24:36 njl Exp $ */ /****************************************************************************** * @@ -261,6 +261,12 @@ /* Total time in ms spent in the poll loop waiting for a response. */ #define EC_POLL_TIMEOUT 50 +#define EVENT_READY(event, status) \ + (((event) == EC_EVENT_OUTPUT_BUFFER_FULL && \ + ((status) & EC_FLAG_OUTPUT_BUFFER) != 0) || \ + ((event) == EC_EVENT_INPUT_BUFFER_EMPTY && \ + ((status) & EC_FLAG_INPUT_BUFFER) == 0)) + static __inline ACPI_STATUS EcLock(struct acpi_ec_softc *sc) { @@ -439,8 +445,7 @@ if (ACPI_FAILURE(Status)) { device_printf(dev, "can't install address space handler for %s - %s\n", acpi_name(sc->ec_handle), AcpiFormatException(Status)); - Status = AcpiRemoveGpeHandler(sc->ec_handle, sc->ec_gpebit, - &EcGpeHandler); + Status = AcpiRemoveGpeHandler(NULL, sc->ec_gpebit, &EcGpeHandler); if (ACPI_FAILURE(Status)) panic("Added GPE handler but can't remove it"); errval = ENXIO; @@ -461,6 +466,7 @@ if (sc->ec_data_res) bus_release_resource(sc->ec_dev, SYS_RES_IOPORT, sc->ec_data_rid, sc->ec_data_res); + mtx_destroy(&sc->ec_mtx); return (errval); } @@ -512,8 +518,11 @@ mtx_lock(&sc->ec_mtx); EcStatus = EC_GET_CSR(sc); mtx_unlock(&sc->ec_mtx); - if ((EcStatus & EC_EVENT_SCI) == 0) + if ((EcStatus & EC_EVENT_SCI) == 0) { + /* If it's not an SCI, wakeup the EcWaitEvent sleep. */ + wakeup(&sc->ec_polldelay); goto re_enable; + } /* Find out why the EC is signaling us. */ Status = EcQuery(sc, &Data); @@ -655,40 +664,42 @@ /* * Poll the EC status register to detect completion of the last - * command. Wait up to 50 ms (in chunks of sc->ec_polldelay - * microseconds for the first 1 ms, in 1 ms chunks for the remainder - * of the period) for this to occur. + * command. First, wait up to 1 ms in chunks of sc->ec_polldelay + * microseconds. */ - for (i = 0; i < (1000 / sc->ec_polldelay) + EC_POLL_TIMEOUT; i++) { + for (i = 0; i < 1000 / sc->ec_polldelay; i++) { EcStatus = EC_GET_CSR(sc); + if (EVENT_READY(Event, EcStatus)) { + Status = AE_OK; + break; + } + AcpiOsStall(sc->ec_polldelay); + } - /* Check if the user's event occurred. */ - if ((Event == EC_EVENT_OUTPUT_BUFFER_FULL && - (EcStatus & EC_FLAG_OUTPUT_BUFFER) != 0) || - (Event == EC_EVENT_INPUT_BUFFER_EMPTY && - (EcStatus & EC_FLAG_INPUT_BUFFER) == 0)) { + /* Scale poll delay by the amount of time actually waited. */ + period = i * sc->ec_polldelay; + if (period <= 5) + sc->ec_polldelay = 1; + else if (period <= 20) + sc->ec_polldelay = 5; + else if (period <= 100) + sc->ec_polldelay = 10; + else + sc->ec_polldelay = 100; + + /* + * If we still don't have a response, wait up to EC_POLL_TIMEOUT ms + * for completion, sleeping for chunks of 10 ms. + */ + if (Status != AE_OK) { + for (i = 0; i < EC_POLL_TIMEOUT / 10; i++) { + EcStatus = EC_GET_CSR(sc); + if (EVENT_READY(Event, EcStatus)) { Status = AE_OK; break; + } + msleep(&sc->ec_polldelay, &sc->ec_mtx, PZERO, "ecpoll", 10/*ms*/); } - - /* For the first 1 ms, DELAY, after that, msleep. */ - if (i < 1000) - AcpiOsStall(sc->ec_polldelay); - else - msleep(&sc->ec_polldelay, &sc->ec_mtx, PZERO, "ecpoll", 1/*ms*/); - } - - /* Scale poll delay by the amount of time actually waited. */ - if (Status == AE_OK) { - period = i * sc->ec_polldelay; - if (period <= 5) - sc->ec_polldelay = 1; - else if (period <= 20) - sc->ec_polldelay = 5; - else if (period <= 100) - sc->ec_polldelay = 10; - else - sc->ec_polldelay = 100; } return (Status); ==== //depot/projects/uart/dev/acpica/acpivar.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.41 2003/05/13 16:59:46 jhb Exp $ + * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.42 2003/07/15 19:19:54 njl Exp $ */ #include "bus_if.h" @@ -104,22 +104,10 @@ # define ACPI_LOCK_DECL int s # define kthread_create(a, b, c, d, e, f) kthread_create(a, b, c, f) # define tc_init(a) init_timecounter(a) -#elif 0 -/* - * The ACPI subsystem lives under a single mutex. You *must* - * acquire this mutex before calling any of the acpi_ or Acpi* functions. - */ -extern struct mtx acpi_mutex; -# define ACPI_LOCK mtx_lock(&acpi_mutex) -# define ACPI_UNLOCK mtx_unlock(&acpi_mutex) -# define ACPI_ASSERTLOCK mtx_assert(&acpi_mutex, MA_OWNED) -# define ACPI_MSLEEP(a, b, c, d, e) msleep(a, b, c, d, e) -# define ACPI_LOCK_DECL #else # define ACPI_LOCK # define ACPI_UNLOCK # define ACPI_ASSERTLOCK -# define ACPI_MSLEEP(a, b, c, d, e) tsleep(a, c, d, e) # define ACPI_LOCK_DECL #endif ==== //depot/projects/uart/dev/bge/if_bge.c#3 (text+ko) ==== @@ -64,7 +64,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.43 2003/07/11 08:19:52 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.44 2003/07/16 00:09:56 wpaul Exp $"); #include #include @@ -135,14 +135,26 @@ "Broadcom BCM5700 Gigabit Ethernet" }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5701, "Broadcom BCM5701 Gigabit Ethernet" }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM5702, + "Broadcom BCM5702 Gigabit Ethernet" }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5702X, "Broadcom BCM5702X Gigabit Ethernet" }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM5703, + "Broadcom BCM5703 Gigabit Ethernet" }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5703X, "Broadcom BCM5703X Gigabit Ethernet" }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5704C, "Broadcom BCM5704C Dual Gigabit Ethernet" }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5704S, "Broadcom BCM5704S Dual Gigabit Ethernet" }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM5705, + "Broadcom BCM5705 Gigabit Ethernet" }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM5705M, + "Broadcom BCM5705M Gigabit Ethernet" }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM5705M_ALT, + "Broadcom BCM5705M Gigabit Ethernet" }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM5782, + "Broadcom BCM5782 Gigabit Ethernet" }, { SK_VENDORID, SK_DEVICEID_ALTIMA, "SysKonnect Gigabit Ethernet" }, { ALTIMA_VENDORID, ALTIMA_DEVICE_AC1000, @@ -162,6 +174,8 @@ static void bge_tick (void *); static void bge_stats_update (struct bge_softc *); +static void bge_stats_update_regs + (struct bge_softc *); static int bge_encap (struct bge_softc *, struct mbuf *, u_int32_t *); @@ -480,13 +494,17 @@ sc = device_get_softc(dev); + /* + * Broadcom's own driver always assumes the internal + * PHY is at GMII address 1. On some chips, the PHY responds + * to accesses at all addresses, which could cause us to + * bogusly attach the PHY 32 times at probe type. Always + * restricting the lookup to address 1 is simpler than + * trying to figure out which chips revisions should be + * special-cased. + */ if (phy != 1) - switch(sc->bge_chipid) { - case BGE_CHIPID_BCM5701_B5: - case BGE_CHIPID_BCM5703_A2: - case BGE_CHIPID_BCM5704_A0: - return(0); - } + return(0); /* Reading with autopolling on may trigger PCI errors */ autopoll = CSR_READ_4(sc, BGE_MI_MODE); @@ -1084,7 +1102,8 @@ } if (sc->bge_asicrev == BGE_ASICREV_BCM5703 || - sc->bge_asicrev == BGE_ASICREV_BCM5704) + sc->bge_asicrev == BGE_ASICREV_BCM5704 || + sc->bge_asicrev == BGE_ASICREV_BCM5705) dma_rw_ctl &= ~BGE_PCIDMARWCTL_MINDMA; pci_write_config(sc->bge_dev, BGE_PCI_DMA_RW_CTL, dma_rw_ctl, 4); @@ -1136,22 +1155,32 @@ */ CSR_WRITE_4(sc, BGE_PCI_MEMWIN_BASEADDR, 0); - /* Configure mbuf memory pool */ - if (sc->bge_extram) { - CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_BASEADDR, BGE_EXT_SSRAM); - CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_LEN, 0x18000); - } else { - CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_BASEADDR, BGE_BUFFPOOL_1); - CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_LEN, 0x18000); + if (sc->bge_asicrev != BGE_ASICREV_BCM5705) { + /* Configure mbuf memory pool */ + if (sc->bge_extram) { + CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_BASEADDR, + BGE_EXT_SSRAM); + CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_LEN, 0x18000); + } else { + CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_BASEADDR, + BGE_BUFFPOOL_1); + CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_LEN, 0x18000); + } + + /* Configure DMA resource pool */ + CSR_WRITE_4(sc, BGE_BMAN_DMA_DESCPOOL_BASEADDR, + BGE_DMA_DESCRIPTORS); + CSR_WRITE_4(sc, BGE_BMAN_DMA_DESCPOOL_LEN, 0x2000); } - /* Configure DMA resource pool */ - CSR_WRITE_4(sc, BGE_BMAN_DMA_DESCPOOL_BASEADDR, BGE_DMA_DESCRIPTORS); - CSR_WRITE_4(sc, BGE_BMAN_DMA_DESCPOOL_LEN, 0x2000); - /* Configure mbuf pool watermarks */ - CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_READDMA_LOWAT, 0x50); - CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_MACRX_LOWAT, 0x20); + if (sc->bge_asicrev == BGE_ASICREV_BCM5705) { + CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_READDMA_LOWAT, 0x0); + CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_MACRX_LOWAT, 0x10); + } else { + CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_READDMA_LOWAT, 0x50); + CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_MACRX_LOWAT, 0x20); + } CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_HIWAT, 0x60); /* Configure DMA resource watermarks */ @@ -1159,20 +1188,22 @@ CSR_WRITE_4(sc, BGE_BMAN_DMA_DESCPOOL_HIWAT, 10); /* Enable buffer manager */ - CSR_WRITE_4(sc, BGE_BMAN_MODE, - BGE_BMANMODE_ENABLE|BGE_BMANMODE_LOMBUF_ATTN); + if (sc->bge_asicrev != BGE_ASICREV_BCM5705) { + CSR_WRITE_4(sc, BGE_BMAN_MODE, + BGE_BMANMODE_ENABLE|BGE_BMANMODE_LOMBUF_ATTN); - /* Poll for buffer manager start indication */ - for (i = 0; i < BGE_TIMEOUT; i++) { - if (CSR_READ_4(sc, BGE_BMAN_MODE) & BGE_BMANMODE_ENABLE) - break; - DELAY(10); - } + /* Poll for buffer manager start indication */ + for (i = 0; i < BGE_TIMEOUT; i++) { + if (CSR_READ_4(sc, BGE_BMAN_MODE) & BGE_BMANMODE_ENABLE) + break; + DELAY(10); + } - if (i == BGE_TIMEOUT) { - printf("bge%d: buffer manager failed to start\n", - sc->bge_unit); - return(ENXIO); + if (i == BGE_TIMEOUT) { + printf("bge%d: buffer manager failed to start\n", + sc->bge_unit); + return(ENXIO); + } } /* Enable flow-through queues */ @@ -1196,7 +1227,11 @@ rcb = &sc->bge_rdata->bge_info.bge_std_rx_rcb; BGE_HOSTADDR(rcb->bge_hostaddr, vtophys(&sc->bge_rdata->bge_rx_std_ring)); - rcb->bge_maxlen_flags = BGE_RCB_MAXLEN_FLAGS(BGE_MAX_FRAMELEN, 0); + if (sc->bge_asicrev == BGE_ASICREV_BCM5705) + rcb->bge_maxlen_flags = BGE_RCB_MAXLEN_FLAGS(512, 0); + else + rcb->bge_maxlen_flags = + BGE_RCB_MAXLEN_FLAGS(BGE_MAX_FRAMELEN, 0); if (sc->bge_extram) rcb->bge_nicaddr = BGE_EXT_STD_RX_RINGS; else @@ -1213,27 +1248,32 @@ * using this ring (i.e. once we set the MTU * high enough to require it). */ - rcb = &sc->bge_rdata->bge_info.bge_jumbo_rx_rcb; - BGE_HOSTADDR(rcb->bge_hostaddr, - vtophys(&sc->bge_rdata->bge_rx_jumbo_ring)); - rcb->bge_maxlen_flags = - BGE_RCB_MAXLEN_FLAGS(BGE_MAX_FRAMELEN, BGE_RCB_FLAG_RING_DISABLED); - if (sc->bge_extram) - rcb->bge_nicaddr = BGE_EXT_JUMBO_RX_RINGS; - else - rcb->bge_nicaddr = BGE_JUMBO_RX_RINGS; - CSR_WRITE_4(sc, BGE_RX_JUMBO_RCB_HADDR_HI, - rcb->bge_hostaddr.bge_addr_hi); - CSR_WRITE_4(sc, BGE_RX_JUMBO_RCB_HADDR_LO, - rcb->bge_hostaddr.bge_addr_lo); - CSR_WRITE_4(sc, BGE_RX_JUMBO_RCB_MAXLEN_FLAGS, rcb->bge_maxlen_flags); - CSR_WRITE_4(sc, BGE_RX_JUMBO_RCB_NICADDR, rcb->bge_nicaddr); + if (sc->bge_asicrev != BGE_ASICREV_BCM5705) { + rcb = &sc->bge_rdata->bge_info.bge_jumbo_rx_rcb; + BGE_HOSTADDR(rcb->bge_hostaddr, + vtophys(&sc->bge_rdata->bge_rx_jumbo_ring)); + rcb->bge_maxlen_flags = + BGE_RCB_MAXLEN_FLAGS(BGE_MAX_FRAMELEN, + BGE_RCB_FLAG_RING_DISABLED); + if (sc->bge_extram) + rcb->bge_nicaddr = BGE_EXT_JUMBO_RX_RINGS; + else + rcb->bge_nicaddr = BGE_JUMBO_RX_RINGS; + CSR_WRITE_4(sc, BGE_RX_JUMBO_RCB_HADDR_HI, + rcb->bge_hostaddr.bge_addr_hi); + CSR_WRITE_4(sc, BGE_RX_JUMBO_RCB_HADDR_LO, + rcb->bge_hostaddr.bge_addr_lo); + CSR_WRITE_4(sc, BGE_RX_JUMBO_RCB_MAXLEN_FLAGS, + rcb->bge_maxlen_flags); + CSR_WRITE_4(sc, BGE_RX_JUMBO_RCB_NICADDR, rcb->bge_nicaddr); - /* Set up dummy disabled mini ring RCB */ - rcb = &sc->bge_rdata->bge_info.bge_mini_rx_rcb; - rcb->bge_maxlen_flags = - BGE_RCB_MAXLEN_FLAGS(0, BGE_RCB_FLAG_RING_DISABLED); - CSR_WRITE_4(sc, BGE_RX_MINI_RCB_MAXLEN_FLAGS, rcb->bge_maxlen_flags); + /* Set up dummy disabled mini ring RCB */ + rcb = &sc->bge_rdata->bge_info.bge_mini_rx_rcb; + rcb->bge_maxlen_flags = + BGE_RCB_MAXLEN_FLAGS(0, BGE_RCB_FLAG_RING_DISABLED); + CSR_WRITE_4(sc, BGE_RX_MINI_RCB_MAXLEN_FLAGS, + rcb->bge_maxlen_flags); + } /* * Set the BD ring replentish thresholds. The recommended @@ -1263,7 +1303,9 @@ vrcb->bge_hostaddr.bge_addr_hi = 0; BGE_HOSTADDR(vrcb->bge_hostaddr, vtophys(&sc->bge_rdata->bge_tx_ring)); vrcb->bge_nicaddr = BGE_NIC_TXRING_ADDR(0, BGE_TX_RING_CNT); - vrcb->bge_maxlen_flags = BGE_RCB_MAXLEN_FLAGS(BGE_TX_RING_CNT, 0); + if (sc->bge_asicrev != BGE_ASICREV_BCM5705) + vrcb->bge_maxlen_flags = + BGE_RCB_MAXLEN_FLAGS(BGE_TX_RING_CNT, 0); /* Disable all unused RX return rings */ vrcb = (volatile struct bge_rcb *)(sc->bge_vhandle + BGE_MEMWIN_START + @@ -1272,7 +1314,7 @@ vrcb->bge_hostaddr.bge_addr_hi = 0; vrcb->bge_hostaddr.bge_addr_lo = 0; vrcb->bge_maxlen_flags = - BGE_RCB_MAXLEN_FLAGS(BGE_RETURN_RING_CNT, + BGE_RCB_MAXLEN_FLAGS(sc->bge_return_ring_cnt, BGE_RCB_FLAG_RING_DISABLED); vrcb->bge_nicaddr = 0; CSR_WRITE_4(sc, BGE_MBX_RX_CONS0_LO + @@ -1297,7 +1339,8 @@ BGE_HOSTADDR(vrcb->bge_hostaddr, vtophys(&sc->bge_rdata->bge_rx_return_ring)); vrcb->bge_nicaddr = 0x00000000; - vrcb->bge_maxlen_flags = BGE_RCB_MAXLEN_FLAGS(BGE_RETURN_RING_CNT, 0); + vrcb->bge_maxlen_flags = + BGE_RCB_MAXLEN_FLAGS(sc->bge_return_ring_cnt, 0); /* Set random backoff seed for TX */ CSR_WRITE_4(sc, BGE_TX_RANDOM_BACKOFF, @@ -1346,23 +1389,29 @@ CSR_WRITE_4(sc, BGE_HCC_TX_COAL_TICKS, sc->bge_tx_coal_ticks); CSR_WRITE_4(sc, BGE_HCC_RX_MAX_COAL_BDS, sc->bge_rx_max_coal_bds); CSR_WRITE_4(sc, BGE_HCC_TX_MAX_COAL_BDS, sc->bge_tx_max_coal_bds); - CSR_WRITE_4(sc, BGE_HCC_RX_COAL_TICKS_INT, 0); - CSR_WRITE_4(sc, BGE_HCC_TX_COAL_TICKS_INT, 0); + if (sc->bge_asicrev != BGE_ASICREV_BCM5705) { + CSR_WRITE_4(sc, BGE_HCC_RX_COAL_TICKS_INT, 0); + CSR_WRITE_4(sc, BGE_HCC_TX_COAL_TICKS_INT, 0); + } CSR_WRITE_4(sc, BGE_HCC_RX_MAX_COAL_BDS_INT, 0); CSR_WRITE_4(sc, BGE_HCC_TX_MAX_COAL_BDS_INT, 0); - CSR_WRITE_4(sc, BGE_HCC_STATS_TICKS, sc->bge_stat_ticks); /* Set up address of statistics block */ - CSR_WRITE_4(sc, BGE_HCC_STATS_BASEADDR, BGE_STATS_BLOCK); - CSR_WRITE_4(sc, BGE_HCC_STATS_ADDR_HI, 0); - CSR_WRITE_4(sc, BGE_HCC_STATS_ADDR_LO, - vtophys(&sc->bge_rdata->bge_info.bge_stats)); + if (sc->bge_asicrev != BGE_ASICREV_BCM5705) { + CSR_WRITE_4(sc, BGE_HCC_STATS_ADDR_HI, 0); + CSR_WRITE_4(sc, BGE_HCC_STATS_ADDR_LO, + vtophys(&sc->bge_rdata->bge_info.bge_stats)); + + CSR_WRITE_4(sc, BGE_HCC_STATS_BASEADDR, BGE_STATS_BLOCK); + CSR_WRITE_4(sc, BGE_HCC_STATUSBLK_BASEADDR, BGE_STATUS_BLOCK); + CSR_WRITE_4(sc, BGE_HCC_STATS_TICKS, sc->bge_stat_ticks); + } /* Set up address of status block */ - CSR_WRITE_4(sc, BGE_HCC_STATUSBLK_BASEADDR, BGE_STATUS_BLOCK); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jul 17 11:19:58 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B959B37B404; Thu, 17 Jul 2003 11:19:57 -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 53F4C37B401 for ; Thu, 17 Jul 2003 11:19:57 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EAB6C43F93 for ; Thu, 17 Jul 2003 11:19:55 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6HIJt0U009282 for ; Thu, 17 Jul 2003 11:19:55 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6HIJr32009279 for perforce@freebsd.org; Thu, 17 Jul 2003 11:19:53 -0700 (PDT) Date: Thu, 17 Jul 2003 11:19:53 -0700 (PDT) Message-Id: <200307171819.h6HIJr32009279@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 34637 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jul 2003 18:19:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=34637 Change 34637 by jhb@jhb_laptop on 2003/07/17 11:19:08 IFC @34631. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/machdep.c#59 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#10 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#7 integrate .. //depot/projects/smpng/sys/amd64/include/pmap.h#5 integrate .. //depot/projects/smpng/sys/amd64/include/vmparam.h#3 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#5 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/biosacpi.c#4 integrate .. //depot/projects/smpng/sys/boot/ia64/skiload/Makefile#8 integrate .. //depot/projects/smpng/sys/boot/ia64/skiload/ldscript.ia64#2 integrate .. //depot/projects/smpng/sys/boot/ia64/skiload/main.c#4 integrate .. //depot/projects/smpng/sys/boot/ia64/skiload/start.S#1 branch .. //depot/projects/smpng/sys/boot/pc98/boot2/asm.h#3 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/main.c#15 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#41 integrate .. //depot/projects/smpng/sys/conf/NOTES#49 integrate .. //depot/projects/smpng/sys/conf/files#82 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#21 integrate .. //depot/projects/smpng/sys/conf/options#56 integrate .. //depot/projects/smpng/sys/conf/options.i386#29 integrate .. //depot/projects/smpng/sys/conf/options.ia64#16 integrate .. //depot/projects/smpng/sys/conf/options.pc98#30 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/CHANGES.txt#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acconfig.h#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdebug.h#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdisasm.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acevents.h#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acexcep.h#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acfreebsd.h#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acglobal.h#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/achware.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acinterp.h#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/aclocal.h#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acmacros.h#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acnamesp.h#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acobject.h#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpi.h#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpiosxf.h#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpixf.h#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actables.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actbl.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actypes.h#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acutils.h#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbcmds.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbdisply.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbexec.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbfileio.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbinput.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbstats.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbutils.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmbuffer.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmobject.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/dmopcode.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmresrc.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmwalk.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsfield.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsinit.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsmethod.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsmthdat.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsobject.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsopcode.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswexec.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evevent.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evgpe.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evgpeblk.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evmisc.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evregion.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evrgnini.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evsci.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxface.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxfevnt.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxfregn.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exconfig.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exdump.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exfldio.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg1.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exregion.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstore.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exsystem.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exutils.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwacpi.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwgpe.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwregs.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwsleep.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwtimer.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsaccess.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsalloc.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsdumpdv.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsload.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsnames.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsparse.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nssearch.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsutils.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nswalk.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfeval.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfname.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psargs.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/pswalk.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psxface.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsaddr.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rscalc.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsio.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsirq.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsmemory.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsmisc.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsxface.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbconvrt.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbget.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbgetall.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbinstal.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbutils.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbxface.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utcopy.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utdebug.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utdelete.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/uteval.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utglobal.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utinit.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utmisc.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utobject.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utxface.c#12 integrate .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/Makefile#2 integrate .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_trace.c#2 integrate .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_trace.h#2 integrate .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_uinfo.c#2 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#28 integrate .. //depot/projects/smpng/sys/dev/aac/aac_pci.c#23 integrate .. //depot/projects/smpng/sys/dev/aac/aacvar.h#18 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdHardware.c#10 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdMemory.c#6 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSynch.c#11 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#44 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_ec.c#18 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_isab.c#2 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci_link.c#6 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib.c#15 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#26 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/if_athvar.h#2 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#29 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#16 integrate .. //depot/projects/smpng/sys/dev/ciss/ciss.c#18 integrate .. //depot/projects/smpng/sys/dev/en/midway.c#18 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.c#21 integrate .. //depot/projects/smpng/sys/dev/firewire/fwdev.c#8 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#41 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatm.c#3 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatm_intr.c#2 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatm_ioctl.c#2 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatm_rx.c#2 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatm_tx.c#2 integrate .. //depot/projects/smpng/sys/dev/kbd/atkbd.c#9 integrate .. //depot/projects/smpng/sys/dev/kbd/atkbdcreg.h#5 integrate .. //depot/projects/smpng/sys/dev/mii/brgphy.c#15 integrate .. //depot/projects/smpng/sys/dev/mii/miidevs#10 integrate .. //depot/projects/smpng/sys/dev/patm/genrtab/Makefile#1 branch .. //depot/projects/smpng/sys/dev/patm/genrtab/genrtab.c#1 branch .. //depot/projects/smpng/sys/dev/patm/idt77252reg.h#1 branch .. //depot/projects/smpng/sys/dev/patm/if_patm.c#1 branch .. //depot/projects/smpng/sys/dev/patm/if_patm_attach.c#1 branch .. //depot/projects/smpng/sys/dev/patm/if_patm_intr.c#1 branch .. //depot/projects/smpng/sys/dev/patm/if_patm_ioctl.c#1 branch .. //depot/projects/smpng/sys/dev/patm/if_patm_rtables.c#1 branch .. //depot/projects/smpng/sys/dev/patm/if_patm_rx.c#1 branch .. //depot/projects/smpng/sys/dev/patm/if_patm_tx.c#1 branch .. //depot/projects/smpng/sys/dev/patm/if_patmvar.h#1 branch .. //depot/projects/smpng/sys/dev/pccard/pccarddevs#27 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs.h#27 integrate .. //depot/projects/smpng/sys/dev/sbni/if_sbni.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/ehci.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/ehci_pci.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/if_aue.c#22 integrate .. //depot/projects/smpng/sys/dev/usb/if_axe.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/if_cue.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/if_kue.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/if_rue.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/ohci.c#23 integrate .. //depot/projects/smpng/sys/dev/usb/ohcireg.h#5 integrate .. //depot/projects/smpng/sys/dev/usb/ohcivar.h#8 integrate .. //depot/projects/smpng/sys/dev/usb/ubsa.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/ucom.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/udbp.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/uftdi.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/ugen.c#17 integrate .. //depot/projects/smpng/sys/dev/usb/uhci.c#26 integrate .. //depot/projects/smpng/sys/dev/usb/uhcivar.h#9 integrate .. //depot/projects/smpng/sys/dev/usb/uhid.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/uhub.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/uplcom.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/usb.c#20 integrate .. //depot/projects/smpng/sys/dev/usb/usb_mem.c#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_mem.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/usb_port.h#16 integrate .. //depot/projects/smpng/sys/dev/usb/usb_subr.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#36 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs.h#36 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#36 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi.h#10 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi_util.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/usbdivar.h#11 integrate .. //depot/projects/smpng/sys/dev/usb/uscanner.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/uvisor.c#6 integrate .. //depot/projects/smpng/sys/dev/utopia/idtphy.h#2 integrate .. //depot/projects/smpng/sys/dev/utopia/utopia.c#2 integrate .. //depot/projects/smpng/sys/dev/utopia/utopia.h#2 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi_pccard.c#20 integrate .. //depot/projects/smpng/sys/geom/geom_dump.c#21 integrate .. //depot/projects/smpng/sys/i386/i386/busdma_machdep.c#22 integrate .. //depot/projects/smpng/sys/i386/i386/locore.s#17 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#62 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#48 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#42 integrate .. //depot/projects/smpng/sys/i386/i386/swtch.s#19 integrate .. //depot/projects/smpng/sys/i386/isa/apic_vector.s#17 integrate .. //depot/projects/smpng/sys/ia64/ia64/db_trace.c#12 integrate .. //depot/projects/smpng/sys/ia64/ia64/exception.S#2 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#60 integrate .. //depot/projects/smpng/sys/ia64/ia64/syscall.S#2 integrate .. //depot/projects/smpng/sys/ia64/ia64/trap.c#52 integrate .. //depot/projects/smpng/sys/ia64/ia64/unwind.c#9 integrate .. //depot/projects/smpng/sys/ia64/include/ia64_cpu.h#10 integrate .. //depot/projects/smpng/sys/ia64/include/unwind.h#5 integrate .. //depot/projects/smpng/sys/isa/psm.c#18 integrate .. //depot/projects/smpng/sys/kern/kern_acct.c#29 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#49 integrate .. //depot/projects/smpng/sys/kern/kern_lock.c#28 integrate .. //depot/projects/smpng/sys/kern/kern_malloc.c#23 integrate .. //depot/projects/smpng/sys/kern/kern_mtxpool.c#7 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#54 integrate .. //depot/projects/smpng/sys/kern/kern_prot.c#73 integrate .. //depot/projects/smpng/sys/kern/kern_resource.c#38 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#73 integrate .. //depot/projects/smpng/sys/kern/kern_sx.c#19 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#54 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#40 integrate .. //depot/projects/smpng/sys/kern/kern_umtx.c#6 integrate .. //depot/projects/smpng/sys/kern/subr_mbpool.c#1 branch .. //depot/projects/smpng/sys/kern/subr_param.c#13 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#100 integrate .. //depot/projects/smpng/sys/kern/sys_pipe.c#30 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#38 integrate .. //depot/projects/smpng/sys/modules/Makefile#57 integrate .. //depot/projects/smpng/sys/modules/acpi/Makefile#13 integrate .. //depot/projects/smpng/sys/modules/libmbpool/Makefile#1 branch .. //depot/projects/smpng/sys/modules/mii/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/patm/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/Makefile#4 integrate .. //depot/projects/smpng/sys/net/if_atm.h#7 integrate .. //depot/projects/smpng/sys/net/if_atmsubr.c#12 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#34 integrate .. //depot/projects/smpng/sys/net/if_vlan.c#18 integrate .. //depot/projects/smpng/sys/net/if_vlan_var.h#8 integrate .. //depot/projects/smpng/sys/netgraph/atm/ng_atm.c#3 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#6 integrate .. //depot/projects/smpng/sys/netinet/ip_fw.h#15 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#17 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#35 integrate .. //depot/projects/smpng/sys/netinet/tcp_seq.h#5 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#18 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.c#13 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#15 integrate .. //depot/projects/smpng/sys/netnatm/natm.c#12 integrate .. //depot/projects/smpng/sys/pc98/i386/machdep.c#56 integrate .. //depot/projects/smpng/sys/pc98/pc98/syscons.c#24 integrate .. //depot/projects/smpng/sys/pci/if_dc.c#41 integrate .. //depot/projects/smpng/sys/pci/if_dcreg.h#16 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#33 integrate .. //depot/projects/smpng/sys/pci/if_rlreg.h#10 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#31 integrate .. //depot/projects/smpng/sys/pci/if_xlreg.h#9 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#41 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#32 integrate .. //depot/projects/smpng/sys/sparc64/include/asmacros.h#13 integrate .. //depot/projects/smpng/sys/sparc64/include/bus.h#18 integrate .. //depot/projects/smpng/sys/sparc64/include/bus_private.h#5 integrate .. //depot/projects/smpng/sys/sparc64/include/elf.h#9 integrate .. //depot/projects/smpng/sys/sparc64/include/intr_machdep.h#11 integrate .. //depot/projects/smpng/sys/sparc64/include/iommuvar.h#12 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/bus_machdep.c#19 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/exception.S#12 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/genassym.c#30 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/interrupt.S#4 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/intr_machdep.c#18 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/iommu.c#19 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#53 integrate .. //depot/projects/smpng/sys/sys/kernel.h#20 integrate .. //depot/projects/smpng/sys/sys/mbpool.h#1 branch .. //depot/projects/smpng/sys/sys/mutex.h#37 integrate .. //depot/projects/smpng/sys/sys/proc.h#94 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#20 integrate .. //depot/projects/smpng/sys/sys/systm.h#42 integrate .. //depot/projects/smpng/sys/sys/vnode.h#34 integrate .. //depot/projects/smpng/sys/vm/vm_init.c#8 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#59 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.204 2003/06/28 06:34:07 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.205 2003/07/15 00:11:03 davidxu Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -1465,7 +1465,7 @@ * Build siginfo_t for SA thread */ void -thread_siginfo(int sig, u_long code, siginfo_t *si) +cpu_thread_siginfo(int sig, u_long code, siginfo_t *si) { struct proc *p; struct thread *td; ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#10 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.583 2003/06/28 06:34:07 davidxu Exp $ + * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.584 2003/07/15 00:11:03 davidxu Exp $ */ #include "opt_atalk.h" @@ -303,7 +303,7 @@ * Build siginfo_t for SA thread */ void -thread_siginfo(int sig, u_long code, siginfo_t *si) +cpu_thread_siginfo(int sig, u_long code, siginfo_t *si) { struct proc *p; struct thread *td; ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#7 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.419 2003/07/03 20:18:01 alc Exp $ + * $FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.423 2003/07/09 22:59:45 peter Exp $ */ /*- * Copyright (c) 2003 Networks Associates Technology, Inc. @@ -330,6 +330,8 @@ pde = pmap_pde(pmap, va); if (pde == NULL || (*pde & PG_V) == 0) return NULL; + if ((*pde & PG_PS) != 0) /* compat with i386 pmap_pte() */ + return ((pt_entry_t *)pde); pte = (pt_entry_t *)PHYS_TO_DMAP(*pde & PG_FRAME); return (&pte[pmap_pte_index(va)]); } @@ -386,14 +388,12 @@ ((pd_entry_t *)KPDphys)[i] |= PG_RW | PG_V; } -#if 0 /* Map from zero to end of allocations under 2M pages */ /* This replaces some of the KPTphys entries above */ for (i = 0; (i << PDRSHIFT) < avail_start; i++) { ((pd_entry_t *)KPDphys)[i] = i << PDRSHIFT; ((pd_entry_t *)KPDphys)[i] |= PG_RW | PG_V | PG_PS; } -#endif /* And connect up the PD to the PDP */ for (i = 0; i < NKPDPE; i++) { @@ -890,6 +890,7 @@ if (m->hold_count == 0) { vm_offset_t pteva; + /* * unmap the page table page */ @@ -914,9 +915,11 @@ } --pmap->pm_stats.resident_count; if (m->pindex < NUPDE) { - /* Unhold the PD page */ + /* We just released a PT, unhold the matching PD */ vm_page_t pdpg; - pdpg = vm_page_lookup(pmap->pm_pteobj, NUPDE + pmap_pdpe_index(va)); + + pdpg = vm_page_lookup(pmap->pm_pteobj, NUPDE + + ((va >> PDPSHIFT) & (NUPDPE - 1))); while (vm_page_sleep_if_busy(pdpg, FALSE, "pulook")) vm_page_lock_queues(); vm_page_unhold(pdpg); @@ -924,9 +927,11 @@ _pmap_unwire_pte_hold(pmap, va, pdpg); } if (m->pindex >= NUPDE && m->pindex < (NUPDE + NUPDPE)) { - /* Unhold the PDP page */ + /* We just released a PD, unhold the matching PDP */ vm_page_t pdppg; - pdppg = vm_page_lookup(pmap->pm_pteobj, NUPDE + NUPDPE + pmap_pml4e_index(va)); + + pdppg = vm_page_lookup(pmap->pm_pteobj, NUPDE + NUPDPE + + ((va >> PML4SHIFT) & (NUPML4E - 1))); while (vm_page_sleep_if_busy(pdppg, FALSE, "pulooK")) vm_page_lock_queues(); vm_page_unhold(pdppg); @@ -1124,7 +1129,8 @@ _pmap_allocpte(pmap, NUPDE + NUPDPE + pml4index); } else { /* Add reference to pdp page */ - pdppg = pmap_page_lookup(pmap->pm_pteobj, NUPDE + NUPDPE + pml4index); + pdppg = pmap_page_lookup(pmap->pm_pteobj, + NUPDE + NUPDPE + pml4index); pdppg->hold_count++; } pdp = (pdp_entry_t *)PHYS_TO_DMAP(*pml4 & PG_FRAME); @@ -1150,16 +1156,17 @@ /* Have to allocate a new pd, recurse */ _pmap_allocpte(pmap, NUPDE + pdpindex); pdp = (pdp_entry_t *)PHYS_TO_DMAP(*pml4 & PG_FRAME); - pdp = &pdp[pdpindex]; + pdp = &pdp[pdpindex & ((1ul << NPDPEPGSHIFT) - 1)]; } else { pdp = (pdp_entry_t *)PHYS_TO_DMAP(*pml4 & PG_FRAME); - pdp = &pdp[pdpindex]; + pdp = &pdp[pdpindex & ((1ul << NPDPEPGSHIFT) - 1)]; if ((*pdp & PG_V) == 0) { /* Have to allocate a new pd, recurse */ _pmap_allocpte(pmap, NUPDE + pdpindex); } else { /* Add reference to the pd page */ - pdpg = pmap_page_lookup(pmap->pm_pteobj, NUPDE + pdpindex); + pdpg = pmap_page_lookup(pmap->pm_pteobj, + NUPDE + pdpindex); pdpg->hold_count++; } } @@ -1239,7 +1246,7 @@ /*************************************************** -* Pmap allocation/deallocation routines. + * Pmap allocation/deallocation routines. ***************************************************/ /* @@ -2119,7 +2126,7 @@ ptepa += NBPDR; pde++; } - pmap_invalidate_all(kernel_pmap); + pmap_invalidate_all(pmap); } } ==== //depot/projects/smpng/sys/amd64/include/pmap.h#5 (text+ko) ==== @@ -42,7 +42,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.104 2003/06/22 13:02:45 simokawa Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.105 2003/07/09 23:04:23 peter Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -86,14 +86,18 @@ * Pte related macros. This is complicated by having to deal with * the sign extension of the 48th bit. */ -#define VADDR_SIGN(l4) \ - ((l4) >= NPML4EPG/2 ? ((unsigned long)-1 << 47) : 0ul) -#define VADDR(l4, l3, l2, l1) ( \ - ((unsigned long)(l4) << PML4SHIFT) | VADDR_SIGN(l4) | \ +#define KVADDR(l4, l3, l2, l1) ( \ + ((unsigned long)-1 << 47) | \ + ((unsigned long)(l4) << PML4SHIFT) | \ ((unsigned long)(l3) << PDPSHIFT) | \ ((unsigned long)(l2) << PDRSHIFT) | \ ((unsigned long)(l1) << PAGE_SHIFT)) +#define UVADDR(l4, l3, l2, l1) ( \ + ((unsigned long)(l4) << PML4SHIFT) | \ + ((unsigned long)(l3) << PDPSHIFT) | \ + ((unsigned long)(l2) << PDRSHIFT) | \ + ((unsigned long)(l1) << PAGE_SHIFT)) #ifndef NKPT #define NKPT 120 /* initial number of kernel page tables */ @@ -103,7 +107,7 @@ #define NKPDPE 1 /* number of kernel PDP slots */ #define NKPDE (NKPDPE*NPDEPG) /* number of kernel PD slots */ -#define NUPML4E 1 /* number of userland PML4 pages */ +#define NUPML4E (NPML4EPG/2) /* number of userland PML4 pages */ #define NUPDPE (NUPML4E*NPDPEPG)/* number of userland PDP pages */ #define NUPDE (NUPDPE*NPDEPG) /* number of userland PD entries */ @@ -149,10 +153,10 @@ * in the page tables and the evil overlapping. */ #ifdef _KERNEL -#define addr_PTmap (VADDR(PML4PML4I, 0, 0, 0)) -#define addr_PDmap (VADDR(PML4PML4I, PML4PML4I, 0, 0)) -#define addr_PDPmap (VADDR(PML4PML4I, PML4PML4I, PML4PML4I, 0)) -#define addr_PML4map (VADDR(PML4PML4I, PML4PML4I, PML4PML4I, PML4PML4I)) +#define addr_PTmap (KVADDR(PML4PML4I, 0, 0, 0)) +#define addr_PDmap (KVADDR(PML4PML4I, PML4PML4I, 0, 0)) +#define addr_PDPmap (KVADDR(PML4PML4I, PML4PML4I, PML4PML4I, 0)) +#define addr_PML4map (KVADDR(PML4PML4I, PML4PML4I, PML4PML4I, PML4PML4I)) #define addr_PML4pml4e (addr_PML4map + (PML4PML4I * sizeof(pml4_entry_t))) #define PTmap ((pt_entry_t *)(addr_PTmap)) #define PDmap ((pd_entry_t *)(addr_PDmap)) ==== //depot/projects/smpng/sys/amd64/include/vmparam.h#3 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.38 2003/05/23 06:36:46 peter Exp $ + * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.39 2003/07/09 23:04:23 peter Exp $ */ @@ -92,18 +92,18 @@ * messy at times, but hey, we'll do anything to save a page :-) */ -#define VM_MAX_KERNEL_ADDRESS VADDR(KPML4I, NPDPEPG-1, NKPDE-1, NPTEPG-1) -#define VM_MIN_KERNEL_ADDRESS VADDR(KPML4I, KPDPI, 0, 0) +#define VM_MAX_KERNEL_ADDRESS KVADDR(KPML4I, NPDPEPG-1, NKPDE-1, NPTEPG-1) +#define VM_MIN_KERNEL_ADDRESS KVADDR(KPML4I, KPDPI, 0, 0) -#define DMAP_MIN_ADDRESS VADDR(DMPML4I, 0, 0, 0) -#define DMAP_MAX_ADDRESS VADDR(DMPML4I+1, 0, 0, 0) +#define DMAP_MIN_ADDRESS KVADDR(DMPML4I, 0, 0, 0) +#define DMAP_MAX_ADDRESS KVADDR(DMPML4I+1, 0, 0, 0) -#define KERNBASE VADDR(KPML4I, KPDPI, 0, 0) +#define KERNBASE KVADDR(KPML4I, KPDPI, 0, 0) -#define UPT_MAX_ADDRESS VADDR(PML4PML4I, PML4PML4I, PML4PML4I, PML4PML4I) -#define UPT_MIN_ADDRESS VADDR(PML4PML4I, 0, 0, 0) +#define UPT_MAX_ADDRESS KVADDR(PML4PML4I, PML4PML4I, PML4PML4I, PML4PML4I) +#define UPT_MIN_ADDRESS KVADDR(PML4PML4I, 0, 0, 0) -#define VM_MAXUSER_ADDRESS VADDR(NUPML4E, 0, 0, 0) +#define VM_MAXUSER_ADDRESS UVADDR(NUPML4E, 0, 0, 0) #define USRSTACK VM_MAXUSER_ADDRESS ==== //depot/projects/smpng/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/boot/efi/libefi/arch/ia64/ldscript.ia64,v 1.6 2002/04/06 03:39:22 peter Exp $ */ +/* $FreeBSD: src/sys/boot/efi/libefi/arch/ia64/ldscript.ia64,v 1.7 2003/07/17 00:32:08 marcel Exp $ */ OUTPUT_FORMAT("elf64-ia64-little", "elf64-ia64-little", "elf64-ia64-little") OUTPUT_ARCH(ia64) ENTRY(_start_plabel) @@ -7,74 +7,67 @@ /* Read-only sections, merged into text segment: */ . = 0; ImageBase = .; - . += 4096; - .text : - { - *(.text) - *(.stub) - /* .gnu.warning sections are handled specially by elf32.em. */ + . = SIZEOF_HEADERS; + . = ALIGN(4096); + .text : { + *(.text .stub .text.* .gnu.linkonce.t.*) + /* .gnu.warning sections are handled specially by elf32.em. */ *(.gnu.warning) - *(.gnu.linkonce.t*) *(.plt) - } + } =0x00300000010070000002000001000400 . = ALIGN(4096); - .hash : { *(.hash) } - . = ALIGN(4096); - .data : - { - *(.rodata*) + .data : { + *(.rodata .rodata.* .gnu.linkonce.r.*) + *(.rodata1) + *(.sdata2 .sdata2.* .gnu.linkonce.s2.*) + *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) + *(.opd) + *(.IA_64.unwind_info* .gnu.linkonce.ia64unwi.*) + *(.IA_64.unwind* .gnu.linkonce.ia64unw.*) __start_set_Xcommand_set = .; *(set_Xcommand_set) __stop_set_Xcommand_set = .; - *(.ctors) - *(.data) + *(.data .data.* .gnu.linkonce.d.*) *(.data1) - *(.gnu.linkonce.d*) *(.plabel) - *(.IA_64.unwind) - *(.IA_64.unwind_info) - *(.bss) *(.dynbss) + *(.bss .bss.* .gnu.linkonce.b.*) *(COMMON) } . = ALIGN(4096); __gp = .; - .sdata : - { - *(.got.plt) - *(.got) + .sdata : { + *(.got.plt .got) *(.IA_64.pltoff) - *(.sdata) - *(.sbss) + *(.sdata .sdata.* .gnu.linkonce.s.*) + *(dynsbss) + *(.sbss .sbss.* .gnu.linkonce.sb.*) *(.scommon) } . = ALIGN(4096); - .dynamic : { *(.dynamic) } + .dynamic : { *(.dynamic) } . = ALIGN(4096); - .rela : - { - *(.rela.text) - *(.rela.gnu.linkonce.t*) - *(.rela.set.*) - *(.rela.sdata) - *(.rela.data) - *(.rela.gnu.linkonce.d*) + .rela : { + *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) + *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) + *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) *(.rela.got) - *(.rela.stab) - *(.rela.ctors) + *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*) + *(.rela.sbss .rela.sbss.* .rela.gnu.linkonce.sb.*) + *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*) + *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) + *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) + *(.rela.plt) + *(.rela.IA_64.pltoff) *(.relaset_*) - *(.rela.IA_64.pltoff) + *(.rela.dyn .rela.dyn.*) } . = ALIGN(4096); - .reloc : { *(.reloc) } + .reloc : { *(.reloc) } + . = ALIGN(4096); + .hash : { *(.hash) } . = ALIGN(4096); - .dynsym : { *(.dynsym) } + .dynsym : { *(.dynsym) } . = ALIGN(4096); - .dynstr : { *(.dynstr) } - .ignored : - { - *(.rela.plabel) - *(.rela.reloc) - } + .dynstr : { *(.dynstr) } } - ==== //depot/projects/smpng/sys/boot/i386/libi386/biosacpi.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.4 2003/04/29 18:50:34 njl Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.5 2003/07/13 22:54:53 njl Exp $ */ #include @@ -31,6 +31,7 @@ #include #include "acfreebsd.h" +#include "acconfig.h" #define ACPI_SYSTEM_XFACE #include "actypes.h" #include "actbl.h" ==== //depot/projects/smpng/sys/boot/ia64/skiload/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/ia64/skiload/Makefile,v 1.10 2003/02/26 06:18:52 obrien Exp $ +# $FreeBSD: src/sys/boot/ia64/skiload/Makefile,v 1.11 2003/07/17 01:49:59 marcel Exp $ .PATH: ${.CURDIR}/../common @@ -7,7 +7,7 @@ NEWVERSWHAT= "ia64 SKI boot" ${MACHINE_ARCH} BINDIR?= /boot -SRCS+= main.c conf.c +SRCS+= conf.c main.c start.S CFLAGS+= -ffreestanding ==== //depot/projects/smpng/sys/boot/ia64/skiload/ldscript.ia64#2 (text+ko) ==== @@ -1,135 +1,61 @@ -/* $FreeBSD: src/sys/boot/ia64/skiload/ldscript.ia64,v 1.1 2001/09/12 08:34:27 dfr Exp $ */ +/* $FreeBSD: src/sys/boot/ia64/skiload/ldscript.ia64,v 1.2 2003/07/17 01:49:59 marcel Exp $ */ OUTPUT_FORMAT("elf64-ia64-little", "elf64-ia64-little", "elf64-ia64-little") OUTPUT_ARCH(ia64) -ENTRY(__start) +ENTRY(_start) SECTIONS { /* Read-only sections, merged into text segment: */ . = 0x100000; - - .text : - { - *(.text.ivt) - . += 8192; - *(.text) - *(.stub) - /* .gnu.warning sections are handled specially by elf32.em. */ + .text : { + *(.text .stub .text.* .gnu.linkonce.t.*) + /* .gnu.warning sections are handled specially by elf32.em. */ *(.gnu.warning) - *(.gnu.linkonce.t*) - } =0x47ff041f - .interp : { *(.interp) } - .hash : { *(.hash) } - .dynsym : { *(.dynsym) } - .dynstr : { *(.dynstr) } - .gnu.version : { *(.gnu.version) } - .gnu.version_d : { *(.gnu.version_d) } - .gnu.version_r : { *(.gnu.version_r) } - .rel.text : - { *(.rel.text) *(.rel.gnu.linkonce.t*) } - .rela.text : - { *(.rela.text) *(.rela.gnu.linkonce.t*) } - .rel.data : - { *(.rel.data) *(.rel.gnu.linkonce.d*) } - .rela.data : - { *(.rela.data) *(.rela.gnu.linkonce.d*) } - .rel.rodata : - { *(.rel.rodata) *(.rel.gnu.linkonce.r*) } - .rela.rodata : - { *(.rela.rodata) *(.rela.gnu.linkonce.r*) } - .rel.got : { *(.rel.got) } - .rela.got : { *(.rela.got) } - .rel.ctors : { *(.rel.ctors) } - .rela.ctors : { *(.rela.ctors) } - .rel.dtors : { *(.rel.dtors) } - .rela.dtors : { *(.rela.dtors) } - .rel.init : { *(.rel.init) } - .rela.init : { *(.rela.init) } - .rel.fini : { *(.rel.fini) } - .rela.fini : { *(.rela.fini) } - .rel.bss : { *(.rel.bss) } - .rela.bss : { *(.rela.bss) } - .rel.plt : { *(.rel.plt) } - .rela.plt : { *(.rela.plt) } - .init : { *(.init) } =0x47ff041f - _etext = .; - PROVIDE (etext = .); - .fini : { *(.fini) } =0x47ff041f - .rodata : { *(.rodata) *(.gnu.linkonce.r*) } - .rodata1 : { *(.rodata1) } - .reginfo : { *(.reginfo) } - /* Adjust the address for the data segment. We want to adjust up to - the same address within the page on the next page up. */ - . = .; - .data : - { - *(.data) - *(.gnu.linkonce.d*) - CONSTRUCTORS + *(.plt) + } =0x00300000010070000002000001000400 + .data : { + *(.rodata .rodata.* .gnu.linkonce.r.*) + *(.rodata1) + *(.sdata2 .sdata2.* .gnu.linkonce.s2.*) + *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) + *(.opd) + *(.IA_64.unwind_info* .gnu.linkonce.ia64unwi.*) + *(.IA_64.unwind* .gnu.linkonce.ia64unw.*) + __start_set_Xcommand_set = .; + *(set_Xcommand_set) + __stop_set_Xcommand_set = .; + *(.data .data.* .gnu.linkonce.d.*) + *(.data1) + *(.plabel) + *(.dynbss) + *(.bss .bss.* .gnu.linkonce.b.*) + *(COMMON) } - .data1 : { *(.data1) } - .ctors : - { - *(.ctors) + __gp = .; + .sdata : { + *(.got.plt .got) + *(.IA_64.pltoff) + *(.sdata .sdata.* .gnu.linkonce.s.*) + *(dynsbss) + *(.sbss .sbss.* .gnu.linkonce.sb.*) + *(.scommon) } - .dtors : - { - *(.dtors) + .dynamic : { *(.dynamic) } + .rela : { + *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) + *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) + *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) + *(.rela.got) + *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*) + *(.rela.sbss .rela.sbss.* .rela.gnu.linkonce.sb.*) + *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*) + *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) + *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) + *(.rela.plt) + *(.rela.IA_64.pltoff) + *(.relaset_*) + *(.rela.dyn .rela.dyn.*) } - .plt : { *(.plt) } - /* gp points at .got+(1<<21) */ - __gp = ALIGN(8) + 0x200000; - .got : { *(.got.plt) *(.got) } - .dynamic : { *(.dynamic) } - /* We want the small data sections together, so single-instruction offsets - can access them all, and initialized data all before uninitialized, so - we can shorten the on-disk segment size. */ - .sdata : { *(.sdata) } - _edata = .; - PROVIDE (edata = .); - __bss_start = .; - .sbss : { *(.sbss) *(.scommon) } - .bss : - { - *(.dynbss) - *(.bss) - *(COMMON) - } - . = ALIGN(64 / 8); - _end = . ; - PROVIDE (end = .); - /* Stabs debugging sections. */ - .stab 0 : { *(.stab) } - .stabstr 0 : { *(.stabstr) } - .stab.excl 0 : { *(.stab.excl) } - .stab.exclstr 0 : { *(.stab.exclstr) } - .stab.index 0 : { *(.stab.index) } - .stab.indexstr 0 : { *(.stab.indexstr) } - .comment 0 : { *(.comment) } - /* DWARF debug sections. - Symbols in the DWARF debugging sections are relative to the beginning - of the section so we begin them at 0. */ - /* DWARF 1 */ - .debug 0 : { *(.debug) } - .line 0 : { *(.line) } - /* GNU DWARF 1 extensions */ - .debug_srcinfo 0 : { *(.debug_srcinfo) } - .debug_sfnames 0 : { *(.debug_sfnames) } - /* DWARF 1.1 and DWARF 2 */ - .debug_aranges 0 : { *(.debug_aranges) } - .debug_pubnames 0 : { *(.debug_pubnames) } - /* DWARF 2 */ - .debug_info 0 : { *(.debug_info) } - .debug_abbrev 0 : { *(.debug_abbrev) } - .debug_line 0 : { *(.debug_line) } - .debug_frame 0 : { *(.debug_frame) } - .debug_str 0 : { *(.debug_str) } - .debug_loc 0 : { *(.debug_loc) } - .debug_macinfo 0 : { *(.debug_macinfo) } - /* SGI/MIPS DWARF 2 extensions */ - .debug_weaknames 0 : { *(.debug_weaknames) } - .debug_funcnames 0 : { *(.debug_funcnames) } - .debug_typenames 0 : { *(.debug_typenames) } - .debug_varnames 0 : { *(.debug_varnames) } - /* These must appear regardless of . */ + .hash : { *(.hash) } + .dynsym : { *(.dynsym) } + .dynstr : { *(.dynstr) } } - ==== //depot/projects/smpng/sys/boot/ia64/skiload/main.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/ia64/skiload/main.c,v 1.3 2003/04/03 21:36:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ia64/skiload/main.c,v 1.4 2003/07/17 01:49:59 marcel Exp $"); #include #include @@ -45,17 +45,11 @@ struct arch_switch archsw; /* MI/MD interface boundary */ void -__start(void) +ski_main(void) { - static char stack[16384] __aligned(16); static char malloc[512*1024]; int i; - __asm __volatile("movl gp=__gp;;"); - __asm __volatile("mov sp=%0" :: "r"(&stack[16384])); - __asm __volatile("bsw.1;;"); - __asm __volatile("mov ar.fpsr=%0" :: "r"(IA64_FPSR_DEFAULT)); - /* * initialise the heap as early as possible. Once this is done, * alloc() is usable. The stack is buried inside us, so this is ==== //depot/projects/smpng/sys/boot/pc98/boot2/asm.h#3 (text+ko) ==== @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.7 92/02/29 15:33:41 rpd - * $FreeBSD: src/sys/boot/pc98/boot2/asm.h,v 1.4 2002/05/14 12:34:03 nyan Exp $ + * $FreeBSD: src/sys/boot/pc98/boot2/asm.h,v 1.5 2003/07/13 08:13:52 nyan Exp $ */ #define S_ARG0 4(%esp) @@ -64,19 +64,19 @@ #define OUTL outl (%dx) #else /* wheeze */ + #define ALIGN #define LCL(x) x #define LB(x,n) n #ifdef __STDC__ #define EXT(x) x -#define LEXT(x) x ## : - +#define LEXT(x) .type EXT(x),@function; EXT(x): #define LBb(x,n) n ## b #define LBf(x,n) n ## f #else /* __STDC__ */ #define EXT(x) _/**/x -#define LEXT(x) _/**/x/**/: +#define LEXT(x) .type EXT(x),@function; EXT(x)/**/: #define LBb(x,n) n/**/b #define LBf(x,n) n/**/f #endif /* __STDC__ */ ==== //depot/projects/smpng/sys/boot/sparc64/loader/main.c#15 (text+ko) ==== @@ -6,7 +6,7 @@ * As long as the above copyright statement and this notice remain * unchanged, you can do what ever you want with this file. * - * $FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.20 2003/06/15 19:16:43 jake Exp $ + * $FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.21 2003/07/11 16:12:50 tmm Exp $ */ /* * FreeBSD/sparc64 kernel loader - machine dependent part @@ -115,7 +115,7 @@ #ifdef LOADER_BZIP2_SUPPORT &bzipfs_fsops, #endif -#ifdef LOADER_NET_SUPPORT +#ifdef LOADER_NFS_SUPPORT &nfs_fsops, #endif #ifdef LOADER_TFTP_SUPPORT >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jul 17 15:54:21 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE39437B404; Thu, 17 Jul 2003 15:54:20 -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 391C137B401 for ; Thu, 17 Jul 2003 15:54:20 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7425243F93 for ; Thu, 17 Jul 2003 15:54:17 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6HMsH0U029514 for ; Thu, 17 Jul 2003 15:54:17 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6HMqvaU028723 for perforce@freebsd.org; Thu, 17 Jul 2003 15:52:57 -0700 (PDT) Date: Thu, 17 Jul 2003 15:52:57 -0700 (PDT) Message-Id: <200307172252.h6HMqvaU028723@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 34659 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jul 2003 22:54:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=34659 Change 34659 by rwatson@rwatson_paprika on 2003/07/17 15:52:20 Integrate the TrustedBSD base branch -- gcc upgrade, OpenPAM upgrade, many KSE/1:1 fixes, further amd64 support, /rescue, ACPI upgrade, 802.11g support, lots of ATM improvements, watchdog support, quota no longer setuid, quota access control fixes, and more. Affected files ... .. //depot/projects/trustedbsd/base/MAINTAINERS#18 integrate .. //depot/projects/trustedbsd/base/Makefile#24 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#41 integrate .. //depot/projects/trustedbsd/base/UPDATING#33 integrate .. //depot/projects/trustedbsd/base/bin/cp/cp.c#12 integrate .. //depot/projects/trustedbsd/base/bin/csh/Makefile#8 integrate .. //depot/projects/trustedbsd/base/bin/ed/Makefile#7 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.1#18 integrate .. //depot/projects/trustedbsd/base/bin/pwd/pwd.c#8 integrate .. //depot/projects/trustedbsd/base/bin/rmail/Makefile#5 integrate .. //depot/projects/trustedbsd/base/bin/sh/alias.c#5 integrate .. //depot/projects/trustedbsd/base/bin/sh/cd.c#6 integrate .. //depot/projects/trustedbsd/base/bin/sh/exec.c#8 integrate .. //depot/projects/trustedbsd/base/bin/sh/exec.h#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/expand.c#11 integrate .. //depot/projects/trustedbsd/base/bin/sh/input.c#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/jobs.c#13 integrate .. //depot/projects/trustedbsd/base/bin/sh/memalloc.c#6 integrate .. //depot/projects/trustedbsd/base/bin/sh/nodes.c.pat#5 integrate .. //depot/projects/trustedbsd/base/bin/sh/output.c#6 integrate .. //depot/projects/trustedbsd/base/bin/sh/parser.c#10 integrate .. //depot/projects/trustedbsd/base/bin/sh/redir.c#8 integrate .. //depot/projects/trustedbsd/base/bin/sh/var.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/cpio/copypass.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/main.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog.0#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog.2#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog.4#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog.5#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog.6#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog.7#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/FSFChangeLog.10#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/FSFChangeLog.11#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/LANGUAGES#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/Makefile.in#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/ONEWS#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/README.Portability#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/aclocal.m4#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/alias.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/ansidecl.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/attribs.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/basic-block.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/bb-reorder.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/bitmap.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/bitmap.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/builtin-attrs.def#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/builtin-types.def#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/builtins.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/builtins.def#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-aux-info.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-common.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-common.def#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-common.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-config-lang.in#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/c-convert.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-decl.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-dump.c#3 branch .. //depot/projects/trustedbsd/base/contrib/gcc/c-errors.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-format.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-lang.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-lex.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-objc-common.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-opts.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/c-parse.in#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-pragma.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-pragma.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-pretty-print.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/c-pretty-print.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/c-semantics.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-tree.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-typeck.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/caller-save.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/calls.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cfg.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cfganal.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cfgbuild.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cfgcleanup.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cfglayout.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cfglayout.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cfgloop.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cfgrtl.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/collect2.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/collect2.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/combine.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config.gcc#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config.in#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/alpha-interix.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/alpha-protos.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/alpha.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/alpha.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/alpha.md#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/elf.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/ev4.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/ev5.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/ev6.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/freebsd.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/gnu.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/linux-elf.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/linux.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/netbsd.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/openbsd.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/osf.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/osf5.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/t-crtfm#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/unicosmk.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/vms-cc.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/vms-crt0-64.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/vms-crt0.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/vms-ld.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/vms-psxcrt0-64.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/vms-psxcrt0.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/vms.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/vxworks.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/README-interworking#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/aof.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/aout.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/arm-modes.def#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/arm-protos.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/arm.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/arm.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/arm.md#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/coff.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/conix-elf.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/crti.asm#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/crtn.asm#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/elf.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/freebsd.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/linux-elf.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/linux-gas.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/netbsd-elf.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/netbsd.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/pe.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/pe.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/rtems-elf.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/semi.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/semiaof.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/t-arm-elf#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/t-pe#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/unknown-elf-oabi.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/unknown-elf.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/vxarm.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/xscale-coff.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/xscale-elf.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/darwin-c.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/darwin-crt2.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/darwin-protos.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/darwin.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/darwin.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/dbx.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/dbxcoff.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/dbxelf.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/elfos.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/fp-bit.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/fp-bit.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/freebsd-spec.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/freebsd.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/cmovd.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/cmovh.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/cmovw.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/frv-abi.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/frv-asm.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/frv-modes.def#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/frv-protos.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/frv.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/frv.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/frv.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/frvbegin.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/frvend.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/lib1funcs.asm#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/modi.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/t-frv#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/uitod.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/uitof.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/ulltod.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/ulltof.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/umodi.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/gnu.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/gofast.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/athlon.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/att.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/beos-elf.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/biarch64.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/bsd.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/crtdll.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/cygwin.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/darwin.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/djgpp.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/freebsd-aout.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/freebsd.h#14 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/freebsd.h.fixed#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/freebsd64.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/gas.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/gnu.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/gstabs.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/gthr-win32.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386-aout.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386-coff.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386-interix.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386-interix3.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386-modes.def#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386-protos.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386.h#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386.md#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386elf.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/k6.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/linux-aout.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/linux.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/linux64.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/lynx-ng.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/lynx.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/mach.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/mingw32.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/mmintrin.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/moss.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/netbsd-elf.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/netbsd.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/netbsd64.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/openbsd.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/pentium.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/ppro.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/ptx4-i.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/rtemself.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/sco5.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/sol2.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/svr3dbx.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/svr3gas.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/sysv3.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/sysv4-cpp.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/sysv4.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/sysv5.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/t-cygwin#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/t-interix#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/t-linux64#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/t-mingw32#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/t-sco5gas#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/unix.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/uwin.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/vsta.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/vxi386.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/win32.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/winnt.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/x86-64.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/xm-vsta.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/xmmintrin.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/aix.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/crtbegin.asm#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/crtend.asm#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/elf.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/freebsd.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/hpux.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/hpux_longdouble.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/ia64-c.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/ia64-modes.def#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/ia64-protos.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/ia64.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/ia64.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/ia64.md#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/linux.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/quadlib.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/sysv4.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/t-aix#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/t-hpux#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/t-ia64#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/unwind-ia64.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/interix.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/libgloss.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/linux-aout.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/linux.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/lynx-ng.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/lynx.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/netbsd-aout.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/netbsd-elf.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/netbsd.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/openbsd-oldgas.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/openbsd.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/psos.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ptx4.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/aix.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/aix31.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/aix41.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/aix43.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/aix51.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/aix52.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/altivec.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/altivec.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/beos.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/darwin-tramp.asm#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/darwin.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/eabi.asm#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/eabi.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/eabiaix.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/eabisim.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/eabispe.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/freebsd.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/gnu.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/linux.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/linux64.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/lynx.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/mach.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/netbsd.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/ppc-asm.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/ppc64-fp.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs6000-c.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs6000-modes.def#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs6000-protos.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs6000.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs6000.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs6000.md#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rtems.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/spe.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/spe.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/sysv4.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/sysv4le.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/t-aix43#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/t-aix52#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/t-darwin#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/t-linux64#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/t-netbsd#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/t-ppccomm#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/t-ppcendian#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/t-rs6000-c-rule#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/vxppc.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/windiss.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/xcoff.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/s390/fixdfdi.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/s390/libgcc-glibc.ver#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/s390/linux.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/s390/s390-modes.def#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/s390/s390-protos.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/s390/s390.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/s390/s390.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/s390/s390.md#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/s390/t-crtstuff#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/s390/t-linux64#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sol2.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/aout.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/cypress.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/freebsd.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/gmon-sol2.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/hypersparc.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/lb1spc.asm#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/lb1spl.asm#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/linux-aout.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/linux.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/linux64.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/litecoff.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/liteelf.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/lynx.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/netbsd-elf.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/netbsd.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/openbsd.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/pbd.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sol2-bi.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sol2.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sol26-sld.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sp64-elf.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sp86x-elf.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sparc-modes.def#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sparc-protos.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sparc.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sparc.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sparc.md#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sparclet.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sunos4.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/supersparc.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sysv4.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/ultra1_2.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/ultra3.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/vxsim.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/vxsparc64.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/svr3.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/svr4.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/t-darwin#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/t-libc-ok#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/t-linux#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/t-linux-gnulibc1#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/t-netbsd#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/configure#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/configure.in#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/conflict.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/convert.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp-demangle.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/ChangeLog#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/ChangeLog.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/ChangeLog.2#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/Make-lang.in#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/NEWS#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/call.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/cfns.gperf#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/class.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/config-lang.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/cp-lang.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/cp-tree.def#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/cp-tree.h#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/cvt.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/decl.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/decl.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/decl2.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/dump.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/error.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/except.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/expr.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/friend.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/g++spec.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/init.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/lang-options.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/lang-specs.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/lex.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/lex.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/mangle.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/method.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/operators.def#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/optimize.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/parse.y#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/pt.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/ptree.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/repo.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/rtti.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/search.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/semantics.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/spew.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/tree.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/typeck.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/typeck2.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cplus-dem.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cppdefault.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cpperror.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cppexp.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cppfiles.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cpphash.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cpphash.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cppinit.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cpplex.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cpplib.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cpplib.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cppmacro.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cppmain.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cppspec.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cpptrad.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/crtstuff.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cse.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cselib.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cselib.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/dbxout.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/debug.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/debug.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/defaults.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/demangle.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/df.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/df.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/diagnostic.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/diagnostic.def#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/diagnostic.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/bugreport.texi#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/c-tree.texi#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/collect2.texi#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/compat.texi#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/contrib.texi#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/cpp.texi#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/cppenv.texi#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/cppopts.texi#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/extend.texi#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/frontends.texi#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/gcc.texi#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/gccint.texi#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/gcov.texi#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/gty.texi#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/doc/headerdirs.texi#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/include/fdl.texi#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/include/gcc-common.texi#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/include/gpl.texi#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/include/texinfo.tex#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/interface.texi#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/invoke.texi#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/makefile.texi#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/md.texi#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/objc.texi#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/passes.texi#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/rtl.texi#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/service.texi#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/sourcebuild.texi#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/standards.texi#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/tm.texi#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/trouble.texi#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doloop.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/dominance.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doschk.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/dummy-conditions.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/dwarf2.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/dwarf2asm.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/dwarf2asm.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/dwarf2out.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/dwarf2out.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/dwarfout.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/emit-rtl.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/errors.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/et-forest.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/et-forest.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/except.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/except.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/explow.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/expmed.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/expr.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/expr.h#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/ChangeLog#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/ChangeLog.0#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/Make-lang.in#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/bad.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/bit.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/bld.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/bugs.texi#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/com.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/com.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/config-lang.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/data.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/expr.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/ffe.texi#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/g77.texi#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/g77spec.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/intdoc.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/intdoc.texi#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/invoke.texi#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/lang-specs.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/lex.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/news.texi#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/parse.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/root.texi#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/stc.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/std.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/ste.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/target.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/target.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/top.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/where.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/where.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/fibheap.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/fibheap.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/final.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/fix-header.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/fixproto#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/flags.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/flow.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/fold-const.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/function.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/function.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/gbl-ctors.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/gcc.1#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/gcc.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/gcc.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/gccbug.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/gccspec.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/gcov-io.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/gcov.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/gcse.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/gdbinit.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/genattr.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/genattrtab.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/genattrtab.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/genautomata.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/gencodes.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/genconditions.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/genconfig.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/genemit.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/genflags.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/gengenrtl.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/gengtype-lex.l#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/gengtype-yacc.y#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/gengtype.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/gengtype.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/genopinit.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/genpreds.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/genrecog.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/gensupport.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/gensupport.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/getopt.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/getopt.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/getruntime.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/ggc-common.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/ggc-none.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/ggc-page.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/ggc-simple.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/ggc.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/ginclude/float.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/ginclude/stdarg.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/ginclude/varargs.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/glimits.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/global.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/graph.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/graph.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/gthr-dce.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/gthr-posix.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/gthr-rtems.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/gthr-single.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/gthr-solaris.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/gthr-vxworks.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/gthr-win32.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/gthr.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/haifa-sched.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/hard-reg-set.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/hashtab.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/hashtab.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/hashtable.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/hashtable.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/hex.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/hooks.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/hooks.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/hwint.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/ifcvt.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/input.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/insn-addr.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/integrate.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/integrate.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/jump.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/langhooks-def.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/langhooks.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/langhooks.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/lbasename.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/lcm.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/libfuncs.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/libgcc-std.ver#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/libgcc2.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/libgcc2.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/libiberty.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/line-map.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/lists.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/local-alloc.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/location.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/longlong.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/loop.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/loop.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/machmode.def#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/machmode.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/mbchar.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/md5.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/mkconfig.sh#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/mkheaders.in#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/mklibgcc.in#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/mkmap-symver.awk#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/objc/Make-lang.in#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/objc/config-lang.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/objc/lang-specs.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/objc/objc-act.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/objc/objc-act.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/objc/objc-lang.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/optabs.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/optabs.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/output.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/params.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/params.def#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/params.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/partition.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/physmem.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/predict.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/predict.def#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/predict.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/prefix.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/pretty-print.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/print-rtl.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/print-tree.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/profile.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/profile.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/protoize.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/ra-build.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/ra-colorize.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/ra-debug.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/ra-rewrite.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/ra.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/ra.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/read-rtl.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/real.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/real.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/recog.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/recog.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/reg-stack.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/regclass.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/regmove.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/regrename.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/regs.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/reload.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/reload.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/reload1.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/reorg.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/resource.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/rtl-error.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/rtl.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/rtl.def#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/rtl.h#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/rtlanal.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/sbitmap.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/sbitmap.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/scan-decls.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/scan.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/sched-deps.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/sched-ebb.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/sched-int.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/sched-rgn.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/sched-vis.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/sdbout.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/sibcall.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/simplify-rtx.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/splay-tree.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/splay-tree.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/ssa-ccp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/ssa-dce.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/ssa.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/ssa.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/stab.def#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/stmt.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/stor-layout.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/stringpool.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/system.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/target-def.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/target.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/timevar.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/timevar.def#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/timevar.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/tlink.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/toplev.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/toplev.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/tracer.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/tree-dump.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/tree-dump.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/tree-inline.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/tree-inline.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/tree.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/tree.def#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/tree.h#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/tsystem.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/unroll.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/unwind-c.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/unwind-dw2-fde-darwin.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/unwind-dw2-fde-glibc.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/unwind-dw2-fde.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/unwind-dw2-fde.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/unwind-dw2.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/unwind-pe.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/unwind-sjlj.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/unwind.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/unwind.inc#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/varasm.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/varray.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/varray.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/version.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/version.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/vmsdbg.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/vmsdbgout.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/xcoffout.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/xcoffout.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/xmemdup.c#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/tmac/doc-common#12 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/doc.tmac#6 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/groff_mdoc.man#10 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/tty-char.tmac#4 integrate .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/cf/freebsd.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/ChangeLog#8 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/Makefile.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/aclocal.m4#4 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/configure#6 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/configure.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/f2cext.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/g2c.hin#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/F77_aloc.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/Version.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/abort_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/c_abs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/c_cos.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/c_div.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/c_exp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/c_log.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/c_sin.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/c_sqrt.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/cabs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/configure#4 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/configure.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/d_abs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/d_acos.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/d_asin.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/d_atan.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/d_atn2.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/d_cnjg.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/d_cos.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/d_cosh.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/d_dim.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/d_exp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/d_imag.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/d_int.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/d_lg10.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/d_log.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/d_mod.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/d_nint.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/d_prod.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/d_sign.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/d_sin.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/d_sinh.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/d_sqrt.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/d_tan.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/d_tanh.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/derf_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/derfc_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/dtime_.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/ef1asc_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/ef1cmc_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/erf_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/erfc_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/etime_.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/exit_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/f2ch.add#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/getarg_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/getenv_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/h_abs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/h_dim.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/h_dnnt.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/h_indx.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/h_len.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/h_mod.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/h_nint.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/h_sign.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/hl_ge.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/hl_gt.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/hl_le.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/hl_lt.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/i_abs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/i_dim.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/i_dnnt.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/i_indx.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/i_len.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/i_mod.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/i_nint.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/i_sign.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/iargc_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/l_ge.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/l_gt.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/l_le.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/l_lt.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/lbitbits.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/lbitshft.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/main.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/pow_ci.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/pow_dd.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/pow_di.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/pow_hh.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/pow_ii.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/pow_qq.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/pow_ri.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/pow_zi.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/pow_zz.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/qbitbits.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/qbitshft.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/r_abs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/r_acos.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/r_asin.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/r_atan.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/r_atn2.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/r_cnjg.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/r_cos.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/r_cosh.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/r_dim.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/r_exp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/r_imag.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/r_int.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/r_lg10.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/r_log.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/r_mod.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/r_nint.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/r_sign.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/r_sin.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/r_sinh.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/r_sqrt.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/r_tan.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/r_tanh.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/s_cat.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/s_cmp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/s_copy.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/s_paus.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/s_rnge.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/s_stop.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/setarg.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/setsig.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/sig_die.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/signal1.h0#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/signal_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/system_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/z_abs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/z_cos.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/z_div.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/z_exp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/z_log.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/z_sin.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/z_sqrt.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/Makefile.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/Version.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/backspace.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/close.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/configure#4 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/configure.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/dfe.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/dolio.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/due.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/endfile.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/err.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/f2ch.add#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/fio.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/fmt.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/fmt.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/fmtlib.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/fp.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/ftell_.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/iio.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/ilnw.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/inquire.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/lio.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/lread.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/lwrite.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/open.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/rdfmt.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/rewind.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/rsfe.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/rsli.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/rsne.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/sfe.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/sue.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/typesize.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/uio.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/util.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/wref.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/wrtfmt.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/wsfe.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/wsle.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/wsne.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/xwsne.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/Makefile.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/Version.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/access_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/alarm_.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/bes.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/chdir_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/chmod_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/config.hin#3 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/configure#4 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/configure.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/ctime_.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/date_.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/datetime_.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/dbes.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/dtime_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/etime_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/fdate_.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/fgetc_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/flush1_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/fnum_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/fputc_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/fstat_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/gerror_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/getcwd_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/getgid_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/getlog_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/getpid_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/getuid_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/gmtime_.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/hostnm_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/idate_.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/ierrno_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/irand_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/isatty_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/itime_.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/kill_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/link_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/lnblnk_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/lstat_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/ltime_.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/mclock_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/perror_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/rand_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/rename_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/secnds_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/second_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/sleep_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/srand_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/stat_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/symlnk_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/sys_clock_.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/time_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/ttynam_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/umask_.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/unlink_.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jul 19 21:55:02 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D91337B404; Sat, 19 Jul 2003 21:55:02 -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 1C11737B401 for ; Sat, 19 Jul 2003 21:55:02 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 86F9E43FAF for ; Sat, 19 Jul 2003 21:55:01 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6K4t10U088162 for ; Sat, 19 Jul 2003 21:55:01 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6K4t0c9088159 for perforce@freebsd.org; Sat, 19 Jul 2003 21:55:00 -0700 (PDT) Date: Sat, 19 Jul 2003 21:55:00 -0700 (PDT) Message-Id: <200307200455.h6K4t0c9088159@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 34739 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jul 2003 04:55:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=34739 Change 34739 by marcel@marcel_nfs on 2003/07/19 21:54:47 o Merge uart_tty.c into uart_core.c. The seperation is just too much trouble. o Keep framing errors and parity errors seperate. It's not our place to lose information. o Further flesh-out the ns8250 driver. Both transmit and receive should do something useful. o Further wrap my brain around the TTY stuff. If I'm unlucky, I may even decrypt sio(4). Affected files ... .. //depot/projects/uart/conf/files#8 edit .. //depot/projects/uart/dev/uart/uart_bus.h#6 edit .. //depot/projects/uart/dev/uart/uart_core.c#7 edit .. //depot/projects/uart/dev/uart/uart_dev_ns8250.c#7 edit .. //depot/projects/uart/dev/uart/uart_tty.c#5 delete Differences ... ==== //depot/projects/uart/conf/files#8 (text+ko) ==== @@ -788,7 +788,6 @@ dev/uart/uart_bus_puc.c optional uart puc dev/uart/uart_cons.c optional uart dev/uart/uart_core.c optional uart -dev/uart/uart_tty.c optional uart dev/ubsec/ubsec.c optional ubsec # # USB support ==== //depot/projects/uart/dev/uart/uart_bus.h#6 (text+ko) ==== @@ -44,9 +44,10 @@ #define UART_IPEND_TXIDLE 0x0010 /* Received character status bits. */ -#define UART_STAT_BREAK 0x1000 -#define UART_STAT_OVERRUN 0x2000 -#define UART_STAT_PARERR 0x4000 +#define UART_STAT_BREAK 0x0100 +#define UART_STAT_FRAMERR 0x0200 +#define UART_STAT_OVERRUN 0x0400 +#define UART_STAT_PARERR 0x0800 /* * UART class & instance (=softc) @@ -111,6 +112,48 @@ int uart_tty_detach(struct uart_softc *); void uart_tty_intr(void *arg); +static __inline void +uart_debug(struct uart_softc *sc, const char *fmt, ...) +{ +#if defined(UART_DEBUG) || 1 + va_list ap; + va_start(ap, fmt); + if (sc != NULL) + device_print_prettyname(sc->sc_dev); + vprintf(fmt, ap); + va_end(ap); +#endif +} + +/* + * Receive buffer operations. + */ +static __inline int +uart_rx_empty(struct uart_softc *sc) +{ + return ((sc->sc_rxget == sc->sc_rxput) ? 1 : 0); +} + +static __inline int +uart_rx_full(struct uart_softc *sc) +{ + return ((sc->sc_rxput + 1 < sc->sc_rxbufsz) + ? (sc->sc_rxput + 1 == sc->sc_rxget) : (sc->sc_rxget == 0)); +} + +static __inline int +uart_rx_get(struct uart_softc *sc) +{ + int ptr, xc; + + ptr = sc->sc_rxget; + if (ptr == sc->sc_rxput) + return (-1); + xc = sc->sc_rxbuf[ptr++]; + sc->sc_rxget = (ptr < sc->sc_rxbufsz) ? ptr : 0; + return (xc); +} + static __inline int uart_rx_put(struct uart_softc *sc, int xc) { @@ -124,17 +167,46 @@ return (0); } -static __inline void -uart_debug(struct uart_softc *sc, const char *fmt, ...) +/* + * Transmit buffer operations. + */ +static __inline int +uart_tx_empty(struct uart_softc *sc) +{ + return ((sc->sc_txget == sc->sc_txput) ? 1 : 0); +} + +static __inline int +uart_tx_full(struct uart_softc *sc) +{ + return ((sc->sc_txput + 1 < sc->sc_txbufsz) + ? (sc->sc_txput + 1 == sc->sc_txget) : (sc->sc_txget == 0)); +} + +static __inline int +uart_tx_get(struct uart_softc *sc) +{ + int ptr, c; + + ptr = sc->sc_txget; + if (ptr == sc->sc_txput) + return (-1); + c = sc->sc_txbuf[ptr++]; + sc->sc_txget = (ptr < sc->sc_txbufsz) ? ptr : 0; + return (c); +} + +static __inline int +uart_tx_put(struct uart_softc *sc, int c) { -#if defined(UART_DEBUG) || 1 - va_list ap; - va_start(ap, fmt); - if (sc != NULL) - device_print_prettyname(sc->sc_dev); - vprintf(fmt, ap); - va_end(ap); -#endif + int ptr; + + ptr = (sc->sc_txput + 1 < sc->sc_txbufsz) ? sc->sc_txput + 1 : 0; + if (ptr == sc->sc_txget) + return (ENOSPC); + sc->sc_txbuf[sc->sc_txput] = c; + sc->sc_txput = ptr; + return (0); } #endif /* _DEV_UART_BUS_H_ */ ==== //depot/projects/uart/dev/uart/uart_core.c#7 (text+ko) ==== @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -52,6 +53,103 @@ MALLOC_DEFINE(M_UART, "UART", "UART driver"); +static d_open_t uart_open; +static d_close_t uart_close; +static d_ioctl_t uart_ioctl; + +static struct cdevsw uart_cdevsw = { + .d_open = uart_open, + .d_close = uart_close, + .d_read = ttyread, + .d_write = ttywrite, + .d_ioctl = uart_ioctl, + .d_poll = ttypoll, + .d_name = uart_driver_name, + .d_maj = MAJOR_AUTO, + .d_flags = D_TTY, + .d_kqfilter = ttykqfilter, +}; + +static void +uart_tty_oproc(struct tty *tp) +{ + struct uart_softc *sc; + int c; + + sc = tp->t_dev->si_drv1; + if (sc == NULL || sc->sc_leaving) + return; + + if (tp->t_state & TS_TBLOCK) { + /* XXX clear RTS */ + } else { + /* XXX set RTS */ + } + + if (tp->t_state & (TS_TIMEOUT | TS_TTSTOP)) { + ttwwakeup(tp); + return; + } + + while (!uart_tx_full(sc) && tp->t_outq.c_cc > 0) { + c = getc(&tp->t_outq); + uart_tx_put(sc, c); + } + tp->t_state |= TS_BUSY; + UART_TRANSMIT(sc); + ttwwakeup(tp); +} + +static int +uart_tty_param(struct tty *tp, struct termios *t) +{ + return (0); +} + +static void +uart_tty_stop(struct tty *tp, int rw) +{ + struct uart_softc *sc; + + sc = tp->t_dev->si_drv1; + if (sc == NULL || sc->sc_leaving) + return; +} + +void +uart_tty_intr(void *arg) +{ + struct uart_softc *sc = arg; + struct tty *tp; + int c, pend, xc; + + if (sc->sc_leaving) + return; + + pend = atomic_readandclear_32(&sc->sc_ttypend); + if (pend == 0) + return; + + tp = sc->sc_tty; + + if (pend & UART_IPEND_RXREADY) { + while (!uart_rx_empty(sc)) { + xc = uart_rx_get(sc); + c = xc & 0xff; + if (xc & UART_STAT_FRAMERR) + c |= TTY_FE; + if (xc & UART_STAT_PARERR) + c |= TTY_PE; + (*linesw[tp->t_line].l_rint)(c, tp); + } + } + + if (pend & UART_IPEND_TXIDLE) { + tp->t_state &= ~TS_BUSY; + (*linesw[tp->t_line].l_start)(tp); + } +} + /* * A break condition has been detected. We treat the break condition as * a special case that should not happen during normal operation. When @@ -132,7 +230,8 @@ { if (sc->sc_txget != sc->sc_txput) UART_TRANSMIT(sc); - atomic_set_32(&sc->sc_ttypend, UART_IPEND_TXIDLE); + else + atomic_set_32(&sc->sc_ttypend, UART_IPEND_TXIDLE); } static void @@ -231,6 +330,7 @@ { struct uart_softc *sc, *sc0; const char *sep; + struct tty *tp; int error; /* @@ -318,13 +418,29 @@ printf("\n"); } - error = uart_tty_attach(sc); - if (!error) - return (0); + tp = ttymalloc(NULL); + sc->sc_tty = tp; + + sc->sc_si = make_dev(&uart_cdevsw, device_get_unit(sc->sc_dev), + UID_ROOT, GID_WHEEL, 0600, "%s%r", uart_driver_name, + device_get_unit(sc->sc_dev)); + sc->sc_si->si_drv1 = sc; + sc->sc_si->si_tty = tp; + + tp->t_dev = sc->sc_si; + tp->t_oproc = uart_tty_oproc; + tp->t_param = uart_tty_param; + tp->t_stop = uart_tty_stop; + + if (sc->sc_console) { + ((struct consdev *)uart_console.consdev)->cn_dev = + makedev(uart_cdevsw.d_maj, device_get_unit(sc->sc_dev)); + } - sc->sc_leaving = 1; + swi_add(&tty_ithd, uart_driver_name, uart_tty_intr, sc, SWI_TTY, + INTR_TYPE_TTY, &sc->sc_softih); - UART_DETACH(sc); + return (0); fail: free(sc->sc_txbuf, M_UART); @@ -348,7 +464,9 @@ sc->sc_leaving = 1; - uart_tty_detach(sc); + ithread_remove_handler(sc->sc_softih); + destroy_dev(sc->sc_si); + /* ttyfree(sc->sc_tty); */ UART_DETACH(sc); @@ -364,3 +482,74 @@ return (0); } + +static int +uart_open(dev_t dev, int flags, int mode, struct thread *td) +{ + struct uart_softc *sc; + struct tty *tp; + int error; + + sc = dev->si_drv1; + if (sc == NULL || sc->sc_leaving) + return (ENXIO); + + tp = dev->si_tty; + if (tp->t_state & TS_ISOPEN) { + if ((tp->t_state & TS_XCLUDE) && suser(td) != 0) + return (EBUSY); + } else { + tp->t_cflag = TTYDEF_CFLAG; + tp->t_iflag = TTYDEF_IFLAG; + tp->t_lflag = TTYDEF_LFLAG; + tp->t_oflag = TTYDEF_OFLAG; + if (sc->sc_console) { + tp->t_cflag |= CLOCAL; + tp->t_ispeed = tp->t_ospeed = uart_console.baudrate; + } else + tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED; + } + + error = (*linesw[tp->t_line].l_open)(dev, tp); + return (error); +} + +static int +uart_close(dev_t dev, int flags, int mode, struct thread *td) +{ + struct tty *tp; + + tp = dev->si_tty; + + if (!(tp->t_state & TS_ISOPEN)) + return (0); + + /* XXX reset UART line and modem signals. */ + + (*linesw[tp->t_line].l_close)(tp, flags); + ttyclose(tp); + return (0); +} + +static int +uart_ioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct thread *td) +{ + struct uart_softc *sc; + struct tty *tp; + int error; + + tp = dev->si_tty; + error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flags, td); + if (error != ENOIOCTL) + return (error); + + error = ttioctl(tp, cmd, data, flags); + if (error != ENOIOCTL) + return (error); + + sc = dev->si_drv1; + if (sc == NULL || sc->sc_leaving) + return (ENXIO); + + return (ENOTTY); +} ==== //depot/projects/uart/dev/uart/uart_dev_ns8250.c#7 (text+ko) ==== @@ -529,13 +529,40 @@ static int ns8250_bus_receive(struct uart_softc *sc) { + struct uart_bas *bas; + int ptr, xc; + uint8_t lsr; + + bas = &sc->sc_bas; - return (0); + while (!uart_rx_full(sc)) { + lsr = uart_getreg(bas, REG_LSR); + if ((lsr & LSR_RXRDY) == 0) + break; + xc = uart_getreg(bas, REG_DATA); + if (lsr & LSR_FE) + xc |= UART_STAT_FRAMERR; + if (lsr & LSR_PE) + xc |= UART_STAT_PARERR; + uart_rx_put(sc, xc); + } + return (0); } static int ns8250_bus_transmit(struct uart_softc *sc) { + struct uart_bas *bas; + int xc; + + bas = &sc->sc_bas; + while (!uart_tx_empty(sc)) { + if ((uart_getreg(bas, REG_LSR) & LSR_THRE) == 0) + break; + xc = uart_tx_get(sc); + uart_setreg(bas, REG_DATA, xc); + uart_barrier(bas); + } return (0); } From owner-p4-projects@FreeBSD.ORG Sat Jul 19 21:58:08 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D880637B404; Sat, 19 Jul 2003 21:58:07 -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 850BD37B401 for ; Sat, 19 Jul 2003 21:58:07 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6D11943F85 for ; Sat, 19 Jul 2003 21:58:06 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6K4w60U088287 for ; Sat, 19 Jul 2003 21:58:06 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6K4w57N088283 for perforce@freebsd.org; Sat, 19 Jul 2003 21:58:05 -0700 (PDT) Date: Sat, 19 Jul 2003 21:58:05 -0700 (PDT) Message-Id: <200307200458.h6K4w57N088283@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 34740 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jul 2003 04:58:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=34740 Change 34740 by marcel@marcel_nfs on 2003/07/19 21:57:17 IFC @34738 Affected files ... .. //depot/projects/uart/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/uart/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/uart/compat/linux/linux_misc.c#2 integrate .. //depot/projects/uart/conf/files#9 integrate .. //depot/projects/uart/dev/acpica/acpi.c#4 integrate .. //depot/projects/uart/dev/acpica/acpi_ec.c#4 integrate .. //depot/projects/uart/dev/acpica/acpi_isab.c#3 integrate .. //depot/projects/uart/dev/acpica/acpivar.h#3 integrate .. //depot/projects/uart/dev/ed/if_ed_pccard.c#2 integrate .. //depot/projects/uart/dev/em/if_em.h#3 integrate .. //depot/projects/uart/dev/ep/if_ep.c#2 integrate .. //depot/projects/uart/dev/ep/if_ep_eisa.c#2 integrate .. //depot/projects/uart/dev/ep/if_ep_isa.c#2 integrate .. //depot/projects/uart/dev/ep/if_ep_mca.c#2 integrate .. //depot/projects/uart/dev/ep/if_ep_pccard.c#2 integrate .. //depot/projects/uart/dev/ep/if_epreg.h#2 integrate .. //depot/projects/uart/dev/ep/if_epvar.h#2 integrate .. //depot/projects/uart/dev/firewire/firewire.c#4 integrate .. //depot/projects/uart/dev/firewire/fwdma.c#4 integrate .. //depot/projects/uart/dev/firewire/fwohci.c#4 integrate .. //depot/projects/uart/dev/firewire/fwohci_pci.c#4 integrate .. //depot/projects/uart/dev/firewire/if_fwe.c#2 integrate .. //depot/projects/uart/dev/firewire/sbp.c#4 integrate .. //depot/projects/uart/dev/hatm/if_hatm.c#4 integrate .. //depot/projects/uart/dev/pccard/pccarddevs#4 integrate .. //depot/projects/uart/dev/pccard/pccarddevs.h#4 integrate .. //depot/projects/uart/dev/wi/if_wi_pccard.c#5 integrate .. //depot/projects/uart/dev/wi/if_wi_pci.c#2 integrate .. //depot/projects/uart/i386/i386/busdma_machdep.c#3 integrate .. //depot/projects/uart/i386/isa/vesa.c#2 integrate .. //depot/projects/uart/kern/init_sysent.c#2 integrate .. //depot/projects/uart/kern/kern_proc.c#3 integrate .. //depot/projects/uart/kern/kern_sig.c#4 integrate .. //depot/projects/uart/kern/kern_thread.c#6 integrate .. //depot/projects/uart/kern/kern_umtx.c#3 integrate .. //depot/projects/uart/kern/syscalls.c#2 integrate .. //depot/projects/uart/kern/syscalls.master#2 integrate .. //depot/projects/uart/kern/uipc_mbuf.c#2 integrate .. //depot/projects/uart/kern/uipc_socket.c#3 integrate .. //depot/projects/uart/net/if.c#2 integrate .. //depot/projects/uart/net/if_atm.h#3 integrate .. //depot/projects/uart/net/route.h#2 integrate .. //depot/projects/uart/netatm/atm_subr.c#2 integrate .. //depot/projects/uart/netatm/uni/unisig_msg.c#2 integrate .. //depot/projects/uart/netinet/ip_output.c#2 integrate .. //depot/projects/uart/netinet/raw_ip.c#2 integrate .. //depot/projects/uart/netinet/tcp_syncache.c#2 integrate .. //depot/projects/uart/pci/if_dc.c#6 integrate .. //depot/projects/uart/pci/if_dcreg.h#5 integrate .. //depot/projects/uart/pci/if_rl.c#6 integrate .. //depot/projects/uart/sparc64/include/cache.h#2 integrate .. //depot/projects/uart/sys/kse.h#2 integrate .. //depot/projects/uart/sys/proc.h#3 integrate .. //depot/projects/uart/sys/socketvar.h#2 integrate .. //depot/projects/uart/sys/syscall.h#2 integrate .. //depot/projects/uart/sys/syscall.mk#2 integrate .. //depot/projects/uart/sys/sysproto.h#2 integrate .. //depot/projects/uart/vm/swap_pager.c#2 integrate .. //depot/projects/uart/vm/swap_pager.h#2 integrate .. //depot/projects/uart/vm/uma_core.c#2 integrate .. //depot/projects/uart/vm/vm_map.c#5 integrate .. //depot/projects/uart/vm/vm_swap.c#2 delete Differences ... ==== //depot/projects/uart/cam/scsi/scsi_da.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.144 2003/06/10 18:14:04 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.146 2003/07/18 16:26:36 thomas Exp $"); #ifdef _KERNEL #include "opt_hw_wdog.h" @@ -276,6 +276,14 @@ }, { /* + * Intelligent Stick USB disk-on-key + * PR: kern/53005 + */ + {T_DIRECT, SIP_MEDIA_REMOVABLE, "USB Card", "IntelligentStick*", "*"}, + /*quirks*/ DA_Q_NO_6_BYTE|DA_Q_NO_SYNC_CACHE + }, + { + /* * Sony DSC cameras (DSC-S30, DSC-S50, DSC-S70) */ {T_DIRECT, SIP_MEDIA_REMOVABLE, "Sony", "Sony DSC", "*"}, ==== //depot/projects/uart/compat/linprocfs/linprocfs.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.66 2003/06/10 21:23:04 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.67 2003/07/18 10:26:08 phk Exp $"); #include #include @@ -121,6 +121,7 @@ unsigned long long swapused; /* used swap space in bytes */ unsigned long long swapfree; /* free swap space in bytes */ vm_object_t object; + int i, j; memtotal = physmem * PAGE_SIZE; /* @@ -135,14 +136,10 @@ */ memused = cnt.v_wire_count * PAGE_SIZE; memfree = memtotal - memused; - if (swapblist == NULL) { - swaptotal = 0; - swapfree = 0; - } else { - swaptotal = (u_quad_t)swapblist->bl_blocks * 1024; /* XXX why 1024? */ - swapfree = (u_quad_t)swapblist->bl_root->u.bmu_avail * PAGE_SIZE; - } - swapused = swaptotal - swapfree; + swap_pager_status(&i, &j); + swaptotal = i * PAGE_SIZE; + swapused = j * PAGE_SIZE; + swapfree = swaptotal - swapused; memshared = 0; TAILQ_FOREACH(object, &vm_object_list, object_list) if (object->shadow_count > 1) ==== //depot/projects/uart/compat/linux/linux_misc.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.144 2003/06/10 21:27:39 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.145 2003/07/18 10:26:09 phk Exp $"); #include "opt_mac.h" @@ -108,7 +108,7 @@ { struct l_sysinfo sysinfo; vm_object_t object; - int i; + int i, j; struct timespec ts; /* Uptime is copied out of print_uptime() in kern_shutdown.c */ @@ -144,13 +144,9 @@ sysinfo.sharedram *= PAGE_SIZE; sysinfo.bufferram = 0; - if (swapblist == NULL) { - sysinfo.totalswap= 0; - sysinfo.freeswap = 0; - } else { - sysinfo.totalswap = swapblist->bl_blocks * 1024; - sysinfo.freeswap = swapblist->bl_root->u.bmu_avail * PAGE_SIZE; - } + swap_pager_status(&i, &j); + sysinfo.totalswap= i * PAGE_SIZE; + sysinfo.freeswap = (i - j) * PAGE_SIZE; sysinfo.procs = 20; /* Hack */ ==== //depot/projects/uart/conf/files#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.807 2003/07/15 22:42:36 jmg Exp $ +# $FreeBSD: src/sys/conf/files,v 1.808 2003/07/18 10:02:43 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1619,7 +1619,6 @@ vm/vm_zeroidle.c standard vm/vm_pageout.c standard vm/vm_pager.c standard -vm/vm_swap.c standard vm/vm_unix.c standard vm/uma_core.c standard vm/uma_dbg.c standard ==== //depot/projects/uart/dev/acpica/acpi.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.91 2003/07/13 22:57:16 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.93 2003/07/20 00:52:57 njl Exp $ */ #include "opt_acpi.h" @@ -383,6 +383,12 @@ goto out; } + /* + * Call the ECDT probe function to provide EC functionality before + * the namespace has been evaluated. + */ + acpi_ec_ecdt_probe(dev); + if (ACPI_FAILURE(status = AcpiInitializeObjects(flags))) { device_printf(dev, "could not initialize ACPI objects: %s\n", AcpiFormatException(status)); goto out; @@ -923,7 +929,7 @@ ACPI_ASSERTLOCK; if (howto & RB_POWEROFF) { - printf("Power system off using ACPI...\n"); + printf("Powering system off using ACPI\n"); if (ACPI_FAILURE(status = AcpiEnterSleepStatePrep(acpi_off_state))) { printf("AcpiEnterSleepStatePrep failed - %s\n", AcpiFormatException(status)); @@ -936,7 +942,7 @@ printf("ACPI power-off failed - timeout\n"); } } else { - printf("Terminate ACPI\n"); + printf("Shutting down ACPI\n"); AcpiTerminate(); } } ==== //depot/projects/uart/dev/acpica/acpi_ec.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.33 2003/07/15 19:24:36 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.34 2003/07/20 00:48:38 njl Exp $ */ /****************************************************************************** * @@ -221,6 +221,26 @@ #define EC_SET_CSR(sc, v) \ bus_space_write_1((sc)->ec_csr_tag, (sc)->ec_csr_handle, 0, (v)) +/* Embedded Controller Boot Resources Table (ECDT) */ +typedef struct { + ACPI_TABLE_HEADER header; + ACPI_GENERIC_ADDRESS control; + ACPI_GENERIC_ADDRESS data; + UINT32 uid; + UINT8 gpe_bit; + char ec_id[0]; +} ACPI_TABLE_ECDT; + +/* Indicate that this device has already been probed via ECDT. */ +#define DEV_ECDT_FLAG 0x80000000 + +/* Indicate that this device should use the global lock. */ +#define DEV_GLK_FLAG 0x40000000 + +/* Get/set GPE bit value in the magic ivar. */ +#define DEV_GET_GPEBIT(x) ((x) & 0xff) +#define DEV_SET_GPEBIT(x, y) ((x) = ((x) & ~0xff) | ((y) & 0xff)) + /* * Driver softc. */ @@ -307,13 +327,11 @@ UINT8 *Data); static ACPI_STATUS EcWrite(struct acpi_ec_softc *sc, UINT8 Address, UINT8 *Data); -static void acpi_ec_identify(driver_t driver, device_t bus); static int acpi_ec_probe(device_t dev); static int acpi_ec_attach(device_t dev); static device_method_t acpi_ec_methods[] = { /* Device interface */ - DEVMETHOD(device_identify, acpi_ec_identify), DEVMETHOD(device_probe, acpi_ec_probe), DEVMETHOD(device_attach, acpi_ec_attach), @@ -330,37 +348,155 @@ DRIVER_MODULE(acpi_ec, acpi, acpi_ec_driver, acpi_ec_devclass, 0, 0); /* - * Look for an ECDT table and if we find one, set up a default EC - * space handler to catch possible attempts to access EC space before + * Look for an ECDT and if we find one, set up default GPE and + * space handlers to catch attempts to access EC space before * we have a real driver instance in place. - * We're not really an identify routine, but because we get called - * before most other things, this works out OK. + * TODO: if people report invalid ECDTs, add a tunable to disable them. */ -static void -acpi_ec_identify(driver_t driver, device_t bus) +void +acpi_ec_ecdt_probe(device_t parent) { + ACPI_TABLE_ECDT *ecdt; + ACPI_STATUS status; + device_t child; + ACPI_HANDLE h; + int magic; + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); - /* XXX implement - need an ACPI 2.0 system to test this */ + /* Find and validate the ECDT. */ + status = AcpiGetFirmwareTable("ECDT", 1, ACPI_LOGICAL_ADDRESSING, + (ACPI_TABLE_HEADER **)&ecdt); + if (ACPI_FAILURE(status) || + ecdt->control.RegisterBitWidth != 8 || + ecdt->data.RegisterBitWidth != 8) { + return; + } + + /* Create the child device with the given unit number. */ + child = BUS_ADD_CHILD(parent, 0, "acpi_ec", ecdt->uid); + if (child == NULL) { + printf("acpi_ec_ecdt_probe: can't add child\n"); + return; + } + + /* Find and save the ACPI handle for this device. */ + status = AcpiGetHandle(NULL, ecdt->ec_id, &h); + if (ACPI_FAILURE(status)) { + device_delete_child(parent, child); + printf("acpi_ec_ecdt_probe: can't get handle\n"); + return; + } + acpi_set_handle(child, h); + + /* Set the data and CSR register addresses. */ + bus_set_resource(child, SYS_RES_IOPORT, 0, ecdt->data.Address, + /*count*/1); + bus_set_resource(child, SYS_RES_IOPORT, 1, ecdt->control.Address, + /*count*/1); + + /* + * Store values for the probe/attach routines to use. Store the + * ECDT GPE bit and set the global lock flag (just to be safe). + * We'll determine whether we really want to use the global lock + * in a later call to attach. + */ + magic = DEV_ECDT_FLAG | DEV_GLK_FLAG; + DEV_SET_GPEBIT(magic, ecdt->gpe_bit); + acpi_set_magic(child, magic); + + /* Finish the attach process. */ + if (device_probe_and_attach(child) != 0) + device_delete_child(parent, child); } -/* - * We could setup resources in the probe routine in order to have them printed - * when the device is attached. - */ static int acpi_ec_probe(device_t dev) { - int ret = ENXIO; + ACPI_HANDLE h; + ACPI_STATUS status; + device_t peer; + char desc[64]; + int magic, uid, glk, gpebit, ret = ENXIO; + + /* Check that this is an EC device and it's not disabled. */ + if (acpi_get_type(dev) != ACPI_TYPE_DEVICE || acpi_disabled("ec") || + !acpi_MatchHid(dev, "PNP0C09")) { + return (ENXIO); + } + + /* + * If probed via ECDT, set description and continue. Otherwise, + * we can access the namespace and make sure this is not a + * duplicate probe. + */ + magic = acpi_get_magic(dev); + if ((magic & DEV_ECDT_FLAG) != 0) { + snprintf(desc, sizeof(desc), "embedded controller: ECDT, GPE %#x, GLK", + DEV_GET_GPEBIT(magic)); + device_set_desc_copy(dev, desc); + ret = 0; + } else { + h = acpi_get_handle(dev); + + /* + * Read the unit ID to check for duplicate attach and the + * global lock value to see if we should acquire it when + * accessing the EC. + */ + status = acpi_EvaluateInteger(h, "_UID", &uid); + if (ACPI_FAILURE(status)) + uid = 0; + status = acpi_EvaluateInteger(h, "_GLK", &glk); + if (ACPI_FAILURE(status)) + glk = 0; + + /* + * Evaluate the _GPE method to find the GPE bit used by the EC to + * signal status (SCI). Note that we don't handle the case where + * it can return a package instead of an int. + */ + status = acpi_EvaluateInteger(h, "_GPE", &gpebit); + if (ACPI_FAILURE(status)) { + device_printf(dev, "can't evaluate _GPE - %s\n", + AcpiFormatException(status)); + return (ENXIO); + } - if (acpi_get_type(dev) == ACPI_TYPE_DEVICE && !acpi_disabled("ec") && - acpi_MatchHid(dev, "PNP0C09")) { + /* Store the values we got from the namespace for attach. */ + magic = glk != 0 ? DEV_GLK_FLAG : 0; + DEV_SET_GPEBIT(magic, gpebit); + acpi_set_magic(dev, magic); /* - * Set device description + * Check for a duplicate probe. This can happen when a probe + * via ECDT succeeded already. If there is a duplicate, override + * its value for GLK in the peer's softc since the ECDT case + * always enables the global lock to be safe. Otherwise, just + * continue on to attach. */ - device_set_desc(dev, "embedded controller"); - ret = 0; + peer = devclass_get_device(acpi_ec_devclass, uid); + if (peer == NULL || !device_is_alive(peer)) { + snprintf(desc, sizeof(desc), "embedded controller: GPE %#x%s", + gpebit, glk != 0 ? ", GLK" : ""); + device_set_desc_copy(dev, desc); + ret = 0; + } else { + struct acpi_ec_softc *sc; + + /* + * Set the peer's sc->ec_glk with locks held so we won't + * override it between another thread's lock/unlock calls. + */ + sc = device_get_softc(peer); + if (sc->ec_glk != glk) { + ACPI_VPRINT(peer, acpi_device_get_parent_softc(peer), + "Changing GLK from %d to %d\n", sc->ec_glk, glk); + mtx_lock(&sc->ec_mtx); + sc->ec_glk = glk != 0 ? 1 : 0; + mtx_unlock(&sc->ec_mtx); + } + } } return (ret); @@ -371,7 +507,7 @@ { struct acpi_ec_softc *sc; ACPI_STATUS Status; - int errval = 0; + int magic, errval = 0; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); @@ -382,6 +518,11 @@ sc->ec_polldelay = EC_POLL_DELAY; mtx_init(&sc->ec_mtx, "ACPI embedded controller", NULL, MTX_DEF); + /* Retrieve previously probed values via device ivars. */ + magic = acpi_get_magic(dev); + sc->ec_glk = (magic & DEV_GLK_FLAG) != 0 ? 1 : 0; + sc->ec_gpebit = DEV_GET_GPEBIT(magic); + /* Attach bus resources for data and command/status ports. */ sc->ec_data_rid = 0; sc->ec_data_res = bus_alloc_resource(sc->ec_dev, SYS_RES_IOPORT, @@ -405,24 +546,7 @@ sc->ec_csr_tag = rman_get_bustag(sc->ec_csr_res); sc->ec_csr_handle = rman_get_bushandle(sc->ec_csr_res); - /* Check if global lock should be used. If not, leave flag as 0. */ - acpi_EvaluateInteger(sc->ec_handle, "_GLK", &sc->ec_glk); - /* - * Evaluate the _GPE method to find the GPE bit used by the EC to signal - * status (SCI). Note that we don't handle the case where it can - * return a package instead of an int. - */ - ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "querying GPE\n")); - Status = acpi_EvaluateInteger(sc->ec_handle, "_GPE", &sc->ec_gpebit); - if (ACPI_FAILURE(Status)) { - device_printf(dev, "can't evaluate _GPE - %s\n", - AcpiFormatException(Status)); - errval = ENXIO; - goto out; - } - - /* * Install a handler for this EC's GPE bit. We want edge-triggered * behavior. */ @@ -452,10 +576,6 @@ goto out; } - ACPI_VPRINT(sc->ec_dev, acpi_device_get_parent_softc(sc->ec_dev), - "GPE bit is %#x, %susing global lock\n", sc->ec_gpebit, - sc->ec_glk == 0 ? "not " : ""); - ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "acpi_ec_attach complete\n")); return (0); ==== //depot/projects/uart/dev/acpica/acpi_isab.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_isab.c,v 1.2 2003/07/09 18:28:53 jhb Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_isab.c,v 1.3 2003/07/17 19:13:41 jhb Exp $ */ /* @@ -94,7 +94,7 @@ if ((acpi_get_type(dev) == ACPI_TYPE_DEVICE) && !acpi_disabled("isa") && - devclass_get_device(isab_devclass, 0) == NULL && + devclass_get_device(isab_devclass, 0) == dev && (acpi_MatchHid(dev, "PNP0A05") || acpi_MatchHid(dev, "PNP0A06"))) { device_set_desc(dev, "ACPI Generic ISA bridge"); return(0); ==== //depot/projects/uart/dev/acpica/acpivar.h#3 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.42 2003/07/15 19:19:54 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.43 2003/07/20 00:48:38 njl Exp $ */ #include "bus_if.h" @@ -133,37 +133,6 @@ #define ACPI_INTR_APIC 1 #define ACPI_INTR_SAPIC 2 -/* XXX this is no longer referenced anywhere, remove? */ -#if 0 -/* - * This is a cheap and nasty way to get around the horrid counted list - * argument format that AcpiEvalateObject uses. - */ -#define ACPI_OBJECTLIST_MAX 16 -struct acpi_object_list { - UINT32 count; - ACPI_OBJECT *pointer[ACPI_OBJECTLIST_MAX]; - ACPI_OBJECT object[ACPI_OBJECTLIST_MAX]; -}; - -static __inline struct acpi_object_list * -acpi_AllocObjectList(int nobj) -{ - struct acpi_object_list *l; - int i; - - if (nobj > ACPI_OBJECTLIST_MAX) - return(NULL); - if ((l = AcpiOsAllocate(sizeof(*l))) == NULL) - return(NULL); - bzero(l, sizeof(*l)); - for (i = 0; i < ACPI_OBJECTLIST_MAX; i++) - l->pointer[i] = &l->object[i]; - l->count = nobj; - return(l); -} -#endif /* unused */ - /* * Note that the low ivar values are reserved to provide * interface compatibility with ISA drivers which can also @@ -376,6 +345,11 @@ extern int acpi_cmbat_get_battinfo(int, struct acpi_battinfo *); /* + * Embedded controller. + */ +extern void acpi_ec_ecdt_probe(device_t); + +/* * AC adapter interface. */ ==== //depot/projects/uart/dev/ed/if_ed_pccard.c#2 (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_pccard.c,v 1.48 2003/04/15 06:37:23 mdodd Exp $ + * $FreeBSD: src/sys/dev/ed/if_ed_pccard.c,v 1.49 2003/07/19 05:36:09 imp Exp $ */ #include "opt_ed.h" @@ -127,6 +127,7 @@ { PCMCIA_CARD(BILLIONTON, LNT10TN, 0), 0}, { PCMCIA_CARD(BILLIONTON, CFLT10N, 0), 0}, { PCMCIA_CARD(BUFFALO, LPC3_CLT, 0), 0}, + { PCMCIA_CARD(BUFFALO, LPC3_CLX, 0), NE2000DVF_AX88190}, { PCMCIA_CARD(BUFFALO, LPC_CF_CLT, 0), 0}, { PCMCIA_CARD(CNET, NE2000, 0), 0}, { PCMCIA_CARD(COMPEX, LINKPORT_ENET_B, 0), 0}, ==== //depot/projects/uart/dev/em/if_em.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.h,v 1.17 2003/07/04 10:15:16 mux Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.h,v 1.18 2003/07/17 19:02:34 jdp Exp $*/ #ifndef _EM_H_DEFINED_ #define _EM_H_DEFINED_ @@ -117,7 +117,7 @@ #define EM_TIDV 64 /* - * TxAbsIntDelay (Not valid for 82542 and 82543) + * TxAbsIntDelay (Not valid for 82542/82543/82544) * Valid Range: 0-65535 (0=off) * Default Value: 64 * This value, in units of 1.024 microseconds, limits the delay in which a @@ -151,7 +151,7 @@ #define EM_RDTR 0 /* - * RxAbsIntDelay (Not valid for 82542 and 82543) + * RxAbsIntDelay (Not valid for 82542/82543/82544) * Valid Range: 0-65535 (0=off) * Default Value: 64 * This value, in units of 1.024 microseconds, limits the delay in which a ==== //depot/projects/uart/dev/ep/if_ep.c#2 (text+ko) ==== @@ -26,8 +26,6 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * if_ep.c,v 1.19 1995/01/24 20:53:45 davidg Exp */ /* @@ -38,8 +36,6 @@ */ /* - * $FreeBSD: src/sys/dev/ep/if_ep.c,v 1.117 2003/06/26 17:02:52 mux Exp $ - * * Promiscuous mode added and interrupt logic slightly changed * to reduce the number of adapter failures. Transceiver select * logic changed to use value from EEPROM. Autoconfiguration @@ -61,71 +57,67 @@ * */ +#include +__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep.c,v 1.118 2003/07/17 19:37:56 markm Exp $"); + #include #include #include #include #include - #include #include #include -#include +#include #include #include -#include +#include #include #include - #include #include /* Exported variables */ devclass_t ep_devclass; -#if 0 -static char * ep_conn_type[] = {"UTP", "AUI", "???", "BNC"}; -static int if_media2ep_media[] = { 0, 0, 0, UTP, BNC, AUI }; -#endif - -static int ep_media2if_media[] = - { IFM_10_T, IFM_10_5, IFM_NONE, IFM_10_2, IFM_NONE }; +static int ep_media2if_media[] = +{IFM_10_T, IFM_10_5, IFM_NONE, IFM_10_2, IFM_NONE}; /* if functions */ -static void ep_if_init (void *); -static int ep_if_ioctl (struct ifnet *, u_long, caddr_t); -static void ep_if_start (struct ifnet *); -static void ep_if_watchdog (struct ifnet *); +static void ep_if_init(void *); +static int ep_if_ioctl(struct ifnet *, u_long, caddr_t); +static void ep_if_start(struct ifnet *); +static void ep_if_watchdog(struct ifnet *); /* if_media functions */ -static int ep_ifmedia_upd (struct ifnet *); -static void ep_ifmedia_sts (struct ifnet *, struct ifmediareq *); +static int ep_ifmedia_upd(struct ifnet *); +static void ep_ifmedia_sts(struct ifnet *, struct ifmediareq *); -static void epstop (struct ep_softc *); -static void epread (struct ep_softc *); -static int eeprom_rdy (struct ep_softc *); +static void epstop(struct ep_softc *); +static void epread(struct ep_softc *); +static int eeprom_rdy(struct ep_softc *); #define EP_FTST(sc, f) (sc->stat & (f)) #define EP_FSET(sc, f) (sc->stat |= (f)) #define EP_FRST(sc, f) (sc->stat &= ~(f)) static int -eeprom_rdy(sc) - struct ep_softc *sc; +eeprom_rdy(struct ep_softc *sc) { - int i; + int i; + + for (i = 0; is_eeprom_busy(BASE) && i < MAX_EEPROMBUSY; i++) + DELAY(100); + + if (i >= MAX_EEPROMBUSY) { + printf("ep%d: eeprom failed to come ready.\n", sc->unit); + return (ENXIO); + } - for (i = 0; is_eeprom_busy(BASE) && i < MAX_EEPROMBUSY; i++) { - DELAY(100); - } - if (i >= MAX_EEPROMBUSY) { - printf("ep%d: eeprom failed to come ready.\n", sc->unit); - return (ENXIO); - } - return (0); + return (0); } /* @@ -133,42 +125,40 @@ * before */ int -get_e(sc, offset, result) - struct ep_softc *sc; - u_int16_t offset; - u_int16_t *result; +get_e(struct ep_softc *sc, u_int16_t offset, u_int16_t *result) { if (eeprom_rdy(sc)) return (ENXIO); + outw(BASE + EP_W0_EEPROM_COMMAND, - (EEPROM_CMD_RD << sc->epb.cmd_off) | offset); + (EEPROM_CMD_RD << sc->epb.cmd_off) | offset); + if (eeprom_rdy(sc)) return (ENXIO); + (*result) = inw(BASE + EP_W0_EEPROM_DATA); return (0); } int -ep_get_macaddr(sc, addr) - struct ep_softc * sc; - u_char * addr; +ep_get_macaddr(struct ep_softc *sc, u_char *addr) { - int i; - u_int16_t result; - int error; - u_int16_t * macaddr; + int i; + u_int16_t result; + int error; + u_int16_t *macaddr; - macaddr = (u_int16_t *)addr; + macaddr = (u_int16_t *) addr; GO_WINDOW(0); - for(i = EEPROM_NODE_ADDR_0; i <= EEPROM_NODE_ADDR_2; i++) { + for (i = EEPROM_NODE_ADDR_0; i <= EEPROM_NODE_ADDR_2; i++) { error = get_e(sc, i, &result); if (error) return (error); macaddr[i] = htons(result); - } + } return (0); } @@ -176,42 +166,40 @@ int ep_alloc(device_t dev) { - struct ep_softc * sc = device_get_softc(dev); - int rid; - int error = 0; - u_int16_t result; + struct ep_softc *sc = device_get_softc(dev); + int rid; + int error = 0; + u_int16_t result; - rid = 0; - sc->iobase = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, - 0, ~0, 1, RF_ACTIVE); - if (!sc->iobase) { - device_printf(dev, "No I/O space?!\n"); + rid = 0; + sc->iobase = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, + 0, ~0, 1, RF_ACTIVE); + if (!sc->iobase) { + device_printf(dev, "No I/O space?!\n"); error = ENXIO; - goto bad; - } - - rid = 0; - sc->irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, - 0, ~0, 1, RF_ACTIVE); - if (!sc->irq) { - device_printf(dev, "No irq?!\n"); + goto bad; + } + rid = 0; + sc->irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, + 0, ~0, 1, RF_ACTIVE); + if (!sc->irq) { + device_printf(dev, "No irq?!\n"); error = ENXIO; - goto bad; - } + goto bad; + } + sc->dev = dev; + sc->unit = device_get_unit(dev); + sc->stat = 0; /* 16 bit access */ - sc->dev = dev; - sc->unit = device_get_unit(dev); - sc->stat = 0; /* 16 bit access */ + sc->ep_io_addr = rman_get_start(sc->iobase); - sc->ep_io_addr = rman_get_start(sc->iobase); + sc->ep_btag = rman_get_bustag(sc->iobase); + sc->ep_bhandle = rman_get_bushandle(sc->iobase); - sc->ep_btag = rman_get_bustag(sc->iobase); - sc->ep_bhandle = rman_get_bushandle(sc->iobase); - sc->ep_connectors = 0; sc->ep_connector = 0; - GO_WINDOW(0); + GO_WINDOW(0); sc->epb.cmd_off = 0; error = get_e(sc, EEPROM_PROD_ID, &result); @@ -229,24 +217,22 @@ } void -ep_get_media(sc) - struct ep_softc * sc; +ep_get_media(struct ep_softc *sc) { - u_int16_t config; - - GO_WINDOW(0); - config = inw(BASE + EP_W0_CONFIG_CTRL); - if (config & IS_AUI) - sc->ep_connectors |= AUI; - if (config & IS_BNC) - sc->ep_connectors |= BNC; - if (config & IS_UTP) - sc->ep_connectors |= UTP; + u_int16_t config; + + GO_WINDOW(0); + config = inw(BASE + EP_W0_CONFIG_CTRL); + if (config & IS_AUI) + sc->ep_connectors |= AUI; + if (config & IS_BNC) + sc->ep_connectors |= BNC; + if (config & IS_UTP) + sc->ep_connectors |= UTP; - if (!(sc->ep_connectors & 7)) { + if (!(sc->ep_connectors & 7)) if (bootverbose) - device_printf(sc->dev, "no connectors!\n"); - } + device_printf(sc->dev, "no connectors!\n"); /* * This works for most of the cards so we'll do it here. @@ -254,14 +240,12 @@ * this later on. */ sc->ep_connector = inw(BASE + EP_W0_ADDRESS_CFG) >> ACF_CONNECTOR_BITS; - - return; } void ep_free(device_t dev) { - struct ep_softc * sc = device_get_softc(dev); + struct ep_softc *sc = device_get_softc(dev); if (sc->ep_intrhand) bus_teardown_intr(dev, sc->irq, sc->ep_intrhand); @@ -269,20 +253,17 @@ bus_release_resource(dev, SYS_RES_IOPORT, 0, sc->iobase); if (sc->irq) bus_release_resource(dev, SYS_RES_IRQ, 0, sc->irq); +} - return; -} - int -ep_attach(sc) - struct ep_softc * sc; +ep_attach(struct ep_softc *sc) { - struct ifnet * ifp = NULL; - struct ifmedia * ifm = NULL; - u_short * p; - int i; - int attached; - int error; + struct ifnet *ifp = NULL; + struct ifmedia *ifm = NULL; + u_short *p; + int i; + int attached; + int error; sc->gone = 0; @@ -291,19 +272,17 @@ device_printf(sc->dev, "Unable to retrieve Ethernet address!\n"); return (ENXIO); } - /* * Setup the station address */ p = (u_short *)&sc->arpcom.ac_enaddr; GO_WINDOW(2); - for (i = 0; i < 3; i++) { + for (i = 0; i < 3; i++) outw(BASE + EP_W2_ADDR_0 + (i * 2), ntohs(p[i])); - } device_printf(sc->dev, "Ethernet address %6D\n", - sc->arpcom.ac_enaddr, ":"); - + sc->arpcom.ac_enaddr, ":"); + ifp = &sc->arpcom.ac_if; attached = (ifp->if_softc != 0); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jul 19 22:01:13 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 103A237B404; Sat, 19 Jul 2003 22:01:13 -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 981DE37B401 for ; Sat, 19 Jul 2003 22:01:12 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8ED5943F93 for ; Sat, 19 Jul 2003 22:01:11 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6K51B0U088472 for ; Sat, 19 Jul 2003 22:01:11 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6K51A16088469 for perforce@freebsd.org; Sat, 19 Jul 2003 22:01:10 -0700 (PDT) Date: Sat, 19 Jul 2003 22:01:10 -0700 (PDT) Message-Id: <200307200501.h6K51A16088469@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 34741 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jul 2003 05:01:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=34741 Change 34741 by marcel@marcel_nfs on 2003/07/19 22:00:55 IFC @34738 Affected files ... .. //depot/projects/ia64/MAINTAINERS#34 integrate .. //depot/projects/ia64/Makefile#28 integrate .. //depot/projects/ia64/bin/setfacl/setfacl.c#5 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/freebsd.h.fixed#3 delete .. //depot/projects/ia64/contrib/top/commands.c#3 integrate .. //depot/projects/ia64/contrib/top/machine.h#3 integrate .. //depot/projects/ia64/contrib/top/top.c#4 integrate .. //depot/projects/ia64/etc/defaults/pccard.conf#21 integrate .. //depot/projects/ia64/kerberos5/Makefile.inc#11 integrate .. //depot/projects/ia64/kerberos5/lib/libasn1/Makefile#8 integrate .. //depot/projects/ia64/kerberos5/lib/libgssapi/Makefile#4 integrate .. //depot/projects/ia64/kerberos5/lib/libhdb/Makefile#9 integrate .. //depot/projects/ia64/kerberos5/lib/libkadm5clnt/Makefile#2 integrate .. //depot/projects/ia64/kerberos5/lib/libkadm5srv/Makefile#2 integrate .. //depot/projects/ia64/kerberos5/lib/libkrb5/Makefile#6 integrate .. //depot/projects/ia64/kerberos5/lib/libroken/Makefile#5 integrate .. //depot/projects/ia64/kerberos5/lib/libsl/Makefile#4 integrate .. //depot/projects/ia64/kerberos5/lib/libvers/Makefile#4 integrate .. //depot/projects/ia64/kerberos5/libexec/hprop/Makefile#5 integrate .. //depot/projects/ia64/kerberos5/libexec/hpropd/Makefile#7 integrate .. //depot/projects/ia64/kerberos5/libexec/ipropd-master/Makefile#8 integrate .. //depot/projects/ia64/kerberos5/libexec/ipropd-slave/Makefile#8 integrate .. //depot/projects/ia64/kerberos5/libexec/kadmind/Makefile#4 integrate .. //depot/projects/ia64/kerberos5/libexec/kdc/Makefile#8 integrate .. //depot/projects/ia64/kerberos5/libexec/kpasswdd/Makefile#4 integrate .. //depot/projects/ia64/kerberos5/usr.bin/kadmin/Makefile#5 integrate .. //depot/projects/ia64/kerberos5/usr.bin/kdestroy/Makefile#3 integrate .. //depot/projects/ia64/kerberos5/usr.bin/kinit/Makefile#3 integrate .. //depot/projects/ia64/kerberos5/usr.bin/klist/Makefile#3 integrate .. //depot/projects/ia64/kerberos5/usr.bin/kpasswd/Makefile#3 integrate .. //depot/projects/ia64/kerberos5/usr.bin/krb5-config/Makefile#9 integrate .. //depot/projects/ia64/kerberos5/usr.bin/ksu/Makefile#3 integrate .. //depot/projects/ia64/kerberos5/usr.sbin/kstash/Makefile#4 integrate .. //depot/projects/ia64/kerberos5/usr.sbin/ktutil/Makefile#8 integrate .. //depot/projects/ia64/lib/Makefile#31 integrate .. //depot/projects/ia64/lib/libc/amd64/gen/Makefile.inc#4 integrate .. //depot/projects/ia64/lib/libc/amd64/gen/makecontext.c#1 branch .. //depot/projects/ia64/lib/libc/amd64/gen/signalcontext.c#1 branch .. //depot/projects/ia64/lib/libc/gen/getpwent.c#14 integrate .. //depot/projects/ia64/lib/libc/gen/raise.c#3 integrate .. //depot/projects/ia64/lib/libc/gen/time.3#2 integrate .. //depot/projects/ia64/lib/libc/gen/time.c#3 integrate .. //depot/projects/ia64/lib/libpthread/Makefile#11 integrate .. //depot/projects/ia64/lib/libpthread/arch/amd64/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libpthread/arch/amd64/amd64/context.S#1 branch .. //depot/projects/ia64/lib/libpthread/arch/amd64/amd64/enter_uts.S#1 branch .. //depot/projects/ia64/lib/libpthread/arch/amd64/include/atomic_ops.h#1 branch .. //depot/projects/ia64/lib/libpthread/arch/amd64/include/ksd.h#1 branch .. //depot/projects/ia64/lib/libpthread/arch/amd64/include/pthread_md.h#1 branch .. //depot/projects/ia64/lib/libpthread/arch/i386/include/ksd.h#4 integrate .. //depot/projects/ia64/lib/libpthread/pthread.map#3 integrate .. //depot/projects/ia64/lib/libpthread/test/sigsuspend_d.c#2 integrate .. //depot/projects/ia64/lib/libpthread/thread/Makefile.inc#9 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_attr_init.c#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_cancel.c#10 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_concurrency.c#4 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_cond.c#14 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_create.c#12 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_find_thread.c#5 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_init.c#13 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#25 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_mutex.c#7 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_nanosleep.c#6 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_private.h#16 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_raise.c#1 branch .. //depot/projects/ia64/lib/libpthread/thread/thr_sig.c#17 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sigmask.c#6 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sigpending.c#6 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sigsuspend.c#8 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sigwait.c#10 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_yield.c#5 integrate .. //depot/projects/ia64/lib/libthr/arch/alpha/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libthr/arch/alpha/alpha/_curthread.c#1 branch .. //depot/projects/ia64/libexec/getty/main.c#8 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#106 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#27 integrate .. //depot/projects/ia64/rescue/librescue/Makefile#3 integrate .. //depot/projects/ia64/rescue/rescue/Makefile#6 integrate .. //depot/projects/ia64/sbin/atm/ilmid/ilmid.c#8 integrate .. //depot/projects/ia64/sbin/mount/mount.c#10 integrate .. //depot/projects/ia64/sbin/umount/umount.8#6 integrate .. //depot/projects/ia64/sbin/umount/umount.c#8 integrate .. //depot/projects/ia64/secure/libexec/telnetd/Makefile#6 delete .. //depot/projects/ia64/share/man/man4/an.4#4 integrate .. //depot/projects/ia64/share/man/man4/ath.4#4 integrate .. //depot/projects/ia64/share/man/man4/ath_hal.4#2 integrate .. //depot/projects/ia64/share/man/man4/sbp.4#9 integrate .. //depot/projects/ia64/share/man/man4/wi.4#27 integrate .. //depot/projects/ia64/share/man/man4/wlan.4#2 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_da.c#46 integrate .. //depot/projects/ia64/sys/compat/linprocfs/linprocfs.c#19 integrate .. //depot/projects/ia64/sys/compat/linux/linux_misc.c#25 integrate .. //depot/projects/ia64/sys/conf/files#89 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi.c#34 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_ec.c#13 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_isab.c#3 integrate .. //depot/projects/ia64/sys/dev/acpica/acpivar.h#18 integrate .. //depot/projects/ia64/sys/dev/ed/if_ed_pccard.c#14 integrate .. //depot/projects/ia64/sys/dev/em/if_em.h#16 integrate .. //depot/projects/ia64/sys/dev/ep/if_ep.c#9 integrate .. //depot/projects/ia64/sys/dev/ep/if_ep_eisa.c#4 integrate .. //depot/projects/ia64/sys/dev/ep/if_ep_isa.c#5 integrate .. //depot/projects/ia64/sys/dev/ep/if_ep_mca.c#3 integrate .. //depot/projects/ia64/sys/dev/ep/if_ep_pccard.c#8 integrate .. //depot/projects/ia64/sys/dev/ep/if_epreg.h#2 integrate .. //depot/projects/ia64/sys/dev/ep/if_epvar.h#3 integrate .. //depot/projects/ia64/sys/dev/firewire/firewire.c#34 integrate .. //depot/projects/ia64/sys/dev/firewire/fwdma.c#4 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci.c#29 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci_pci.c#21 integrate .. //depot/projects/ia64/sys/dev/firewire/if_fwe.c#15 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp.c#38 integrate .. //depot/projects/ia64/sys/dev/hatm/if_hatm.c#4 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs#31 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs.h#31 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi_pccard.c#26 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi_pci.c#13 integrate .. //depot/projects/ia64/sys/i386/i386/busdma_machdep.c#22 integrate .. //depot/projects/ia64/sys/i386/isa/vesa.c#9 integrate .. //depot/projects/ia64/sys/kern/init_sysent.c#29 integrate .. //depot/projects/ia64/sys/kern/kern_proc.c#44 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#60 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#60 integrate .. //depot/projects/ia64/sys/kern/kern_umtx.c#6 integrate .. //depot/projects/ia64/sys/kern/syscalls.c#30 integrate .. //depot/projects/ia64/sys/kern/syscalls.master#31 integrate .. //depot/projects/ia64/sys/kern/uipc_mbuf.c#20 integrate .. //depot/projects/ia64/sys/kern/uipc_socket.c#33 integrate .. //depot/projects/ia64/sys/net/if.c#24 integrate .. //depot/projects/ia64/sys/net/if_atm.h#8 integrate .. //depot/projects/ia64/sys/net/route.h#8 integrate .. //depot/projects/ia64/sys/netatm/atm_subr.c#13 integrate .. //depot/projects/ia64/sys/netatm/uni/unisig_msg.c#6 integrate .. //depot/projects/ia64/sys/netinet/ip_output.c#28 integrate .. //depot/projects/ia64/sys/netinet/raw_ip.c#23 integrate .. //depot/projects/ia64/sys/netinet/tcp_syncache.c#22 integrate .. //depot/projects/ia64/sys/pci/if_dc.c#42 integrate .. //depot/projects/ia64/sys/pci/if_dcreg.h#16 integrate .. //depot/projects/ia64/sys/pci/if_rl.c#37 integrate .. //depot/projects/ia64/sys/sparc64/include/cache.h#7 integrate .. //depot/projects/ia64/sys/sys/kse.h#13 integrate .. //depot/projects/ia64/sys/sys/proc.h#71 integrate .. //depot/projects/ia64/sys/sys/socketvar.h#29 integrate .. //depot/projects/ia64/sys/sys/syscall.h#29 integrate .. //depot/projects/ia64/sys/sys/syscall.mk#29 integrate .. //depot/projects/ia64/sys/sys/sysproto.h#32 integrate .. //depot/projects/ia64/sys/vm/swap_pager.c#32 integrate .. //depot/projects/ia64/sys/vm/swap_pager.h#11 integrate .. //depot/projects/ia64/sys/vm/uma_core.c#43 integrate .. //depot/projects/ia64/sys/vm/vm_map.c#60 integrate .. //depot/projects/ia64/sys/vm/vm_swap.c#22 delete .. //depot/projects/ia64/tools/tools/tinderbox/www/index.cgi#4 integrate .. //depot/projects/ia64/usr.bin/sockstat/sockstat.c#5 integrate .. //depot/projects/ia64/usr.bin/top/machine.c#6 integrate .. //depot/projects/ia64/usr.bin/top/top.local.1#2 integrate .. //depot/projects/ia64/usr.sbin/arp/arp.8#6 integrate .. //depot/projects/ia64/usr.sbin/arp/arp.c#13 integrate .. //depot/projects/ia64/usr.sbin/lpr/lpr/printcap.5#5 integrate .. //depot/projects/ia64/usr.sbin/mountd/mountd.c#7 integrate .. //depot/projects/ia64/usr.sbin/pccard/pccardc/enabler.c#2 integrate Differences ... ==== //depot/projects/ia64/MAINTAINERS#34 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.74 2003/07/15 16:52:08 dwmalone Exp $ +$FreeBSD: src/MAINTAINERS,v 1.75 2003/07/19 00:17:36 markm Exp $ subsystem login notes ----------------------------- @@ -13,9 +13,8 @@ NEWCARD imp Pre-commit review requested. OLDCARD imp Pre-commit review requested. wi imp Pre-commit review requested. -telnet markm commits _must_ be made to src/crypto/telnet - first, only then to "base" telnet via "make - unifdef". The "base" commit _must_ be made. +telnet markm please ensure that a security-aware person + sanity-checks your work. secure/* markm please ensure that a security-aware person sanity-checks your work. kerberos5/* markm please ensure that a security-aware person ==== //depot/projects/ia64/Makefile#28 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.284 2003/07/04 17:35:26 ru Exp $ +# $FreeBSD: src/Makefile,v 1.285 2003/07/19 23:17:08 ru Exp $ # # The user-driven targets are: # @@ -141,7 +141,7 @@ # upgrade_checks: @if ! (cd ${.CURDIR}/tools/regression/usr.bin/make && \ - PATH=${PATH} ${MAKE} >/dev/null 2>&1); \ + PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \ then \ (cd ${.CURDIR} && make make); \ fi ==== //depot/projects/ia64/bin/setfacl/setfacl.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.7 2002/12/30 15:36:29 rwatson Exp $"); +__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.8 2003/07/18 16:00:26 rwatson Exp $"); #include #include @@ -153,7 +153,7 @@ entry = zmalloc(sizeof(struct sf_entry)); entry->acl = acl_from_text(optarg); if (entry->acl == NULL) - err(1, "acl_from_text() failed"); + err(1, "%s", optarg); entry->op = OP_MERGE_ACL; TAILQ_INSERT_TAIL(&entrylist, entry, next); break; @@ -164,7 +164,7 @@ entry = zmalloc(sizeof(struct sf_entry)); entry->acl = acl_from_text(optarg); if (entry->acl == NULL) - err(1, "acl_from_text() failed"); + err(1, "%s", optarg); entry->op = OP_REMOVE_ACL; TAILQ_INSERT_TAIL(&entrylist, entry, next); break; ==== //depot/projects/ia64/contrib/top/commands.c#3 (text+ko) ==== @@ -8,7 +8,7 @@ * Copyright (c) 1984, 1989, William LeFebvre, Rice University * Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University * - * $FreeBSD: src/contrib/top/commands.c,v 1.5 2002/01/24 17:52:26 dwmalone Exp $ + * $FreeBSD: src/contrib/top/commands.c,v 1.6 2003/07/17 23:56:40 julian Exp $ */ /* @@ -71,6 +71,7 @@ d - change number of displays to show\n\ e - list errors generated by last \"kill\" or \"renice\" command\n\ i - toggle the displaying of idle processes\n\ +H - toggle the displaying of threads\n\ I - same as 'i'\n\ k - kill processes; send a signal to a list of processes\n\ n or # - change number of processes to display\n", stdout); ==== //depot/projects/ia64/contrib/top/machine.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/contrib/top/machine.h,v 1.5 2002/01/24 17:58:42 dwmalone Exp $ + * $FreeBSD: src/contrib/top/machine.h,v 1.6 2003/07/17 23:56:40 julian Exp $ */ /* @@ -59,6 +59,7 @@ int idle; /* show idle processes */ int self; /* show self */ int system; /* show system processes */ + int thread; /* show threads */ int uid; /* only this uid (unless uid == -1) */ char *command; /* only this command (unless == NULL) */ }; ==== //depot/projects/ia64/contrib/top/top.c#4 (text+ko) ==== @@ -13,7 +13,7 @@ * Copyright (c) 1994, 1995, William LeFebvre, Argonne National Laboratory * Copyright (c) 1996, William LeFebvre, Group sys Consulting * - * $FreeBSD: src/contrib/top/top.c,v 1.9 2002/01/24 17:55:40 dwmalone Exp $ + * $FreeBSD: src/contrib/top/top.c,v 1.10 2003/07/17 23:56:40 julian Exp $ */ /* @@ -192,9 +192,9 @@ fd_set readfds; #ifdef ORDER - static char command_chars[] = "\f qh?en#sdkriIuto"; + static char command_chars[] = "\f qh?en#sdkriIutHo"; #else - static char command_chars[] = "\f qh?en#sdkriIut"; + static char command_chars[] = "\f qh?en#sdkriIutH"; #endif /* these defines enumerate the "strchr"s of the commands in command_chars */ #define CMD_redraw 0 @@ -214,8 +214,9 @@ #define CMD_idletog2 13 #define CMD_user 14 #define CMD_selftog 15 +#define CMD_thrtog 16 #ifdef ORDER -#define CMD_order 16 +#define CMD_order 17 #endif /* set the buffer for stdout */ @@ -245,6 +246,7 @@ ps.self = -1; ps.system = No; ps.uid = -1; + ps.thread = No; ps.command = NULL; /* get preset options from the environment */ @@ -270,7 +272,7 @@ optind = 1; } - while ((i = getopt(ac, av, "SIbinquvs:d:U:o:t")) != EOF) + while ((i = getopt(ac, av, "SIHbinquvs:d:U:o:t")) != EOF) { switch(i) { @@ -365,10 +367,14 @@ ps.self = (ps.self == -1) ? getpid() : -1; break; + case 'H': + ps.thread = !ps.thread; + break; + default: fprintf(stderr, "\ Top version %s\n\ -Usage: %s [-ISbinqut] [-d x] [-s x] [-o field] [-U username] [number]\n", +Usage: %s [-HISbinqut] [-d x] [-s x] [-o field] [-U username] [number]\n", version_string(), myname); exit(1); } @@ -955,6 +961,13 @@ } break; + case CMD_thrtog: + ps.thread = !ps.thread; + new_message(MT_standout | MT_delayed, + " %sisplaying threads.", + ps.thread ? "D" : "Not d"); + putchar('\r'); + break; #ifdef ORDER case CMD_order: new_message(MT_standout, ==== //depot/projects/ia64/etc/defaults/pccard.conf#21 (text+ko) ==== @@ -1,7 +1,7 @@ # # Default PCCARD configuration file # -# $FreeBSD: src/etc/defaults/pccard.conf,v 1.260 2003/04/10 17:16:01 shiba Exp $ +# $FreeBSD: src/etc/defaults/pccard.conf,v 1.261 2003/07/19 05:40:06 imp Exp $ # # Please send new entries for this file to imp@freebsd.org. He likes to # review them before they are committed to make sure they are correct for @@ -544,6 +544,12 @@ insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop +# D-Link DFE-670 Fast Ethernet Card +card "D-Link" "DFE-670TXD" + config auto "ed" ? 0x80010 + insert /etc/pccard_ether $device start + remove /etc/pccard_ether $device stop + # D-Link DME-560T LAN/FAX/MODEM Card (as Ethernet) card "D-Link" "DME560T" config default "ed" ? ==== //depot/projects/ia64/kerberos5/Makefile.inc#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/Makefile.inc,v 1.18 2003/07/16 20:59:13 markm Exp $ +# $FreeBSD: src/kerberos5/Makefile.inc,v 1.19 2003/07/18 13:21:55 markm Exp $ DISTRIBUTION?= crypto NOLINT= true @@ -63,51 +63,51 @@ COMPILE_ET= compile_et -.ORDER: asn1_err.c asn1_err.h -asn1_err.c asn1_err.h: ${KRB5DIR}/lib/asn1/asn1_err.et +.ORDER: asn1_err.c ${.OBJDIR}/asn1_err.h +asn1_err.c ${.OBJDIR}/asn1_err.h: ${KRB5DIR}/lib/asn1/asn1_err.et test -e ${.OBJDIR}/asn1_err.et || ln -sf ${.ALLSRC} ${COMPILE_ET} asn1_err.et CLEANFILES+=asn1_err.h asn1_err.c asn1_err.et -.ORDER: hdb_err.c hdb_err.h -hdb_err.c hdb_err.h: ${KRB5DIR}/lib/hdb/hdb_err.et +.ORDER: hdb_err.c ${.OBJDIR}/hdb_err.h +hdb_err.c ${.OBJDIR}/hdb_err.h: ${KRB5DIR}/lib/hdb/hdb_err.et test -e ${.OBJDIR}/hdb_err.et || ln -sf ${.ALLSRC} ${COMPILE_ET} hdb_err.et CLEANFILES+=hdb_err.h hdb_err.c hdb_err.et -.ORDER: heim_err.c heim_err.h -heim_err.c heim_err.h: ${KRB5DIR}/lib/krb5/heim_err.et +.ORDER: heim_err.c ${.OBJDIR}/heim_err.h +heim_err.c ${.OBJDIR}/heim_err.h: ${KRB5DIR}/lib/krb5/heim_err.et test -e ${.OBJDIR}/heim_err.et || ln -sf ${.ALLSRC} ${COMPILE_ET} heim_err.et CLEANFILES+=heim_err.h heim_err.c heim_err.et -.ORDER: krb5_err.c krb5_err.h -krb5_err.c krb5_err.h: ${KRB5DIR}/lib/krb5/krb5_err.et +.ORDER: krb5_err.c ${.OBJDIR}/krb5_err.h +krb5_err.c ${.OBJDIR}/krb5_err.h: ${KRB5DIR}/lib/krb5/krb5_err.et test -e ${.OBJDIR}/krb5_err.et || ln -sf ${.ALLSRC} ${COMPILE_ET} krb5_err.et CLEANFILES+=krb5_err.h krb5_err.c krb5_err.et -.ORDER: kadm5_err.c kadm5_err.h -kadm5_err.c kadm5_err.h: \ +.ORDER: kadm5_err.c ${.OBJDIR}/kadm5_err.h +kadm5_err.c ${.OBJDIR}/kadm5_err.h: \ ${KRB5DIR}/lib/kadm5/kadm5_err.et test -e ${.OBJDIR}/kadm5_err.et || ln -sf ${.ALLSRC} ${COMPILE_ET} kadm5_err.et CLEANFILES+=kadm5_err.h kadm5_err.c kadm5_err.et -.ORDER: k524_err.c k524_err.h -k524_err.c k524_err.h: \ +.ORDER: k524_err.c ${.OBJDIR}/k524_err.h +k524_err.c ${.OBJDIR}/k524_err.h: \ ${KRB5DIR}/lib/krb5/k524_err.et test -e ${.OBJDIR}/k524_err.et || ln -sf ${.ALLSRC} ${COMPILE_ET} k524_err.et CLEANFILES+=k524_err.h k524_err.c k524_err.et -roken.h: make-roken +${.OBJDIR}/roken.h: make-roken ./make-roken > tmp.h ;\ if [ -f roken.h ] && cmp -s tmp.h roken.h ; then rm -f tmp.h ; \ else rm -f roken.h; mv tmp.h roken.h; fi ==== //depot/projects/ia64/kerberos5/lib/libasn1/Makefile#8 (text+ko) ==== @@ -1,14 +1,25 @@ -# $FreeBSD: src/kerberos5/lib/libasn1/Makefile,v 1.18 2003/04/05 20:30:29 imp Exp $ +# $FreeBSD: src/kerberos5/lib/libasn1/Makefile,v 1.19 2003/07/18 13:21:55 markm Exp $ LIB= asn1 -CFLAGS+=-I${KRB5DIR}/include \ - -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/roken \ - -I${INCLUDEOBJDIR} \ + +SRCS= \ + der_get.c \ + der_put.c \ + der_free.c \ + der_length.c \ + der_copy.c \ + timegm.c \ + asn1_err.c \ + ${.OBJDIR}/asn1_err.h \ + ${.OBJDIR}/krb5_asn1.h \ + ${.OBJDIR}/roken.h \ + ${GEN:S/.x/.c/g} + +CFLAGS+=-I${KRB5DIR}/include \ + -I${KRB5DIR}/lib/asn1 \ + -I${KRB5DIR}/lib/roken \ + -I${INCLUDEOBJDIR} \ -I${.OBJDIR} -SRCS= der_get.c der_put.c der_free.c der_length.c der_copy.c \ - timegm.c asn1_err.c asn1_err.h krb5_asn1.h roken.h \ - ${GEN:S/.x/.c/g} GEN= \ asn1_APOptions.x \ @@ -63,7 +74,7 @@ asn1_TransitedEncoding.x \ asn1_UNSIGNED.x -INCS= krb5_asn1.h asn1_err.h +INCS= ${.OBJDIR}/krb5_asn1.h ${.OBJDIR}/asn1_err.h .include @@ -71,7 +82,7 @@ .PATH: ${KRB5DIR}/lib/vers .PATH: ${KRB5DIR}/lib/roken -beforedepend all: roken.h +beforedepend all: ${.OBJDIR}/roken.h .for I in ${GEN} ${I:S/.x/.c/}: ${I} @@ -80,7 +91,7 @@ CLEANFILES+= ${GEN:S/.x/.c/g} krb5_asn1.h asn1_files -${GEN} krb5_asn1.h: asn1_compile k5.asn1 +${GEN} ${.OBJDIR}/krb5_asn1.h: asn1_compile k5.asn1 ./asn1_compile ${KRB5DIR}/lib/asn1/k5.asn1 krb5_asn1 build-tools: make-print-version make-roken asn1_compile @@ -101,25 +112,26 @@ symbol.c \ getarg.c \ warnerr.c \ - print_version.o \ + ${.OBJDIR}/print_version.o \ get_window_size.c \ strupr.c ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.OODATE} ${LDADD} -parse.o: parse.c roken.h +${.OBJDIR}/parse.o: ${.OBJDIR}/parse.c ${.OBJDIR}/roken.h -.ORDER: parse.c parse.h -parse.h parse.c: parse.y +.ORDER: ${.OBJDIR}/parse.c ${.OBJDIR}/parse.h +${.OBJDIR}/parse.h ${.OBJDIR}/parse.c: parse.y ${YACC} -d ${.OODATE} cp y.tab.c parse.c cp y.tab.h parse.h -lex.o: lex.l parse.h roken.h +lex.o: lex.l ${.OBJDIR}/parse.h ${.OBJDIR}/roken.h -print_version.o: print_version.h print_version.c roken.h +${.OBJDIR}/print_version.o: ${.OBJDIR}/print_version.h print_version.c \ + ${.OBJDIR}/roken.h ${CC} ${CFLAGS} -c -o ${.TARGET} ${KRB5DIR}/lib/vers/print_version.c -print_version.h: make-print-version +${.OBJDIR}/print_version.h: make-print-version ./make-print-version print_version.h make-print-version: make-print-version.c ==== //depot/projects/ia64/kerberos5/lib/libgssapi/Makefile#4 (text+ko) ==== @@ -1,56 +1,63 @@ -# $FreeBSD: src/kerberos5/lib/libgssapi/Makefile,v 1.4 2002/05/12 16:00:49 ru Exp $ +# $FreeBSD: src/kerberos5/lib/libgssapi/Makefile,v 1.5 2003/07/18 13:21:55 markm Exp $ LIB= gssapi -CFLAGS+=-I${KRB5DIR}/lib/gssapi \ - -I${KRB5DIR}/lib/krb5 \ - -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/lib/des \ - -I${KRB5DIR}/include \ - -I${ASN1OBJDIR} \ + +SRCS= \ + 8003.c \ + accept_sec_context.c \ + acquire_cred.c \ + add_oid_set_member.c \ + canonicalize_name.c \ + compare_name.c \ + context_time.c \ + copy_ccache.c \ + create_emtpy_oid_set.c \ + decapsulate.c \ + delete_sec_context.c \ + display_name.c \ + display_status.c \ + duplicate_name.c \ + encapsulate.c \ + export_sec_context.c \ + export_name.c \ + external.c \ + get_mic.c \ + gssapi.h \ + gssapi_locl.h \ + import_name.c \ + import_sec_context.c \ + indicate_mechs.c \ + init.c \ + init_sec_context.c \ + inquire_context.c \ + inquire_cred.c \ + release_buffer.c \ + release_cred.c \ + release_name.c \ + release_oid_set.c \ + test_oid_set_member.c \ + unwrap.c \ + v1.c \ + verify_mic.c \ + wrap.c \ + address_to_krb5addr.c \ + ${.OBJDIR}/heim_err.h \ + ${.OBJDIR}/krb5_err.h \ + ${.OBJDIR}/k524_err.h + +CFLAGS+=-I${KRB5DIR}/lib/gssapi \ + -I${KRB5DIR}/lib/krb5 \ + -I${KRB5DIR}/lib/asn1 \ + -I${KRB5DIR}/lib/roken \ + -I${KRB5DIR}/lib/des \ + -I${KRB5DIR}/include \ + -I${ASN1OBJDIR} \ -I${.OBJDIR} -SRCS= \ - 8003.c \ - accept_sec_context.c \ - acquire_cred.c \ - add_oid_set_member.c \ - canonicalize_name.c \ - compare_name.c \ - context_time.c \ - copy_ccache.c \ - create_emtpy_oid_set.c \ - decapsulate.c \ - delete_sec_context.c \ - display_name.c \ - display_status.c \ - duplicate_name.c \ - encapsulate.c \ - export_sec_context.c \ - export_name.c \ - external.c \ - get_mic.c \ - gssapi.h \ - gssapi_locl.h \ - import_name.c \ - import_sec_context.c \ - indicate_mechs.c \ - init.c \ - init_sec_context.c \ - inquire_context.c \ - inquire_cred.c \ - release_buffer.c \ - release_cred.c \ - release_name.c \ - release_oid_set.c \ - test_oid_set_member.c \ - unwrap.c \ - v1.c \ - verify_mic.c \ - wrap.c \ - address_to_krb5addr.c - -INCS= gssapi.h heim_err.h krb5_err.h k524_err.h +INCS= gssapi.h \ + ${.OBJDIR}/heim_err.h \ + ${.OBJDIR}/krb5_err.h \ + ${.OBJDIR}/k524_err.h .include ==== //depot/projects/ia64/kerberos5/lib/libhdb/Makefile#9 (text+ko) ==== @@ -1,40 +1,41 @@ -# $FreeBSD: src/kerberos5/lib/libhdb/Makefile,v 1.12 2003/06/18 09:11:33 mr Exp $ +# $FreeBSD: src/kerberos5/lib/libhdb/Makefile,v 1.13 2003/07/18 13:21:55 markm Exp $ LIB= hdb -CFLAGS+=-I${KRB5DIR}/include \ - -I${INCLUDEOBJDIR} \ - -I${KRB5DIR}/lib/krb5 \ - -I${KRB5DIR}/lib/hdb \ - -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/roken \ - -I${.OBJDIR} \ - -I${ASN1OBJDIR} \ - ${LDAPCFLAGS} SRCS= \ - common.c \ - db.c \ - db3.c \ - hdb-ldap.c \ - hdb.c \ - keytab.c \ - mkey.c \ - ndbm.c \ - print.c \ - hdb_err.c \ - hdb_err.h \ - hdb_asn1.h \ - k524_err.h \ - krb5_err.h \ - heim_err.h \ + common.c \ + db.c \ + db3.c \ + hdb-ldap.c \ + hdb.c \ + keytab.c \ + mkey.c \ + ndbm.c \ + print.c \ + hdb_err.c \ + ${.OBJDIR}/hdb_err.h \ + ${.OBJDIR}/hdb_asn1.h \ + ${.OBJDIR}/k524_err.h \ + ${.OBJDIR}/krb5_err.h \ + ${.OBJDIR}/heim_err.h \ ${GEN:S/.x/.c/g} -GEN= \ - asn1_Key.x \ - asn1_GENERATION.x \ - asn1_Event.x \ - asn1_HDBFlags.x \ - asn1_hdb_entry.x \ +CFLAGS+=-I${KRB5DIR}/include \ + -I${INCLUDEOBJDIR} \ + -I${KRB5DIR}/lib/krb5 \ + -I${KRB5DIR}/lib/hdb \ + -I${KRB5DIR}/lib/asn1 \ + -I${KRB5DIR}/lib/roken \ + -I${.OBJDIR} \ + -I${ASN1OBJDIR} \ + ${LDAPCFLAGS} + +GEN= \ + asn1_Key.x \ + asn1_GENERATION.x \ + asn1_Event.x \ + asn1_HDBFlags.x \ + asn1_hdb_entry.x \ asn1_Salt.x .include @@ -53,7 +54,7 @@ CLEANFILES+= ${GEN:S/.x/.c/g} hdb_asn1.h asn1_files -${GEN} hdb_asn1.h: asn1_compile hdb.asn1 +${GEN} ${.OBJDIR}/hdb_asn1.h: asn1_compile hdb.asn1 ./asn1_compile ${KRB5DIR}/lib/hdb/hdb.asn1 hdb_asn1 asn1_compile: parse.o lex.o main.c hash.c symbol.c emalloc.c gen.c \ ==== //depot/projects/ia64/kerberos5/lib/libkadm5clnt/Makefile#2 (text+ko) ==== @@ -1,39 +1,40 @@ -# $FreeBSD: src/kerberos5/lib/libkadm5clnt/Makefile,v 1.3 2001/02/14 19:47:15 markm Exp $ +# $FreeBSD: src/kerberos5/lib/libkadm5clnt/Makefile,v 1.4 2003/07/18 13:21:55 markm Exp $ LIB= kadm5clnt -CFLAGS+=-I${KRB5DIR}/include \ - -I${KRB5DIR}/lib/krb5 \ - -I${KRB5DIR}/lib/kadm5 \ - -I${KRB5DIR}/lib/hdb \ - -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/roken \ - -I${ASN1OBJDIR} \ - -I${HDBOBJDIR} \ - -I${.OBJDIR} SRCS= \ - admin.h \ - chpass_c.c \ - common_glue.c \ - create_c.c \ - delete_c.c \ - destroy_c.c \ - flush_c.c \ - free.c \ - get_c.c \ - get_princs_c.c \ - init_c.c \ - kadm5_err.c \ - kadm5_err.h \ - kadm5_locl.h \ - marshall.c \ - modify_c.c \ - private.h \ - privs_c.c \ - randkey_c.c \ - rename_c.c \ - send_recv.c \ - client_glue.c + chpass_c.c \ + common_glue.c \ + create_c.c \ + delete_c.c \ + destroy_c.c \ + flush_c.c \ + free.c \ + get_c.c \ + get_princs_c.c \ + init_c.c \ + kadm5_err.c \ + marshall.c \ + modify_c.c \ + privs_c.c \ + randkey_c.c \ + rename_c.c \ + send_recv.c \ + client_glue.c \ + admin.h \ + private.h \ + kadm5_locl.h \ + ${.OBJDIR}/kadm5_err.h + +CFLAGS+=-I${KRB5DIR}/include \ + -I${KRB5DIR}/lib/krb5 \ + -I${KRB5DIR}/lib/kadm5 \ + -I${KRB5DIR}/lib/hdb \ + -I${KRB5DIR}/lib/asn1 \ + -I${KRB5DIR}/lib/roken \ + -I${ASN1OBJDIR} \ + -I${HDBOBJDIR} \ + -I${.OBJDIR} .include ==== //depot/projects/ia64/kerberos5/lib/libkadm5srv/Makefile#2 (text+ko) ==== @@ -1,48 +1,49 @@ -# $FreeBSD: src/kerberos5/lib/libkadm5srv/Makefile,v 1.3 2001/02/14 19:47:18 markm Exp $ +# $FreeBSD: src/kerberos5/lib/libkadm5srv/Makefile,v 1.4 2003/07/18 13:21:55 markm Exp $ LIB= kadm5srv -CFLAGS+=-I${KRB5DIR}/include \ - -I${KRB5DIR}/lib/krb5 \ - -I${KRB5DIR}/lib/kadm5 \ - -I${KRB5DIR}/lib/hdb \ - -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/roken \ - -I${ASN1OBJDIR} \ - -I${HDBOBJDIR} \ - -I${.OBJDIR} SRCS= \ - acl.c \ - admin.h \ - bump_pw_expire.c \ - chpass_s.c \ - common_glue.c \ - context_s.c \ - create_s.c \ - delete_s.c \ - destroy_s.c \ - ent_setup.c \ - error.c \ - flush_s.c \ - free.c \ - get_princs_s.c \ - get_s.c \ - init_s.c \ - kadm5_err.c \ - kadm5_err.h \ - kadm5_locl.h \ - keys.c \ - log.c \ - marshall.c \ - modify_s.c \ - private.h \ - privs_s.c \ - randkey_s.c \ - rename_s.c \ - set_keys.c \ - set_modifier.c \ - password_quality.c \ - server_glue.c + acl.c \ + bump_pw_expire.c \ + chpass_s.c \ + common_glue.c \ + context_s.c \ + create_s.c \ + delete_s.c \ + destroy_s.c \ + ent_setup.c \ + error.c \ + flush_s.c \ + free.c \ + get_princs_s.c \ + get_s.c \ + init_s.c \ + kadm5_err.c \ + keys.c \ + log.c \ + marshall.c \ + modify_s.c \ + privs_s.c \ + randkey_s.c \ + rename_s.c \ + set_keys.c \ + set_modifier.c \ + password_quality.c \ + server_glue.c \ + admin.h \ + kadm5_locl.h \ + private.h \ + ${.OBJDIR}/kadm5_err.h + +CFLAGS+=-I${KRB5DIR}/include \ + -I${KRB5DIR}/lib/krb5 \ + -I${KRB5DIR}/lib/kadm5 \ + -I${KRB5DIR}/lib/hdb \ + -I${KRB5DIR}/lib/asn1 \ + -I${KRB5DIR}/lib/roken \ + -I${ASN1OBJDIR} \ + -I${HDBOBJDIR} \ + -I${.OBJDIR} .include ==== //depot/projects/ia64/kerberos5/lib/libkrb5/Makefile#6 (text+ko) ==== @@ -1,148 +1,154 @@ -# $FreeBSD: src/kerberos5/lib/libkrb5/Makefile,v 1.12 2003/03/09 21:56:51 markm Exp $ +# $FreeBSD: src/kerberos5/lib/libkrb5/Makefile,v 1.13 2003/07/18 13:21:55 markm Exp $ LIB= krb5 -CFLAGS+=-I${KRB5DIR}/lib/krb5 \ - -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/des \ - -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/include \ - -I${KRB5OBJDIR} \ + +SRCS= \ + acl.c \ + add_et_list.c \ + addr_families.c \ + aname_to_localname.c \ + appdefault.c \ + asn1_glue.c \ + auth_context.c \ + build_ap_req.c \ + build_auth.c \ + cache.c \ + changepw.c \ + codec.c \ + config_file.c \ + config_file_netinfo.c \ + convert_creds.c \ + constants.c \ + context.c \ + copy_host_realm.c \ + crc.c \ + creds.c \ + crypto.c \ + data.c \ + eai_to_heim_errno.c \ + error_string.c \ + expand_hostname.c \ + fcache.c \ + free.c \ + free_host_realm.c \ + generate_seq_number.c \ + generate_subkey.c \ + get_addrs.c \ + get_cred.c \ + get_default_principal.c \ + get_default_realm.c \ + get_for_creds.c \ + get_host_realm.c \ + get_in_tkt.c \ + get_in_tkt_pw.c \ + get_in_tkt_with_keytab.c \ + get_in_tkt_with_skey.c \ + get_port.c \ + init_creds.c \ + init_creds_pw.c \ + keyblock.c \ + keytab.c \ + keytab_any.c \ + keytab_file.c \ + keytab_memory.c \ + keytab_keyfile.c \ + keytab_krb4.c \ + krbhst.c \ + kuserok.c \ + log.c \ + mcache.c \ + misc.c \ + mk_error.c \ + mk_priv.c \ + mk_rep.c \ >>> TRUNCATED FOR MAIL (1000 lines) <<<