From owner-p4-projects@FreeBSD.ORG Mon Mar 26 08:09:36 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5BB2816A408; Mon, 26 Mar 2007 08:09:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 31DD416A406 for ; Mon, 26 Mar 2007 08:09:36 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1FF5213C4B7 for ; Mon, 26 Mar 2007 08:09:36 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2Q89atD004527 for ; Mon, 26 Mar 2007 08:09:36 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2Q89Qvj004203 for perforce@freebsd.org; Mon, 26 Mar 2007 08:09:26 GMT (envelope-from piso@freebsd.org) Date: Mon, 26 Mar 2007 08:09:26 GMT Message-Id: <200703260809.l2Q89Qvj004203@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 116563 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Mar 2007 08:09:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=116563 Change 116563 by piso@piso_newluxor on 2007/03/26 08:08:40 IFC@116561 Affected files ... .. //depot/projects/soc2006/intr_filter/Makefile#5 integrate .. //depot/projects/soc2006/intr_filter/amd64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/acpica/madt.c#4 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/identcpu.c#4 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/io_apic.c#5 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/legacy.c#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/local_apic.c#9 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/mptable.c#3 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/nexus.c#7 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/pmap.c#13 integrate .. //depot/projects/soc2006/intr_filter/amd64/conf/NOTES#7 integrate .. //depot/projects/soc2006/intr_filter/amd64/include/acpica_machdep.h#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/include/apicvar.h#6 integrate .. //depot/projects/soc2006/intr_filter/amd64/include/pcpu.h#3 integrate .. //depot/projects/soc2006/intr_filter/amd64/include/specialreg.h#4 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/cpufunc_asm_arm9.S#2 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/at91_twi.c#7 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/at91_twireg.h#2 integrate .. //depot/projects/soc2006/intr_filter/arm/conf/KB920X#6 integrate .. //depot/projects/soc2006/intr_filter/arm/conf/KB920X.hints#1 branch .. //depot/projects/soc2006/intr_filter/arm/include/bootconfig.h#2 integrate .. //depot/projects/soc2006/intr_filter/arm/include/cpufunc.h#4 integrate .. //depot/projects/soc2006/intr_filter/arm/include/pcpu.h#2 integrate .. //depot/projects/soc2006/intr_filter/arm/include/undefined.h#2 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/ixp425/avila_ata.c#3 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/ixp425/ixp425.c#4 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/ixp425/ixp425reg.h#2 integrate .. //depot/projects/soc2006/intr_filter/boot/arm/at91/bootspi/loader_prompt.c#3 integrate .. //depot/projects/soc2006/intr_filter/boot/arm/at91/libat91/Makefile#5 integrate .. //depot/projects/soc2006/intr_filter/boot/ficl/ficl.h#2 integrate .. //depot/projects/soc2006/intr_filter/boot/ficl/float.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/ficl/softwords/fileaccess.fr#2 integrate .. //depot/projects/soc2006/intr_filter/boot/ficl/softwords/jhlocal.fr#2 integrate .. //depot/projects/soc2006/intr_filter/boot/ficl/softwords/oo.fr#2 integrate .. //depot/projects/soc2006/intr_filter/boot/ficl/softwords/prefix.fr#2 integrate .. //depot/projects/soc2006/intr_filter/boot/ficl/softwords/softcore.awk#2 integrate .. //depot/projects/soc2006/intr_filter/boot/ficl/tools.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/ficl/unix.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/ficl/vm.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/ficl/words.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/i386/libi386/biosacpi.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/ia64/ski/acpi_stub.c#3 integrate .. //depot/projects/soc2006/intr_filter/boot/pc98/boot0.5/boot.s#2 integrate .. //depot/projects/soc2006/intr_filter/boot/pc98/boot0.5/boot0.5.s#2 integrate .. //depot/projects/soc2006/intr_filter/boot/pc98/boot0.5/disk.s#2 integrate .. //depot/projects/soc2006/intr_filter/cam/cam_xpt.c#9 integrate .. //depot/projects/soc2006/intr_filter/coda/coda_vnops.c#3 integrate .. //depot/projects/soc2006/intr_filter/compat/linprocfs/linprocfs.c#10 integrate .. //depot/projects/soc2006/intr_filter/compat/linsysfs/linsysfs.c#3 integrate .. //depot/projects/soc2006/intr_filter/conf/NOTES#16 integrate .. //depot/projects/soc2006/intr_filter/conf/files#16 integrate .. //depot/projects/soc2006/intr_filter/conf/kern.post.mk#7 integrate .. //depot/projects/soc2006/intr_filter/conf/kmod.mk#8 integrate .. //depot/projects/soc2006/intr_filter/conf/options#15 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/CHANGES.txt#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/acapps.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/acconfig.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/acdebug.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/acdisasm.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/acdispat.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/acefi.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/acenv.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/acevents.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/acexcep.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/acfreebsd.h#3 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/acgcc.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/acglobal.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/achware.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/acinterp.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/aclocal.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/acmacros.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/acnames.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/acnamesp.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/acobject.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/acopcode.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/acoutput.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/acparser.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/acpi.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/acpica_prep.sh#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/acpiosxf.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/acpixf.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/acresrc.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/acstruct.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/actables.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/actbl.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/actbl1.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/actbl2.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/actypes.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/acutils.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/aecommon.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/aeexec.c#2 delete .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/amlcode.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/amlresrc.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/common/adfile.c#1 branch .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/common/adisasm.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/common/adwalk.c#1 branch .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/common/dmrestag.c#1 branch .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/common/dmtable.c#1 branch .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/common/dmtbdump.c#1 branch .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/common/dmtbinfo.c#1 branch .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/common/getopt.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/compiler/aslanalyze.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/compiler/aslcodegen.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/compiler/aslcompile.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/compiler/aslcompiler.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/compiler/aslcompiler.l#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/compiler/asldefine.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/compiler/aslerror.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/compiler/aslfiles.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/compiler/aslfold.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/compiler/aslglobal.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/compiler/asllength.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/compiler/asllisting.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/compiler/aslload.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/compiler/asllookup.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/compiler/aslmain.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/compiler/aslmap.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/compiler/aslopcodes.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/compiler/asloperands.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/compiler/aslopt.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/compiler/aslresource.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/compiler/aslrestype1.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/compiler/aslrestype2.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/compiler/aslstubs.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/compiler/asltransform.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/compiler/asltree.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/compiler/asltypes.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/compiler/aslutils.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/dbcmds.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/dbdisply.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/dbexec.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/dbfileio.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/dbhistry.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/dbinput.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/dbstats.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/dbutils.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/dbxface.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/dmbuffer.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/dmnames.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/dmobject.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/dmopcode.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/dmresrc.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/dmresrcl.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/dmresrcs.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/dmutils.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/dmwalk.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/dsfield.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/dsinit.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/dsmethod.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/dsmthdat.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/dsobject.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/dsopcode.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/dsutils.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/dswexec.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/dswload.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/dswscope.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/dswstate.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/evevent.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/evgpe.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/evgpeblk.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/evmisc.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/evregion.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/evrgnini.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/evsci.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/evxface.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/evxfevnt.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/evxfregn.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/exconfig.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/exconvrt.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/excreate.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/exdump.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/exfield.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/exfldio.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/exmisc.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/exmutex.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/exnames.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/exoparg1.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/exoparg2.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/exoparg3.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/exoparg6.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/exprep.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/exregion.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/exresnte.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/exresolv.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/exresop.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/exstore.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/exstoren.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/exstorob.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/exsystem.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/exutils.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/hwacpi.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/hwgpe.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/hwregs.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/hwsleep.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/hwtimer.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/nsaccess.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/nsalloc.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/nsdump.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/nsdumpdv.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/nseval.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/nsinit.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/nsload.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/nsnames.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/nsobject.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/nsparse.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/nssearch.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/nsutils.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/nswalk.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/nsxfeval.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/nsxfname.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/nsxfobj.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/osunixxf.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/psargs.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/psloop.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/psopcode.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/psparse.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/psscope.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/pstree.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/psutils.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/pswalk.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/psxface.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/rsaddr.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/rscalc.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/rscreate.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/rsdump.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/rsinfo.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/rsio.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/rsirq.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/rslist.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/rsmemory.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/rsmisc.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/rsutils.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/rsxface.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/tbconvrt.c#2 delete .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/tbfadt.c#1 branch .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/tbfind.c#1 branch .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/tbget.c#2 delete .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/tbgetall.c#2 delete .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/tbinstal.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/tbrsdt.c#2 delete .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/tbutils.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/tbxface.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/tbxfroot.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/utalloc.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/utcache.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/utclib.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/utcopy.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/utdebug.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/utdelete.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/uteval.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/utglobal.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/utinit.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/utmath.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/utmisc.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/utmutex.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/utobject.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/utresrc.c#1 branch .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/utstate.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/uttrack.c#1 branch .. //depot/projects/soc2006/intr_filter/contrib/dev/acpica/utxface.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/pf/net/if_pfsync.c#6 integrate .. //depot/projects/soc2006/intr_filter/contrib/pf/net/if_pfsync.h#2 integrate .. //depot/projects/soc2006/intr_filter/crypto/via/padlock.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/acpi_support/acpi_asus.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/acpi_support/acpi_fujitsu.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/acpi_support/acpi_ibm.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/Osd/OsdDebug.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/Osd/OsdMemory.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/Osd/OsdSchedule.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/Osd/OsdSynch.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/Osd/OsdTable.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpi.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpi_acad.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpi_button.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpi_cmbat.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpi_cpu.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpi_dock.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpi_ec.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpi_lid.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpi_pci_link.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpi_perf.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpi_quirk.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpi_resource.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpi_throttle.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpi_timer.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpivar.h#5 integrate .. //depot/projects/soc2006/intr_filter/dev/ar/if_ar.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/arcmsr/arcmsr.c#9 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/ata-chipset.c#14 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/ata-pci.h#10 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/ata-queue.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/atapi-cam.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/bge/if_bge.c#15 integrate .. //depot/projects/soc2006/intr_filter/dev/ce/if_ce.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/cm/smc90cx6.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/cp/if_cp.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/ctau/if_ct.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/cx/if_cx.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_ael1002.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_common.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_firmware_exports.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_mc5.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_mv88e1xxx.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_regs.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_sge_defs.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_t3_cpl.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_t3_hw.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_tcb.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_version.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_vsc8211.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_xgmac.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/cxgb/cxgb_adapter.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/cxgb/cxgb_config.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/cxgb/cxgb_ioctl.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/cxgb/cxgb_lro.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/cxgb/cxgb_main.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/cxgb/cxgb_osdep.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/cxgb/cxgb_sge.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/cxgb/t3fw-3.2.bin.gz.uu#1 branch .. //depot/projects/soc2006/intr_filter/dev/ed/if_ed.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/exca/exca.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/firewire/firewire.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/firewire/firewirereg.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/firewire/fwdev.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/firewire/fwmem.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/firewire/fwohci.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/firewire/fwohci_pci.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/firewire/fwohcivar.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/firewire/if_fwe.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/firewire/if_fwip.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/firewire/sbp.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/firewire/sbp_targ.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/hifn/hifn7751.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/hifn/hifn7751reg.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/hifn/hifn7751var.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ichwd/ichwd.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/if_ndis/if_ndis.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/iicbus/icee.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/iicbus/iic.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/iicbus/iicbb.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/iicbus/iicbus.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/iicbus/iicbus.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/iicbus/iiconf.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/ipw/if_ipw.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp.c#14 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_freebsd.c#11 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_freebsd.h#9 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_ioctl.h#4 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_library.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_library.h#4 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_pci.c#14 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_sbus.c#10 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_stds.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_target.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_target.h#5 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_tpublic.h#5 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/ispmbox.h#8 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/ispreg.h#5 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/ispvar.h#8 integrate .. //depot/projects/soc2006/intr_filter/dev/iwi/if_iwi.c#13 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/brgphy.c#8 integrate .. //depot/projects/soc2006/intr_filter/dev/mpt/mpt.h#9 integrate .. //depot/projects/soc2006/intr_filter/dev/mpt/mpt_cam.c#12 integrate .. //depot/projects/soc2006/intr_filter/dev/my/if_my.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/pcf/envctrl.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/pcf/pcf_ebus.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/pcf/pcf_isa.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/ppc/ppc.c#9 integrate .. //depot/projects/soc2006/intr_filter/dev/ral/rt2560.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/ral/rt2661.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/safe/safe.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/scc/scc_bfe.h#7 integrate .. //depot/projects/soc2006/intr_filter/dev/scc/scc_bfe_ebus.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/scc/scc_bfe_macio.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/scc/scc_bfe_sbus.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/scc/scc_core.c#17 integrate .. //depot/projects/soc2006/intr_filter/dev/snp/snp.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/isa/ad1816.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/isa/mss.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/isa/sbc.c#8 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/midi/midi.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/midi/sequencer.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/als4000.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/atiixp.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/cmi.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/csa.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/ds1.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/emu10k1.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/emu10kx-pcm.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/envy24.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/envy24ht.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/es137x.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/hda/hdac.c#9 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/hda/hdac_private.h#4 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/ich.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/maestro.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/maestro3.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/solo.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/t4dwave.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/via8233.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/via82c686.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/ac97.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/buffer.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/channel.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/channel_if.m#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/dsp.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/fake.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/feeder.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/feeder.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/feeder_fmt.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/feeder_rate.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/feeder_volume.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/sndstat.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/sound.c#8 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/sound.h#5 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/vchan.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/sbus/cs4231.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/usb/uaudio.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/usb/uaudio.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/usb/uaudio_pcm.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/sr/if_sr.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/ubsec/ubsec.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/if_ural.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/uplcom.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/usb_quirks.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/usbdevs#11 integrate .. //depot/projects/soc2006/intr_filter/dev/wl/if_wl.c#5 integrate .. //depot/projects/soc2006/intr_filter/fs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/projects/soc2006/intr_filter/fs/devfs/devfs_vnops.c#6 integrate .. //depot/projects/soc2006/intr_filter/fs/fdescfs/fdesc_vnops.c#2 integrate .. //depot/projects/soc2006/intr_filter/fs/hpfs/hpfs_vfsops.c#4 integrate .. //depot/projects/soc2006/intr_filter/fs/msdosfs/msdosfs_denode.c#3 integrate .. //depot/projects/soc2006/intr_filter/fs/ntfs/ntfs_vfsops.c#4 integrate .. //depot/projects/soc2006/intr_filter/fs/nullfs/null_subr.c#2 integrate .. //depot/projects/soc2006/intr_filter/fs/nwfs/nwfs_node.c#2 integrate .. //depot/projects/soc2006/intr_filter/fs/portalfs/portal_vfsops.c#3 integrate .. //depot/projects/soc2006/intr_filter/fs/portalfs/portal_vnops.c#4 integrate .. //depot/projects/soc2006/intr_filter/fs/procfs/procfs.c#3 integrate .. //depot/projects/soc2006/intr_filter/fs/pseudofs/pseudofs.c#2 integrate .. //depot/projects/soc2006/intr_filter/fs/pseudofs/pseudofs.h#2 integrate .. //depot/projects/soc2006/intr_filter/fs/pseudofs/pseudofs_vncache.c#3 integrate .. //depot/projects/soc2006/intr_filter/fs/smbfs/smbfs_node.c#3 integrate .. //depot/projects/soc2006/intr_filter/fs/udf/udf_vfsops.c#8 integrate .. //depot/projects/soc2006/intr_filter/fs/udf/udf_vnops.c#5 integrate .. //depot/projects/soc2006/intr_filter/fs/umapfs/umap_subr.c#2 integrate .. //depot/projects/soc2006/intr_filter/fs/unionfs/union_subr.c#4 integrate .. //depot/projects/soc2006/intr_filter/geom/eli/g_eli.c#8 integrate .. //depot/projects/soc2006/intr_filter/geom/eli/g_eli_crypto.c#2 integrate .. //depot/projects/soc2006/intr_filter/geom/journal/g_journal.c#3 integrate .. //depot/projects/soc2006/intr_filter/gnu/fs/ext2fs/ext2_vfsops.c#6 integrate .. //depot/projects/soc2006/intr_filter/gnu/fs/reiserfs/reiserfs_inode.c#2 integrate .. //depot/projects/soc2006/intr_filter/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/acpica/acpi_machdep.c#4 integrate .. //depot/projects/soc2006/intr_filter/i386/acpica/acpi_wakeup.c#5 integrate .. //depot/projects/soc2006/intr_filter/i386/acpica/madt.c#4 integrate .. //depot/projects/soc2006/intr_filter/i386/bios/smapi.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/bios/smbios.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/bios/vpd.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/conf/NOTES#8 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/identcpu.c#6 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/io_apic.c#5 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/legacy.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/local_apic.c#9 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/locore.s#3 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/machdep.c#12 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/mptable.c#3 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/nexus.c#8 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/pmap.c#12 integrate .. //depot/projects/soc2006/intr_filter/i386/include/acpica_machdep.h#2 integrate .. //depot/projects/soc2006/intr_filter/i386/include/apicvar.h#6 integrate .. //depot/projects/soc2006/intr_filter/i386/include/pcpu.h#3 integrate .. //depot/projects/soc2006/intr_filter/i386/include/pmap.h#4 integrate .. //depot/projects/soc2006/intr_filter/i386/include/specialreg.h#5 integrate .. //depot/projects/soc2006/intr_filter/ia64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/soc2006/intr_filter/ia64/acpica/madt.c#2 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia64/nexus.c#6 integrate .. //depot/projects/soc2006/intr_filter/ia64/include/acpica_machdep.h#2 integrate .. //depot/projects/soc2006/intr_filter/ia64/include/pcpu.h#3 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_acct.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_condvar.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_descrip.c#12 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_exec.c#7 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_exit.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_kse.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_lock.c#7 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_mutex.c#8 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_proc.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_rwlock.c#7 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_sig.c#10 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_sx.c#7 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_synch.c#10 integrate .. //depot/projects/soc2006/intr_filter/kern/sched_ule.c#12 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_witness.c#7 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_mqueue.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_sockbuf.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_socket.c#12 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_usrreq.c#11 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_bio.c#10 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_hash.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_mount.c#8 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_subr.c#9 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_syscalls.c#9 integrate .. //depot/projects/soc2006/intr_filter/modules/Makefile#13 integrate .. //depot/projects/soc2006/intr_filter/modules/acpi/Makefile#5 integrate .. //depot/projects/soc2006/intr_filter/modules/acpi/acpi/Makefile#3 integrate .. //depot/projects/soc2006/intr_filter/modules/crypto/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/cxgb/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/modules/hifn/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/if_edsc/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/modules/if_vlan/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/my/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/padlock/Makefile#3 integrate .. //depot/projects/soc2006/intr_filter/modules/safe/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/ubsec/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/net/bridgestp.c#9 integrate .. //depot/projects/soc2006/intr_filter/net/bridgestp.h#5 integrate .. //depot/projects/soc2006/intr_filter/net/if.c#10 integrate .. //depot/projects/soc2006/intr_filter/net/if_bridge.c#12 integrate .. //depot/projects/soc2006/intr_filter/net/if_edsc.c#1 branch .. //depot/projects/soc2006/intr_filter/net/if_ethersubr.c#9 integrate .. //depot/projects/soc2006/intr_filter/net/if_tap.c#6 integrate .. //depot/projects/soc2006/intr_filter/net/if_var.h#5 integrate .. //depot/projects/soc2006/intr_filter/net/if_vlan.c#10 integrate .. //depot/projects/soc2006/intr_filter/net/rtsock.c#5 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211.c#7 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_crypto.c#2 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_crypto.h#2 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_input.c#10 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_ioctl.c#7 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_node.c#6 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_node.h#2 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_output.c#8 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_proto.c#6 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_proto.h#5 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_radiotap.h#2 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_var.h#7 integrate .. //depot/projects/soc2006/intr_filter/netgraph/ng_base.c#3 integrate .. //depot/projects/soc2006/intr_filter/netgraph/ng_ether.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/if_ether.c#7 integrate .. //depot/projects/soc2006/intr_filter/netinet/in.c#5 integrate .. //depot/projects/soc2006/intr_filter/netinet/in_var.h#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_fastfwd.c#4 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_input.c#5 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_mroute.c#7 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_output.c#8 integrate .. //depot/projects/soc2006/intr_filter/netinet/raw_ip.c#6 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp.h#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_asconf.c#7 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_asconf.h#4 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_auth.c#5 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_auth.h#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_bsd_addr.c#4 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_bsd_addr.h#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_constants.h#6 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_header.h#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_indata.c#7 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_input.c#7 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_lock_bsd.h#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_os.h#5 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_os_bsd.h#6 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_output.c#7 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_output.h#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_pcb.c#7 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_pcb.h#5 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_peeloff.c#5 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_structs.h#7 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_sysctl.c#1 branch .. //depot/projects/soc2006/intr_filter/netinet/sctp_sysctl.h#1 branch .. //depot/projects/soc2006/intr_filter/netinet/sctp_timer.c#6 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_uio.h#6 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_usrreq.c#7 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_var.h#5 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctputil.c#7 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctputil.h#6 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp.h#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_debug.h#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_hostcache.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_input.c#11 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_output.c#6 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_sack.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_subr.c#8 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_syncache.c#8 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_timer.c#5 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_usrreq.c#8 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_var.h#7 integrate .. //depot/projects/soc2006/intr_filter/netinet6/mld6.c#4 integrate .. //depot/projects/soc2006/intr_filter/netinet6/sctp6_usrreq.c#7 integrate .. //depot/projects/soc2006/intr_filter/netinet6/sctp6_var.h#3 integrate .. //depot/projects/soc2006/intr_filter/netipsec/ipsec.c#4 integrate .. //depot/projects/soc2006/intr_filter/nfsclient/nfs_node.c#4 integrate .. //depot/projects/soc2006/intr_filter/nfsclient/nfs_vfsops.c#6 integrate .. //depot/projects/soc2006/intr_filter/nfsserver/nfs.h#4 integrate .. //depot/projects/soc2006/intr_filter/nfsserver/nfs_serv.c#5 integrate .. //depot/projects/soc2006/intr_filter/nfsserver/nfs_srvcache.c#4 integrate .. //depot/projects/soc2006/intr_filter/nfsserver/nfs_srvsock.c#4 integrate .. //depot/projects/soc2006/intr_filter/nfsserver/nfs_srvsubs.c#5 integrate .. //depot/projects/soc2006/intr_filter/nfsserver/nfs_syscalls.c#7 integrate .. //depot/projects/soc2006/intr_filter/nfsserver/nfsm_subs.h#3 integrate .. //depot/projects/soc2006/intr_filter/opencrypto/crypto.c#2 integrate .. //depot/projects/soc2006/intr_filter/opencrypto/crypto_if.m#2 delete .. //depot/projects/soc2006/intr_filter/opencrypto/cryptodev.c#2 integrate .. //depot/projects/soc2006/intr_filter/opencrypto/cryptodev.h#2 integrate .. //depot/projects/soc2006/intr_filter/opencrypto/cryptodev_if.m#1 branch .. //depot/projects/soc2006/intr_filter/opencrypto/cryptosoft.c#2 integrate .. //depot/projects/soc2006/intr_filter/opencrypto/cryptosoft.h#2 integrate .. //depot/projects/soc2006/intr_filter/pc98/cbus/fdc.c#6 integrate .. //depot/projects/soc2006/intr_filter/pc98/pc98/machdep.c#9 integrate .. //depot/projects/soc2006/intr_filter/pci/if_ste.c#5 integrate .. //depot/projects/soc2006/intr_filter/pci/if_stereg.h#2 integrate .. //depot/projects/soc2006/intr_filter/powerpc/include/pcpu.h#2 integrate .. //depot/projects/soc2006/intr_filter/rpc/rpcclnt.c#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/include/pcpu.h#2 integrate .. //depot/projects/soc2006/intr_filter/sun4v/include/pcpu.h#5 integrate .. //depot/projects/soc2006/intr_filter/sys/_mutex.h#3 integrate .. //depot/projects/soc2006/intr_filter/sys/_rwlock.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/acl.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/condvar.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/extattr.h#6 integrate .. //depot/projects/soc2006/intr_filter/sys/lock.h#5 integrate .. //depot/projects/soc2006/intr_filter/sys/mbuf.h#8 integrate .. //depot/projects/soc2006/intr_filter/sys/mutex.h#8 integrate .. //depot/projects/soc2006/intr_filter/sys/param.h#10 integrate .. //depot/projects/soc2006/intr_filter/sys/pcpu.h#5 integrate .. //depot/projects/soc2006/intr_filter/sys/proc.h#10 integrate .. //depot/projects/soc2006/intr_filter/sys/rwlock.h#7 integrate .. //depot/projects/soc2006/intr_filter/sys/sleepqueue.h#5 integrate .. //depot/projects/soc2006/intr_filter/sys/socketvar.h#6 integrate .. //depot/projects/soc2006/intr_filter/sys/sx.h#5 integrate .. //depot/projects/soc2006/intr_filter/sys/systm.h#10 integrate .. //depot/projects/soc2006/intr_filter/sys/ucred.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/vnode.h#6 integrate .. //depot/projects/soc2006/intr_filter/tools/acpi_quirks2h.awk#2 integrate .. //depot/projects/soc2006/intr_filter/ufs/ffs/ffs_softdep.c#5 integrate .. //depot/projects/soc2006/intr_filter/ufs/ffs/ffs_vfsops.c#6 integrate .. //depot/projects/soc2006/intr_filter/ufs/ffs/ffs_vnops.c#7 integrate .. //depot/projects/soc2006/intr_filter/ufs/ufs/quota.h#3 integrate .. //depot/projects/soc2006/intr_filter/ufs/ufs/ufs_lookup.c#3 integrate .. //depot/projects/soc2006/intr_filter/ufs/ufs/ufs_quota.c#6 integrate .. //depot/projects/soc2006/intr_filter/ufs/ufs/ufs_vnops.c#8 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_fault.c#8 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_map.c#7 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_object.c#9 integrate Differences ... ==== //depot/projects/soc2006/intr_filter/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.40 2006/11/26 18:27:16 maxim Exp $ +# $FreeBSD: src/sys/Makefile,v 1.41 2007/03/24 22:21:01 maxim Exp $ .include @@ -9,7 +9,7 @@ # Directories to include in cscope name file and TAGS. CSCOPEDIRS= cam coda compat conf contrib crypto ddb dev fs geom gnu i4b \ - isa isofs kern libkern modules net net80211 netatalk netatm \ + isa kern libkern modules net net80211 netatalk netatm \ netgraph netinet netinet6 netipx netkey netnatm netncp \ netsmb nfs nfsclient nfs4client rpc pccard pci sys \ ufs vm ${ARCHDIR} ==== //depot/projects/soc2006/intr_filter/amd64/acpica/OsdEnvironment.c#2 (text+ko) ==== @@ -26,16 +26,18 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.13 2005/09/11 18:39:00 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.14 2007/03/22 18:16:38 jkim Exp $"); /* * 6.1 : Environmental support */ #include +#include #include #include #include +#include static u_long amd64_acpi_root; @@ -54,25 +56,16 @@ return(0); } -ACPI_STATUS -AcpiOsGetRootPointer(UINT32 Flags, ACPI_POINTER *RsdpPhysicalAddress) +ACPI_PHYSICAL_ADDRESS +AcpiOsGetRootPointer(void) { - ACPI_POINTER ptr; - ACPI_STATUS status; + u_long ptr; - if (amd64_acpi_root == 0) { - /* - * The loader passes the physical address at which it found the - * RSDP in a hint. We could recover this rather than searching - * manually here. - */ - status = AcpiFindRootPointer(Flags, &ptr); - if (status == AE_OK) - amd64_acpi_root = ptr.Pointer.Physical; - } else - status = AE_OK; + if (amd64_acpi_root == 0 && + (resource_long_value("acpi", 0, "rsdp", (long *)&ptr) == 0 || + AcpiFindRootPointer((ACPI_NATIVE_UINT *)&ptr) == AE_OK) && + ptr != 0) + amd64_acpi_root = ptr; - RsdpPhysicalAddress->PointerType = ACPI_PHYSICAL_POINTER; - RsdpPhysicalAddress->Pointer.Physical = amd64_acpi_root; - return (status); + return (amd64_acpi_root); } ==== //depot/projects/soc2006/intr_filter/amd64/acpica/madt.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.22 2007/03/05 20:35:16 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.23 2007/03/22 18:16:38 jkim Exp $"); #include #include @@ -56,7 +56,7 @@ #define NIOAPICS 32 /* Max number of I/O APICs */ #define NLAPICS 32 /* Max number of local APICs */ -typedef void madt_entry_handler(APIC_HEADER *entry, void *arg); +typedef void madt_entry_handler(ACPI_SUBTABLE_HEADER *entry, void *arg); /* These two arrays are indexed by APIC IDs. */ struct ioapic_info { @@ -70,26 +70,29 @@ } lapics[NLAPICS]; static int madt_found_sci_override; -static MULTIPLE_APIC_TABLE *madt; +static ACPI_TABLE_MADT *madt; static vm_paddr_t madt_physaddr; static vm_offset_t madt_length; MALLOC_DEFINE(M_MADT, "madt_table", "ACPI MADT Table Items"); -static enum intr_polarity interrupt_polarity(UINT16 Polarity, UINT8 Source); -static enum intr_trigger interrupt_trigger(UINT16 TriggerMode, UINT8 Source); +static enum intr_polarity interrupt_polarity(UINT16 IntiFlags, UINT8 Source); +static enum intr_trigger interrupt_trigger(UINT16 IntiFlags, UINT8 Source); static int madt_find_cpu(u_int acpi_id, u_int *apic_id); static int madt_find_interrupt(int intr, void **apic, u_int *pin); static void *madt_map(vm_paddr_t pa, int offset, vm_offset_t length); static void *madt_map_table(vm_paddr_t pa, int offset, const char *sig); -static void madt_parse_apics(APIC_HEADER *entry, void *arg); -static void madt_parse_interrupt_override(MADT_INTERRUPT_OVERRIDE *intr); -static void madt_parse_ints(APIC_HEADER *entry, void *arg __unused); -static void madt_parse_local_nmi(MADT_LOCAL_APIC_NMI *nmi); -static void madt_parse_nmi(MADT_NMI_SOURCE *nmi); +static void madt_parse_apics(ACPI_SUBTABLE_HEADER *entry, void *arg); +static void madt_parse_interrupt_override( + ACPI_MADT_INTERRUPT_OVERRIDE *intr); +static void madt_parse_ints(ACPI_SUBTABLE_HEADER *entry, + void *arg __unused); +static void madt_parse_local_nmi(ACPI_MADT_LOCAL_APIC_NMI *nmi); +static void madt_parse_nmi(ACPI_MADT_NMI_SOURCE *nmi); static int madt_probe(void); static int madt_probe_cpus(void); -static void madt_probe_cpus_handler(APIC_HEADER *entry, void *arg __unused); +static void madt_probe_cpus_handler(ACPI_SUBTABLE_HEADER *entry, + void *arg __unused); static int madt_probe_table(vm_paddr_t address); static void madt_register(void *dummy); static int madt_setup_local(void); @@ -161,14 +164,14 @@ void *table; header = madt_map(pa, offset, sizeof(ACPI_TABLE_HEADER)); - if (strncmp(header->Signature, sig, 4) != 0) { + if (strncmp(header->Signature, sig, ACPI_NAME_SIZE) != 0) { madt_unmap(header, sizeof(ACPI_TABLE_HEADER)); return (NULL); } length = header->Length; madt_unmap(header, sizeof(ACPI_TABLE_HEADER)); table = madt_map(pa, offset, length); - if (ACPI_FAILURE(AcpiTbVerifyTableChecksum(table))) { + if (ACPI_FAILURE(AcpiTbChecksum(table, length))) { if (bootverbose) printf("MADT: Failed checksum for table %s\n", sig); madt_unmap(table, length); @@ -192,10 +195,10 @@ static int madt_probe(void) { - ACPI_POINTER rsdp_ptr; - RSDP_DESCRIPTOR *rsdp; - RSDT_DESCRIPTOR *rsdt; - XSDT_DESCRIPTOR *xsdt; + ACPI_PHYSICAL_ADDRESS rsdp_ptr; + ACPI_TABLE_RSDP *rsdp; + ACPI_TABLE_RSDT *rsdt; + ACPI_TABLE_XSDT *xsdt; int i, count; if (resource_disabled("acpi", 0)) @@ -206,12 +209,9 @@ * calls pmap_mapbios() to find the RSDP, we assume that we can use * pmap_mapbios() to map the RSDP. */ - if (AcpiOsGetRootPointer(ACPI_LOGICAL_ADDRESSING, &rsdp_ptr) != AE_OK) + if ((rsdp_ptr = AcpiOsGetRootPointer()) == 0) return (ENXIO); -#ifdef __i386__ - KASSERT(rsdp_ptr.Pointer.Physical < KERNLOAD, ("RSDP too high")); -#endif - rsdp = pmap_mapbios(rsdp_ptr.Pointer.Physical, sizeof(RSDP_DESCRIPTOR)); + rsdp = pmap_mapbios(rsdp_ptr, sizeof(ACPI_TABLE_RSDP)); if (rsdp == NULL) { if (bootverbose) printf("MADT: Failed to map RSDP\n"); @@ -230,38 +230,40 @@ * the version 1.0 portion of the RSDP. Version 2.0 has * an additional checksum that we verify first. */ - if (AcpiTbGenerateChecksum(rsdp, ACPI_RSDP_XCHECKSUM_LENGTH)) { + if (AcpiTbChecksum((UINT8 *)rsdp, ACPI_RSDP_XCHECKSUM_LENGTH)) { if (bootverbose) printf("MADT: RSDP failed extended checksum\n"); return (ENXIO); } - xsdt = madt_map_table(rsdp->XsdtPhysicalAddress, 1, XSDT_SIG); + xsdt = madt_map_table(rsdp->XsdtPhysicalAddress, 1, + ACPI_SIG_XSDT); if (xsdt == NULL) { if (bootverbose) printf("MADT: Failed to map XSDT\n"); return (ENXIO); } - count = (xsdt->Length - sizeof(ACPI_TABLE_HEADER)) / + count = (xsdt->Header.Length - sizeof(ACPI_TABLE_HEADER)) / sizeof(UINT64); for (i = 0; i < count; i++) if (madt_probe_table(xsdt->TableOffsetEntry[i])) break; madt_unmap_table(xsdt); } else { - rsdt = madt_map_table(rsdp->RsdtPhysicalAddress, 1, RSDT_SIG); + rsdt = madt_map_table(rsdp->RsdtPhysicalAddress, 1, + ACPI_SIG_RSDT); if (rsdt == NULL) { if (bootverbose) printf("MADT: Failed to map RSDT\n"); return (ENXIO); } - count = (rsdt->Length - sizeof(ACPI_TABLE_HEADER)) / + count = (rsdt->Header.Length - sizeof(ACPI_TABLE_HEADER)) / sizeof(UINT32); for (i = 0; i < count; i++) if (madt_probe_table(rsdt->TableOffsetEntry[i])) break; madt_unmap_table(rsdt); } - pmap_unmapbios((vm_offset_t)rsdp, sizeof(RSDP_DESCRIPTOR)); + pmap_unmapbios((vm_offset_t)rsdp, sizeof(ACPI_TABLE_RSDP)); if (madt_physaddr == 0) { if (bootverbose) printf("MADT: No MADT table found\n"); @@ -275,7 +277,7 @@ * Verify that we can map the full table and that its checksum is * correct, etc. */ - madt = madt_map_table(madt_physaddr, 0, APIC_SIG); + madt = madt_map_table(madt_physaddr, 0, ACPI_SIG_MADT); if (madt == NULL) return (ENXIO); madt_unmap_table(madt); @@ -303,7 +305,7 @@ printf("Table '%.4s' at 0x%jx\n", table->Signature, (uintmax_t)address); - if (strncmp(table->Signature, APIC_SIG, 4) != 0) { + if (strncmp(table->Signature, ACPI_SIG_MADT, ACPI_NAME_SIZE) != 0) { madt_unmap(table, sizeof(ACPI_TABLE_HEADER)); return (0); } @@ -320,7 +322,7 @@ madt_probe_cpus(void) { - madt = madt_map_table(madt_physaddr, 0, APIC_SIG); + madt = madt_map_table(madt_physaddr, 0, ACPI_SIG_MADT); KASSERT(madt != NULL, ("Unable to re-map MADT")); madt_walk_table(madt_probe_cpus_handler, NULL); madt_unmap_table(madt); @@ -336,10 +338,10 @@ { madt = pmap_mapbios(madt_physaddr, madt_length); - lapic_init(madt->LocalApicAddress); + lapic_init(madt->Address); printf("ACPI APIC Table: <%.*s %.*s>\n", - (int)sizeof(madt->OemId), madt->OemId, - (int)sizeof(madt->OemTableId), madt->OemTableId); + (int)sizeof(madt->Header.OemId), madt->Header.OemId, + (int)sizeof(madt->Header.OemTableId), madt->Header.OemTableId); /* * We ignore 64-bit local APIC override entries. Should we @@ -378,10 +380,10 @@ * force it to use level trigger and active-low polarity. */ if (!madt_found_sci_override) { - if (madt_find_interrupt(AcpiGbl_FADT->SciInt, &ioapic, &pin) - != 0) - printf("MADT: Could not find APIC for SCI IRQ %d\n", - AcpiGbl_FADT->SciInt); + if (madt_find_interrupt(AcpiGbl_FADT.SciInterrupt, &ioapic, + &pin) != 0) + printf("MADT: Could not find APIC for SCI IRQ %u\n", + AcpiGbl_FADT.SciInterrupt); else { printf( "MADT: Forcing active-low polarity and level trigger for SCI\n"); @@ -416,46 +418,46 @@ static void madt_walk_table(madt_entry_handler *handler, void *arg) { - APIC_HEADER *entry; + ACPI_SUBTABLE_HEADER *entry; u_char *p, *end; - end = (u_char *)(madt) + madt->Length; + end = (u_char *)(madt) + madt->Header.Length; for (p = (u_char *)(madt + 1); p < end; ) { - entry = (APIC_HEADER *)p; + entry = (ACPI_SUBTABLE_HEADER *)p; handler(entry, arg); p += entry->Length; } } static void -madt_probe_cpus_handler(APIC_HEADER *entry, void *arg) +madt_probe_cpus_handler(ACPI_SUBTABLE_HEADER *entry, void *arg) { - MADT_PROCESSOR_APIC *proc; + ACPI_MADT_LOCAL_APIC *proc; struct lapic_info *la; switch (entry->Type) { - case APIC_PROCESSOR: + case ACPI_MADT_TYPE_LOCAL_APIC: /* * The MADT does not include a BSP flag, so we have to * let the MP code figure out which CPU is the BSP on * its own. */ - proc = (MADT_PROCESSOR_APIC *)entry; + proc = (ACPI_MADT_LOCAL_APIC *)entry; if (bootverbose) - printf("MADT: Found CPU APIC ID %d ACPI ID %d: %s\n", - proc->LocalApicId, proc->ProcessorId, - proc->ProcessorEnabled ? "enabled" : "disabled"); - if (!proc->ProcessorEnabled) + printf("MADT: Found CPU APIC ID %u ACPI ID %u: %s\n", + proc->Id, proc->ProcessorId, + (proc->LapicFlags & ACPI_MADT_ENABLED) ? + "enabled" : "disabled"); + if (!(proc->LapicFlags & ACPI_MADT_ENABLED)) break; - if (proc->LocalApicId >= NLAPICS) - panic("%s: CPU ID %d too high", __func__, - proc->LocalApicId); - la = &lapics[proc->LocalApicId]; + if (proc->Id >= NLAPICS) + panic("%s: CPU ID %u too high", __func__, proc->Id); + la = &lapics[proc->Id]; KASSERT(la->la_enabled == 0, - ("Duplicate local APIC ID %d", proc->LocalApicId)); + ("Duplicate local APIC ID %u", proc->Id)); la->la_enabled = 1; la->la_acpi_id = proc->ProcessorId; - lapic_create(proc->LocalApicId, 0); + lapic_create(proc->Id, 0); break; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Mar 26 10:34:36 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 312B816A408; Mon, 26 Mar 2007 10:34:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F1CB216A406 for ; Mon, 26 Mar 2007 10:34:35 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E0C9913C45E for ; Mon, 26 Mar 2007 10:34:35 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2QAYZQm072876 for ; Mon, 26 Mar 2007 10:34:35 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2QAYZt8072873 for perforce@freebsd.org; Mon, 26 Mar 2007 10:34:35 GMT (envelope-from gabor@freebsd.org) Date: Mon, 26 Mar 2007 10:34:35 GMT Message-Id: <200703261034.l2QAYZt8072873@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 116570 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Mar 2007 10:34:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=116570 Change 116570 by gabor@gabor_server on 2007/03/26 10:34:26 IFC Affected files ... .. //depot/projects/soc2006/gabor_destdir/CHANGES#4 integrate .. //depot/projects/soc2006/gabor_destdir/GIDs#3 integrate .. //depot/projects/soc2006/gabor_destdir/LEGAL#3 integrate .. //depot/projects/soc2006/gabor_destdir/MOVED#4 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.autotools.mk#3 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.efl.mk#1 branch .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.gnome.mk#5 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.kde.mk#3 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.ocaml.mk#1 branch .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#7 edit .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.subdir.mk#7 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.sites.mk#4 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.xfce.mk#1 branch .. //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/dopackagestats#3 integrate .. //depot/projects/soc2006/gabor_destdir/UIDs#3 integrate .. //depot/projects/soc2006/gabor_destdir/UPDATING#4 integrate Differences ... ==== //depot/projects/soc2006/gabor_destdir/CHANGES#4 (text+ko) ==== @@ -10,6 +10,27 @@ All ports committers are allowed to commit to this file. +20070324: +AUTHOR: portmgr@FreeBSD.org +The following changes were made to the ports infrastructure: + + * Default LIBTOOLFILES value was changed from literal `configure' + to ${CONFIGURE_SCRIPT}. + + * bsd.efl.mk was moved to ports/Mk. USE_EFL family of macros is now + generally available to all ports. + + * New macros COPYTREE_BIN and COPYTREE_SHARE were added, to allow + for easy installation of a tree hierarchy, either with executable (bin) + or read-only (share) permissions on files. + + * A new variable WWWDIR was added, with default value of + ${PREFIX}/www/${PORTNAME}. + + * Variables DOCSDIR_REL, DATADIR_REL, EXAMPLESDIR_REL and WWWDIR_REL were + added for porter's convenience. They contain the values of their + respective non-REL variables, except relative to installation PREFIX. + 20070306: AUTHOR: portmgr@FreeBSD.org The following changes were made to the ports infrastructure: @@ -1283,4 +1304,4 @@ Contact Erwin Lansing if you have any questions about your use of this document. -$FreeBSD: ports/CHANGES,v 1.66 2007/03/06 06:21:46 linimon Exp $ +$FreeBSD: ports/CHANGES,v 1.67 2007/03/24 14:02:05 pav Exp $ ==== //depot/projects/soc2006/gabor_destdir/GIDs#3 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: ports/GIDs,v 1.28 2007/02/17 09:57:35 dinoex Exp $ +$FreeBSD: ports/GIDs,v 1.32 2007/03/24 05:10:35 marcus Exp $ # Please keep this file sorted by GID! smmsp:*:25: bind:*:53: @@ -20,7 +20,7 @@ qnofiles:*:81: qmail:*:82: mysql:*:88: -vpopmail:*:89: +vchkpw:*:89: firebird:*:90: mailman:*:91: gdm:*:92: @@ -54,9 +54,11 @@ fetchmail:*:124 postfix:*:125: maildrop:*:126: +nav:*:127: vchat:*:128: _bgpd:*:130: _ospfd:*:131: +_spamd:*:132: dovecot:*:143: rbldns:*:153: sfs:*:171: @@ -96,6 +98,7 @@ avahi:*:558: tacacs:*:559: distcc:*:561: +polkit:*:562: _xsi:*:600: bnetd:*:700: bopm:*:717: ==== //depot/projects/soc2006/gabor_destdir/LEGAL#3 (text+ko) ==== @@ -1,5 +1,5 @@ # Creator: Jordan Hubbard -# $FreeBSD: ports/LEGAL,v 1.524 2007/02/20 21:47:23 nox Exp $ +# $FreeBSD: ports/LEGAL,v 1.530 2007/03/20 11:09:57 miwi Exp $ ********************************************************************** *** NOTE TO COMMITTERS *** @@ -186,6 +186,8 @@ ezmlm-* mail/ezmlm-idx No license -- see http://cr.yp.to/softwarelaw.html f-prot-sig* security/f-prot-sig Free for personal use only +f-protd security/f-protd 60 days free of trial for + everybody f6kuzzzz.taz databases/libudbc Downloading and redistribution terms are unclear faac* audio/faac Restrictive copyright (do not @@ -235,8 +237,8 @@ before downloading freqship/* sysutils/freqsdwn License agreement is required to download -fretsonfire/FretsOnFire-*-linux* games/fretsonfire-data Only Unreal Voodoo - site is allowed to +fretsonfire/FretsOnFire-*-linux* games/fretsonfire-data Only Unreal Voodoo + site is allowed to distribute the music ftree-* misc/ftree Cannot distribute commercially fwtk/* security/fwtk No redistribution allowed @@ -279,10 +281,6 @@ httprint_freebsd_*.zip security/httprint No cost for personal, education and non-commercial use HyperSpec-*.tar.gz devel/clisp-hyperspec Commercial redistribution prohibited -IBMJava2-SDK-131.tgz java/linux-ibm-jdk13 Redistribution of repackaged - binaries not permitted -IBMJava2-SDK-* java/linux-ibm-jdk14 Redistribution of repackaged - binaries not permitted ICON-AquaFusion.* x11-themes/gnome-icons-aqua-fusion Author rights unclear ICON-CoolGorilla.* x11-themes/gnome-icons-cool-gorilla Author rights unclear CrystalSVGforGnomeIcons* x11-themes/gnome-icons-crystal Author rights unclear @@ -433,6 +431,7 @@ ncftpd-* ftp/ncftpd 30 day evaluation license netbeans3-* java/netbeans3 Restrictive copyright netbeans4-* java/netbeans4 Restrictive copyright +netbeans5-* java/netbeans5 Restrictive copyright NetComponents-* java/netcomponents No redistribution except as part of a substantially different product netshow_linux.gz multimedia/netshow Commercial software @@ -499,7 +498,7 @@ RealPlayer-*.rpm multimedia/linux-realplayer Redistribution not allowed ruby/ruby_cast_256.zip security/ruby-cast_256 Crypto; export-controlled runrev/linux.tgz devel/linux-runrev Do not sell for profit -savage/savage* games/linux-savage Savage is freeware, but i am +savage/savage* games/linux-savage Savage is freeware, but i am not sure of its license sdr-* mbone/sdr Crypto; export-controlled serialmail-* mail/serialmail No license -- see @@ -552,8 +551,8 @@ not permitted susv3.tar.bz2 misc/susv3 Redistribution of the documents is not permitted -svm_light.tar.gz science/svmlight The software must not be further - distributed without prior permission +svm_light.tar.gz science/svmlight The software must not be further + distributed without prior permission of the author swing1_1_1* java/jfc Do not distribute without value-added application @@ -582,7 +581,7 @@ Japan, user must have Japanese version of Windows and EPSON printer specified - by EULA + by EULA tonicpoint-* graphics/tonicpoint-viewer Free for non-profit tuc-* converters/tuc Author does not allow CD-ROM distribution @@ -677,3 +676,5 @@ tw_cli-* sysutils/tw_cli Redistribution forbidden by license. lha-1.14i-ac* archivers/lha-ac No Redistribution +GotoBLAS* math/gotoblas No Redistribution +gamess.*/gamess* science/gamess No Redistribution ==== //depot/projects/soc2006/gabor_destdir/MOVED#4 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1313 2007/03/08 14:29:11 ahze Exp $ +# $FreeBSD: ports/MOVED,v 1.1333 2007/03/25 20:41:50 ahze Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -2217,7 +2217,7 @@ mail/ruby-mime-types||2006-04-07|Has expired: mastersite disappeared, no longer maintained by author devel/wftk||2006-04-07|master site disappeared www/linux-flashplugin||2006-04-08|Removed due to license problem -net/nic||2006-04-08|Deprecated for a long time +net/nic|net-mgmt/horde-nic|2006-04-08|Moved to more appropriate category, updated to H3 www/flashpluginwrapper||2006-04-08|Removed as it depends on linux-flashplugin mail/mew-mule||2006-04-10|Has expired: Does not work on the current emacs port net/smbfs||2006-04-14|Incorporated into base system long ago @@ -2501,7 +2501,6 @@ x11-themes/e17-theme-mclaren||2006-11-01|Has expired: doesn't work with recent e17 x11-themes/e17-theme-grey||2006-11-01|Has expired: doesn't work with recent e17 devel/ac-archive|devel/autoconf-archive|2006-11-01|Replace broken ac-archive with working autoconf-archive -www/firefox-devel|www/firefox|2006-11-01|Firefox 2.0 is now stable graphics/php4-imlib2|graphics/pecl-imlib2|2006-11-01|Follow PECL ports naming conversion graphics/php5-imlib2|graphics/pecl-imlib2|2006-11-01|Follow PECL ports naming conversion chinese/xcin25|chinese/xcin|2006-11-05|Reflect its real portname @@ -2846,3 +2845,45 @@ devel/boost-gcc3|devel/boost|2007-03-07|Removed support for FreeBSD 4. graphics/jpeg-mmx|graphics/jpeg|2007-03-08|Has expired: no longer needed. graphics/gstreamer-plugins-jpeg-mmx80|graphics/gstreamer-plugins-jpeg80|2007-03-08|graphics/jpeg-mmx was removed +java/linux-ibm-jdk13||2007-03-09|Has expired: Vulnerabilities in the browser plugin +java/linux-ibm-jdk14||2007-03-09|Has expired: Vulnerabilities in the browser plugin +japanese/emacs20-dl-canna||2007-03-09|Has expired: has deprecated dependency +japanese/emacs20-dl-wnn6||2007-03-09|Has expired: has deprecated dependency +misc/pbs||2007-03-11|Has expired: failed to build +devel/pcre-utf8||2007-03-11|UTF8 support is now enabled in devel/pcre +www/ruby-webunit||2007-03-13|Has expired: has deprecated dependencies +emulators/grustibus||2007-03-13|Has expired: Project was abandoned 6 years ago and expects an old version of xmame (0.37b4), please use other frontends instead (like gxmame) +graphics/drm-kmod||2007-03-13|Has expired: Broken on all supported versions of FreeBSD +java/janosvm||2007-03-13|Has expired: Broken on all supported versions of FreeBSD +korean/gau||2007-03-13|Has expired: Broken on all supported versions of FreeBSD +lang/cyclone||2007-03-13|Has expired: Broken on all supported versions of FreeBSD +lang/pike70||2007-03-13|Has expired: Please use pike72 +misc/lile||2007-03-13|Has expired: Broken on all supported versions of FreeBSD +misc/muuz||2007-03-13|Has expired: Broken on all supported versions of FreeBSD +misc/xdf||2007-03-13|Has expired: Broken on all supported versions of FreeBSD +net/telnetx||2007-03-13|Has expired: Broken on all supported versions of FreeBSD +sysutils/diskmark||2007-03-13|Has expired: Makes no sense on FreeBSD > 4.x. Use glabel(8) instead +sysutils/diskusage||2007-03-13|Has expired: Unmainntaied, MASTER_SITES disappeared, WWW disappeared. +sysutils/xperfmon3||2007-03-13|Has expired: Broken on all supported versions of FreeBSD +comms/mwavem||2007-03-13|Has expired: Broken on all supported versions of FreeBSD +chinese/big5fs||2007-03-14|Has expired: Use mount_cd9660(8), mount_msdosfs(8), or mount_ntfs(8) instead +chinese/gbfs||2007-03-14|Has expired: Use mount_cd9660(8), mount_msdosfs(8), or mount_ntfs(8) instead +audio/anthem||2007-03-16|Has expired: this software is not developed any more +www/jakarta-tomcat41|www/tomcat41|2007-03-17|Renamed (no longer a Jakarta project) +multimedia/totem-gstreamer|multimedia/totem|2007-03-19|multimedia/totem now uses gstreamer by default +x11-wm/fluxbox-devel|x11-wm/fluxbox|2007-03-19|Merged into x11-wm/fluxbox +lang/xotcl-thread||2007-03-21|Not longer needed +graphics/gnome-colorscheme|graphics/agave|2007-03-21|Project renamed +databases/zodb||2007-03-22|Has expired: outdated software, databases/zodb3 should be used +finance/gnomepm||2007-03-22|Has expired: is unfetchable and has no homepage +games/frabs||2007-03-22|Has expired: is unfetchable and homepage disappeared +www/drupal|www/drupal4|2007-03-25|rename for drupal5 +www/drupal-attachment|www/drupal4-attachment|2007-03-25|rename for drupal5 +www/drupal-filemanager|www/drupal4-filemanager|2007-03-25|rename for drupal5 +www/drupal-gsitemap|www/drupal4-gsitemap|2007-03-25|rename for drupal5 +www/drupal-i18n|www/drupal4-i18n|2007-03-25|rename for drupal5 +www/drupal-nice_menus|www/drupal4-nice_menus|2007-03-25|rename for drupal5 +www/drupal-taxonomy_access|www/drupal4-taxonomy_access|2007-03-25|rename for drupal5 +www/drupal-textile|www/drupal4-textile|2007-03-25|rename for drupal5 +security/drupal-ldap_integration|security/drupal4-ldap_integration|2007-03-25|rename for drupal5 +devel/xdg-user-dirs-gtk||2007-03-25|Not all dependencies are in ports yet ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.autotools.mk#3 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.autotools.mk,v 1.25 2006/12/04 01:07:25 ade Exp $ +# $FreeBSD: ports/Mk/bsd.autotools.mk,v 1.26 2007/03/24 14:02:06 pav Exp $ # # Please view me with 4 column tabs! # @@ -64,7 +64,8 @@ # # LIBTOOLFILES= # - A list of files to patch during libtool pre-configuration -# Defaults to "aclocal.m4" if autoconf is in use, otherwise "configure" +# Defaults to "aclocal.m4" if autoconf is in use, otherwise +# ${CONFIGURE_SCRIPT} (usually "configure") # #--------------------------------------------------------------------------- @@ -210,7 +211,7 @@ . if defined(AUTOTOOL_autoconf) LIBTOOLFILES?= aclocal.m4 . else -LIBTOOLFILES?= configure +LIBTOOLFILES?= ${CONFIGURE_SCRIPT} . endif .endif ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.gnome.mk#5 (text+ko) ==== @@ -1,9 +1,9 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.139 2007/02/04 22:25:07 tmclaugh Exp $ +# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.140 2007/03/19 05:19:11 marcus Exp $ # $NetBSD: $ -# $MCom: ports/Mk/bsd.gnome.mk,v 1.401 2006/08/05 05:25:55 marcus Exp $ +# $MCom: ports/Mk/bsd.gnome.mk,v 1.414 2007/03/13 01:24:54 marcus Exp $ # # Please view me with 4 column tabs! @@ -64,7 +64,8 @@ libgnomecanvas libgnomedb libgnomeprint libgnomeprintui \ libgnomeui libgsf libgsf_gnome libgtkhtml libidl librsvg2 libwnck \ libxml2 libxslt libzvt linc metacity nautilus2 nautiluscdburner \ - orbit2 pango pygnome2 pygnomeextras pygtk2 vte pygnomedesktop + orbit2 pango pygnome2 pygnomeextras pygtk2 vte pygnomedesktop \ + libgnomekbd GNOME_MAKEFILEIN?= Makefile.in SCROLLKEEPER_DIR= /var/db/scrollkeeper @@ -409,7 +410,7 @@ gnomecontrolcenter2_LIB_DEPENDS=gnome-window-settings.1:${PORTSDIR}/sysutils/gnome-control-center gnomecontrolcenter2_DETECT=${LOCALBASE}/libdata/pkgconfig/gnome-window-settings-2.0.pc -gnomecontrolcenter2_USE_GNOME_IMPL=desktopfileutils gnomedesktop gnomemenus metacity nautilus2 desktopfileutils +gnomecontrolcenter2_USE_GNOME_IMPL=metacity nautilus2 gnomemenus desktopfileutils libgnomekbd gnomepanel libgda2_LIB_DEPENDS= gda-2.3:${PORTSDIR}/databases/libgda2 libgda2_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgda.pc @@ -459,15 +460,15 @@ s|unpack *[(]'"'"'U\*'"'"'|unpack ('"'"'C*'"'"'|' intlhack_USE_GNOME_IMPL=intltool -gtkhtml3_LIB_DEPENDS= gtkhtml-3.8.15:${PORTSDIR}/www/gtkhtml3 -gtkhtml3_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgtkhtml-3.8.pc -gtkhtml3_USE_GNOME_IMPL=gail libgnomeui libgnomeprintui +gtkhtml3_LIB_DEPENDS= gtkhtml-3.14.19:${PORTSDIR}/www/gtkhtml3 +gtkhtml3_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgtkhtml-3.14.pc +gtkhtml3_USE_GNOME_IMPL=gail libgnomeui gnomespeech_LIB_DEPENDS=gnomespeech.7:${PORTSDIR}/accessibility/gnome-speech gnomespeech_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-speech-1.0.pc gnomespeech_USE_GNOME_IMPL=libbonobo -evolutiondataserver_LIB_DEPENDS=edataserver-1.2.7:${PORTSDIR}/databases/evolution-data-server +evolutiondataserver_LIB_DEPENDS=edataserver-1.2.9:${PORTSDIR}/databases/evolution-data-server evolutiondataserver_DETECT= ${LOCALBASE}/libdata/pkgconfig/evolution-data-server-1.2.pc evolutiondataserver_USE_GNOME_IMPL=libgnomeui @@ -478,7 +479,7 @@ nautiluscdburner_LIB_DEPENDS=nautilus-burn.4:${PORTSDIR}/sysutils/nautilus-cd-burner nautiluscdburner_DETECT= ${LOCALBASE}/libdata/pkgconfig/libnautilus-burn.pc -nautiluscdburner_USE_GNOME_IMPL=nautilus2 +nautiluscdburner_USE_GNOME_IMPL=nautilus2 desktopfileutils gnomemenus_LIB_DEPENDS= gnome-menu.2:${PORTSDIR}/x11/gnome-menus gnomemenus_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnome-menu.pc @@ -514,6 +515,10 @@ gnomesharp20_RUN_DEPENDS= ${gnomesharp20_DETECT}:${PORTSDIR}/x11-toolkits/gnome-sharp20 gnomesharp20_USE_GNOME_IMPL= gnomepanel gtkhtml3 gtksharp20 librsvg2 vte +libgnomekbd_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnomekbd.pc +libgnomekbd_LIB_DEPENDS= gnomekbd.1:${PORTSDIR}/x11/libgnomekbd +libgnomekbd_USE_GNOME_IMPL= libgnomeui + # End component definition section # This section defines tests for optional software. These work off four ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.kde.mk#3 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: Makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.kde.mk,v 1.68 2007/02/23 16:53:13 lofi Exp $ +# $FreeBSD: ports/Mk/bsd.kde.mk,v 1.70 2007/03/25 04:07:55 lofi Exp $ # # Please view me with 4 column tabs! @@ -104,7 +104,7 @@ # Yeah, it's namespace pollution, but this is really the best place for this # stuff. Arts does NOT use it anymore. -KDE_VERSION= 3.5.5 +KDE_VERSION= 3.5.6 KDE_ORIGVER= ${KDE_VERSION} KDE_PREFIX?= ${LOCALBASE} @@ -158,7 +158,7 @@ MAKE_ENV+= QMAKESPEC="${QMAKESPEC}" .endif # !defined(QT_NONSTANDARD) -QT4_VERSION= 4.2.2 +QT4_VERSION= 4.2.3 _QT_COMPONENTS_ALL= accessible assistant codecs-cn codecs-jp codecs-kr \ codecs-tw corelib designer doc gui iconengines \ ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#7 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.port.mk,v 1.555 2007/03/06 06:21:46 linimon Exp $ +# $FreeBSD: ports/Mk/bsd.port.mk,v 1.557 2007/03/24 14:02:06 pav Exp $ # $NetBSD: $ # # bsd.port.mk - 940820 Jordan K. Hubbard. @@ -217,7 +217,8 @@ # NOT_FOR_ARCHS_REASON # NOT_FOR_ARCHS_REASON_${ARCH} # - Reason why it's not for ${NOT_FOR_ARCHS}s -# IA32_BINARY_PORT - Set this instead of ONLY_FOR_ARCHS if the given port +# IA32_BINARY_PORT +# - Set this instead of ONLY_FOR_ARCHS if the given port # fetches and installs compiled i386 binaries. # # Dependency checking. Use these if your port requires another port @@ -406,12 +407,18 @@ # (libtool, autoconf, autoheader, automake et al.) # See bsd.autotools.mk for more details. ## -# USE_SCONS - If set, this port uses the Python-based SCons build system +# USE_SCONS - If set, this port uses the Python-based SCons build system # See bsd.scons.mk for more details. ## +# USE_EFL - If set, this port use EFL libraries. +# Implies inclusion of bsd.efl.mk. (Also see +# that file for more information on USE_EFL_*). # USE_JAVA - If set, this port relies on the Java language. # Implies inclusion of bsd.java.mk. (Also see # that file for more information on USE_JAVA_*). +# USE_OCAML - If set, this port relies on the OCaml language. +# Implies inclusion of bsd.ocaml.mk. (Also see +# that file for more information on USE_OCAML*). # USE_PYTHON - If set, this port relies on the Python language. # Implies inclusion of bsd.python.mk. (Also see # that file for more information on USE_PYTHON_* @@ -538,8 +545,9 @@ # ${LINUXBASE_REL} if USE_LINUX_PREFIX is set, # otherwise ${LOCALBASE_REL} # -# IGNORE_PATH_CHECKS - There are some sanity checks against PREFIX and DESTDIR. -# You can diasble these checks with defining +# IGNORE_PATH_CHECKS +# - There are some sanity checks against PREFIX and DESTDIR. +# You can disable these checks with defining # this variable, but this is not recommended! # Only do this if you really know what you are # doing. These sanity checks are the following: @@ -725,7 +733,7 @@ # # Default sequence for "all" is: # -# check-sanity fetch checksum extract patch configure build +# check-sanity fetch checksum extract patch configure build # # Please read the comments in the targets section below; you # should be able to use the pre-* or post-* targets/scripts @@ -761,8 +769,12 @@ # # For fetch: # -# FETCH_CMD - Full path to ftp/http fetch command if not in $PATH. -# Default: "/usr/bin/fetch -ARr" +# FETCH_BINARY - Path to ftp/http fetch command if not in $PATH. +# Default: "/usr/bin/fetch" +# FETCH_ARGS - Arguments to ftp/http fetch command. +# Default: "-ARr" +# FETCH_CMD - ftp/http fetch command. +# Default: ${FETCH_BINARY} ${FETCH_ARGS} # FETCH_BEFORE_ARGS # - Arguments to ${FETCH_CMD} before filename. # Default: none @@ -906,9 +918,9 @@ # - If set, bsd.port.mk will automatically run ldconfig commands # from post-install and also add appropriate @exec/@unexec # directives to directories listed in LDCONFIG_DIRS. (deprecated) -# If USE_LINUX_PREFIX is defined, the Linux version of ldconfig -# will be used instead of the native FreeBSD version (in such -# case, LDCONFIG_DIRS is ignored). +# If USE_LINUX_PREFIX is defined, the Linux version of +# ldconfig will be used instead of the native FreeBSD +# version, and LDCONFIG_DIRS will be ignored. # LDCONFIG_DIRS - List of directories to run ldconfig if INSTALLS_SHLIB is set. # Note that this is passed through sed just like the # rest of PLIST, so ${PLIST_SUB} substitutions also @@ -916,24 +928,41 @@ # %%PREFIX%% for ${PREFIX}, %%LOCALBASE%% for # ${LOCALBASE_REL} and %%X11BASE%% for ${X11BASE_REL}. # Default: %%PREFIX%%/lib -# USE_LDCONFIG - If set to "yes", it replaces the old variable INSTALLS_SHLIB. -# Otherwise, it can be set to a list of directories to be added to -# ${PREFIX}/libdata/ldconfig/${UNIQUENAME}. Note that this -# directory is used by ldconfig startup script, it is meant to -# replace ldconfig scripts installed by some ports as (sometimes) -# 000.${UNQUENAME}.sh. +# USE_LDCONFIG - If set to "yes", this subsumes the function of the +# deprecated variable INSTALLS_SHLIB and adds ${PREFIX}/lib +# to the list of directories to be searched for shared +# libraries. Otherwise, this is a list of directories to +# be added to that list. The directory names are written to +# ${PREFIX}/libdata/ldconfig/${UNIQUENAME} which is then +# used by the ldconfig startup script. +# This mechanism replaces ldconfig scripts installed by some +# ports, often under such names as 000.${UNQUENAME}.sh. # USE_LDCONFIG32 # - Same as USE_LDCONFIG but the target file is # ${PREFIX}/libdata/ldconfig32/${UNIQUENAME} instead. # Note: that should only be used on 64-bit architectures. +# NO_LDCONFIG_MTREE +# - Denotes whether the libdata/ldconfig directory is part of +# the mtree on a given OSVERSION system. If it is not, we +# create the directory, pull in the ldconfig_compat port, +# and clean up on de-installation. NOTE: this variable is +# internal to bsd.port.mk and must not be set in your Makefile. # # DOCSDIR - Name of the directory to install the packages docs in. # Default: ${TARGETDIR}/share/doc/${PORTNAME} +# DOCSDIR_REL - The DOCSDIR relative to ${TARGETDIR} # EXAMPLESDIR - Name of the directory to install the packages examples in. # Default: ${TARGETDIR}/share/examples/${PORTNAME} +# EXAMPLESDIR_REL +# - The EXAMPLESDIR relative to ${TARGETDIR} # DATADIR - Name of the directory to install the packages shared data in. # Default: ${TARGETDIR}/share/${PORTNAME} +# DATADIR_REL - The DATADIR relative to ${TARGETDIR} # +# WWWDIR - Name of the directory to install the packages www data in. +# Default: ${TARGETDIR}/www/${PORTNAME} +# WWWDIR_REL - The WWWDIR relative to ${TARGETDIR} +# # DESKTOPDIR - Name of the directory to install ${DESKTOP_ENTRIES} in. # Default: ${TARGETDIR}/share/applications # DESKTOP_ENTRIES @@ -1289,7 +1318,7 @@ .if defined(_PREMKINCLUDED) check-makefile:: - @${ECHO_CMD} "${PKGNAME}: Makefile error: you cannot include bsd.port[.pre].mk twice" + @${ECHO_MSG} "${PKGNAME}: Makefile error: you cannot include bsd.port[.pre].mk twice" @${FALSE} .endif @@ -1436,6 +1465,10 @@ .include "${PORTSDIR}/Mk/bsd.python.mk" .endif +.if defined(USE_EFL) || defined(WANT_EFL) || defined(USE_EFL_ESMART) +.include "${PORTSDIR}/Mk/bsd.efl.mk" +.endif + .if defined(USE_JAVA) .include "${PORTSDIR}/Mk/bsd.java.mk" .endif @@ -1444,6 +1477,10 @@ .include "${PORTSDIR}/Mk/bsd.ruby.mk" .endif +.if defined(USE_OCAML) +.include "${PORTSDIR}/Mk/bsd.ocaml.mk" +.endif + .if defined(USE_TCL) || defined(USE_TCL_BUILD) || defined(USE_TK) || defined(USE_TK_BUILD) .include "${PORTSDIR}/Mk/bsd.tcl.mk" .endif @@ -1480,6 +1517,10 @@ .include "${PORTSDIR}/Mk/bsd.sdl.mk" .endif +.if defined(USE_XFCE) +.include "${PORTSDIR}/Mk/bsd.xfce.mk" +.endif + # These do some path checks if DESTDIR is set correctly. # You can force skipping these test by defining IGNORE_PATH_CHECKS .if !defined(IGNORE_PATH_CHECKS) @@ -1531,7 +1572,7 @@ .if defined(_POSTMKINCLUDED) check-makefile:: - @${ECHO_CMD} "${PKGNAME}: Makefile error: you cannot include bsd.port[.post].mk twice" + @${ECHO_MSG} "${PKGNAME}: Makefile error: you cannot include bsd.port[.post].mk twice" @${FALSE} .endif @@ -1552,6 +1593,7 @@ PLIST_SUB+= OSREL=${OSREL} PREFIX=%D LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} SUB_LIST+= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \ DATADIR=${DATADIR} DOCSDIR=${DOCSDIR} EXAMPLESDIR=${EXAMPLESDIR} + WWWDIR=${WWWDIR} PLIST_REINPLACE+= dirrmtry stopdaemon PLIST_REINPLACE_DIRRMTRY=s!^@dirrmtry \(.*\)!@unexec rmdir %D/\1 2>/dev/null || true! @@ -1573,9 +1615,9 @@ .endif .if defined(NOPORTDOCS) -PLIST_SUB+= PORTDOCS="@comment " +PLIST_SUB+= PORTDOCS="@comment " .else -PLIST_SUB+= PORTDOCS="" +PLIST_SUB+= PORTDOCS="" .endif CONFIGURE_SHELL?= ${SH} @@ -1588,7 +1630,7 @@ .if ${MANCOMPRESSED} != yes && ${MANCOMPRESSED} != no && \ ${MANCOMPRESSED} != maybe check-makevars:: - @${ECHO_CMD} "${PKGNAME}: Makefile error: value of MANCOMPRESSED (is \"${MANCOMPRESSED}\") can only be \"yes\", \"no\" or \"maybe\"". + @${ECHO_MSG} "${PKGNAME}: Makefile error: value of MANCOMPRESSED (is \"${MANCOMPRESSED}\") can only be \"yes\", \"no\" or \"maybe\"". @${FALSE} .endif .endif @@ -1889,6 +1931,10 @@ .include "${PORTSDIR}/Mk/bsd.gstreamer.mk" .endif +.if defined(USE_EFL) || defined(WANT_EFL) || defined(USE_EFL_ESMART) +.include "${PORTSDIR}/Mk/bsd.efl.mk" +.endif + .if defined(USE_JAVA) .include "${PORTSDIR}/Mk/bsd.java.mk" .endif @@ -1937,6 +1983,9 @@ .include "${PORTSDIR}/Mk/bsd.gnome.mk" .endif +.if defined(USE_XFCE) +.include "${PORTSDIR}/Mk/bsd.xfce.mk" +.endif .if exists(${PORTSDIR}/../Makefile.inc) .include "${PORTSDIR}/../Makefile.inc" @@ -1998,6 +2047,18 @@ REINPLACE_ARGS?= -i.bak REINPLACE_CMD?= ${SED} ${REINPLACE_ARGS} +# Macro for coping entire directory tree with correct permissions +COPYTREE_BIN= ${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \ + 2>&1) && \ + ${CHOWN} -R ${BINOWN}:${BINGRP} $$1 && \ + ${FIND} $$1 -type d -exec chmod 755 {} \; && \ + ${FIND} $$1 -type f -exec chmod ${BINMODE} {} \;' -- +COPYTREE_SHARE= ${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \ + 2>&1) && \ + ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} $$1 && \ + ${FIND} $$1/ -type d -exec chmod 755 {} \; && \ + ${FIND} $$1/ -type f -exec chmod ${SHAREMODE} {} \;' -- + # Names of cookies used to skip already completed stages EXTRACT_COOKIE?= ${WRKDIR}/.extract_done.${PORTNAME}.${PREFIX:S/\//_/g} CONFIGURE_COOKIE?= ${WRKDIR}/.configure_done.${PORTNAME}.${PREFIX:S/\//_/g} @@ -2044,15 +2105,18 @@ PTHREAD_LIBS?= -pthread .if exists(/usr/bin/fetch) -FETCH_CMD?= /usr/bin/fetch -ApRr +FETCH_BINARY?= /usr/bin/fetch +FETCH_ARGS?= -ApRr FETCH_REGET?= 1 .if !defined(DISABLE_SIZE) FETCH_BEFORE_ARGS+= $${CKSIZE:+-S $$CKSIZE} .endif .else -FETCH_CMD?= /usr/bin/ftp +FETCH_BINARY?= /usr/bin/ftp +FETCH_ARGS?= -R FETCH_REGET?= 0 .endif +FETCH_CMD?= ${FETCH_BINARY} ${FETCH_ARGS} .if defined(RANDOMIZE_MASTER_SITES) .if exists(/usr/games/random) @@ -2257,8 +2321,8 @@ _G_TEMP= ${_group} . if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default check-makevars:: - @${ECHO_CMD} "Makefile error: the words all, ALL and default are reserved and cannot be" - @${ECHO_CMD} "used in group definitions. Please fix your MASTER_SITES" + @${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be" + @${ECHO_MSG} "used in group definitions. Please fix your MASTER_SITES" @${FALSE} . endif _MASTER_SITES_${_group}+= ${_S:C@^(.*/):[^/:]+$@\1@} @@ -2274,8 +2338,8 @@ _G_TEMP= ${_group} . if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default check-makevars:: - @${ECHO_CMD} "The words all, ALL and default are reserved and cannot be" - @${ECHO_CMD} "used in group definitions. Please fix your PATCH_SITES" + @${ECHO_MSG} "The words all, ALL and default are reserved and cannot be" + @${ECHO_MSG} "used in group definitions. Please fix your PATCH_SITES" @${FALSE} . endif _PATCH_SITES_${_group}+= ${_S:C@^(.*/):[^/:]+$@\1@} @@ -2296,8 +2360,8 @@ _G_TEMP= ${_group} . if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default check-makevars:: - @${ECHO_CMD} "Makefile error: the words all, ALL and default are reserved and cannot be" - @${ECHO_CMD} "used in group definitions. Please fix your MASTER_SITE_SUBDIR" + @${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be" + @${ECHO_MSG} "used in group definitions. Please fix your MASTER_SITE_SUBDIR" @${FALSE} . endif . if defined(_MASTER_SITES_${_group}) @@ -2317,8 +2381,8 @@ _G_TEMP= ${_group} . if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default check-makevars:: - @${ECHO_CMD} "Makefile error: the words all, ALL and default are reserved and cannot be" - @${ECHO_CMD} "used in group definitions. Please fix your PATCH_SITE_SUBDIR" + @${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be" + @${ECHO_MSG} "used in group definitions. Please fix your PATCH_SITE_SUBDIR" @${FALSE} . endif . if defined(_PATCH_SITES_${_group}) @@ -2650,7 +2714,7 @@ .if !defined(CATEGORIES) check-categories: - @${ECHO_CMD} "${PKGNAME}: Makefile error: CATEGORIES is mandatory." + @${ECHO_MSG} "${PKGNAME}: Makefile error: CATEGORIES is mandatory." @${FALSE} .else @@ -2674,7 +2738,7 @@ @if ${ECHO_CMD} ${VALID_CATEGORIES} | ${GREP} -wq ${cat}; then \ ${TRUE}; \ else \ - ${ECHO_CMD} "${PKGNAME}: Makefile error: category ${cat} not in list of valid categories."; \ + ${ECHO_MSG} "${PKGNAME}: Makefile error: category ${cat} not in list of valid categories."; \ ${FALSE}; \ fi .endfor @@ -2772,7 +2836,7 @@ }' | ${SED} -e 's \([^/ ][^ ]*\.\(.\)[^. ]*\) $${MAN\2PREFIX}/$$$$$$$${__lang}/man\2/\1${MANEXT}g' -e 's/ //g' -e 's/MANlPREFIX/MANLPREFIX/g' -e 's/MANnPREFIX/MANNPREFIX/g' .if ${__pmlinks:Mbroken} == "broken" check-makevars:: - @${ECHO_CMD} "${PKGNAME}: Makefile error: unable to parse MLINKS." + @${ECHO_MSG} "${PKGNAME}: Makefile error: unable to parse MLINKS." @${FALSE} .endif _MLINKS= ${_MLINKS_PREPEND} @@ -2857,12 +2921,18 @@ .endif DOCSDIR?= ${PREFIX}/share/doc/${PORTNAME} +DOCSDIR_REL= ${DOCSDIR:S,^${PREFIX}/,,} EXAMPLESDIR?= ${PREFIX}/share/examples/${PORTNAME} +EXAMPLESDIR_REL= ${EXAMPLESDIR:S,^${PREFIX}/,,} DATADIR?= ${PREFIX}/share/${PORTNAME} +DATADIR_REL= ${DATADIR:S,^${PREFIX}/,,} +WWWDIR?= ${PREFIX}/www/${PORTNAME} +WWWDIR_REL= ${WWWDIR:S,^${PREFIX}/,,} PLIST_SUB+= DOCSDIR="${DOCSDIR:S,^${PREFIX}/,,}" \ EXAMPLESDIR="${EXAMPLESDIR:S,^${PREFIX}/,,}" \ - DATADIR="${DATADIR:S,^${PREFIX}/,,}" + DATADIR="${DATADIR:S,^${PREFIX}/,,}" \ + WWWDIR="${WWWDIR:S,^${PREFIX}/,,}" DESKTOPDIR?= ${PREFIX}/share/applications _DESKTOPDIR_REL= ${DESKTOPDIR:S,^${PREFIX}/,,}/ @@ -2909,11 +2979,11 @@ .if defined(ONLY_FOR_ARCHS) .for __ARCH in ${ONLY_FOR_ARCHS} .if ${ARCH:M${__ARCH}} != "" -__ARCH_OK?= 1 +__ARCH_OK?= 1 .endif .endfor .else -__ARCH_OK?= 1 +__ARCH_OK?= 1 .endif .if defined(NOT_FOR_ARCHS) @@ -3453,7 +3523,7 @@ INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; then \ - ${ECHO_CMD} "===> Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \ + ${ECHO_MSG} "===> Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \ (${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT} 75 79 ; \ ${FALSE}; \ fi) @@ -3654,11 +3724,11 @@ else \ ${ECHO_CMD} "===> An older version of ${PKGORIGIN} is already installed ($${found_package})"; \ fi; \ - ${ECHO_CMD} " You may wish to \`\`make deinstall'' and install this port again"; \ - ${ECHO_CMD} " by \`\`make reinstall'' to upgrade it properly."; \ - ${ECHO_CMD} " If you really wish to overwrite the old port of ${PKGORIGIN}"; \ - ${ECHO_CMD} " without deleting it first, set the variable \"FORCE_PKG_REGISTER\""; \ - ${ECHO_CMD} " in your environment or the \"make install\" command line."; \ + ${ECHO_MSG} " You may wish to \`\`make deinstall'' and install this port again"; \ + ${ECHO_MSG} " by \`\`make reinstall'' to upgrade it properly."; \ + ${ECHO_MSG} " If you really wish to overwrite the old port of ${PKGORIGIN}"; \ + ${ECHO_MSG} " without deleting it first, set the variable \"FORCE_PKG_REGISTER\""; \ + ${ECHO_MSG} " in your environment or the \"make install\" command line."; \ exit 1; \ fi .else @@ -3689,8 +3759,8 @@ .if !defined(NO_MTREE) @if [ `${ID} -u` = 0 ]; then \ if [ ! -f ${MTREE_FILE} ]; then \ - ${ECHO_CMD} "Error: mtree file \"${MTREE_FILE}\" is missing."; \ - ${ECHO_CMD} "Copy it from a suitable location (e.g., /usr/src/etc/mtree) and try again."; \ + ${ECHO_MSG} "Error: mtree file \"${MTREE_FILE}\" is missing."; \ + ${ECHO_MSG} "Copy it from a suitable location (e.g., /usr/src/etc/mtree) and try again."; \ exit 1; \ else \ ${MTREE_CMD} ${MTREE_ARGS} ${PREFIX}/ >/dev/null; \ @@ -4066,9 +4136,9 @@ pretty-print-www-site: @www_site=$$(cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} www-site); \ if [ -n "$${www_site}" ]; then \ - ${ECHO_CMD} -n " and/or visit the "; \ - ${ECHO_CMD} -n "web site"; \ - ${ECHO_CMD} " for futher informations"; \ + ${ECHO_MSG} -n " and/or visit the "; \ + ${ECHO_MSG} -n "web site"; \ + ${ECHO_MSG} " for futher informations"; \ fi .endif @@ -4325,8 +4395,8 @@ for alg in ${CHECKSUM_ALGORITHMS:U}; do \ eval alg_executable=\$$$$alg; \ if [ -z "$$alg_executable" ]; then \ - ${ECHO_CMD} "Checksum algorithm $$alg: Couldn't find the executable."; \ - ${ECHO_CMD} "Set $$alg=/path/to/$$alg in /etc/make.conf and try again."; \ + ${ECHO_MSG} "Checksum algorithm $$alg: Couldn't find the executable."; \ + ${ECHO_MSG} "Set $$alg=/path/to/$$alg in /etc/make.conf and try again."; \ exit 1; \ fi; \ done; \ @@ -5052,13 +5122,13 @@ _PRETTY_PRINT_DEPENDS_LIST=\ if [ ! -r ${INDEXDIR}/${INDEXFILE} ] ; then \ - ${ECHO_CMD} "${.TARGET} requires an INDEX file (${INDEXFILE}). Please run make index or make fetchindex."; \ + ${ECHO_MSG} "${.TARGET} requires an INDEX file (${INDEXFILE}). Please run make index or make fetchindex."; \ else \ target=${.TARGET:C/pretty-print-(.*)-depends-list/\1/} ; \ if [ "$$target" = "build" ] ; then fldnum=8 ; else fldnum=9 ; fi ; \ - ${ECHO_CMD} -n 'This port requires package(s) "' ; \ - ${ECHO_CMD} -n `${AWK} -F\| "\\$$1 ~ /^${PKGNAME}/ {print \\$$$${fldnum};}" ${INDEXDIR}/${INDEXFILE}` ; \ - ${ECHO_CMD} "\" to $$target."; \ + ${ECHO_MSG} -n 'This port requires package(s) "' ; \ + ${ECHO_MSG} -n `${AWK} -F\| "\\$$1 ~ /^${PKGNAME}/ {print \\$$$${fldnum};}" ${INDEXDIR}/${INDEXFILE}` ; \ + ${ECHO_MSG} "\" to $$target."; \ fi; @@ -5083,7 +5153,7 @@ .if defined(SUB_FILES) .for file in ${SUB_FILES} .if !exists(${FILESDIR}/${file}.in) - @${ECHO_CMD} "** Missing ${FILESDIR}/${file}.in for ${PKGNAME}."; exit 1 + @${ECHO_MSG} "** Missing ${FILESDIR}/${file}.in for ${PKGNAME}."; exit 1 .else @${SED} ${_SUB_LIST_TEMP} -e '/^@comment /d' ${FILESDIR}/${file}.in > ${WRKDIR}/${file} .endif @@ -5103,7 +5173,7 @@ generate-plist: @${ECHO_MSG} "===> Generating temporary packing list" @${MKDIR} `${DIRNAME} ${TMPPLIST}` - @if [ ! -f ${DESCR} ]; then ${ECHO_CMD} "** Missing pkg-descr for ${PKGNAME}."; exit 1; fi + @if [ ! -f ${DESCR} ]; then ${ECHO_MSG} "** Missing pkg-descr for ${PKGNAME}."; exit 1; fi @>${TMPPLIST} @for file in ${PLIST_FILES}; do \ ${ECHO_CMD} $${file} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} >> ${TMPPLIST}; \ @@ -5181,15 +5251,14 @@ .for x in ${PORTDOCS} @if ${ECHO_CMD} "${x}"| ${AWK} '$$1 ~ /(\*|\||\[|\]|\?|\{|\}|\$$)/ { exit 1};'; then \ if [ ! -e ${DOCSDIR}/${x} ]; then \ - ${ECHO_CMD} ${DOCSDIR}/${x} | \ - ${SED} -e 's,^${PREFIX}/,,' >> ${TMPPLIST}; \ + ${ECHO_CMD} ${DOCSDIR_REL}/${x} >> ${TMPPLIST}; \ fi;fi .endfor @${FIND} -P ${PORTDOCS:S/^/${DOCSDIR}\//} ! -type d 2>/dev/null | \ ${SED} -ne 's,^${PREFIX}/,,p' >> ${TMPPLIST} @${FIND} -P -d ${PORTDOCS:S/^/${DOCSDIR}\//} -type d 2>/dev/null | \ ${SED} -ne 's,^${PREFIX}/,@dirrm ,p' >> ${TMPPLIST} - @${ECHO_CMD} "@dirrm ${DOCSDIR:S,^${PREFIX}/,,}" >> ${TMPPLIST} + @${ECHO_CMD} "@dirrm ${DOCSDIR_REL}" >> ${TMPPLIST} .else @${DO_NADA} .endif @@ -5234,7 +5303,7 @@ install-rc-script: .if defined(USE_RCORDER) || defined(USE_RC_SUBR) && ${USE_RC_SUBR:U} != "YES" .if defined(USE_RCORDER) - @${ECHO_CMD} "===> Installing early rc.d startup script(s)" + @${ECHO_MSG} "===> Installing early rc.d startup script(s)" @${ECHO_CMD} "@cwd /" >> ${TMPPLIST} @for i in ${USE_RCORDER}; do \ ${INSTALL_SCRIPT} ${WRKDIR}/$${i} /etc/rc.d/$${i%.sh}; \ @@ -5243,7 +5312,7 @@ @${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST} .endif .if defined(USE_RC_SUBR) && ${USE_RC_SUBR:U} != "YES" - @${ECHO_CMD} "===> Installing rc.d startup script(s)" + @${ECHO_MSG} "===> Installing rc.d startup script(s)" @${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST} @for i in ${USE_RC_SUBR}; do \ ${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${PREFIX}/etc/rc.d/$${i%.sh}${RC_SUBR_SUFFIX}; \ @@ -5619,11 +5688,11 @@ entry="$$entry ($$1)"; \ fi; \ if [ -z "$$1" ]; then \ - ${ECHO_CMD} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 1 (Name) is empty"; \ + ${ECHO_MSG} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 1 (Name) is empty"; \ exit 1; \ fi; \ if [ -z "$$4" ]; then \ - ${ECHO_CMD} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 4 (Exec) is empty"; \ + ${ECHO_MSG} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 4 (Exec) is empty"; \ exit 1; \ fi; \ if [ -n "$$5" ]; then \ @@ -5634,21 +5703,21 @@ fi; \ done; \ if ! ${ECHO_CMD} "$$5" | ${GREP} -q ';$$'; then \ - ${ECHO_CMD} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 5 (Categories) does not end with a semicolon"; \ + ${ECHO_MSG} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 5 (Categories) does not end with a semicolon"; \ exit 1; \ fi; \ else \ if [ -z "`cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} desktop-categories`" ]; then \ - ${ECHO_CMD} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 5 (Categories) is empty and could not be deduced from the CATEGORIES variable"; \ + ${ECHO_MSG} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 5 (Categories) is empty and could not be deduced from the CATEGORIES variable"; \ exit 1; \ fi; \ fi; \ if [ -z "$$6" ]; then \ - ${ECHO_CMD} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 6 (StartupNotify) is empty"; \ + ${ECHO_MSG} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 6 (StartupNotify) is empty"; \ exit 1; \ fi; \ if [ "x$$6" != "xtrue" ] && [ "x$$6" != "xfalse" ]; then \ - ${ECHO_CMD} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 6 (StartupNotify) is not \"true\" or \"false\""; \ + ${ECHO_MSG} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 6 (StartupNotify) is not \"true\" or \"false\""; \ exit 1; \ fi; \ shift 6; \ ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.subdir.mk#7 (text+ko) ==== @@ -1,5 +1,8 @@ +#-*- mode: makefile; tab-width: 4; -*- +# ex:ts=4 +# # from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91 -# $FreeBSD: ports/Mk/bsd.port.subdir.mk,v 1.68 2007/03/06 06:58:35 linimon Exp $ +# $FreeBSD: ports/Mk/bsd.port.subdir.mk,v 1.69 2007/03/24 14:02:06 pav Exp $ # # The include file contains the default targets # for building ports subdirectories. @@ -7,19 +10,19 @@ # # +++ variables +++ # -# STRIP The flag passed to the install program to cause the binary -# to be stripped. This is to be used when building your -# own install script so that the entire system can be made -# stripped/not-stripped using a single knob. [-s] +# STRIP - The flag passed to the install program to cause the binary +# to be stripped. This is to be used when building your +# own install script so that the entire system can be made +# stripped/not-stripped using a single knob. [-s] # -# ECHO_MSG Used to print all the '===>' style prompts - override this -# to turn them off [echo]. +# ECHO_MSG - Used to print all the '===>' style prompts - override this +# to turn them off [echo]. # -# OPSYS Get the operating system type [`uname -s`] +# OPSYS - Get the operating system type [`uname -s`] # -# SUBDIR A list of subdirectories that should be built as well. -# Each of the targets will execute the same target in the -# subdirectories. +# SUBDIR - A list of subdirectories that should be built as well. +# Each of the targets will execute the same target in the +# subdirectories. # # # +++ targets +++ ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.sites.mk#4 (text+ko) ==== @@ -20,7 +20,7 @@ # # Note: all entries should terminate with a slash. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Mar 27 04:08:13 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 83F7516A406; Tue, 27 Mar 2007 04:08:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 341FB16A404 for ; Tue, 27 Mar 2007 04:08:13 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 22BAE13C45D for ; Tue, 27 Mar 2007 04:08:13 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2R48Dkc015498 for ; Tue, 27 Mar 2007 04:08:13 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2R48CBK015495 for perforce@freebsd.org; Tue, 27 Mar 2007 04:08:12 GMT (envelope-from scottl@freebsd.org) Date: Tue, 27 Mar 2007 04:08:12 GMT Message-Id: <200703270408.l2R48CBK015495@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 116622 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Mar 2007 04:08:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=116622 Change 116622 by scottl@scottl-x64 on 2007/03/27 04:07:44 Don't let the periph be removed while the sysctl registration task is still running. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#10 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#26 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#10 (text+ko) ==== @@ -572,8 +572,10 @@ char tmpstr[80], tmpstr2[80]; periph = (struct cam_periph *)context; + if (cam_periph_acquire(periph) != CAM_REQ_CMP) + return; + softc = (struct cd_softc *)periph->softc; - snprintf(tmpstr, sizeof(tmpstr), "CAM CD unit %d", periph->unit_number); snprintf(tmpstr2, sizeof(tmpstr2), "%d", periph->unit_number); @@ -588,6 +590,7 @@ if (softc->sysctl_tree == NULL) { printf("cdsysctlinit: unable to allocate sysctl tree\n"); mtx_unlock(&Giant); + cam_periph_release(periph); return; } @@ -601,6 +604,7 @@ "Minimum CDB size"); mtx_unlock(&Giant); + cam_periph_release(periph); } /* ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#26 (text+ko) ==== @@ -1009,8 +1009,10 @@ char tmpstr[80], tmpstr2[80]; periph = (struct cam_periph *)context; + if (cam_periph_acquire(periph) != CAM_REQ_CMP) + return; + softc = (struct da_softc *)periph->softc; - snprintf(tmpstr, sizeof(tmpstr), "CAM DA unit %d", periph->unit_number); snprintf(tmpstr2, sizeof(tmpstr2), "%d", periph->unit_number); @@ -1023,6 +1025,7 @@ if (softc->sysctl_tree == NULL) { printf("dasysctlinit: unable to allocate sysctl tree\n"); mtx_unlock(&Giant); + cam_periph_release(periph); return; } @@ -1036,6 +1039,7 @@ "Minimum CDB size"); mtx_unlock(&Giant); + cam_periph_release(periph); } static int From owner-p4-projects@FreeBSD.ORG Tue Mar 27 05:01:20 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C79816A408; Tue, 27 Mar 2007 05:01:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 13CE616A406 for ; Tue, 27 Mar 2007 05:01:20 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0477F13C4AE for ; Tue, 27 Mar 2007 05:01:20 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2R51J1I074001 for ; Tue, 27 Mar 2007 05:01:19 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2R51Jdu073966 for perforce@freebsd.org; Tue, 27 Mar 2007 05:01:19 GMT (envelope-from scottl@freebsd.org) Date: Tue, 27 Mar 2007 05:01:19 GMT Message-Id: <200703270501.l2R51Jdu073966@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 116625 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Mar 2007 05:01:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=116625 Change 116625 by scottl@scottl-x64 on 2007/03/27 05:01:18 Fix up refcounting in the pass driver. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pass.c#19 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pass.c#19 (text+ko) ==== @@ -331,7 +331,7 @@ error = 0; /* default to no error */ periph = (struct cam_periph *)dev->si_drv1; - if (periph == NULL) + if (cam_periph_acquire(periph) != CAM_REQ_CMP) return (ENXIO); cam_periph_lock(periph); @@ -342,6 +342,7 @@ if (softc->flags & PASS_FLAG_INVALID) { splx(s); cam_periph_unlock(periph); + cam_periph_release(periph); return(ENXIO); } @@ -352,6 +353,7 @@ if (error) { splx(s); cam_periph_unlock(periph); + cam_periph_release(periph); return(error); } @@ -361,6 +363,7 @@ if (((flags & FWRITE) == 0) || ((flags & FREAD) == 0)) { splx(s); cam_periph_unlock(periph); + cam_periph_release(periph); return(EPERM); } @@ -371,17 +374,17 @@ xpt_print(periph->path, "can't do nonblocking access\n"); splx(s); cam_periph_unlock(periph); + cam_periph_release(periph); return(EINVAL); } splx(s); if ((softc->flags & PASS_FLAG_OPEN) == 0) { - if (cam_periph_acquire(periph) != CAM_REQ_CMP) { - cam_periph_unlock(periph); - return(ENXIO); - } softc->flags |= PASS_FLAG_OPEN; + } else { + /* Device closes aren't symmertical, so fix up the refcount */ + cam_periph_release(periph); } cam_periph_unlock(periph); @@ -404,8 +407,8 @@ softc = (struct pass_softc *)periph->softc; softc->flags &= ~PASS_FLAG_OPEN; + cam_periph_unlock(periph); cam_periph_release(periph); - cam_periph_unlock(periph); return (0); } @@ -526,7 +529,7 @@ break; } - cam_periph_lock(periph); + cam_periph_unlock(periph); return(error); } From owner-p4-projects@FreeBSD.ORG Tue Mar 27 05:11:33 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 24D0116A404; Tue, 27 Mar 2007 05:11:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E2A6116A401 for ; Tue, 27 Mar 2007 05:11:32 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D2FE113C45D for ; Tue, 27 Mar 2007 05:11:32 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2R5BWYd083892 for ; Tue, 27 Mar 2007 05:11:32 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2R5BWpO083881 for perforce@freebsd.org; Tue, 27 Mar 2007 05:11:32 GMT (envelope-from scottl@freebsd.org) Date: Tue, 27 Mar 2007 05:11:32 GMT Message-Id: <200703270511.l2R5BWpO083881@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 116626 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Mar 2007 05:11:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=116626 Change 116626 by scottl@scottl-x64 on 2007/03/27 05:10:35 Remove spls from scsi_pass. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pass.c#20 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pass.c#20 (text+ko) ==== @@ -326,7 +326,6 @@ struct cam_periph *periph; struct pass_softc *softc; int error; - int s; error = 0; /* default to no error */ @@ -338,9 +337,7 @@ softc = (struct pass_softc *)periph->softc; - s = splsoftcam(); if (softc->flags & PASS_FLAG_INVALID) { - splx(s); cam_periph_unlock(periph); cam_periph_release(periph); return(ENXIO); @@ -351,7 +348,6 @@ */ error = securelevel_gt(td->td_ucred, 1); if (error) { - splx(s); cam_periph_unlock(periph); cam_periph_release(periph); return(error); @@ -361,7 +357,6 @@ * Only allow read-write access. */ if (((flags & FWRITE) == 0) || ((flags & FREAD) == 0)) { - splx(s); cam_periph_unlock(periph); cam_periph_release(periph); return(EPERM); @@ -372,14 +367,11 @@ */ if ((flags & O_NONBLOCK) != 0) { xpt_print(periph->path, "can't do nonblocking access\n"); - splx(s); cam_periph_unlock(periph); cam_periph_release(periph); return(EINVAL); } - splx(s); - if ((softc->flags & PASS_FLAG_OPEN) == 0) { softc->flags |= PASS_FLAG_OPEN; } else { @@ -417,18 +409,15 @@ passstart(struct cam_periph *periph, union ccb *start_ccb) { struct pass_softc *softc; - int s; softc = (struct pass_softc *)periph->softc; switch (softc->state) { case PASS_STATE_NORMAL: - s = splbio(); start_ccb->ccb_h.ccb_type = PASS_CCB_WAITING; SLIST_INSERT_HEAD(&periph->ccb_list, &start_ccb->ccb_h, periph_links.sle); periph->immediate_priority = CAM_PRIORITY_NONE; - splx(s); wakeup(&periph->ccb_list); break; } From owner-p4-projects@FreeBSD.ORG Tue Mar 27 07:58:05 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E67EA16A405; Tue, 27 Mar 2007 07:58:04 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B8A5D16A404 for ; Tue, 27 Mar 2007 07:58:04 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A6E0413C4DD for ; Tue, 27 Mar 2007 07:58:04 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2R7w42M038781 for ; Tue, 27 Mar 2007 07:58:04 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2R7vxRW038315 for perforce@freebsd.org; Tue, 27 Mar 2007 07:57:59 GMT (envelope-from cdjones@FreeBSD.org) Date: Tue, 27 Mar 2007 07:57:59 GMT Message-Id: <200703270757.l2R7vxRW038315@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 116634 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Mar 2007 07:58:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=116634 Change 116634 by cdjones@cdjones_iconoclast on 2007/03/27 07:57:04 Integrate from current. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/Makefile.sun4v#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/files.sun4v#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/options.sun4v#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/Make.tags.inc#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/Makefile#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/bus_if.m#6 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/makesyscalls.sh#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/syscalls.master#6 edit .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/vnode_if.src#6 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_bus_dma.h#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_elf_solaris.h#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_lock.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_mutex.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/_semaphore.h#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/acl.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/apm.h#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ata.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/bio.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/buf.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/bufobj.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/bus.h#6 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/bus_dma.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/cdefs.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/clock.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/condvar.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/conf.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/cons.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/consio.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/copyright.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/cpu.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/digiio.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/dirent.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/domain.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/elf.h#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/elf32.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/elf64.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/elf_common.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/event.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/eventhandler.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/extattr.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/file.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/firmware.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/imgact.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/interrupt.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ioccom.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ipmi.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/jail.h#22 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/kbio.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/kernel.h#6 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/kobj.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ksem.h#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/libkern.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/lock.h#6 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/lock_profile.h#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/lockmgr.h#6 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mac.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mbuf.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mount.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mouse.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/msgbuf.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mutex.h#6 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/param.h#7 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/pcpu.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/pioctl.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/posix4.h#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/priority.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/priv.h#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/proc.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/protosw.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/queue.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/rtprio.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/runq.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sched.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sem.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/semaphore.h#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/signalvar.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sleepqueue.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/socket.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/socketvar.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sockio.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/soundcard.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/stat.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sx.h#6 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/syscall.h#6 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/syscall.mk#6 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/syscallsubr.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sysctl.h#6 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sysent.h#6 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sysproto.h#6 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/systm.h#6 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/thr.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/time.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ttycom.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/types.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/ucred.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/uio.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/umtx.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/unpcb.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/vmmeter.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/vnode.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/watchdog.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/redzone.c#1 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/vm/redzone.h#1 branch .. //depot/projects/soc2006/cdjones_jail/src/usr.sbin/jail/jail.8#6 integrate Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/Make.tags.inc#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/kern/Make.tags.inc,v 1.15 2003/03/05 19:24:21 peter Exp $ +# $FreeBSD: src/sys/kern/Make.tags.inc,v 1.17 2007/02/11 14:01:32 rodrigc Exp $ # @(#)Make.tags.inc 8.1 (Berkeley) 6/11/93 SYS?= ${.CURDIR}/.. @@ -47,7 +47,6 @@ ${SYS}/netnatm/*.[ch] \ ${SYS}/nfs/*.[ch] \ ${SYS}/pci/*.[ch] \ - ${SYS}/posix4/*.[ch] \ ${SYS}/ufs/ffs/*.[ch] \ ${SYS}/ufs/ufs/*.[ch] \ ${SYS}/vm/*.[ch] \ @@ -64,7 +63,6 @@ ${SYS}/netnatm \ ${SYS}/nfs \ ${SYS}/pci \ - ${SYS}/posix4 \ ${SYS}/vm \ ${SYS}/sys @@ -96,6 +94,6 @@ ${SYS}/fs/specfs \ ${SYS}/fs/umapfs \ ${SYS}/fs/unionfs \ - ${SYS}/isofs/cd9660 \ + ${SYS}/fs/cd9660 \ ${SYS}/ufs/ffs \ ${SYS}/ufs/ufs ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 3/21/94 -# $FreeBSD: src/sys/kern/Makefile,v 1.11.12.1 2005/07/18 19:54:49 jhb Exp $ +# $FreeBSD: src/sys/kern/Makefile,v 1.13 2006/08/05 19:25:14 jb Exp $ # Makefile for kernel tags files, init_sysent, etc. @@ -11,10 +11,11 @@ sysent: init_sysent.c syscalls.c ../sys/syscall.h ../sys/syscall.mk \ ../sys/sysproto.h -init_sysent.c syscalls.c ../sys/syscall.h \ +init_sysent.c syscalls.c systrace_args.c ../sys/syscall.h \ ../sys/syscall.mk ../sys/sysproto.h: makesyscalls.sh syscalls.master -mv -f init_sysent.c init_sysent.c.bak -mv -f syscalls.c syscalls.c.bak + -mv -f systrace_args.c systrace_args.c.bak -mv -f ../sys/syscall.h ../sys/syscall.h.bak -mv -f ../sys/syscall.mk ../sys/syscall.mk.bak -mv -f ../sys/sysproto.h ../sys/sysproto.h.bak ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/bus_if.m#6 (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/kern/bus_if.m,v 1.29.2.1 2006/07/12 22:57:57 imp Exp $ +# $FreeBSD: src/sys/kern/bus_if.m,v 1.34 2007/02/23 12:19:01 piso Exp $ # #include @@ -326,6 +326,7 @@ device_t _child; struct resource *_irq; int _flags; + driver_filter_t *_filter; driver_intr_t *_intr; void *_arg; void **_cookiep; @@ -529,3 +530,36 @@ const char * _dname; int _dunit; }; + +/** + * @brief Returns bus_dma_tag_t for use w/ devices on the bus. + * + * @param _dev the parent device of @p _child + * @param _child the device to which the tag will belong + */ +METHOD bus_dma_tag_t get_dma_tag { + device_t _dev; + device_t _child; +} DEFAULT bus_generic_get_dma_tag; + +/** + * @brief Notify a (bus) driver about a child that the hints mechanism + * believes it has discovered. + * + * The bus is responsible for then adding the child in the right order + * and discovering other things about the child. The bus driver is + * free to ignore this hint, to do special things, etc. It is all up + * to the bus driver to interpret. + * + * This method is only called in response to the parent bus asking for + * hinted devices to be enumerated. + * + * @param _dev the bus device + * @param _dname the name of the device w/o unit numbers + * @param _dunit the unit number of the device + */ +METHOD void hinted_child { + device_t _dev; + const char * _dname; + int _dunit; +}; ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/makesyscalls.sh#5 (text+ko) ==== @@ -1,6 +1,6 @@ #! /bin/sh - # @(#)makesyscalls.sh 8.1 (Berkeley) 6/10/93 -# $FreeBSD: src/sys/kern/makesyscalls.sh,v 1.62 2005/05/30 15:09:15 rwatson Exp $ +# $FreeBSD: src/sys/kern/makesyscalls.sh,v 1.67 2006/11/11 16:26:56 trhodes Exp $ set -e @@ -18,8 +18,10 @@ syscallprefix="SYS_" switchname="sysent" namesname="syscallnames" +systrace="systrace_args.c" # tmp files: +sysaue="sysent.aue.$$" sysdcl="sysent.dcl.$$" syscompat="sysent.compat.$$" syscompatdcl="sysent.compatdcl.$$" @@ -30,9 +32,9 @@ sysarg="sysarg.switch.$$" sysprotoend="sysprotoend.$$" -trap "rm $sysdcl $syscompat $syscompatdcl $syscompat4 $syscompat4dcl $sysent $sysinc $sysarg $sysprotoend" 0 +trap "rm $sysaue $sysdcl $syscompat $syscompatdcl $syscompat4 $syscompat4dcl $sysent $sysinc $sysarg $sysprotoend" 0 -touch $sysdcl $syscompat $syscompatdcl $syscompat4 $syscompat4dcl $sysent $sysinc $sysarg $sysprotoend +touch $sysaue $sysdcl $syscompat $syscompatdcl $syscompat4 $syscompat4dcl $sysent $sysinc $sysarg $sysprotoend case $# in 0) echo "usage: $0 input-file " 1>&2 @@ -58,6 +60,7 @@ } ' < $1 | awk " BEGIN { + sysaue = \"$sysaue\" sysdcl = \"$sysdcl\" sysproto = \"$sysproto\" sysprotoend = \"$sysprotoend\" @@ -73,6 +76,7 @@ sysnames = \"$sysnames\" syshdr = \"$syshdr\" sysmk = \"$sysmk\" + systrace = \"$systrace\" compat = \"$compat\" compat4 = \"$compat4\" syscallprefix = \"$syscallprefix\" @@ -102,6 +106,10 @@ printf "# FreeBSD system call names.\n" > sysmk printf "# DO NOT EDIT-- this file is automatically generated.\n" > sysmk printf "# $%s$\n", "FreeBSD" > sysmk + + printf "/*\n * System call argument to DTrace register array converstion.\n *\n" > systrace + printf " * DO NOT EDIT-- this file is automatically generated.\n" > systrace + printf " * $%s$\n", "FreeBSD" > systrace } NR == 1 { gsub("[$]FreeBSD: ", "", $0) @@ -117,10 +125,9 @@ printf "#define\t%s\n\n", sysproto_h > sysarg printf "#include \n" > sysarg printf "#include \n" > sysarg - printf "#include \n" > sysarg - printf "#include \n" > sysarg - printf "#include \n\n" > sysarg + printf "#include \n" > sysarg printf "#include \n\n" > sysarg + printf "#include \n\n" > sysarg printf "struct proc;\n\n" > sysarg printf "struct thread;\n\n" > sysarg printf "#define\tPAD_(t)\t(sizeof(register_t) <= sizeof(t) ? \\\n" > sysarg @@ -140,6 +147,11 @@ printf "# created from%s\nMIASM = ", $0 > sysmk + printf " * This file is part of the DTrace syscall provider.\n */\n\n" > systrace + printf "static void\nsystrace_args(int sysnum, void *params, u_int64_t *uarg, int *n_args)\n{\n" > systrace + printf "\tint64_t *iarg = (int64_t *) uarg;\n" > systrace + printf "\tswitch (sysnum) {\n" > systrace + next } NF == 0 || $1 ~ /^;/ { @@ -288,41 +300,28 @@ auditev = $2; } - # The 'M' type prefix - # - { - mpsafe = "SYF_MPSAFE | "; - if ($3 == "MSTD") { - $3 = "STD"; - } else if ($3 == "MNODEF") { - $3 = "NODEF"; - } else if ($3 == "MNOARGS") { - $3 = "NOARGS"; - } else if ($3 == "MNOPROTO") { - $3 = "NOPROTO"; - } else if ($3 == "MNOIMPL") { - $3 = "NOIMPL"; - } else if ($3 == "MNOSTD") { - $3 = "NOSTD"; - } else if ($3 == "MCOMPAT") { - $3 = "COMPAT"; - } else if ($3 == "MCOMPAT4") { - $3 = "COMPAT4"; - } else if ($3 == "MCPT_NOA") { - $3 = "CPT_NOA"; - } else if ($3 == "MLIBCOMPAT") { - $3 = "LIBCOMPAT"; - } else if ($3 == "MOBSOL") { - $3 = "OBSOL"; - } else if ($3 == "MUNIMPL") { - $3 = "UNIMPL"; - } else { - mpsafe = ""; - } - } $3 == "STD" || $3 == "NODEF" || $3 == "NOARGS" || $3 == "NOPROTO" \ || $3 == "NOIMPL" || $3 == "NOSTD" { parseline() + printf("\t/* %s */\n\tcase %d: {\n", funcname, syscall) > systrace + if (argc > 0) { + printf("\t\tstruct %s *p = params;\n", argalias) > systrace + for (i = 1; i <= argc; i++) { + if (index(argtype[i], "*") > 0 || argtype[i] == "caddr_t") + printf("\t\tuarg[%d] = (intptr_t) p->%s; /* %s */\n", \ + i - 1, \ + argname[i], argtype[i]) > systrace + else if (substr(argtype[i], 1, 1) == "u" || argtype[i] == "size_t") + printf("\t\tuarg[%d] = p->%s; /* %s */\n", \ + i - 1, \ + argname[i], argtype[i]) > systrace + else + printf("\t\tiarg[%d] = p->%s; /* %s */\n", \ + i - 1, \ + argname[i], argtype[i]) > systrace + } + } + printf("\t\t*n_args = %d;\n\t\tbreak;\n\t}\n", argc) > systrace if ((!nosys || funcname != "nosys") && \ (funcname != "lkmnosys") && (funcname != "lkmressys")) { if (argc != 0 && $3 != "NOARGS" && $3 != "NOPROTO") { @@ -347,21 +346,23 @@ printf("%s\t%s(struct thread *, struct %s *)", rettype, funcname, argalias) > sysdcl printf(";\n") > sysdcl + printf("#define\t%sAUE_%s\t%s\n", syscallprefix, + funcalias, auditev) > sysaue } if (funcname == "nosys") nosys = 1 if (funcname == "lkmnosys") lkmnosys = 1 - printf("\t{ %s%s, (sy_call_t *)", mpsafe, argssize) > sysent - column = 8 + 2 + length(mpsafe) + length(argssize) + 15 + printf("\t{ %s, (sy_call_t *)", argssize) > sysent + column = 8 + 2 + length(argssize) + 15 if ($3 == "NOIMPL") { - printf("%s },", "nosys, AUE_NULL") > sysent + printf("%s },", "nosys, AUE_NULL, NULL, 0, 0") > sysent column = column + length("nosys") + 3 } else if ($3 == "NOSTD") { - printf("%s },", "lkmressys, AUE_NULL") > sysent + printf("%s },", "lkmressys, AUE_NULL, NULL, 0, 0") > sysent column = column + length("lkmressys") + 3 } else { - printf("%s, %s },", funcname, auditev) > sysent + printf("%s, %s, NULL, 0, 0 },", funcname, auditev) > sysent column = column + length(funcname) + length(auditev) + 3 } align_sysent_comment(column) @@ -406,9 +407,9 @@ argalias) > sysarg printf("%s\t%s%s(struct thread *, struct %s *);\n", rettype, prefix, funcname, argalias) > outdcl - printf("\t{ %s(%s%s,%s), %s },", - wrap, mpsafe, argssize, funcname, auditev) > sysent - align_sysent_comment(8 + 9 + length(mpsafe) + \ + printf("\t{ %s(%s,%s), %s, NULL, 0, 0 },", + wrap, argssize, funcname, auditev) > sysent + align_sysent_comment(8 + 9 + \ length(argssize) + 1 + length(funcname) + length(auditev) + 4) printf("/* %d = old %s */\n", syscall, funcalias) > sysent printf("\t\"old.%s\",\t\t/* %d = old %s */\n", @@ -422,9 +423,9 @@ ncompat++ parseline() printf("%s\to%s();\n", rettype, funcname) > syscompatdcl - printf("\t{ compat(%s%s,%s), %s },", - mpsafe, argssize, funcname, auditev) > sysent - align_sysent_comment(8 + 9 + length(mpsafe) + \ + printf("\t{ compat(%s,%s), %s, NULL, 0, 0 },", + argssize, funcname, auditev) > sysent + align_sysent_comment(8 + 9 + \ length(argssize) + 1 + length(funcname) + length(auditev) + 4) printf("/* %d = old %s */\n", syscall, funcalias) > sysent printf("\t\"old.%s\",\t\t/* %d = old %s */\n", @@ -436,7 +437,7 @@ next } $3 == "OBSOL" { - printf("\t{ 0, (sy_call_t *)nosys, AUE_NULL },") > sysent + printf("\t{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },") > sysent align_sysent_comment(34) printf("/* %d = obsolete %s */\n", syscall, comment) > sysent printf("\t\"obs_%s\",\t\t\t/* %d = obsolete %s */\n", @@ -447,7 +448,7 @@ next } $3 == "UNIMPL" { - printf("\t{ 0, (sy_call_t *)nosys, AUE_NULL },\t\t\t/* %d = %s */\n", + printf("\t{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },\t\t\t/* %d = %s */\n", syscall, comment) > sysent printf("\t\"#%d\",\t\t\t/* %d = %s */\n", syscall, syscall, comment) > sysnames @@ -485,7 +486,7 @@ printf("\n#endif /* %s */\n\n", compat4) > syscompat4dcl - printf("#undef PAD_\n") > sysprotoend + printf("\n#undef PAD_\n") > sysprotoend printf("#undef PADL_\n") > sysprotoend printf("#undef PADR_\n") > sysprotoend printf("\n#endif /* !%s */\n", sysproto_h) > sysprotoend @@ -495,11 +496,12 @@ printf("};\n") > sysnames printf("#define\t%sMAXSYSCALL\t%d\n", syscallprefix, syscall) \ > syshdr + printf "\tdefault:\n\t\t*n_args = 0;\n\t\tbreak;\n\t};\n}\n" > systrace } ' cat $sysinc $sysent >> $syssw cat $sysarg $sysdcl \ $syscompat $syscompatdcl \ $syscompat4 $syscompat4dcl \ - $sysprotoend > $sysproto + $sysaue $sysprotoend > $sysproto ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/syscalls.master#6 (text+ko) ==== @@ -1,19 +1,18 @@ - $FreeBSD: src/sys/kern/syscalls.master,v 1.198.2.2 2006/03/17 01:47:06 rwatson Exp $ + $FreeBSD: src/sys/kern/syscalls.master,v 1.231 2006/11/03 15:23:14 rrs Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; ; System call name/number master file. ; Processed to created init_sysent.c, syscalls.c and syscall.h. -; Columns: number [M]type nargs name alt{name,tag,rtyp}/comments +; Columns: number audit type name alt{name,tag,rtyp}/comments ; number system call number, must be in order ; audit the audit event associated with the system call ; A value of AUE_NULL means no auditing, but it also means that ; there is no audit event for the call at this time. For the ; case where the event exists, but we don't want auditing, the ; event should be #defined to AUE_NULL in audit_kevents.h. -; type one of [M]STD, [M]OBSOL, [M]UNIMPL, [M]COMPAT, [M]CPT_NOA, -; [M]LIBCOMPAT, [M]NODEF, [M]NOARGS, [M]NOPROTO, [M]NOIMPL, -; [M]NOSTD, [M]COMPAT4 +; type one of STD, OBSOL, UNIMPL, COMPAT, CPT_NOA, LIBCOMPAT, +; NODEF, NOARGS, NOPROTO, NOIMPL, NOSTD, COMPAT4 ; name psuedo-prototype of syscall routine ; If one of the following alts is different, then all appear: ; altname name of system call if different @@ -22,9 +21,6 @@ ; for UNIMPL/OBSOL, name continues with comments ; types: -; [M] e.g. like MSTD -- means the system call is MP-safe. If no -; M prefix is used, the syscall wrapper will obtain the Giant -; lock for the syscall. ; STD always included ; COMPAT included on COMPAT #ifdef ; COMPAT4 included on COMPAT4 #ifdef (FreeBSD 4 compat) @@ -32,8 +28,8 @@ ; OBSOL obsolete, not included in system, only specifies name ; UNIMPL not implemented, placeholder only ; NOSTD implemented but as a lkm that can be statically -; compiled in sysent entry will be filled with lkmsys -; so the SYSCALL_MODULE macro works +; compiled in; sysent entry will be filled with lkmsys +; so the SYSCALL_MODULE macro works ; ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master @@ -50,247 +46,247 @@ ; redistributions should be placed in the reserved range at the end ; of the current calls. -0 AUE_NULL MSTD { int nosys(void); } syscall nosys_args int -1 AUE_NULL MSTD { void sys_exit(int rval); } exit \ +0 AUE_NULL STD { int nosys(void); } syscall nosys_args int +1 AUE_EXIT STD { void sys_exit(int rval); } exit \ sys_exit_args void -2 AUE_NULL MSTD { int fork(void); } -3 AUE_NULL MSTD { ssize_t read(int fd, void *buf, \ +2 AUE_FORK STD { int fork(void); } +3 AUE_NULL STD { ssize_t read(int fd, void *buf, \ size_t nbyte); } -4 AUE_NULL MSTD { ssize_t write(int fd, const void *buf, \ +4 AUE_NULL STD { ssize_t write(int fd, const void *buf, \ size_t nbyte); } -5 AUE_NULL MSTD { int open(char *path, int flags, int mode); } +5 AUE_OPEN_RWTC STD { int open(char *path, int flags, int mode); } ; XXX should be { int open(const char *path, int flags, ...); } ; but we're not ready for `const' or varargs. ; XXX man page says `mode_t mode'. -6 AUE_NULL MSTD { int close(int fd); } -7 AUE_NULL MSTD { int wait4(int pid, int *status, \ +6 AUE_CLOSE STD { int close(int fd); } +7 AUE_WAIT4 STD { int wait4(int pid, int *status, \ int options, struct rusage *rusage); } \ wait4 wait_args int -8 AUE_NULL MCOMPAT { int creat(char *path, int mode); } -9 AUE_NULL MSTD { int link(char *path, char *link); } -10 AUE_NULL MSTD { int unlink(char *path); } +8 AUE_CREAT COMPAT { int creat(char *path, int mode); } +9 AUE_LINK STD { int link(char *path, char *link); } +10 AUE_UNLINK STD { int unlink(char *path); } 11 AUE_NULL OBSOL execv -12 AUE_NULL MSTD { int chdir(char *path); } -13 AUE_NULL MSTD { int fchdir(int fd); } -14 AUE_NULL MSTD { int mknod(char *path, int mode, int dev); } -15 AUE_NULL MSTD { int chmod(char *path, int mode); } -16 AUE_NULL MSTD { int chown(char *path, int uid, int gid); } -17 AUE_NULL MSTD { int obreak(char *nsize); } break \ +12 AUE_CHDIR STD { int chdir(char *path); } +13 AUE_FCHDIR STD { int fchdir(int fd); } +14 AUE_MKNOD STD { int mknod(char *path, int mode, int dev); } +15 AUE_CHMOD STD { int chmod(char *path, int mode); } +16 AUE_CHOWN STD { int chown(char *path, int uid, int gid); } +17 AUE_NULL STD { int obreak(char *nsize); } break \ obreak_args int -18 AUE_NULL MCOMPAT4 { int getfsstat(struct ostatfs *buf, \ +18 AUE_GETFSSTAT COMPAT4 { int getfsstat(struct ostatfs *buf, \ long bufsize, int flags); } -19 AUE_NULL MCOMPAT { long lseek(int fd, long offset, \ +19 AUE_LSEEK COMPAT { long lseek(int fd, long offset, \ int whence); } -20 AUE_NULL MSTD { pid_t getpid(void); } -21 AUE_NULL STD { int mount(char *type, char *path, \ +20 AUE_GETPID STD { pid_t getpid(void); } +21 AUE_MOUNT STD { int mount(char *type, char *path, \ int flags, caddr_t data); } ; XXX `path' should have type `const char *' but we're not ready for that. -22 AUE_NULL STD { int unmount(char *path, int flags); } -23 AUE_NULL MSTD { int setuid(uid_t uid); } -24 AUE_NULL MSTD { uid_t getuid(void); } -25 AUE_NULL MSTD { uid_t geteuid(void); } -26 AUE_NULL MSTD { int ptrace(int req, pid_t pid, \ +22 AUE_UMOUNT STD { int unmount(char *path, int flags); } +23 AUE_SETUID STD { int setuid(uid_t uid); } +24 AUE_GETUID STD { uid_t getuid(void); } +25 AUE_GETEUID STD { uid_t geteuid(void); } +26 AUE_PTRACE STD { int ptrace(int req, pid_t pid, \ caddr_t addr, int data); } -27 AUE_NULL MSTD { int recvmsg(int s, struct msghdr *msg, \ +27 AUE_RECVMSG STD { int recvmsg(int s, struct msghdr *msg, \ int flags); } -28 AUE_NULL MSTD { int sendmsg(int s, struct msghdr *msg, \ +28 AUE_SENDMSG STD { int sendmsg(int s, struct msghdr *msg, \ int flags); } -29 AUE_NULL MSTD { int recvfrom(int s, caddr_t buf, \ +29 AUE_RECVFROM STD { int recvfrom(int s, caddr_t buf, \ size_t len, int flags, \ struct sockaddr * __restrict from, \ __socklen_t * __restrict fromlenaddr); } -30 AUE_NULL MSTD { int accept(int s, \ +30 AUE_ACCEPT STD { int accept(int s, \ struct sockaddr * __restrict name, \ __socklen_t * __restrict anamelen); } -31 AUE_NULL MSTD { int getpeername(int fdes, \ +31 AUE_GETPEERNAME STD { int getpeername(int fdes, \ struct sockaddr * __restrict asa, \ __socklen_t * __restrict alen); } -32 AUE_NULL MSTD { int getsockname(int fdes, \ +32 AUE_GETSOCKNAME STD { int getsockname(int fdes, \ struct sockaddr * __restrict asa, \ __socklen_t * __restrict alen); } -33 AUE_NULL MSTD { int access(char *path, int flags); } -34 AUE_NULL MSTD { int chflags(char *path, int flags); } -35 AUE_NULL MSTD { int fchflags(int fd, int flags); } -36 AUE_NULL MSTD { int sync(void); } -37 AUE_NULL MSTD { int kill(int pid, int signum); } -38 AUE_NULL MCOMPAT { int stat(char *path, struct ostat *ub); } -39 AUE_NULL MSTD { pid_t getppid(void); } -40 AUE_NULL MCOMPAT { int lstat(char *path, struct ostat *ub); } -41 AUE_NULL MSTD { int dup(u_int fd); } -42 AUE_NULL MSTD { int pipe(void); } -43 AUE_NULL MSTD { gid_t getegid(void); } -44 AUE_NULL MSTD { int profil(caddr_t samples, size_t size, \ +33 AUE_ACCESS STD { int access(char *path, int flags); } +34 AUE_CHFLAGS STD { int chflags(char *path, int flags); } +35 AUE_FCHFLAGS STD { int fchflags(int fd, int flags); } +36 AUE_SYNC STD { int sync(void); } +37 AUE_KILL STD { int kill(int pid, int signum); } +38 AUE_STAT COMPAT { int stat(char *path, struct ostat *ub); } +39 AUE_GETPPID STD { pid_t getppid(void); } +40 AUE_LSTAT COMPAT { int lstat(char *path, struct ostat *ub); } +41 AUE_DUP STD { int dup(u_int fd); } +42 AUE_PIPE STD { int pipe(void); } +43 AUE_GETEGID STD { gid_t getegid(void); } +44 AUE_PROFILE STD { int profil(caddr_t samples, size_t size, \ size_t offset, u_int scale); } -45 AUE_NULL MSTD { int ktrace(const char *fname, int ops, \ +45 AUE_KTRACE STD { int ktrace(const char *fname, int ops, \ int facs, int pid); } -46 AUE_NULL MCOMPAT { int sigaction(int signum, \ +46 AUE_SIGACTION COMPAT { int sigaction(int signum, \ struct osigaction *nsa, \ struct osigaction *osa); } -47 AUE_NULL MSTD { gid_t getgid(void); } -48 AUE_NULL MCOMPAT { int sigprocmask(int how, osigset_t mask); } +47 AUE_GETGID STD { gid_t getgid(void); } +48 AUE_SIGPROCMASK COMPAT { int sigprocmask(int how, osigset_t mask); } ; XXX note nonstandard (bogus) calling convention - the libc stub passes ; us the mask, not a pointer to it, and we return the old mask as the ; (int) return value. -49 AUE_NULL MSTD { int getlogin(char *namebuf, u_int \ +49 AUE_GETLOGIN STD { int getlogin(char *namebuf, u_int \ namelen); } -50 AUE_NULL MSTD { int setlogin(char *namebuf); } -51 AUE_NULL MSTD { int acct(char *path); } -52 AUE_NULL MCOMPAT { int sigpending(void); } -53 AUE_NULL MSTD { int sigaltstack(stack_t *ss, \ +50 AUE_SETLOGIN STD { int setlogin(char *namebuf); } +51 AUE_ACCT STD { int acct(char *path); } +52 AUE_SIGPENDING COMPAT { int sigpending(void); } +53 AUE_SIGALTSTACK STD { int sigaltstack(stack_t *ss, \ stack_t *oss); } -54 AUE_NULL MSTD { int ioctl(int fd, u_long com, \ +54 AUE_IOCTL STD { int ioctl(int fd, u_long com, \ caddr_t data); } -55 AUE_NULL MSTD { int reboot(int opt); } -56 AUE_NULL MSTD { int revoke(char *path); } -57 AUE_NULL MSTD { int symlink(char *path, char *link); } -58 AUE_NULL MSTD { int readlink(char *path, char *buf, \ +55 AUE_REBOOT STD { int reboot(int opt); } +56 AUE_REVOKE STD { int revoke(char *path); } +57 AUE_SYMLINK STD { int symlink(char *path, char *link); } +58 AUE_READLINK STD { int readlink(char *path, char *buf, \ int count); } -59 AUE_NULL MSTD { int execve(char *fname, char **argv, \ +59 AUE_EXECVE STD { int execve(char *fname, char **argv, \ char **envv); } -60 AUE_NULL MSTD { int umask(int newmask); } umask umask_args \ +60 AUE_UMASK STD { int umask(int newmask); } umask umask_args \ int -61 AUE_NULL MSTD { int chroot(char *path); } -62 AUE_NULL MCOMPAT { int fstat(int fd, struct ostat *sb); } -63 AUE_NULL MCOMPAT { int getkerninfo(int op, char *where, \ +61 AUE_CHROOT STD { int chroot(char *path); } +62 AUE_FSTAT COMPAT { int fstat(int fd, struct ostat *sb); } +63 AUE_NULL COMPAT { int getkerninfo(int op, char *where, \ size_t *size, int arg); } getkerninfo \ getkerninfo_args int -64 AUE_NULL MCOMPAT { int getpagesize(void); } getpagesize \ +64 AUE_NULL COMPAT { int getpagesize(void); } getpagesize \ getpagesize_args int -65 AUE_NULL MSTD { int msync(void *addr, size_t len, \ +65 AUE_MSYNC STD { int msync(void *addr, size_t len, \ int flags); } -66 AUE_NULL MSTD { int vfork(void); } +66 AUE_VFORK STD { int vfork(void); } 67 AUE_NULL OBSOL vread 68 AUE_NULL OBSOL vwrite -69 AUE_NULL MSTD { int sbrk(int incr); } -70 AUE_NULL MSTD { int sstk(int incr); } -71 AUE_NULL MCOMPAT { int mmap(void *addr, int len, int prot, \ +69 AUE_SBRK STD { int sbrk(int incr); } +70 AUE_SSTK STD { int sstk(int incr); } +71 AUE_MMAP COMPAT { int mmap(void *addr, int len, int prot, \ int flags, int fd, long pos); } -72 AUE_NULL MSTD { int ovadvise(int anom); } vadvise \ +72 AUE_O_VADVISE STD { int ovadvise(int anom); } vadvise \ ovadvise_args int -73 AUE_NULL MSTD { int munmap(void *addr, size_t len); } -74 AUE_NULL MSTD { int mprotect(const void *addr, size_t len, \ +73 AUE_MUNMAP STD { int munmap(void *addr, size_t len); } +74 AUE_MPROTECT STD { int mprotect(const void *addr, size_t len, \ int prot); } -75 AUE_NULL MSTD { int madvise(void *addr, size_t len, \ +75 AUE_MADVISE STD { int madvise(void *addr, size_t len, \ int behav); } 76 AUE_NULL OBSOL vhangup 77 AUE_NULL OBSOL vlimit -78 AUE_NULL MSTD { int mincore(const void *addr, size_t len, \ +78 AUE_MINCORE STD { int mincore(const void *addr, size_t len, \ char *vec); } -79 AUE_NULL MSTD { int getgroups(u_int gidsetsize, \ +79 AUE_GETGROUPS STD { int getgroups(u_int gidsetsize, \ gid_t *gidset); } -80 AUE_NULL MSTD { int setgroups(u_int gidsetsize, \ +80 AUE_SETGROUPS STD { int setgroups(u_int gidsetsize, \ gid_t *gidset); } -81 AUE_NULL MSTD { int getpgrp(void); } -82 AUE_NULL MSTD { int setpgid(int pid, int pgid); } -83 AUE_NULL MSTD { int setitimer(u_int which, struct \ +81 AUE_GETPGRP STD { int getpgrp(void); } +82 AUE_SETPGRP STD { int setpgid(int pid, int pgid); } +83 AUE_SETITIMER STD { int setitimer(u_int which, struct \ itimerval *itv, struct itimerval *oitv); } -84 AUE_NULL MCOMPAT { int wait(void); } -85 AUE_NULL MSTD { int swapon(char *name); } -86 AUE_NULL MSTD { int getitimer(u_int which, \ +84 AUE_WAIT4 COMPAT { int wait(void); } +85 AUE_SWAPON STD { int swapon(char *name); } +86 AUE_GETITIMER STD { int getitimer(u_int which, \ struct itimerval *itv); } -87 AUE_NULL MCOMPAT { int gethostname(char *hostname, \ +87 AUE_SYSCTL COMPAT { int gethostname(char *hostname, \ u_int len); } gethostname \ gethostname_args int -88 AUE_NULL MCOMPAT { int sethostname(char *hostname, \ +88 AUE_SYSCTL COMPAT { int sethostname(char *hostname, \ u_int len); } sethostname \ sethostname_args int -89 AUE_NULL MSTD { int getdtablesize(void); } -90 AUE_NULL MSTD { int dup2(u_int from, u_int to); } +89 AUE_GETDTABLESIZE STD { int getdtablesize(void); } +90 AUE_DUP2 STD { int dup2(u_int from, u_int to); } 91 AUE_NULL UNIMPL getdopt -92 AUE_NULL MSTD { int fcntl(int fd, int cmd, long arg); } +92 AUE_FCNTL STD { int fcntl(int fd, int cmd, long arg); } ; XXX should be { int fcntl(int fd, int cmd, ...); } ; but we're not ready for varargs. -93 AUE_NULL MSTD { int select(int nd, fd_set *in, fd_set *ou, \ +93 AUE_SELECT STD { int select(int nd, fd_set *in, fd_set *ou, \ fd_set *ex, struct timeval *tv); } 94 AUE_NULL UNIMPL setdopt -95 AUE_NULL MSTD { int fsync(int fd); } -96 AUE_NULL MSTD { int setpriority(int which, int who, \ +95 AUE_FSYNC STD { int fsync(int fd); } +96 AUE_SETPRIORITY STD { int setpriority(int which, int who, \ int prio); } -97 AUE_NULL MSTD { int socket(int domain, int type, \ +97 AUE_SOCKET STD { int socket(int domain, int type, \ int protocol); } -98 AUE_NULL MSTD { int connect(int s, caddr_t name, \ +98 AUE_CONNECT STD { int connect(int s, caddr_t name, \ int namelen); } -99 AUE_NULL MCPT_NOA { int accept(int s, caddr_t name, \ +99 AUE_ACCEPT CPT_NOA { int accept(int s, caddr_t name, \ int *anamelen); } accept accept_args int -100 AUE_NULL MSTD { int getpriority(int which, int who); } -101 AUE_NULL MCOMPAT { int send(int s, caddr_t buf, int len, \ +100 AUE_GETPRIORITY STD { int getpriority(int which, int who); } +101 AUE_SEND COMPAT { int send(int s, caddr_t buf, int len, \ int flags); } -102 AUE_NULL MCOMPAT { int recv(int s, caddr_t buf, int len, \ +102 AUE_RECV COMPAT { int recv(int s, caddr_t buf, int len, \ int flags); } -103 AUE_NULL MCOMPAT { int sigreturn( \ +103 AUE_SIGRETURN COMPAT { int sigreturn( \ struct osigcontext *sigcntxp); } -104 AUE_NULL MSTD { int bind(int s, caddr_t name, \ +104 AUE_BIND STD { int bind(int s, caddr_t name, \ int namelen); } -105 AUE_NULL MSTD { int setsockopt(int s, int level, int name, \ +105 AUE_SETSOCKOPT STD { int setsockopt(int s, int level, int name, \ caddr_t val, int valsize); } -106 AUE_NULL MSTD { int listen(int s, int backlog); } +106 AUE_LISTEN STD { int listen(int s, int backlog); } 107 AUE_NULL OBSOL vtimes -108 AUE_NULL MCOMPAT { int sigvec(int signum, struct sigvec *nsv, \ +108 AUE_NULL COMPAT { int sigvec(int signum, struct sigvec *nsv, \ struct sigvec *osv); } -109 AUE_NULL MCOMPAT { int sigblock(int mask); } -110 AUE_NULL MCOMPAT { int sigsetmask(int mask); } -111 AUE_NULL MCOMPAT { int sigsuspend(osigset_t mask); } +109 AUE_NULL COMPAT { int sigblock(int mask); } +110 AUE_NULL COMPAT { int sigsetmask(int mask); } +111 AUE_NULL COMPAT { int sigsuspend(osigset_t mask); } ; XXX note nonstandard (bogus) calling convention - the libc stub passes ; us the mask, not a pointer to it. -112 AUE_NULL MCOMPAT { int sigstack(struct sigstack *nss, \ +112 AUE_NULL COMPAT { int sigstack(struct sigstack *nss, \ struct sigstack *oss); } -113 AUE_NULL MCOMPAT { int recvmsg(int s, struct omsghdr *msg, \ +113 AUE_RECVMSG COMPAT { int recvmsg(int s, struct omsghdr *msg, \ int flags); } -114 AUE_NULL MCOMPAT { int sendmsg(int s, caddr_t msg, \ +114 AUE_SENDMSG COMPAT { int sendmsg(int s, caddr_t msg, \ int flags); } 115 AUE_NULL OBSOL vtrace -116 AUE_NULL MSTD { int gettimeofday(struct timeval *tp, \ +116 AUE_GETTIMEOFDAY STD { int gettimeofday(struct timeval *tp, \ struct timezone *tzp); } -117 AUE_NULL MSTD { int getrusage(int who, \ +117 AUE_GETRUSAGE STD { int getrusage(int who, \ struct rusage *rusage); } -118 AUE_NULL MSTD { int getsockopt(int s, int level, int name, \ +118 AUE_GETSOCKOPT STD { int getsockopt(int s, int level, int name, \ caddr_t val, int *avalsize); } 119 AUE_NULL UNIMPL resuba (BSD/OS 2.x) -120 AUE_NULL MSTD { int readv(int fd, struct iovec *iovp, \ +120 AUE_READV STD { int readv(int fd, struct iovec *iovp, \ u_int iovcnt); } -121 AUE_NULL MSTD { int writev(int fd, struct iovec *iovp, \ +121 AUE_WRITEV STD { int writev(int fd, struct iovec *iovp, \ u_int iovcnt); } -122 AUE_NULL MSTD { int settimeofday(struct timeval *tv, \ +122 AUE_SETTIMEOFDAY STD { int settimeofday(struct timeval *tv, \ struct timezone *tzp); } -123 AUE_NULL MSTD { int fchown(int fd, int uid, int gid); } -124 AUE_NULL MSTD { int fchmod(int fd, int mode); } -125 AUE_NULL MCPT_NOA { int recvfrom(int s, caddr_t buf, \ +123 AUE_FCHOWN STD { int fchown(int fd, int uid, int gid); } +124 AUE_FCHMOD STD { int fchmod(int fd, int mode); } +125 AUE_RECVFROM CPT_NOA { int recvfrom(int s, caddr_t buf, \ size_t len, int flags, caddr_t from, int \ *fromlenaddr); } recvfrom recvfrom_args \ int -126 AUE_NULL MSTD { int setreuid(int ruid, int euid); } -127 AUE_NULL MSTD { int setregid(int rgid, int egid); } -128 AUE_NULL MSTD { int rename(char *from, char *to); } -129 AUE_NULL MCOMPAT { int truncate(char *path, long length); } -130 AUE_NULL MCOMPAT { int ftruncate(int fd, long length); } -131 AUE_NULL MSTD { int flock(int fd, int how); } -132 AUE_NULL MSTD { int mkfifo(char *path, int mode); } -133 AUE_NULL MSTD { int sendto(int s, caddr_t buf, size_t len, \ +126 AUE_SETREUID STD { int setreuid(int ruid, int euid); } +127 AUE_SETREGID STD { int setregid(int rgid, int egid); } +128 AUE_RENAME STD { int rename(char *from, char *to); } +129 AUE_TRUNCATE COMPAT { int truncate(char *path, long length); } +130 AUE_FTRUNCATE COMPAT { int ftruncate(int fd, long length); } +131 AUE_FLOCK STD { int flock(int fd, int how); } +132 AUE_MKFIFO STD { int mkfifo(char *path, int mode); } +133 AUE_SENDTO STD { int sendto(int s, caddr_t buf, size_t len, \ int flags, caddr_t to, int tolen); } -134 AUE_NULL MSTD { int shutdown(int s, int how); } -135 AUE_NULL MSTD { int socketpair(int domain, int type, \ +134 AUE_SHUTDOWN STD { int shutdown(int s, int how); } +135 AUE_SOCKETPAIR STD { int socketpair(int domain, int type, \ int protocol, int *rsv); } -136 AUE_NULL MSTD { int mkdir(char *path, int mode); } -137 AUE_NULL MSTD { int rmdir(char *path); } -138 AUE_NULL MSTD { int utimes(char *path, \ +136 AUE_MKDIR STD { int mkdir(char *path, int mode); } +137 AUE_RMDIR STD { int rmdir(char *path); } +138 AUE_UTIMES STD { int utimes(char *path, \ struct timeval *tptr); } 139 AUE_NULL OBSOL 4.2 sigreturn -140 AUE_NULL MSTD { int adjtime(struct timeval *delta, \ +140 AUE_ADJTIME STD { int adjtime(struct timeval *delta, \ struct timeval *olddelta); } -141 AUE_NULL MCOMPAT { int getpeername(int fdes, caddr_t asa, \ +141 AUE_GETPEERNAME COMPAT { int getpeername(int fdes, caddr_t asa, \ int *alen); } -142 AUE_NULL MCOMPAT { long gethostid(void); } -143 AUE_NULL MCOMPAT { int sethostid(long hostid); } -144 AUE_NULL MCOMPAT { int getrlimit(u_int which, struct \ +142 AUE_SYSCTL COMPAT { long gethostid(void); } +143 AUE_SYSCTL COMPAT { int sethostid(long hostid); } +144 AUE_GETRLIMIT COMPAT { int getrlimit(u_int which, struct \ orlimit *rlp); } -145 AUE_NULL MCOMPAT { int setrlimit(u_int which, \ +145 AUE_SETRLIMIT COMPAT { int setrlimit(u_int which, \ struct orlimit *rlp); } -146 AUE_NULL MCOMPAT { int killpg(int pgid, int signum); } -147 AUE_NULL MSTD { int setsid(void); } -148 AUE_NULL MSTD { int quotactl(char *path, int cmd, int uid, \ +146 AUE_KILLPG COMPAT { int killpg(int pgid, int signum); } +147 AUE_SETSID STD { int setsid(void); } +148 AUE_QUOTACTL STD { int quotactl(char *path, int cmd, int uid, \ caddr_t arg); } -149 AUE_NULL MCOMPAT { int quota(void); } -150 AUE_NULL MCPT_NOA { int getsockname(int fdec, \ +149 AUE_O_QUOTA COMPAT { int quota(void); } +150 AUE_GETSOCKNAME CPT_NOA { int getsockname(int fdec, \ caddr_t asa, int *alen); } getsockname \ getsockname_args int @@ -303,95 +299,95 @@ 153 AUE_NULL UNIMPL asyncdaemon (BSD/OS 2.x) 154 AUE_NULL UNIMPL nosys ; 155 is initialized by the NFS code, if present. -155 AUE_NULL MNOIMPL { int nfssvc(int flag, caddr_t argp); } -156 AUE_NULL COMPAT { int getdirentries(int fd, char *buf, \ +155 AUE_NFS_SVC NOSTD { int nfssvc(int flag, caddr_t argp); } +156 AUE_GETDIRENTRIES COMPAT { int getdirentries(int fd, char *buf, \ u_int count, long *basep); } -157 AUE_NULL MCOMPAT4 { int statfs(char *path, \ +157 AUE_STATFS COMPAT4 { int statfs(char *path, \ struct ostatfs *buf); } -158 AUE_NULL MCOMPAT4 { int fstatfs(int fd, \ +158 AUE_FSTATFS COMPAT4 { int fstatfs(int fd, \ struct ostatfs *buf); } 159 AUE_NULL UNIMPL nosys -160 AUE_NULL MSTD { int lgetfh(char *fname, \ +160 AUE_LGETFH STD { int lgetfh(char *fname, \ struct fhandle *fhp); } -161 AUE_NULL MSTD { int getfh(char *fname, \ +161 AUE_NFS_GETFH STD { int getfh(char *fname, \ struct fhandle *fhp); } -162 AUE_NULL MSTD { int getdomainname(char *domainname, \ +162 AUE_SYSCTL STD { int getdomainname(char *domainname, \ int len); } -163 AUE_NULL MSTD { int setdomainname(char *domainname, \ +163 AUE_SYSCTL STD { int setdomainname(char *domainname, \ int len); } -164 AUE_NULL MSTD { int uname(struct utsname *name); } -165 AUE_NULL MSTD { int sysarch(int op, char *parms); } -166 AUE_NULL MSTD { int rtprio(int function, pid_t pid, \ +164 AUE_NULL STD { int uname(struct utsname *name); } +165 AUE_SYSARCH STD { int sysarch(int op, char *parms); } +166 AUE_RTPRIO STD { int rtprio(int function, pid_t pid, \ struct rtprio *rtp); } 167 AUE_NULL UNIMPL nosys 168 AUE_NULL UNIMPL nosys ; 169 is initialized by the SYSVSEM code if present or loaded -169 AUE_NULL MNOSTD { int semsys(int which, int a2, int a3, \ +169 AUE_SEMSYS NOSTD { int semsys(int which, int a2, int a3, \ int a4, int a5); } ; 169 is initialized by the SYSVMSG code if present or loaded ; XXX should be { int semsys(int which, ...); } -170 AUE_NULL MNOSTD { int msgsys(int which, int a2, int a3, \ +170 AUE_MSGSYS NOSTD { int msgsys(int which, int a2, int a3, \ int a4, int a5, int a6); } ; 169 is initialized by the SYSVSHM code if present or loaded ; XXX should be { int msgsys(int which, ...); } -171 AUE_NULL MNOSTD { int shmsys(int which, int a2, int a3, \ +171 AUE_SHMSYS NOSTD { int shmsys(int which, int a2, int a3, \ int a4); } ; XXX should be { int shmsys(int which, ...); } 172 AUE_NULL UNIMPL nosys -173 AUE_NULL MSTD { ssize_t pread(int fd, void *buf, \ +173 AUE_PREAD STD { ssize_t pread(int fd, void *buf, \ size_t nbyte, int pad, off_t offset); } -174 AUE_NULL MSTD { ssize_t pwrite(int fd, const void *buf, \ +174 AUE_PWRITE STD { ssize_t pwrite(int fd, const void *buf, \ size_t nbyte, int pad, off_t offset); } 175 AUE_NULL UNIMPL nosys -176 AUE_NULL MSTD { int ntp_adjtime(struct timex *tp); } +176 AUE_NTP_ADJTIME STD { int ntp_adjtime(struct timex *tp); } 177 AUE_NULL UNIMPL sfork (BSD/OS 2.x) 178 AUE_NULL UNIMPL getdescriptor (BSD/OS 2.x) 179 AUE_NULL UNIMPL setdescriptor (BSD/OS 2.x) 180 AUE_NULL UNIMPL nosys ; Syscalls 181-199 are used by/reserved for BSD -181 AUE_NULL MSTD { int setgid(gid_t gid); } -182 AUE_NULL MSTD { int setegid(gid_t egid); } -183 AUE_NULL MSTD { int seteuid(uid_t euid); } +181 AUE_SETGID STD { int setgid(gid_t gid); } +182 AUE_SETEGID STD { int setegid(gid_t egid); } +183 AUE_SETEUID STD { int seteuid(uid_t euid); } 184 AUE_NULL UNIMPL lfs_bmapv 185 AUE_NULL UNIMPL lfs_markv 186 AUE_NULL UNIMPL lfs_segclean 187 AUE_NULL UNIMPL lfs_segwait -188 AUE_NULL MSTD { int stat(char *path, struct stat *ub); } -189 AUE_NULL MSTD { int fstat(int fd, struct stat *sb); } -190 AUE_NULL MSTD { int lstat(char *path, struct stat *ub); } -191 AUE_NULL MSTD { int pathconf(char *path, int name); } -192 AUE_NULL MSTD { int fpathconf(int fd, int name); } +188 AUE_STAT STD { int stat(char *path, struct stat *ub); } +189 AUE_FSTAT STD { int fstat(int fd, struct stat *sb); } +190 AUE_LSTAT STD { int lstat(char *path, struct stat *ub); } +191 AUE_PATHCONF STD { int pathconf(char *path, int name); } +192 AUE_FPATHCONF STD { int fpathconf(int fd, int name); } 193 AUE_NULL UNIMPL nosys -194 AUE_NULL MSTD { int getrlimit(u_int which, \ +194 AUE_GETRLIMIT STD { int getrlimit(u_int which, \ struct rlimit *rlp); } getrlimit \ __getrlimit_args int -195 AUE_NULL MSTD { int setrlimit(u_int which, \ +195 AUE_SETRLIMIT STD { int setrlimit(u_int which, \ struct rlimit *rlp); } setrlimit \ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Mar 27 14:21:30 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6854B16A403; Tue, 27 Mar 2007 14:21:30 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3A3B516A401 for ; Tue, 27 Mar 2007 14:21:30 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2B6D613C457 for ; Tue, 27 Mar 2007 14:21:30 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2RELUQ9033693 for ; Tue, 27 Mar 2007 14:21:30 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2RELTWR033687 for perforce@freebsd.org; Tue, 27 Mar 2007 14:21:29 GMT (envelope-from sephe@FreeBSD.org) Date: Tue, 27 Mar 2007 14:21:29 GMT Message-Id: <200703271421.l2RELTWR033687@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 116647 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Mar 2007 14:21:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=116647 Change 116647 by sephe@sephe_zealot:sam_wifi on 2007/03/27 14:21:05 Make sure that the size of xrate+rate ie does not exceed the maxium that net80211 can support. Reviewed-by: sam@ Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#96 edit .. //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#16 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#96 (text+ko) ==== @@ -2102,6 +2102,10 @@ frm += frm[1] + 2; } IEEE80211_VERIFY_ELEMENT(scan.rates, IEEE80211_RATE_MAXSIZE); + if (scan.xrates != NULL) { + IEEE80211_VERIFY_ELEMENT(scan.xrates, + IEEE80211_RATE_MAXSIZE - scan.rates[1]); + } IEEE80211_VERIFY_ELEMENT(scan.ssid, IEEE80211_NWID_LEN); #if IEEE80211_CHAN_MAX < 255 if (scan.chan > IEEE80211_CHAN_MAX) { @@ -2342,6 +2346,10 @@ frm += frm[1] + 2; } IEEE80211_VERIFY_ELEMENT(rates, IEEE80211_RATE_MAXSIZE); + if (xrates != NULL) { + IEEE80211_VERIFY_ELEMENT(xrates, + IEEE80211_RATE_MAXSIZE - rates[1]); + } IEEE80211_VERIFY_ELEMENT(ssid, IEEE80211_NWID_LEN); IEEE80211_VERIFY_SSID(ic->ic_bss, ssid); if ((ic->ic_flags & IEEE80211_F_HIDESSID) && ssid[1] == 0) { @@ -2534,6 +2542,10 @@ frm += frm[1] + 2; } IEEE80211_VERIFY_ELEMENT(rates, IEEE80211_RATE_MAXSIZE); + if (xrates != NULL) { + IEEE80211_VERIFY_ELEMENT(xrates, + IEEE80211_RATE_MAXSIZE - rates[1]); + } IEEE80211_VERIFY_ELEMENT(ssid, IEEE80211_NWID_LEN); IEEE80211_VERIFY_SSID(ic->ic_bss, ssid); @@ -2778,6 +2790,10 @@ } IEEE80211_VERIFY_ELEMENT(rates, IEEE80211_RATE_MAXSIZE); + if (xrates != NULL) { + IEEE80211_VERIFY_ELEMENT(xrates, + IEEE80211_RATE_MAXSIZE - rates[1]); + } rate = ieee80211_setup_rates(ni, rates, xrates, IEEE80211_F_JOIN | IEEE80211_F_DOSORT | IEEE80211_F_DOFRATE | ==== //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#16 (text+ko) ==== @@ -244,7 +244,7 @@ memcpy(ise->se_rates, sp->rates, 2+sp->rates[1]); if (sp->xrates != NULL) { /* XXX validate xrates[1] */ - KASSERT(sp->xrates[1] <= IEEE80211_RATE_MAXSIZE, + KASSERT(sp->xrates[1] + sp->rates[1] <= IEEE80211_RATE_MAXSIZE, ("xrate set too large: %u", sp->xrates[1])); memcpy(ise->se_xrates, sp->xrates, 2+sp->xrates[1]); } else From owner-p4-projects@FreeBSD.ORG Tue Mar 27 14:26:37 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC5F716A404; Tue, 27 Mar 2007 14:26:37 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 62DA116A402 for ; Tue, 27 Mar 2007 14:26:37 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5404313C45B for ; Tue, 27 Mar 2007 14:26:37 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2REQb86034733 for ; Tue, 27 Mar 2007 14:26:37 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2REQbhq034725 for perforce@freebsd.org; Tue, 27 Mar 2007 14:26:37 GMT (envelope-from sephe@FreeBSD.org) Date: Tue, 27 Mar 2007 14:26:37 GMT Message-Id: <200703271426.l2REQbhq034725@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 116648 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Mar 2007 14:26:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=116648 Change 116648 by sephe@sephe_zealot:sam_wifi on 2007/03/27 14:26:25 Grrr... Style changes. Sorry. Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#97 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#97 (text+ko) ==== @@ -2102,10 +2102,9 @@ frm += frm[1] + 2; } IEEE80211_VERIFY_ELEMENT(scan.rates, IEEE80211_RATE_MAXSIZE); - if (scan.xrates != NULL) { + if (scan.xrates != NULL) IEEE80211_VERIFY_ELEMENT(scan.xrates, IEEE80211_RATE_MAXSIZE - scan.rates[1]); - } IEEE80211_VERIFY_ELEMENT(scan.ssid, IEEE80211_NWID_LEN); #if IEEE80211_CHAN_MAX < 255 if (scan.chan > IEEE80211_CHAN_MAX) { @@ -2346,10 +2345,9 @@ frm += frm[1] + 2; } IEEE80211_VERIFY_ELEMENT(rates, IEEE80211_RATE_MAXSIZE); - if (xrates != NULL) { + if (xrates != NULL) IEEE80211_VERIFY_ELEMENT(xrates, IEEE80211_RATE_MAXSIZE - rates[1]); - } IEEE80211_VERIFY_ELEMENT(ssid, IEEE80211_NWID_LEN); IEEE80211_VERIFY_SSID(ic->ic_bss, ssid); if ((ic->ic_flags & IEEE80211_F_HIDESSID) && ssid[1] == 0) { @@ -2542,10 +2540,9 @@ frm += frm[1] + 2; } IEEE80211_VERIFY_ELEMENT(rates, IEEE80211_RATE_MAXSIZE); - if (xrates != NULL) { + if (xrates != NULL) IEEE80211_VERIFY_ELEMENT(xrates, IEEE80211_RATE_MAXSIZE - rates[1]); - } IEEE80211_VERIFY_ELEMENT(ssid, IEEE80211_NWID_LEN); IEEE80211_VERIFY_SSID(ic->ic_bss, ssid); @@ -2790,10 +2787,9 @@ } IEEE80211_VERIFY_ELEMENT(rates, IEEE80211_RATE_MAXSIZE); - if (xrates != NULL) { + if (xrates != NULL) IEEE80211_VERIFY_ELEMENT(xrates, IEEE80211_RATE_MAXSIZE - rates[1]); - } rate = ieee80211_setup_rates(ni, rates, xrates, IEEE80211_F_JOIN | IEEE80211_F_DOSORT | IEEE80211_F_DOFRATE | From owner-p4-projects@FreeBSD.ORG Tue Mar 27 15:47:27 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 23CE316A40D; Tue, 27 Mar 2007 15:47:27 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CC8B216A408 for ; Tue, 27 Mar 2007 15:47:26 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B176D13C4DE for ; Tue, 27 Mar 2007 15:47:26 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2RFlQZJ004673 for ; Tue, 27 Mar 2007 15:47:26 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2RFlQiJ004661 for perforce@freebsd.org; Tue, 27 Mar 2007 15:47:26 GMT (envelope-from scottl@freebsd.org) Date: Tue, 27 Mar 2007 15:47:26 GMT Message-Id: <200703271547.l2RFlQiJ004661@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 116657 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Mar 2007 15:47:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=116657 Change 116657 by scottl@scottl-x64 on 2007/03/27 15:46:52 Convert the CD driver to using callouts. Lock the global list of changers. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#11 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#11 (text+ko) ==== @@ -70,6 +70,7 @@ #include #include #include +#include #include #include @@ -290,9 +291,6 @@ PERIPHDRIVER_DECLARE(cd, cddriver); - -static int num_changers; - #ifndef CHANGER_MIN_BUSY_SECONDS #define CHANGER_MIN_BUSY_SECONDS 5 #endif @@ -319,22 +317,26 @@ struct camq devq; struct timeval start_time; struct cd_softc *cur_device; - struct callout_handle short_handle; - struct callout_handle long_handle; + struct callout short_handle; + struct callout long_handle; volatile cd_changer_flags flags; STAILQ_ENTRY(cdchanger) changer_links; STAILQ_HEAD(chdevlist, cd_softc) chluns; }; +static struct mtx changerq_mtx; static STAILQ_HEAD(changerlist, cdchanger) changerq; +static int num_changers; - static void cdinit(void) { cam_status status; struct cam_path *path; + mtx_init(&changerq_mtx, "cdchangerq", "SCSI CD Changer List", MTX_DEF); + STAILQ_INIT(&changerq); + /* * Install a global async callback. This callback will * receive async callbacks like "new device found". @@ -456,8 +458,7 @@ * be any bogus pointer references there. */ if (softc->changer->flags & CHANGER_SHORT_TMOUT_SCHED) { - untimeout(cdshorttimeout, softc->changer, - softc->changer->short_handle); + callout_stop(&softc->changer->short_handle); softc->changer->flags &= ~CHANGER_SHORT_TMOUT_SCHED; } softc->changer->devq.qfrozen_cnt--; @@ -478,22 +479,22 @@ * it won't hurt to check and see if there are any left. */ if (softc->changer->flags & CHANGER_TIMEOUT_SCHED) { - untimeout(cdrunchangerqueue, softc->changer, - softc->changer->long_handle); + callout_stop(&softc->changer->long_handle); softc->changer->flags &= ~CHANGER_TIMEOUT_SCHED; } if (softc->changer->flags & CHANGER_SHORT_TMOUT_SCHED) { - untimeout(cdshorttimeout, softc->changer, - softc->changer->short_handle); + callout_stop(&softc->changer->short_handle); softc->changer->flags &= ~CHANGER_SHORT_TMOUT_SCHED; } + mtx_lock(&changerq_mtx); STAILQ_REMOVE(&changerq, softc->changer, cdchanger, changer_links); + num_changers--; + mtx_unlock(&changerq_mtx); xpt_print(periph->path, "removing changer entry\n"); free(softc->changer, M_DEVBUF); - num_changers--; } disk_destroy(softc->disk); free(softc, M_DEVBUF); @@ -787,13 +788,11 @@ /* Set the changer flag in the current device's softc */ softc->flags |= CD_FLAG_CHANGER; - if (num_changers == 0) - STAILQ_INIT(&changerq); - /* * Now, look around for an existing changer device with the * same path and target ID as the current device. */ + mtx_lock(&changerq_mtx); for (found = 0, nchanger = (struct cdchanger *)STAILQ_FIRST(&changerq); nchanger != NULL; @@ -804,6 +803,7 @@ break; } } + mtx_unlock(&changerq_mtx); /* * If we found a matching entry, just add this device to @@ -909,8 +909,6 @@ goto cdregisterexit; } - num_changers++; - nchanger->path_id = cgd->ccb_h.path_id; nchanger->target_id = cgd->ccb_h.target_id; @@ -919,8 +917,16 @@ STAILQ_INIT(&nchanger->chluns); + callout_init_mtx(&nchanger->long_handle, + periph->sim->mtx, 0); + callout_init_mtx(&nchanger->short_handle, + periph->sim->mtx, 0); + + mtx_lock(&changerq_mtx); + num_changers++; STAILQ_INSERT_TAIL(&changerq, nchanger, changer_links); + mtx_unlock(&changerq_mtx); /* * Create a path with lun id 0, and see if we can @@ -1186,9 +1192,9 @@ changer->cur_device->bufs_left = changer->cur_device->outstanding_cmds; if (called_from_timeout) { - changer->long_handle = - timeout(cdrunchangerqueue, changer, - changer_max_busy_seconds * hz); + callout_reset(&changer->long_handle, + changer_max_busy_seconds * hz, + cdrunchangerqueue, changer); changer->flags |= CHANGER_TIMEOUT_SCHED; } splx(s); @@ -1233,12 +1239,12 @@ * ones so this device gets its full time quantum. */ if (changer->flags & CHANGER_TIMEOUT_SCHED) { - untimeout(cdrunchangerqueue, changer, changer->long_handle); + callout_stop(&changer->long_handle); changer->flags &= ~CHANGER_TIMEOUT_SCHED; } if (changer->flags & CHANGER_SHORT_TMOUT_SCHED) { - untimeout(cdshorttimeout, changer, changer->short_handle); + callout_stop(&changer->short_handle); changer->flags &= ~CHANGER_SHORT_TMOUT_SCHED; } @@ -1304,18 +1310,18 @@ * and schedule our timeouts. */ if ((changer->flags & CHANGER_TIMEOUT_SCHED) == 0) { - changer->long_handle = - timeout(cdrunchangerqueue, changer, - changer_max_busy_seconds * hz); + callout_reset(&changer->long_handle, + changer_max_busy_seconds * hz, + cdrunchangerqueue, changer); changer->flags |= CHANGER_TIMEOUT_SCHED; } else printf("cdchangerschedule: already have a long" " timeout!\n"); if ((changer->flags & CHANGER_SHORT_TMOUT_SCHED) == 0) { - changer->short_handle = - timeout(cdshorttimeout, changer, - changer_min_busy_seconds * hz); + callout_reset(&changer->short_handle, + changer_min_busy_seconds * hz, + cdshorttimeout, changer); changer->flags |= CHANGER_SHORT_TMOUT_SCHED; } else printf("cdchangerschedule: already have a short " From owner-p4-projects@FreeBSD.ORG Tue Mar 27 16:00:47 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE40F16A40B; Tue, 27 Mar 2007 16:00:47 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6CA6E16A403 for ; Tue, 27 Mar 2007 16:00:47 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 51ABC13C4F4 for ; Tue, 27 Mar 2007 16:00:47 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2RG0lxX054570 for ; Tue, 27 Mar 2007 16:00:47 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2RG0lHR054540 for perforce@freebsd.org; Tue, 27 Mar 2007 16:00:47 GMT (envelope-from scottl@freebsd.org) Date: Tue, 27 Mar 2007 16:00:47 GMT Message-Id: <200703271600.l2RG0lHR054540@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 116663 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Mar 2007 16:00:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=116663 Change 116663 by scottl@scottl-x64 on 2007/03/27 16:00:44 Lock the scsi_cd driver and remove spl markers. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#12 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#12 (text+ko) ==== @@ -104,7 +104,8 @@ CD_FLAG_RETRY_UA = 0x0200, CD_FLAG_VALID_MEDIA = 0x0400, CD_FLAG_VALID_TOC = 0x0800, - CD_FLAG_SCTX_INIT = 0x1000 + CD_FLAG_SCTX_INIT = 0x1000, + CD_FLAG_OPEN = 0x2000 } cd_flags; typedef enum { @@ -366,7 +367,6 @@ static void cdoninvalidate(struct cam_periph *periph) { - int s; struct cd_softc *softc; struct ccb_setasync csa; @@ -386,19 +386,11 @@ softc->flags |= CD_FLAG_INVALID; /* - * Although the oninvalidate() routines are always called at - * splsoftcam, we need to be at splbio() here to keep the buffer - * queue from being modified while we traverse it. - */ - s = splbio(); - - /* * Return all queued I/O with ENXIO. * XXX Handle any transactions queued to the card * with XPT_ABORT_CCB. */ bioq_flush(&softc->bio_queue, NULL, ENXIO); - splx(s); /* * If this device is part of a changer, and it was scheduled @@ -417,7 +409,6 @@ cdcleanup(struct cam_periph *periph) { struct cd_softc *softc; - int s; softc = (struct cd_softc *)periph->softc; @@ -428,7 +419,6 @@ xpt_print(periph->path, "can't remove sysctl context\n"); } - s = splsoftcam(); /* * In the queued, non-active case, the device in question * has already been removed from the changer run queue. Since this @@ -498,7 +488,6 @@ } disk_destroy(softc->disk); free(softc, M_DEVBUF); - splx(s); } static void @@ -545,10 +534,8 @@ { struct cd_softc *softc; struct ccb_hdr *ccbh; - int s; softc = (struct cd_softc *)periph->softc; - s = splsoftcam(); /* * Don't fail on the expected unit attention * that will occur. @@ -556,7 +543,6 @@ softc->flags |= CD_FLAG_RETRY_UA; LIST_FOREACH(ccbh, &softc->pending_ccbs, periph_links.le) ccbh->ccb_state |= CD_CCB_RETRY_UA; - splx(s); /* FALLTHROUGH */ } default: @@ -1011,17 +997,22 @@ softc = (struct cd_softc *)periph->softc; - /* - * Grab splsoftcam and hold it until we lock the peripheral. - */ + if (cam_periph_acquire(periph) != CAM_REQ_CMP) + return(ENXIO); + + cam_periph_lock(periph); + if (softc->flags & CD_FLAG_INVALID) { + cam_periph_unlock(periph); + cam_periph_release(periph); return(ENXIO); } - if (cam_periph_acquire(periph) != CAM_REQ_CMP) - return(ENXIO); - - cam_periph_lock(periph); + /* Closes aren't symmetrical with opens, so fix up the refcounting. */ + if (softc->flags & CD_FLAG_OPEN) + cam_periph_release(periph); + else + softc->flags |= CD_FLAG_OPEN; /* * Check for media, and set the appropriate flags. We don't bail @@ -1062,7 +1053,7 @@ /* * We'll check the media and toc again at the next open(). */ - softc->flags &= ~(CD_FLAG_VALID_MEDIA|CD_FLAG_VALID_TOC); + softc->flags &= ~(CD_FLAG_VALID_MEDIA|CD_FLAG_VALID_TOC|CD_FLAG_OPEN); cam_periph_unlock(periph); cam_periph_release(periph); @@ -1074,10 +1065,7 @@ cdshorttimeout(void *arg) { struct cdchanger *changer; - int s; - s = splsoftcam(); - changer = (struct cdchanger *)arg; /* Always clear the short timeout flag, since that's what we're in */ @@ -1092,8 +1080,6 @@ changer->flags |= CHANGER_MANUAL_CALL; cdrunchangerqueue(changer); } - - splx(s); } /* @@ -1103,9 +1089,6 @@ cdschedule(struct cam_periph *periph, int priority) { struct cd_softc *softc; - int s; - - s = splsoftcam(); softc = (struct cd_softc *)periph->softc; @@ -1144,9 +1127,6 @@ } else if ((softc->flags & CD_FLAG_ACTIVE) && ((softc->flags & CD_FLAG_SCHED_ON_COMP) == 0)) xpt_schedule(periph, priority); - - splx(s); - } static void @@ -1155,9 +1135,6 @@ struct cd_softc *softc; struct cdchanger *changer; int called_from_timeout; - int s; - - s = splsoftcam(); changer = (struct cdchanger *)arg; @@ -1177,7 +1154,6 @@ /* nothing to do if the queue is empty */ if (changer->devq.entries <= 0) { - splx(s); return; } @@ -1197,7 +1173,6 @@ cdrunchangerqueue, changer); changer->flags |= CHANGER_TIMEOUT_SCHED; } - splx(s); return; } @@ -1254,17 +1229,12 @@ * switch time. */ changer->flags |= CHANGER_NEED_TIMEOUT; - - splx(s); } static void cdchangerschedule(struct cd_softc *softc) { struct cdchanger *changer; - int s; - - s = splsoftcam(); changer = softc->changer; @@ -1334,7 +1304,6 @@ changer->flags &= ~CHANGER_NEED_TIMEOUT; } - splx(s); } static int @@ -1363,14 +1332,10 @@ cdgetccb(struct cam_periph *periph, u_int32_t priority) { struct cd_softc *softc; - int s; softc = (struct cd_softc *)periph->softc; if (softc->flags & CD_FLAG_CHANGER) { - - s = splsoftcam(); - /* * This should work the first time this device is woken up, * but just in case it doesn't, we use a while loop. @@ -1395,7 +1360,6 @@ } else tsleep(&softc->changer, PRIBIO, "cgticb", 0); } - splx(s); } return(cam_periph_getccb(periph, priority)); } @@ -1411,7 +1375,6 @@ { struct cam_periph *periph; struct cd_softc *softc; - int s; periph = (struct cam_periph *)bp->bio_disk->d_drv1; if (periph == NULL) { @@ -1419,22 +1382,16 @@ return; } + cam_periph_lock(periph); CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, ("entering cdstrategy\n")); softc = (struct cd_softc *)periph->softc; /* - * Mask interrupts so that the pack cannot be invalidated until - * after we are in the queue. Otherwise, we might not properly - * clean up one of the buffers. - */ - s = splbio(); - - /* * If the device has been made invalid, error out */ if ((softc->flags & CD_FLAG_INVALID)) { - splx(s); + cam_periph_unlock(periph); biofinish(bp, NULL, ENXIO); return; } @@ -1448,7 +1405,7 @@ error = cdcheckmedia(periph); if (error != 0) { - splx(s); + cam_periph_unlock(periph); biofinish(bp, NULL, error); return; } @@ -1459,8 +1416,6 @@ */ bioq_disksort(&softc->bio_queue, bp); - splx(s); - /* * Schedule ourselves for performing the work. We do things * differently for changers. @@ -1470,6 +1425,7 @@ else cdschedule(periph, /* priority */ 1); + cam_periph_unlock(periph); return; } @@ -1480,7 +1436,6 @@ struct bio *bp; struct ccb_scsiio *csio; struct scsi_read_capacity_data *rcap; - int s; softc = (struct cd_softc *)periph->softc; @@ -1489,9 +1444,6 @@ switch (softc->state) { case CD_STATE_NORMAL: { - int oldspl; - - s = splbio(); bp = bioq_first(&softc->bio_queue); if (periph->immediate_priority <= periph->pinfo.priority) { start_ccb->ccb_h.ccb_state = CD_CCB_WAITING; @@ -1499,10 +1451,8 @@ SLIST_INSERT_HEAD(&periph->ccb_list, &start_ccb->ccb_h, periph_links.sle); periph->immediate_priority = CAM_PRIORITY_NONE; - splx(s); wakeup(&periph->ccb_list); } else if (bp == NULL) { - splx(s); xpt_release_ccb(start_ccb); } else { bioq_remove(&softc->bio_queue, bp); @@ -1526,15 +1476,9 @@ start_ccb->ccb_h.ccb_state = CD_CCB_BUFFER_IO; - /* - * Block out any asyncronous callbacks - * while we touch the pending ccb list. - */ - oldspl = splcam(); LIST_INSERT_HEAD(&softc->pending_ccbs, &start_ccb->ccb_h, periph_links.le); softc->outstanding_cmds++; - splx(oldspl); /* We expect a unit attention from this device */ if ((softc->flags & CD_FLAG_RETRY_UA) != 0) { @@ -1544,7 +1488,6 @@ start_ccb->ccb_h.ccb_bp = bp; bp = bioq_first(&softc->bio_queue); - splx(s); xpt_action(start_ccb); } @@ -1598,7 +1541,6 @@ { struct bio *bp; int error; - int oldspl; bp = (struct bio *)done_ccb->ccb_h.ccb_bp; error = 0; @@ -1622,13 +1564,9 @@ } if (error != 0) { - int s; - xpt_print(periph->path, "cddone: got error %#x back\n", error); - s = splbio(); bioq_flush(&softc->bio_queue, NULL, EIO); - splx(s); bp->bio_resid = bp->bio_bcount; bp->bio_error = error; bp->bio_flags |= BIO_ERROR; @@ -1651,14 +1589,8 @@ } } - /* - * Block out any asyncronous callbacks - * while we touch the pending ccb list. - */ - oldspl = splcam(); LIST_REMOVE(&done_ccb->ccb_h, periph_links.le); softc->outstanding_cmds--; - splx(oldspl); if (softc->flags & CD_FLAG_CHANGER) cdchangerschedule(softc); From owner-p4-projects@FreeBSD.ORG Tue Mar 27 16:34:39 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E29C916A407; Tue, 27 Mar 2007 16:34:38 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B898B16A405 for ; Tue, 27 Mar 2007 16:34:38 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A6F9613C4AE for ; Tue, 27 Mar 2007 16:34:38 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2RGYcSE053080 for ; Tue, 27 Mar 2007 16:34:38 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2RGYV6w052638 for perforce@freebsd.org; Tue, 27 Mar 2007 16:34:31 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 27 Mar 2007 16:34:31 GMT Message-Id: <200703271634.l2RGYV6w052638@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 116668 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Mar 2007 16:34:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=116668 Change 116668 by rdivacky@rdivacky_witten on 2007/03/27 16:33:32 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/Makefile#4 integrate .. //depot/projects/linuxolator/src/sys/amd64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/acpica/madt.c#3 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/identcpu.c#4 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/io_apic.c#5 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/legacy.c#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/local_apic.c#8 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/nexus.c#7 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/prof_machdep.c#4 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/trap.c#6 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/tsc.c#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/conf/NOTES#6 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/acpica_machdep.h#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/apicvar.h#6 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/specialreg.h#4 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/cpufunc_asm_arm9.S#2 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91_twi.c#6 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91_twireg.h#2 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/kb920x_machdep.c#6 integrate .. //depot/projects/linuxolator/src/sys/arm/conf/KB920X#3 integrate .. //depot/projects/linuxolator/src/sys/arm/conf/KB920X.hints#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/bootconfig.h#2 integrate .. //depot/projects/linuxolator/src/sys/arm/include/cpufunc.h#3 integrate .. //depot/projects/linuxolator/src/sys/arm/include/undefined.h#2 integrate .. //depot/projects/linuxolator/src/sys/boot/ficl/ficl.h#2 integrate .. //depot/projects/linuxolator/src/sys/boot/ficl/float.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/ficl/softwords/fileaccess.fr#2 integrate .. //depot/projects/linuxolator/src/sys/boot/ficl/softwords/jhlocal.fr#2 integrate .. //depot/projects/linuxolator/src/sys/boot/ficl/softwords/oo.fr#2 integrate .. //depot/projects/linuxolator/src/sys/boot/ficl/softwords/prefix.fr#2 integrate .. //depot/projects/linuxolator/src/sys/boot/ficl/softwords/softcore.awk#2 integrate .. //depot/projects/linuxolator/src/sys/boot/ficl/tools.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/ficl/unix.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/ficl/vm.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/ficl/words.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/i386/boot0/boot0.S#2 integrate .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/biosacpi.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/ia64/ski/acpi_stub.c#3 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_signal.c#12 edit .. //depot/projects/linuxolator/src/sys/conf/NOTES#21 integrate .. //depot/projects/linuxolator/src/sys/conf/files#24 integrate .. //depot/projects/linuxolator/src/sys/conf/kern.post.mk#5 integrate .. //depot/projects/linuxolator/src/sys/conf/kmod.mk#6 integrate .. //depot/projects/linuxolator/src/sys/conf/options#19 integrate .. //depot/projects/linuxolator/src/sys/contrib/altq/altq/altq_subr.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/CHANGES.txt#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/acapps.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/acconfig.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/acdebug.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/acdisasm.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/acdispat.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/acefi.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/acenv.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/acevents.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/acexcep.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/acfreebsd.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/acgcc.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/acglobal.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/achware.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/acinterp.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/aclocal.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/acmacros.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/acnames.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/acnamesp.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/acobject.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/acopcode.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/acoutput.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/acparser.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/acpi.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/acpica_prep.sh#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/acpiosxf.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/acpixf.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/acresrc.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/acstruct.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/actables.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/actbl.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/actbl1.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/actbl2.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/actypes.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/acutils.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/aecommon.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/aeexec.c#2 delete .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/amlcode.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/amlresrc.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/common/adfile.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/common/adisasm.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/common/adwalk.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/common/dmrestag.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/common/dmtable.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/common/dmtbdump.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/common/dmtbinfo.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/common/getopt.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/compiler/aslanalyze.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/compiler/aslcodegen.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/compiler/aslcompile.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/compiler/aslcompiler.l#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/compiler/asldefine.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/compiler/aslerror.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/compiler/aslfiles.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/compiler/aslfold.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/compiler/aslglobal.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/compiler/asllength.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/compiler/asllisting.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/compiler/aslload.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/compiler/asllookup.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/compiler/aslmain.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/compiler/aslmap.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/compiler/aslopcodes.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/compiler/asloperands.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/compiler/aslopt.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/compiler/aslresource.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/compiler/aslrestype1.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/compiler/aslrestype2.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/compiler/aslstubs.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/compiler/asltransform.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/compiler/asltree.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/compiler/asltypes.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/compiler/aslutils.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/dbcmds.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/dbdisply.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/dbexec.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/dbfileio.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/dbhistry.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/dbinput.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/dbstats.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/dbutils.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/dbxface.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/dmbuffer.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/dmnames.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/dmobject.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/dmopcode.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/dmresrc.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/dmresrcl.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/dmresrcs.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/dmutils.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/dmwalk.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/dsfield.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/dsinit.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/dsmethod.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/dsmthdat.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/dsobject.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/dsopcode.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/dsutils.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/dswexec.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/dswload.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/dswscope.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/dswstate.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/evevent.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/evgpe.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/evgpeblk.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/evmisc.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/evregion.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/evrgnini.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/evsci.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/evxface.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/evxfevnt.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/evxfregn.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/exconfig.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/exconvrt.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/excreate.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/exdump.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/exfield.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/exfldio.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/exmisc.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/exmutex.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/exnames.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/exoparg1.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/exoparg2.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/exoparg3.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/exoparg6.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/exprep.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/exregion.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/exresnte.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/exresolv.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/exresop.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/exstore.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/exstoren.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/exstorob.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/exsystem.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/exutils.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/hwacpi.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/hwgpe.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/hwregs.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/hwsleep.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/hwtimer.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/nsaccess.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/nsalloc.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/nsdump.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/nsdumpdv.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/nseval.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/nsinit.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/nsload.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/nsnames.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/nsobject.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/nsparse.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/nssearch.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/nsutils.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/nswalk.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/nsxfeval.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/nsxfname.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/nsxfobj.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/osunixxf.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/psargs.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/psloop.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/psopcode.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/psparse.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/psscope.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/pstree.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/psutils.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/pswalk.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/psxface.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/rsaddr.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/rscalc.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/rscreate.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/rsdump.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/rsinfo.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/rsio.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/rsirq.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/rslist.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/rsmemory.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/rsmisc.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/rsutils.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/rsxface.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/tbconvrt.c#2 delete .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/tbfadt.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/tbfind.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/tbget.c#2 delete .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/tbgetall.c#2 delete .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/tbinstal.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/tbrsdt.c#2 delete .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/tbutils.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/tbxface.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/tbxfroot.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/utalloc.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/utcache.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/utclib.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/utcopy.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/utdebug.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/utdelete.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/uteval.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/utglobal.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/utinit.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/utmath.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/utmisc.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/utmutex.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/utobject.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/utresrc.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/utstate.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/uttrack.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/utxface.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/pf/net/if_pfsync.c#4 integrate .. //depot/projects/linuxolator/src/sys/contrib/pf/net/if_pfsync.h#2 integrate .. //depot/projects/linuxolator/src/sys/crypto/via/padlock.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/acpi_support/acpi_asus.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/acpi_support/acpi_fujitsu.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/Osd/OsdDebug.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/Osd/OsdMemory.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/Osd/OsdSchedule.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/Osd/OsdSynch.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/Osd/OsdTable.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi_acad.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi_button.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi_cmbat.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi_cpu.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi_dock.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi_ec.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi_lid.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi_pci_link.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi_perf.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi_quirk.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi_resource.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi_throttle.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi_timer.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpivar.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ar/if_ar.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ce/if_ce.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/cm/smc90cx6.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/cp/if_cp.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/ctau/if_ct.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/cx/if_cx.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/common/cxgb_common.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/common/cxgb_regs.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/common/cxgb_t3_hw.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/common/cxgb_version.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/common/cxgb_xgmac.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/cxgb_config.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/cxgb_ioctl.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/cxgb_main.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/cxgb_osdep.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ed/if_ed.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/exca/exca.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/firewire/fwohci.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/firewire/fwohci_pci.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/hifn/hifn7751.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/hifn/hifn7751reg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/hifn/hifn7751var.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/iicbus/icee.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/iicbus/iic.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/iicbus/iicbb.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/iicbus/iicbus.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/iicbus/iicbus.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/iicbus/iiconf.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ipw/if_ipw.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp.c#13 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_library.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_library.h#6 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_pci.c#15 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/ispvar.h#8 integrate .. //depot/projects/linuxolator/src/sys/dev/iwi/if_iwi.c#11 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/brgphy.c#11 integrate .. //depot/projects/linuxolator/src/sys/dev/mxge/if_mxge.c#9 integrate .. //depot/projects/linuxolator/src/sys/dev/pcf/envctrl.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/pcf/pcf_ebus.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/pcf/pcf_isa.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pci.c#20 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pcivar.h#7 integrate .. //depot/projects/linuxolator/src/sys/dev/ppc/ppc.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/safe/safe.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/scc/scc_bfe.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/scc/scc_bfe_ebus.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/scc/scc_bfe_macio.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/scc/scc_bfe_sbus.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/scc/scc_core.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/snp/snp.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/atiixp.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/csa.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/hda/hdac.c#17 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/hda/hdac_private.h#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/ich.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/via8233.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/via82c686.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/buffer.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/channel.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/vchan.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/sr/if_sr.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ubsec/ubsec.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/uplcom.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usb_quirks.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usbdevs#11 integrate .. //depot/projects/linuxolator/src/sys/dev/wl/if_wl.c#4 integrate .. //depot/projects/linuxolator/src/sys/fs/devfs/devfs_vnops.c#6 integrate .. //depot/projects/linuxolator/src/sys/fs/udf/udf_vnops.c#5 integrate .. //depot/projects/linuxolator/src/sys/geom/eli/g_eli.c#7 integrate .. //depot/projects/linuxolator/src/sys/geom/eli/g_eli_crypto.c#2 integrate .. //depot/projects/linuxolator/src/sys/geom/geom_dev.c#4 integrate .. //depot/projects/linuxolator/src/sys/geom/journal/g_journal.c#4 integrate .. //depot/projects/linuxolator/src/sys/i386/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/acpica/madt.c#3 integrate .. //depot/projects/linuxolator/src/sys/i386/bios/smapi.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/bios/smbios.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/bios/vpd.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/conf/NOTES#8 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/identcpu.c#5 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/io_apic.c#5 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/legacy.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/local_apic.c#8 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/locore.s#3 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/machdep.c#13 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/nexus.c#8 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/pmap.c#10 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/trap.c#5 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/tsc.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/ibcs2/ibcs2_misc.c#4 integrate .. //depot/projects/linuxolator/src/sys/i386/include/acpica_machdep.h#2 integrate .. //depot/projects/linuxolator/src/sys/i386/include/apicvar.h#6 integrate .. //depot/projects/linuxolator/src/sys/i386/include/pmap.h#4 integrate .. //depot/projects/linuxolator/src/sys/i386/include/specialreg.h#4 integrate .. //depot/projects/linuxolator/src/sys/i386/isa/prof_machdep.c#4 integrate .. //depot/projects/linuxolator/src/sys/ia64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/linuxolator/src/sys/ia64/acpica/madt.c#2 integrate .. //depot/projects/linuxolator/src/sys/ia64/ia64/nexus.c#4 integrate .. //depot/projects/linuxolator/src/sys/ia64/include/acpica_machdep.h#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_condvar.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_cpu.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_exec.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_exit.c#9 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_kse.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_lock.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_mutex.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_proc.c#8 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_rwlock.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_sig.c#10 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_sx.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_synch.c#10 integrate .. //depot/projects/linuxolator/src/sys/kern/sched_ule.c#11 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_witness.c#9 integrate .. //depot/projects/linuxolator/src/sys/kern/sysv_sem.c#9 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_sockbuf.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_socket.c#15 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_socket2.c#2 delete .. //depot/projects/linuxolator/src/sys/kern/vfs_bio.c#10 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_mount.c#11 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_subr.c#10 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_syscalls.c#11 integrate .. //depot/projects/linuxolator/src/sys/modules/Makefile#11 integrate .. //depot/projects/linuxolator/src/sys/modules/acpi/Makefile#5 integrate .. //depot/projects/linuxolator/src/sys/modules/acpi/acpi/Makefile#3 integrate .. //depot/projects/linuxolator/src/sys/modules/crypto/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/modules/cxgb/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/modules/hifn/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/modules/if_edsc/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/modules/if_vlan/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/modules/padlock/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/modules/safe/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/modules/ubsec/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/net/if.c#6 integrate .. //depot/projects/linuxolator/src/sys/net/if_bridge.c#14 integrate .. //depot/projects/linuxolator/src/sys/net/if_disc.c#2 integrate .. //depot/projects/linuxolator/src/sys/net/if_edsc.c#1 branch .. //depot/projects/linuxolator/src/sys/net/if_ethersubr.c#7 integrate .. //depot/projects/linuxolator/src/sys/net/if_tap.c#5 integrate .. //depot/projects/linuxolator/src/sys/net/if_var.h#2 integrate .. //depot/projects/linuxolator/src/sys/net/if_vlan.c#7 integrate .. //depot/projects/linuxolator/src/sys/net/rtsock.c#3 integrate .. //depot/projects/linuxolator/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate .. //depot/projects/linuxolator/src/sys/netgraph/ng_base.c#4 integrate .. //depot/projects/linuxolator/src/sys/netgraph/ng_ether.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/if_ether.c#7 integrate .. //depot/projects/linuxolator/src/sys/netinet/in.c#5 integrate .. //depot/projects/linuxolator/src/sys/netinet/in_var.h#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_fastfwd.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_input.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_output.c#9 integrate .. //depot/projects/linuxolator/src/sys/netinet/raw_ip.c#5 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_indata.c#9 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_input.c#9 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_os_bsd.h#8 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_output.c#9 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_pcb.c#9 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_pcb.h#7 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_structs.h#9 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_timer.c#7 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_usrreq.c#9 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_var.h#7 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctputil.c#9 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctputil.h#8 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp.h#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_debug.h#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_hostcache.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_input.c#12 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_output.c#8 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_sack.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_subr.c#8 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_timer.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_usrreq.c#8 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_var.h#6 integrate .. //depot/projects/linuxolator/src/sys/netinet6/mld6.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet6/sctp6_usrreq.c#9 integrate .. //depot/projects/linuxolator/src/sys/netinet6/sctp6_var.h#3 integrate .. //depot/projects/linuxolator/src/sys/netipsec/ipsec.c#4 integrate .. //depot/projects/linuxolator/src/sys/nfsclient/nfs_vfsops.c#8 integrate .. //depot/projects/linuxolator/src/sys/nfsserver/nfs.h#3 integrate .. //depot/projects/linuxolator/src/sys/nfsserver/nfs_serv.c#6 integrate .. //depot/projects/linuxolator/src/sys/nfsserver/nfs_srvcache.c#2 integrate .. //depot/projects/linuxolator/src/sys/nfsserver/nfs_srvsock.c#3 integrate .. //depot/projects/linuxolator/src/sys/nfsserver/nfs_srvsubs.c#4 integrate .. //depot/projects/linuxolator/src/sys/nfsserver/nfs_syscalls.c#6 integrate .. //depot/projects/linuxolator/src/sys/nfsserver/nfsm_subs.h#3 integrate .. //depot/projects/linuxolator/src/sys/opencrypto/crypto.c#2 integrate .. //depot/projects/linuxolator/src/sys/opencrypto/crypto_if.m#2 delete .. //depot/projects/linuxolator/src/sys/opencrypto/cryptodev.c#2 integrate .. //depot/projects/linuxolator/src/sys/opencrypto/cryptodev.h#2 integrate .. //depot/projects/linuxolator/src/sys/opencrypto/cryptodev_if.m#1 branch .. //depot/projects/linuxolator/src/sys/opencrypto/cryptosoft.c#2 integrate .. //depot/projects/linuxolator/src/sys/opencrypto/cryptosoft.h#2 integrate .. //depot/projects/linuxolator/src/sys/pc98/cbus/fdc.c#4 integrate .. //depot/projects/linuxolator/src/sys/pc98/pc98/machdep.c#10 integrate .. //depot/projects/linuxolator/src/sys/rpc/rpcclnt.c#2 integrate .. //depot/projects/linuxolator/src/sys/sys/_mutex.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/_rwlock.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/condvar.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/cpu.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/eventhandler.h#4 integrate .. //depot/projects/linuxolator/src/sys/sys/lock.h#7 integrate .. //depot/projects/linuxolator/src/sys/sys/mbuf.h#8 integrate .. //depot/projects/linuxolator/src/sys/sys/mutex.h#7 integrate .. //depot/projects/linuxolator/src/sys/sys/param.h#13 integrate .. //depot/projects/linuxolator/src/sys/sys/proc.h#14 integrate .. //depot/projects/linuxolator/src/sys/sys/rwlock.h#5 integrate .. //depot/projects/linuxolator/src/sys/sys/socketvar.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/sx.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/systm.h#11 integrate .. //depot/projects/linuxolator/src/sys/tools/acpi_quirks2h.awk#2 integrate .. //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_softdep.c#7 integrate .. //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_vfsops.c#9 integrate .. //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_vnops.c#9 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_fault.c#6 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_map.c#4 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_object.c#8 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.40 2006/11/26 18:27:16 maxim Exp $ +# $FreeBSD: src/sys/Makefile,v 1.41 2007/03/24 22:21:01 maxim Exp $ .include @@ -9,7 +9,7 @@ # Directories to include in cscope name file and TAGS. CSCOPEDIRS= cam coda compat conf contrib crypto ddb dev fs geom gnu i4b \ - isa isofs kern libkern modules net net80211 netatalk netatm \ + isa kern libkern modules net net80211 netatalk netatm \ netgraph netinet netinet6 netipx netkey netnatm netncp \ netsmb nfs nfsclient nfs4client rpc pccard pci sys \ ufs vm ${ARCHDIR} ==== //depot/projects/linuxolator/src/sys/amd64/acpica/OsdEnvironment.c#2 (text+ko) ==== @@ -26,16 +26,18 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.13 2005/09/11 18:39:00 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.14 2007/03/22 18:16:38 jkim Exp $"); /* * 6.1 : Environmental support */ #include +#include #include #include #include +#include static u_long amd64_acpi_root; @@ -54,25 +56,16 @@ return(0); } -ACPI_STATUS -AcpiOsGetRootPointer(UINT32 Flags, ACPI_POINTER *RsdpPhysicalAddress) +ACPI_PHYSICAL_ADDRESS +AcpiOsGetRootPointer(void) { - ACPI_POINTER ptr; - ACPI_STATUS status; + u_long ptr; - if (amd64_acpi_root == 0) { - /* - * The loader passes the physical address at which it found the - * RSDP in a hint. We could recover this rather than searching - * manually here. - */ - status = AcpiFindRootPointer(Flags, &ptr); - if (status == AE_OK) - amd64_acpi_root = ptr.Pointer.Physical; - } else - status = AE_OK; + if (amd64_acpi_root == 0 && + (resource_long_value("acpi", 0, "rsdp", (long *)&ptr) == 0 || + AcpiFindRootPointer((ACPI_NATIVE_UINT *)&ptr) == AE_OK) && + ptr != 0) + amd64_acpi_root = ptr; - RsdpPhysicalAddress->PointerType = ACPI_PHYSICAL_POINTER; - RsdpPhysicalAddress->Pointer.Physical = amd64_acpi_root; - return (status); + return (amd64_acpi_root); } ==== //depot/projects/linuxolator/src/sys/amd64/acpica/madt.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.22 2007/03/05 20:35:16 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.23 2007/03/22 18:16:38 jkim Exp $"); #include #include @@ -56,7 +56,7 @@ #define NIOAPICS 32 /* Max number of I/O APICs */ #define NLAPICS 32 /* Max number of local APICs */ -typedef void madt_entry_handler(APIC_HEADER *entry, void *arg); +typedef void madt_entry_handler(ACPI_SUBTABLE_HEADER *entry, void *arg); /* These two arrays are indexed by APIC IDs. */ struct ioapic_info { @@ -70,26 +70,29 @@ } lapics[NLAPICS]; static int madt_found_sci_override; -static MULTIPLE_APIC_TABLE *madt; +static ACPI_TABLE_MADT *madt; static vm_paddr_t madt_physaddr; static vm_offset_t madt_length; MALLOC_DEFINE(M_MADT, "madt_table", "ACPI MADT Table Items"); -static enum intr_polarity interrupt_polarity(UINT16 Polarity, UINT8 Source); -static enum intr_trigger interrupt_trigger(UINT16 TriggerMode, UINT8 Source); +static enum intr_polarity interrupt_polarity(UINT16 IntiFlags, UINT8 Source); +static enum intr_trigger interrupt_trigger(UINT16 IntiFlags, UINT8 Source); static int madt_find_cpu(u_int acpi_id, u_int *apic_id); static int madt_find_interrupt(int intr, void **apic, u_int *pin); static void *madt_map(vm_paddr_t pa, int offset, vm_offset_t length); static void *madt_map_table(vm_paddr_t pa, int offset, const char *sig); -static void madt_parse_apics(APIC_HEADER *entry, void *arg); -static void madt_parse_interrupt_override(MADT_INTERRUPT_OVERRIDE *intr); -static void madt_parse_ints(APIC_HEADER *entry, void *arg __unused); -static void madt_parse_local_nmi(MADT_LOCAL_APIC_NMI *nmi); -static void madt_parse_nmi(MADT_NMI_SOURCE *nmi); +static void madt_parse_apics(ACPI_SUBTABLE_HEADER *entry, void *arg); +static void madt_parse_interrupt_override( + ACPI_MADT_INTERRUPT_OVERRIDE *intr); +static void madt_parse_ints(ACPI_SUBTABLE_HEADER *entry, + void *arg __unused); +static void madt_parse_local_nmi(ACPI_MADT_LOCAL_APIC_NMI *nmi); +static void madt_parse_nmi(ACPI_MADT_NMI_SOURCE *nmi); static int madt_probe(void); static int madt_probe_cpus(void); -static void madt_probe_cpus_handler(APIC_HEADER *entry, void *arg __unused); +static void madt_probe_cpus_handler(ACPI_SUBTABLE_HEADER *entry, + void *arg __unused); static int madt_probe_table(vm_paddr_t address); static void madt_register(void *dummy); static int madt_setup_local(void); @@ -161,14 +164,14 @@ void *table; header = madt_map(pa, offset, sizeof(ACPI_TABLE_HEADER)); - if (strncmp(header->Signature, sig, 4) != 0) { + if (strncmp(header->Signature, sig, ACPI_NAME_SIZE) != 0) { madt_unmap(header, sizeof(ACPI_TABLE_HEADER)); return (NULL); } length = header->Length; madt_unmap(header, sizeof(ACPI_TABLE_HEADER)); table = madt_map(pa, offset, length); - if (ACPI_FAILURE(AcpiTbVerifyTableChecksum(table))) { + if (ACPI_FAILURE(AcpiTbChecksum(table, length))) { if (bootverbose) printf("MADT: Failed checksum for table %s\n", sig); madt_unmap(table, length); @@ -192,10 +195,10 @@ static int madt_probe(void) { - ACPI_POINTER rsdp_ptr; - RSDP_DESCRIPTOR *rsdp; - RSDT_DESCRIPTOR *rsdt; - XSDT_DESCRIPTOR *xsdt; + ACPI_PHYSICAL_ADDRESS rsdp_ptr; + ACPI_TABLE_RSDP *rsdp; + ACPI_TABLE_RSDT *rsdt; + ACPI_TABLE_XSDT *xsdt; int i, count; if (resource_disabled("acpi", 0)) @@ -206,12 +209,9 @@ * calls pmap_mapbios() to find the RSDP, we assume that we can use * pmap_mapbios() to map the RSDP. */ - if (AcpiOsGetRootPointer(ACPI_LOGICAL_ADDRESSING, &rsdp_ptr) != AE_OK) + if ((rsdp_ptr = AcpiOsGetRootPointer()) == 0) return (ENXIO); -#ifdef __i386__ - KASSERT(rsdp_ptr.Pointer.Physical < KERNLOAD, ("RSDP too high")); -#endif - rsdp = pmap_mapbios(rsdp_ptr.Pointer.Physical, sizeof(RSDP_DESCRIPTOR)); + rsdp = pmap_mapbios(rsdp_ptr, sizeof(ACPI_TABLE_RSDP)); if (rsdp == NULL) { if (bootverbose) printf("MADT: Failed to map RSDP\n"); @@ -230,38 +230,40 @@ * the version 1.0 portion of the RSDP. Version 2.0 has * an additional checksum that we verify first. */ - if (AcpiTbGenerateChecksum(rsdp, ACPI_RSDP_XCHECKSUM_LENGTH)) { + if (AcpiTbChecksum((UINT8 *)rsdp, ACPI_RSDP_XCHECKSUM_LENGTH)) { if (bootverbose) printf("MADT: RSDP failed extended checksum\n"); return (ENXIO); } - xsdt = madt_map_table(rsdp->XsdtPhysicalAddress, 1, XSDT_SIG); + xsdt = madt_map_table(rsdp->XsdtPhysicalAddress, 1, + ACPI_SIG_XSDT); if (xsdt == NULL) { if (bootverbose) printf("MADT: Failed to map XSDT\n"); return (ENXIO); } - count = (xsdt->Length - sizeof(ACPI_TABLE_HEADER)) / + count = (xsdt->Header.Length - sizeof(ACPI_TABLE_HEADER)) / sizeof(UINT64); for (i = 0; i < count; i++) if (madt_probe_table(xsdt->TableOffsetEntry[i])) break; madt_unmap_table(xsdt); } else { - rsdt = madt_map_table(rsdp->RsdtPhysicalAddress, 1, RSDT_SIG); + rsdt = madt_map_table(rsdp->RsdtPhysicalAddress, 1, + ACPI_SIG_RSDT); if (rsdt == NULL) { if (bootverbose) printf("MADT: Failed to map RSDT\n"); return (ENXIO); } - count = (rsdt->Length - sizeof(ACPI_TABLE_HEADER)) / + count = (rsdt->Header.Length - sizeof(ACPI_TABLE_HEADER)) / sizeof(UINT32); for (i = 0; i < count; i++) if (madt_probe_table(rsdt->TableOffsetEntry[i])) break; madt_unmap_table(rsdt); } - pmap_unmapbios((vm_offset_t)rsdp, sizeof(RSDP_DESCRIPTOR)); + pmap_unmapbios((vm_offset_t)rsdp, sizeof(ACPI_TABLE_RSDP)); if (madt_physaddr == 0) { if (bootverbose) printf("MADT: No MADT table found\n"); @@ -275,7 +277,7 @@ * Verify that we can map the full table and that its checksum is * correct, etc. */ - madt = madt_map_table(madt_physaddr, 0, APIC_SIG); + madt = madt_map_table(madt_physaddr, 0, ACPI_SIG_MADT); if (madt == NULL) return (ENXIO); madt_unmap_table(madt); @@ -303,7 +305,7 @@ printf("Table '%.4s' at 0x%jx\n", table->Signature, (uintmax_t)address); - if (strncmp(table->Signature, APIC_SIG, 4) != 0) { + if (strncmp(table->Signature, ACPI_SIG_MADT, ACPI_NAME_SIZE) != 0) { madt_unmap(table, sizeof(ACPI_TABLE_HEADER)); return (0); } @@ -320,7 +322,7 @@ madt_probe_cpus(void) { - madt = madt_map_table(madt_physaddr, 0, APIC_SIG); + madt = madt_map_table(madt_physaddr, 0, ACPI_SIG_MADT); KASSERT(madt != NULL, ("Unable to re-map MADT")); madt_walk_table(madt_probe_cpus_handler, NULL); madt_unmap_table(madt); @@ -336,10 +338,10 @@ { madt = pmap_mapbios(madt_physaddr, madt_length); - lapic_init(madt->LocalApicAddress); + lapic_init(madt->Address); printf("ACPI APIC Table: <%.*s %.*s>\n", - (int)sizeof(madt->OemId), madt->OemId, - (int)sizeof(madt->OemTableId), madt->OemTableId); + (int)sizeof(madt->Header.OemId), madt->Header.OemId, + (int)sizeof(madt->Header.OemTableId), madt->Header.OemTableId); /* * We ignore 64-bit local APIC override entries. Should we @@ -378,10 +380,10 @@ * force it to use level trigger and active-low polarity. */ if (!madt_found_sci_override) { - if (madt_find_interrupt(AcpiGbl_FADT->SciInt, &ioapic, &pin) - != 0) - printf("MADT: Could not find APIC for SCI IRQ %d\n", - AcpiGbl_FADT->SciInt); + if (madt_find_interrupt(AcpiGbl_FADT.SciInterrupt, &ioapic, + &pin) != 0) + printf("MADT: Could not find APIC for SCI IRQ %u\n", + AcpiGbl_FADT.SciInterrupt); else { printf( "MADT: Forcing active-low polarity and level trigger for SCI\n"); @@ -416,46 +418,46 @@ static void madt_walk_table(madt_entry_handler *handler, void *arg) { - APIC_HEADER *entry; + ACPI_SUBTABLE_HEADER *entry; u_char *p, *end; - end = (u_char *)(madt) + madt->Length; + end = (u_char *)(madt) + madt->Header.Length; for (p = (u_char *)(madt + 1); p < end; ) { - entry = (APIC_HEADER *)p; + entry = (ACPI_SUBTABLE_HEADER *)p; handler(entry, arg); p += entry->Length; } } static void -madt_probe_cpus_handler(APIC_HEADER *entry, void *arg) +madt_probe_cpus_handler(ACPI_SUBTABLE_HEADER *entry, void *arg) { - MADT_PROCESSOR_APIC *proc; + ACPI_MADT_LOCAL_APIC *proc; struct lapic_info *la; switch (entry->Type) { - case APIC_PROCESSOR: + case ACPI_MADT_TYPE_LOCAL_APIC: /* * The MADT does not include a BSP flag, so we have to * let the MP code figure out which CPU is the BSP on * its own. */ - proc = (MADT_PROCESSOR_APIC *)entry; + proc = (ACPI_MADT_LOCAL_APIC *)entry; if (bootverbose) - printf("MADT: Found CPU APIC ID %d ACPI ID %d: %s\n", - proc->LocalApicId, proc->ProcessorId, - proc->ProcessorEnabled ? "enabled" : "disabled"); - if (!proc->ProcessorEnabled) + printf("MADT: Found CPU APIC ID %u ACPI ID %u: %s\n", + proc->Id, proc->ProcessorId, + (proc->LapicFlags & ACPI_MADT_ENABLED) ? + "enabled" : "disabled"); + if (!(proc->LapicFlags & ACPI_MADT_ENABLED)) break; - if (proc->LocalApicId >= NLAPICS) - panic("%s: CPU ID %d too high", __func__, - proc->LocalApicId); - la = &lapics[proc->LocalApicId]; + if (proc->Id >= NLAPICS) + panic("%s: CPU ID %u too high", __func__, proc->Id); + la = &lapics[proc->Id]; KASSERT(la->la_enabled == 0, - ("Duplicate local APIC ID %d", proc->LocalApicId)); + ("Duplicate local APIC ID %u", proc->Id)); la->la_enabled = 1; la->la_acpi_id = proc->ProcessorId; - lapic_create(proc->LocalApicId, 0); + lapic_create(proc->Id, 0); break; } } @@ -465,26 +467,26 @@ * Add an I/O APIC from an entry in the table. */ static void -madt_parse_apics(APIC_HEADER *entry, void *arg __unused) +madt_parse_apics(ACPI_SUBTABLE_HEADER *entry, void *arg __unused) { - MADT_IO_APIC *apic; + ACPI_MADT_IO_APIC *apic; switch (entry->Type) { - case APIC_IO: - apic = (MADT_IO_APIC *)entry; + case ACPI_MADT_TYPE_IO_APIC: + apic = (ACPI_MADT_IO_APIC *)entry; if (bootverbose) - printf("MADT: Found IO APIC ID %d, Interrupt %d at %p\n", - apic->IoApicId, apic->Interrupt, + printf( + "MADT: Found IO APIC ID %u, Interrupt %u at %p\n", + apic->Id, apic->GlobalIrqBase, (void *)(uintptr_t)apic->Address); - if (apic->IoApicId >= NIOAPICS) - panic("%s: I/O APIC ID %d too high", __func__, - apic->IoApicId); - if (ioapics[apic->IoApicId].io_apic != NULL) - panic("%s: Double APIC ID %d", __func__, - apic->IoApicId); - ioapics[apic->IoApicId].io_apic = ioapic_create(apic->Address, - apic->IoApicId, apic->Interrupt); - ioapics[apic->IoApicId].io_vector = apic->Interrupt; + if (apic->Id >= NIOAPICS) + panic("%s: I/O APIC ID %u too high", __func__, + apic->Id); + if (ioapics[apic->Id].io_apic != NULL) + panic("%s: Double APIC ID %u", __func__, apic->Id); + ioapics[apic->Id].io_apic = ioapic_create(apic->Address, + apic->Id, apic->GlobalIrqBase); + ioapics[apic->Id].io_vector = apic->GlobalIrqBase; break; default: break; @@ -498,18 +500,18 @@ * SCI for which we use Active Lo, Level Triggered. */ static enum intr_polarity -interrupt_polarity(UINT16 Polarity, UINT8 Source) +interrupt_polarity(UINT16 IntiFlags, UINT8 Source) { - switch (Polarity) { - case POLARITY_CONFORMS: - if (Source == AcpiGbl_FADT->SciInt) + switch (IntiFlags & ACPI_MADT_POLARITY_MASK) { + case ACPI_MADT_POLARITY_CONFORMS: + if (Source == AcpiGbl_FADT.SciInterrupt) return (INTR_POLARITY_LOW); else return (INTR_POLARITY_HIGH); - case POLARITY_ACTIVE_HIGH: + case ACPI_MADT_POLARITY_ACTIVE_HIGH: return (INTR_POLARITY_HIGH); - case POLARITY_ACTIVE_LOW: + case ACPI_MADT_POLARITY_ACTIVE_LOW: return (INTR_POLARITY_LOW); default: panic("Bogus Interrupt Polarity"); @@ -517,18 +519,18 @@ } static enum intr_trigger -interrupt_trigger(UINT16 TriggerMode, UINT8 Source) +interrupt_trigger(UINT16 IntiFlags, UINT8 Source) { - switch (TriggerMode) { - case TRIGGER_CONFORMS: - if (Source == AcpiGbl_FADT->SciInt) + switch (IntiFlags & ACPI_MADT_TRIGGER_MASK) { + case ACPI_MADT_TRIGGER_CONFORMS: + if (Source == AcpiGbl_FADT.SciInterrupt) return (INTR_TRIGGER_LEVEL); else return (INTR_TRIGGER_EDGE); - case TRIGGER_EDGE: + case ACPI_MADT_TRIGGER_EDGE: return (INTR_TRIGGER_EDGE); - case TRIGGER_LEVEL: + case ACPI_MADT_TRIGGER_LEVEL: return (INTR_TRIGGER_LEVEL); default: panic("Bogus Interrupt Trigger Mode"); @@ -586,7 +588,7 @@ * Parse an interrupt source override for an ISA interrupt. */ static void -madt_parse_interrupt_override(MADT_INTERRUPT_OVERRIDE *intr) +madt_parse_interrupt_override(ACPI_MADT_INTERRUPT_OVERRIDE *intr) { void *new_ioapic, *old_ioapic; u_int new_pin, old_pin; @@ -594,20 +596,19 @@ enum intr_polarity pol; char buf[64]; - if (acpi_quirks & ACPI_Q_MADT_IRQ0 && intr->Source == 0 && - intr->Interrupt == 2) { + if (acpi_quirks & ACPI_Q_MADT_IRQ0 && intr->SourceIrq == 0 && + intr->GlobalIrq == 2) { if (bootverbose) printf("MADT: Skipping timer override\n"); return; } if (bootverbose) printf("MADT: Interrupt override: source %u, irq %u\n", - intr->Source, intr->Interrupt); + intr->SourceIrq, intr->GlobalIrq); KASSERT(intr->Bus == 0, ("bus for interrupt overrides must be zero")); - if (madt_find_interrupt(intr->Interrupt, &new_ioapic, - &new_pin) != 0) { - printf("MADT: Could not find APIC for vector %d (IRQ %d)\n", - intr->Interrupt, intr->Source); + if (madt_find_interrupt(intr->GlobalIrq, &new_ioapic, &new_pin) != 0) { + printf("MADT: Could not find APIC for vector %u (IRQ %u)\n", + intr->GlobalIrq, intr->SourceIrq); return; } @@ -615,15 +616,15 @@ * Lookup the appropriate trigger and polarity modes for this * entry. */ - trig = interrupt_trigger(intr->TriggerMode, intr->Source); - pol = interrupt_polarity(intr->Polarity, intr->Source); + trig = interrupt_trigger(intr->IntiFlags, intr->SourceIrq); + pol = interrupt_polarity(intr->IntiFlags, intr->SourceIrq); /* * If the SCI is identity mapped but has edge trigger and * active-hi polarity or the force_sci_lo tunable is set, * force it to use level/lo. */ - if (intr->Source == AcpiGbl_FADT->SciInt) { + if (intr->SourceIrq == AcpiGbl_FADT.SciInterrupt) { madt_found_sci_override = 1; if (getenv_string("hw.acpi.sci.trigger", buf, sizeof(buf))) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Mar 27 16:39:45 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A41E616A406; Tue, 27 Mar 2007 16:39:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 59BB316A402 for ; Tue, 27 Mar 2007 16:39:45 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 31EDF13C4BD for ; Tue, 27 Mar 2007 16:39:45 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2RGdjQ7069157 for ; Tue, 27 Mar 2007 16:39:45 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2RGdips069139 for perforce@freebsd.org; Tue, 27 Mar 2007 16:39:44 GMT (envelope-from scottl@freebsd.org) Date: Tue, 27 Mar 2007 16:39:44 GMT Message-Id: <200703271639.l2RGdips069139@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 116669 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Mar 2007 16:39:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=116669 Change 116669 by scottl@scottl-x64 on 2007/03/27 16:38:52 Remove the D_NEEDSGIANT flag. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#13 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#13 (text+ko) ==== @@ -738,7 +738,7 @@ softc->disk->d_name = "cd"; softc->disk->d_unit = periph->unit_number; softc->disk->d_drv1 = periph; - softc->disk->d_flags = DISKFLAG_NEEDSGIANT; + softc->disk->d_flags = 0; disk_create(softc->disk, DISK_VERSION); /* From owner-p4-projects@FreeBSD.ORG Tue Mar 27 16:53:04 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D4B1A16A407; Tue, 27 Mar 2007 16:53:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A812716A404 for ; Tue, 27 Mar 2007 16:53:03 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8BA2E13C45A for ; Tue, 27 Mar 2007 16:53:03 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2RGr3L2015421 for ; Tue, 27 Mar 2007 16:53:03 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2RGr3Nw015403 for perforce@freebsd.org; Tue, 27 Mar 2007 16:53:03 GMT (envelope-from scottl@freebsd.org) Date: Tue, 27 Mar 2007 16:53:03 GMT Message-Id: <200703271653.l2RGr3Nw015403@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 116673 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Mar 2007 16:53:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=116673 Change 116673 by scottl@scottl-x64 on 2007/03/27 16:52:06 Lock the scsi_pt driver and remove spl markers. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pt.c#7 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pt.c#7 (text+ko) ==== @@ -119,7 +119,7 @@ static struct cdevsw pt_cdevsw = { .d_version = D_VERSION, - .d_flags = D_NEEDGIANT, + .d_flags = 0, .d_open = ptopen, .d_close = ptclose, .d_read = physread, @@ -138,38 +138,31 @@ { struct cam_periph *periph; struct pt_softc *softc; - int unit; int error = 0; - int s; - unit = minor(dev); periph = (struct cam_periph *)dev->si_drv1; - if (periph == NULL) + if (cam_periph_acquire(periph) != CAM_REQ_CMP) return (ENXIO); softc = (struct pt_softc *)periph->softc; - s = splsoftcam(); + cam_periph_lock(periph); if (softc->flags & PT_FLAG_DEVICE_INVALID) { - splx(s); + cam_periph_unlock(periph); + cam_periph_release(periph); return(ENXIO); } - if ((softc->flags & PT_FLAG_OPEN) == 0) { - if (cam_periph_acquire(periph) != CAM_REQ_CMP) - error = ENXIO; - else - softc->flags |= PT_FLAG_OPEN; - } else + if ((softc->flags & PT_FLAG_OPEN) == 0) + softc->flags |= PT_FLAG_OPEN; + else { error = EBUSY; - - cam_periph_lock(periph); + cam_periph_release(periph); + } CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, - ("ptopen: dev=%s (unit %d)\n", devtoname(dev), unit)); + ("ptopen: dev=%s\n", devtoname(dev))); - splx(s); - cam_periph_unlock(periph); return (error); } @@ -204,7 +197,6 @@ { struct cam_periph *periph; struct pt_softc *softc; - int s; periph = (struct cam_periph *)bp->bio_dev->si_drv1; bp->bio_resid = bp->bio_bcount; @@ -212,20 +204,14 @@ biofinish(bp, NULL, ENXIO); return; } + cam_periph_lock(periph); softc = (struct pt_softc *)periph->softc; /* - * Mask interrupts so that the pack cannot be invalidated until - * after we are in the queue. Otherwise, we might not properly - * clean up one of the buffers. - */ - s = splbio(); - - /* * If the device has been made invalid, error out */ if ((softc->flags & PT_FLAG_DEVICE_INVALID)) { - splx(s); + cam_periph_unlock(periph); biofinish(bp, NULL, ENXIO); return; } @@ -235,12 +221,11 @@ */ bioq_insert_tail(&softc->bio_queue, bp); - splx(s); - /* * Schedule ourselves for performing the work. */ xpt_schedule(periph, /* XXX priority */1); + cam_periph_unlock(periph); return; } @@ -347,7 +332,6 @@ static void ptoninvalidate(struct cam_periph *periph) { - int s; struct pt_softc *softc; struct ccb_setasync csa; @@ -367,21 +351,12 @@ softc->flags |= PT_FLAG_DEVICE_INVALID; /* - * Although the oninvalidate() routines are always called at - * splsoftcam, we need to be at splbio() here to keep the buffer - * queue from being modified while we traverse it. - */ - s = splbio(); - - /* * Return all queued I/O with ENXIO. * XXX Handle any transactions queued to the card * with XPT_ABORT_CCB. */ bioq_flush(&softc->bio_queue, NULL, ENXIO); - splx(s); - xpt_print(periph->path, "lost device\n"); } @@ -440,10 +415,8 @@ { struct pt_softc *softc; struct ccb_hdr *ccbh; - int s; softc = (struct pt_softc *)periph->softc; - s = splsoftcam(); /* * Don't fail on the expected unit attention * that will occur. @@ -451,7 +424,6 @@ softc->flags |= PT_FLAG_RETRY_UA; LIST_FOREACH(ccbh, &softc->pending_ccbs, periph_links.le) ccbh->ccb_state |= PT_CCB_RETRY_UA; - splx(s); } /* FALLTHROUGH */ default: @@ -465,14 +437,12 @@ { struct pt_softc *softc; struct bio *bp; - int s; softc = (struct pt_softc *)periph->softc; /* * See if there is a buf with work for us to do.. */ - s = splbio(); bp = bioq_first(&softc->bio_queue); if (periph->immediate_priority <= periph->pinfo.priority) { CAM_DEBUG_PRINT(CAM_DEBUG_SUBTRACE, @@ -481,14 +451,10 @@ SLIST_INSERT_HEAD(&periph->ccb_list, &start_ccb->ccb_h, periph_links.sle); periph->immediate_priority = CAM_PRIORITY_NONE; - splx(s); wakeup(&periph->ccb_list); } else if (bp == NULL) { - splx(s); xpt_release_ccb(start_ccb); } else { - int oldspl; - bioq_remove(&softc->bio_queue, bp); devstat_start_transaction_bio(softc->device_stats, bp); @@ -510,14 +476,11 @@ * Block out any asyncronous callbacks * while we touch the pending ccb list. */ - oldspl = splcam(); LIST_INSERT_HEAD(&softc->pending_ccbs, &start_ccb->ccb_h, periph_links.le); - splx(oldspl); start_ccb->ccb_h.ccb_bp = bp; bp = bioq_first(&softc->bio_queue); - splx(s); xpt_action(start_ccb); @@ -541,12 +504,10 @@ case PT_CCB_BUFFER_IO_UA: { struct bio *bp; - int oldspl; bp = (struct bio *)done_ccb->ccb_h.ccb_bp; if ((done_ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { int error; - int s; int sf; if ((csio->ccb_h.ccb_state & PT_CCB_RETRY_UA) != 0) @@ -563,8 +524,6 @@ return; } if (error != 0) { - s = splbio(); - if (error == ENXIO) { /* * Catastrophic error. Mark our device @@ -581,7 +540,6 @@ * proper order should it attempt to recover. */ bioq_flush(&softc->bio_queue, NULL, EIO); - splx(s); bp->bio_error = error; bp->bio_resid = bp->bio_bcount; bp->bio_flags |= BIO_ERROR; @@ -609,9 +567,7 @@ * Block out any asyncronous callbacks * while we touch the pending ccb list. */ - oldspl = splcam(); LIST_REMOVE(&done_ccb->ccb_h, periph_links.le); - splx(oldspl); biofinish(bp, softc->device_stats, 0); break; @@ -660,20 +616,14 @@ *(int *)addr = 0; break; case PTIOCSETTIMEOUT: - { - int s; - if (*(int *)addr < 1) { error = EINVAL; break; } - s = splsoftcam(); softc->io_timeout = *(int *)addr * 1000; - splx(s); break; - } default: error = cam_periph_ioctl(periph, cmd, addr, pterror); break; From owner-p4-projects@FreeBSD.ORG Tue Mar 27 17:12:29 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 22F7816A403; Tue, 27 Mar 2007 17:12:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D5F0816A401 for ; Tue, 27 Mar 2007 17:12:28 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C66A313C44B for ; Tue, 27 Mar 2007 17:12:28 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2RHCSLm082802 for ; Tue, 27 Mar 2007 17:12:28 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2RHCSOE082780 for perforce@freebsd.org; Tue, 27 Mar 2007 17:12:28 GMT (envelope-from scottl@freebsd.org) Date: Tue, 27 Mar 2007 17:12:28 GMT Message-Id: <200703271712.l2RHCSOE082780@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 116676 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Mar 2007 17:12:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=116676 Change 116676 by scottl@scottl-x64 on 2007/03/27 17:11:47 Lock the scsi_ch driver, remove spl markers. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ch.c#8 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ch.c#8 (text+ko) ==== @@ -173,8 +173,6 @@ int sc_settledelay; /* delay for settle */ }; -#define CHUNIT(x) (minor((x))) - static d_open_t chopen; static d_close_t chclose; static d_ioctl_t chioctl; @@ -213,7 +211,7 @@ static struct cdevsw ch_cdevsw = { .d_version = D_VERSION, - .d_flags = D_NEEDGIANT, + .d_flags = 0, .d_open = chopen, .d_close = chclose, .d_ioctl = chioctl, @@ -407,23 +405,24 @@ int error; periph = (struct cam_periph *)dev->si_drv1; - if (periph == NULL) - return(ENXIO); + if (cam_periph_acquire(periph) != CAM_REQ_CMP) + return (ENXIO); softc = (struct ch_softc *)periph->softc; + cam_periph_lock(periph); + if (softc->flags & CH_FLAG_INVALID) { + cam_periph_unlock(periph); + cam_periph_release(periph); return(ENXIO); } - if ((softc->flags & CH_FLAG_OPEN) == 0) { - if (cam_periph_acquire(periph) != CAM_REQ_CMP) - return(ENXIO); + if ((softc->flags & CH_FLAG_OPEN) == 0) softc->flags |= CH_FLAG_OPEN; - } + else + cam_periph_release(periph); - cam_periph_lock(periph); - /* * Load information about this changer device into the softc. */ @@ -468,24 +467,20 @@ chstart(struct cam_periph *periph, union ccb *start_ccb) { struct ch_softc *softc; - int s; softc = (struct ch_softc *)periph->softc; switch (softc->state) { case CH_STATE_NORMAL: { - s = splbio(); if (periph->immediate_priority <= periph->pinfo.priority){ start_ccb->ccb_h.ccb_state = CH_CCB_WAITING; SLIST_INSERT_HEAD(&periph->ccb_list, &start_ccb->ccb_h, periph_links.sle); periph->immediate_priority = CAM_PRIORITY_NONE; - splx(s); wakeup(&periph->ccb_list); - } else - splx(s); + } break; } case CH_STATE_PROBE: @@ -745,8 +740,10 @@ { int new_picker = *(int *)addr; - if (new_picker > (softc->sc_counts[CHET_MT] - 1)) - return (EINVAL); + if (new_picker > (softc->sc_counts[CHET_MT] - 1)) { + error = EINVAL; + break; + } softc->sc_picker = softc->sc_firsts[CHET_MT] + new_picker; break; } From owner-p4-projects@FreeBSD.ORG Tue Mar 27 19:20:12 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3AB6216A403; Tue, 27 Mar 2007 19:20:12 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F2D1916A402 for ; Tue, 27 Mar 2007 19:20:11 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C9F8D13C457 for ; Tue, 27 Mar 2007 19:20:11 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2RJKBw2059458 for ; Tue, 27 Mar 2007 19:20:11 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2RJKBdR059440 for perforce@freebsd.org; Tue, 27 Mar 2007 19:20:11 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 27 Mar 2007 19:20:11 GMT Message-Id: <200703271920.l2RJKBdR059440@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 116691 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Mar 2007 19:20:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=116691 Change 116691 by hselasky@hselasky_mini_itx on 2007/03/27 19:19:24 Patch to allow F_SETFL ioctl which uses the FIOASYNC ioctl. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ugen.c#11 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ugen.c#11 (text+ko) ==== @@ -1631,6 +1631,9 @@ } switch (cmd) { + case FIOASYNC: + if (*(int *)addr) + error = EINVAL; case FIONBIO: /* all handled in the upper FS layer */ goto done; From owner-p4-projects@FreeBSD.ORG Tue Mar 27 22:42:28 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC37916A404; Tue, 27 Mar 2007 22:42:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5BACD16A402 for ; Tue, 27 Mar 2007 22:42:28 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4C4E913C45D for ; Tue, 27 Mar 2007 22:42:28 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2RMgSFK043065 for ; Tue, 27 Mar 2007 22:42:28 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2RMgRkM043005 for perforce@freebsd.org; Tue, 27 Mar 2007 22:42:27 GMT (envelope-from scottl@freebsd.org) Date: Tue, 27 Mar 2007 22:42:27 GMT Message-Id: <200703272242.l2RMgRkM043005@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 116708 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Mar 2007 22:42:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=116708 Change 116708 by scottl@scottl-x64 on 2007/03/27 22:41:28 Fix a couple of accidents. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#17 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#27 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#17 (text+ko) ==== @@ -849,9 +849,9 @@ struct cam_sim *sim; int error; - mtx_assert(sim->mtx, MA_OWNED); error = 0; sim = xpt_path_sim(ccb->ccb_h.path); + mtx_assert(sim->mtx, MA_OWNED); /* * If the user has supplied a stats structure, and if we understand ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#27 (text+ko) ==== @@ -743,7 +743,7 @@ * Schedule ourselves for performing the work. */ xpt_schedule(periph, /* XXX priority */1); - cam_periph_lock(periph); + cam_periph_unlock(periph); return; } From owner-p4-projects@FreeBSD.ORG Tue Mar 27 23:03:56 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C1BE16A402; Tue, 27 Mar 2007 23:03:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E1E6916A400 for ; Tue, 27 Mar 2007 23:03:55 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id BA88F13C455 for ; Tue, 27 Mar 2007 23:03:55 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2RN3tll018167 for ; Tue, 27 Mar 2007 23:03:55 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2RN3tu6018158 for perforce@freebsd.org; Tue, 27 Mar 2007 23:03:55 GMT (envelope-from scottl@freebsd.org) Date: Tue, 27 Mar 2007 23:03:55 GMT Message-Id: <200703272303.l2RN3tu6018158@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 116710 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Mar 2007 23:03:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=116710 Change 116710 by scottl@scottl-x64 on 2007/03/27 23:03:09 Change an errant cam_periph_unlock to a cam_periph_release. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#14 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#14 (text+ko) ==== @@ -1781,7 +1781,7 @@ * operation. */ xpt_release_ccb(done_ccb); - cam_periph_unlock(periph); + cam_periph_release(periph); return; } case CD_CCB_WAITING: From owner-p4-projects@FreeBSD.ORG Tue Mar 27 23:06:00 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C972A16A40A; Tue, 27 Mar 2007 23:05:59 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 77C0816A401 for ; Tue, 27 Mar 2007 23:05:59 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 36ED513C4AD for ; Tue, 27 Mar 2007 23:05:59 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2RN5xV8019325 for ; Tue, 27 Mar 2007 23:05:59 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2RN5xBg019322 for perforce@freebsd.org; Tue, 27 Mar 2007 23:05:59 GMT (envelope-from scottl@freebsd.org) Date: Tue, 27 Mar 2007 23:05:59 GMT Message-Id: <200703272305.l2RN5xBg019322@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 116711 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Mar 2007 23:06:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=116711 Change 116711 by scottl@scottl-x64 on 2007/03/27 23:05:27 Fix another missed cam_periph_unlock->cam_periph_release conversion. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ch.c#9 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ch.c#9 (text+ko) ==== @@ -653,7 +653,7 @@ * operation. */ xpt_release_ccb(done_ccb); - cam_periph_unlock(periph); + cam_periph_release(periph); return; } case CH_CCB_WAITING: From owner-p4-projects@FreeBSD.ORG Wed Mar 28 07:07:56 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 447BB16A404; Wed, 28 Mar 2007 07:07:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0310316A400 for ; Wed, 28 Mar 2007 07:07:56 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E6EE713C4C3 for ; Wed, 28 Mar 2007 07:07:55 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2S77tEE074360 for ; Wed, 28 Mar 2007 07:07:55 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2S77sk2074249 for perforce@freebsd.org; Wed, 28 Mar 2007 07:07:54 GMT (envelope-from marcel@freebsd.org) Date: Wed, 28 Mar 2007 07:07:54 GMT Message-Id: <200703280707.l2S77sk2074249@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 Cc: Subject: PERFORCE change 116720 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Mar 2007 07:07:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=116720 Change 116720 by marcel@marcel_xcllnt on 2007/03/28 07:07:26 IFC @116719 Affected files ... .. //depot/projects/uart/Makefile#11 integrate .. //depot/projects/uart/amd64/amd64/identcpu.c#13 integrate .. //depot/projects/uart/amd64/amd64/prof_machdep.c#6 integrate .. //depot/projects/uart/amd64/amd64/trap.c#17 integrate .. //depot/projects/uart/amd64/amd64/tsc.c#6 integrate .. //depot/projects/uart/arm/at91/at91_st.c#7 integrate .. //depot/projects/uart/arm/at91/at91_twi.c#7 integrate .. //depot/projects/uart/arm/at91/at91_twireg.h#2 integrate .. //depot/projects/uart/arm/at91/kb920x_machdep.c#9 integrate .. //depot/projects/uart/arm/conf/KB920X#7 integrate .. //depot/projects/uart/arm/conf/KB920X.hints#1 branch .. //depot/projects/uart/arm/xscale/i80321/i80321_wdog.c#3 integrate .. //depot/projects/uart/arm/xscale/ixp425/ixp425_wdog.c#2 integrate .. //depot/projects/uart/boot/ficl/ficl.h#3 integrate .. //depot/projects/uart/boot/ficl/float.c#2 integrate .. //depot/projects/uart/boot/ficl/softwords/fileaccess.fr#2 integrate .. //depot/projects/uart/boot/ficl/softwords/jhlocal.fr#2 integrate .. //depot/projects/uart/boot/ficl/softwords/oo.fr#2 integrate .. //depot/projects/uart/boot/ficl/softwords/prefix.fr#2 integrate .. //depot/projects/uart/boot/ficl/softwords/softcore.awk#2 integrate .. //depot/projects/uart/boot/ficl/tools.c#2 integrate .. //depot/projects/uart/boot/ficl/unix.c#2 integrate .. //depot/projects/uart/boot/ficl/vm.c#2 integrate .. //depot/projects/uart/boot/ficl/words.c#2 integrate .. //depot/projects/uart/boot/i386/boot0/boot0.S#7 integrate .. //depot/projects/uart/conf/NOTES#48 integrate .. //depot/projects/uart/conf/files#80 integrate .. //depot/projects/uart/conf/kern.post.mk#19 integrate .. //depot/projects/uart/conf/options#45 integrate .. //depot/projects/uart/contrib/altq/altq/altq_subr.c#4 integrate .. //depot/projects/uart/dev/acpica/Osd/OsdSynch.c#9 integrate .. //depot/projects/uart/dev/ce/if_ce.c#5 integrate .. //depot/projects/uart/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/uart/dev/cxgb/cxgb_main.c#2 integrate .. //depot/projects/uart/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/uart/dev/exca/exca.c#14 integrate .. //depot/projects/uart/dev/ichwd/ichwd.c#5 integrate .. //depot/projects/uart/dev/iicbus/icee.c#1 branch .. //depot/projects/uart/dev/iicbus/iic.c#9 integrate .. //depot/projects/uart/dev/iicbus/iicbb.c#6 integrate .. //depot/projects/uart/dev/iicbus/iicbus.c#7 integrate .. //depot/projects/uart/dev/iicbus/iicbus.h#4 integrate .. //depot/projects/uart/dev/iicbus/iiconf.c#5 integrate .. //depot/projects/uart/dev/ipmi/ipmi.c#7 integrate .. //depot/projects/uart/dev/ipw/if_ipw.c#9 integrate .. //depot/projects/uart/dev/mk48txx/mk48txx.c#9 integrate .. //depot/projects/uart/dev/mxge/if_mxge.c#7 integrate .. //depot/projects/uart/dev/pci/pci.c#29 integrate .. //depot/projects/uart/dev/pci/pcivar.h#12 integrate .. //depot/projects/uart/dev/scc/scc_core.c#28 integrate .. //depot/projects/uart/dev/snp/snp.c#10 integrate .. //depot/projects/uart/dev/usb/uhci.c#20 integrate .. //depot/projects/uart/dev/usb/uplcom.c#19 integrate .. //depot/projects/uart/dev/usb/usb_quirks.c#12 integrate .. //depot/projects/uart/dev/usb/usbdevs#30 integrate .. //depot/projects/uart/dev/watchdog/watchdog.c#4 integrate .. //depot/projects/uart/fs/devfs/devfs_vnops.c#20 integrate .. //depot/projects/uart/fs/udf/udf_vnops.c#15 integrate .. //depot/projects/uart/geom/geom_dev.c#14 integrate .. //depot/projects/uart/i386/i386/elan-mmcr.c#8 integrate .. //depot/projects/uart/i386/i386/geode.c#6 integrate .. //depot/projects/uart/i386/i386/identcpu.c#24 integrate .. //depot/projects/uart/i386/i386/locore.s#10 integrate .. //depot/projects/uart/i386/i386/pmap.c#47 integrate .. //depot/projects/uart/i386/i386/trap.c#18 integrate .. //depot/projects/uart/i386/i386/tsc.c#8 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_misc.c#12 integrate .. //depot/projects/uart/i386/isa/prof_machdep.c#6 integrate .. //depot/projects/uart/kern/init_main.c#19 integrate .. //depot/projects/uart/kern/kern_cpu.c#6 integrate .. //depot/projects/uart/kern/kern_exec.c#23 integrate .. //depot/projects/uart/kern/kern_proc.c#19 integrate .. //depot/projects/uart/kern/kern_thread.c#26 integrate .. //depot/projects/uart/kern/sysv_sem.c#16 integrate .. //depot/projects/uart/kern/uipc_sockbuf.c#4 integrate .. //depot/projects/uart/kern/uipc_socket.c#26 integrate .. //depot/projects/uart/kern/uipc_socket2.c#18 delete .. //depot/projects/uart/kern/vfs_bio.c#28 integrate .. //depot/projects/uart/kern/vfs_subr.c#38 integrate .. //depot/projects/uart/modules/Makefile#46 integrate .. //depot/projects/uart/modules/if_edsc/Makefile#1 branch .. //depot/projects/uart/net/if.c#26 integrate .. //depot/projects/uart/net/if_disc.c#10 integrate .. //depot/projects/uart/net/if_edsc.c#1 branch .. //depot/projects/uart/net/rtsock.c#16 integrate .. //depot/projects/uart/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#10 integrate .. //depot/projects/uart/netinet/in_pcb.h#13 integrate .. //depot/projects/uart/netinet/ip_input.c#21 integrate .. //depot/projects/uart/netinet/ip_output.c#21 integrate .. //depot/projects/uart/netinet/tcp_debug.h#4 integrate .. //depot/projects/uart/netinet/tcp_input.c#30 integrate .. //depot/projects/uart/netinet/tcp_sack.c#11 integrate .. //depot/projects/uart/nfsclient/nfs_vfsops.c#18 integrate .. //depot/projects/uart/nfsserver/nfs_serv.c#15 integrate .. //depot/projects/uart/rpc/rpcclnt.c#6 integrate .. //depot/projects/uart/sys/cpu.h#2 integrate .. //depot/projects/uart/sys/eventhandler.h#6 integrate .. //depot/projects/uart/sys/mbuf.h#17 integrate .. //depot/projects/uart/sys/param.h#31 integrate .. //depot/projects/uart/sys/rwlock.h#8 integrate .. //depot/projects/uart/vm/vm_fault.c#21 integrate .. //depot/projects/uart/vm/vm_map.c#26 integrate .. //depot/projects/uart/vm/vm_object.c#27 integrate Differences ... ==== //depot/projects/uart/Makefile#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.40 2006/11/26 18:27:16 maxim Exp $ +# $FreeBSD: src/sys/Makefile,v 1.41 2007/03/24 22:21:01 maxim Exp $ .include @@ -9,7 +9,7 @@ # Directories to include in cscope name file and TAGS. CSCOPEDIRS= cam coda compat conf contrib crypto ddb dev fs geom gnu i4b \ - isa isofs kern libkern modules net net80211 netatalk netatm \ + isa kern libkern modules net net80211 netatalk netatm \ netgraph netinet netinet6 netipx netkey netnatm netncp \ netsmb nfs nfsclient nfs4client rpc pccard pci sys \ ufs vm ${ARCHDIR} ==== //depot/projects/uart/amd64/amd64/identcpu.c#13 (text+ko) ==== @@ -39,12 +39,14 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.152 2007/03/20 20:22:45 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.153 2007/03/26 18:03:29 njl Exp $"); #include "opt_cpu.h" #include #include +#include +#include #include #include #include @@ -404,6 +406,21 @@ } +/* Update TSC freq with the value indicated by the caller. */ +static void +tsc_freq_changed(void *arg, const struct cf_level *level, int status) +{ + /* If there was an error during the transition, don't do anything. */ + if (status != 0) + return; + + /* Total setting for this level gives the new frequency in MHz. */ + hw_clockrate = level->total_set.freq; +} + +EVENTHANDLER_DEFINE(cpufreq_post_change, tsc_freq_changed, NULL, + EVENTHANDLER_PRI_ANY); + /* * Final stage of CPU identification. -- Should I check TI? */ ==== //depot/projects/uart/amd64/amd64/prof_machdep.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/prof_machdep.c,v 1.28 2006/10/29 09:48:44 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/prof_machdep.c,v 1.29 2007/03/26 18:03:29 njl Exp $"); #ifdef GUPROF #if 0 @@ -35,6 +35,9 @@ #include #include +#include +#include +#include #include #include #include @@ -60,6 +63,9 @@ static int cputime_clock_pmc_init; static struct gmonparam saved_gmp; #endif +#if defined(I586_CPU) || defined(I686_CPU) +static int cputime_prof_active; +#endif #endif /* GUPROF */ #ifdef __GNUCLIKE_ASM @@ -205,6 +211,7 @@ u_char high, low; static u_int prev_count; +#if defined(I586_CPU) || defined(I686_CPU) if (cputime_clock == CPUTIME_CLOCK_TSC) { /* * Scale the TSC a little to make cputime()'s frequency @@ -233,6 +240,7 @@ return (delta); } #endif /* PERFMON && I586_PMC_GUPROF && !SMP */ +#endif /* I586_CPU || I686_CPU */ /* * Read the current value of the 8254 timer counter 0. @@ -314,12 +322,17 @@ { if (cputime_clock == CPUTIME_CLOCK_UNINITIALIZED) { cputime_clock = CPUTIME_CLOCK_I8254; - if (tsc_freq != 0 && !tsc_is_broken && mp_ncpus < 2) +#if defined(I586_CPU) || defined(I686_CPU) + if (tsc_freq != 0 && !tsc_is_broken && mp_ncpus == 1) cputime_clock = CPUTIME_CLOCK_TSC; +#endif } gp->profrate = timer_freq << CPUTIME_CLOCK_I8254_SHIFT; - if (cputime_clock == CPUTIME_CLOCK_TSC) +#if defined(I586_CPU) || defined(I686_CPU) + if (cputime_clock == CPUTIME_CLOCK_TSC) { gp->profrate = tsc_freq >> 1; + cputime_prof_active = 1; + } #if defined(PERFMON) && defined(I586_PMC_GUPROF) else if (cputime_clock == CPUTIME_CLOCK_I586_PMC) { if (perfmon_avail() && @@ -346,6 +359,7 @@ } } #endif /* PERFMON && I586_PMC_GUPROF */ +#endif /* I586_CPU || I686_CPU */ cputime_bias = 0; cputime(); } @@ -361,5 +375,27 @@ cputime_clock_pmc_init = FALSE; } #endif +#if defined(I586_CPU) || defined(I686_CPU) + if (cputime_clock == CPUTIME_CLOCK_TSC) + cputime_prof_active = 0; +#endif } + +#if defined(I586_CPU) || defined(I686_CPU) +/* If the cpu frequency changed while profiling, report a warning. */ +static void +tsc_freq_changed(void *arg, const struct cf_level *level, int status) +{ + + /* If there was an error during the transition, don't do anything. */ + if (status != 0) + return; + if (cputime_prof_active && cputime_clock == CPUTIME_CLOCK_TSC) + printf("warning: cpu freq changed while profiling active\n"); +} + +EVENTHANDLER_DEFINE(cpufreq_post_change, tsc_freq_changed, NULL, + EVENTHANDLER_PRI_ANY); +#endif /* I586_CPU || I686_CPU */ + #endif /* GUPROF */ ==== //depot/projects/uart/amd64/amd64/trap.c#17 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.314 2007/03/09 04:02:36 mohans Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.315 2007/03/26 21:45:44 kris Exp $"); /* * AMD64 Trap and System call handling @@ -745,10 +745,8 @@ #ifdef DIAGNOSTIC if (ISPL(frame->tf_cs) != SEL_UPL) { - mtx_lock(&Giant); /* try to stabilize the system XXX */ panic("syscall"); /* NOT REACHED */ - mtx_unlock(&Giant); } #endif ==== //depot/projects/uart/amd64/amd64/tsc.c#6 (text+ko) ==== @@ -25,11 +25,14 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/tsc.c,v 1.206 2006/02/11 09:33:05 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/tsc.c,v 1.207 2007/03/26 18:03:29 njl Exp $"); #include "opt_clock.h" #include +#include +#include +#include #include #include #include @@ -41,8 +44,11 @@ #include #include +#include "cpufreq_if.h" + uint64_t tsc_freq; int tsc_is_broken; +static eventhandler_tag tsc_levels_tag, tsc_pre_tag, tsc_post_tag; #ifdef SMP static int smp_tsc; @@ -51,14 +57,19 @@ TUNABLE_INT("kern.timecounter.smp_tsc", &smp_tsc); #endif +static void tsc_freq_changed(void *arg, const struct cf_level *level, + int status); +static void tsc_freq_changing(void *arg, const struct cf_level *level, + int *status); static unsigned tsc_get_timecount(struct timecounter *tc); +static void tsc_levels_changed(void *arg, int unit); static struct timecounter tsc_timecounter = { tsc_get_timecount, /* get_timecount */ 0, /* no poll_pps */ - ~0u, /* counter_mask */ + ~0u, /* counter_mask */ 0, /* frequency */ - "TSC", /* name */ + "TSC", /* name */ 800, /* quality (adjusted in code) */ }; @@ -77,10 +88,24 @@ tsc_freq = tscval[1] - tscval[0]; if (bootverbose) printf("TSC clock: %lu Hz\n", tsc_freq); + + /* + * Inform CPU accounting about our boot-time clock rate. Once the + * system is finished booting, we will get the real max clock rate + * via tsc_freq_max(). This also will be updated if someone loads + * a cpufreq driver after boot that discovers a new max frequency. + */ set_cputicker(rdtsc, tsc_freq, 1); + + /* Register to find out about changes in CPU frequency. */ + tsc_pre_tag = EVENTHANDLER_REGISTER(cpufreq_pre_change, + tsc_freq_changing, NULL, EVENTHANDLER_PRI_FIRST); + tsc_post_tag = EVENTHANDLER_REGISTER(cpufreq_post_change, + tsc_freq_changed, NULL, EVENTHANDLER_PRI_FIRST); + tsc_levels_tag = EVENTHANDLER_REGISTER(cpufreq_levels_changed, + tsc_levels_changed, NULL, EVENTHANDLER_PRI_ANY); } - void init_TSC_tc(void) { @@ -104,6 +129,72 @@ } } +/* + * When cpufreq levels change, find out about the (new) max frequency. We + * use this to update CPU accounting in case it got a lower estimate at boot. + */ +static void +tsc_levels_changed(void *arg, int unit) +{ + device_t cf_dev; + struct cf_level *levels; + int count, error; + uint64_t max_freq; + + /* Only use values from the first CPU, assuming all are equal. */ + if (unit != 0) + return; + + /* Find the appropriate cpufreq device instance. */ + cf_dev = devclass_get_device(devclass_find("cpufreq"), unit); + if (cf_dev == NULL) { + printf("tsc_levels_changed() called but no cpufreq device?\n"); + return; + } + + /* Get settings from the device and find the max frequency. */ + count = 64; + levels = malloc(count * sizeof(*levels), M_TEMP, M_NOWAIT); + if (levels == NULL) + return; + error = CPUFREQ_LEVELS(cf_dev, levels, &count); + if (error == 0 && count != 0) { + max_freq = (uint64_t)levels[0].total_set.freq * 1000000; + set_cputicker(rdtsc, max_freq, 1); + } else + printf("tsc_levels_changed: no max freq found\n"); + free(levels, M_TEMP); +} + +/* + * If the TSC timecounter is in use, veto the pending change. It may be + * possible in the future to handle a dynamically-changing timecounter rate. + */ +static void +tsc_freq_changing(void *arg, const struct cf_level *level, int *status) +{ + + if (*status != 0 || timecounter != &tsc_timecounter) + return; + + printf("timecounter TSC must not be in use when " + "changing frequencies; change denied\n"); + *status = EBUSY; +} + +/* Update TSC freq with the value indicated by the caller. */ +static void +tsc_freq_changed(void *arg, const struct cf_level *level, int status) +{ + /* If there was an error during the transition, don't do anything. */ + if (status != 0) + return; + + /* Total setting for this level gives the new frequency in MHz. */ + tsc_freq = (uint64_t)level->total_set.freq * 1000000; + tsc_timecounter.tc_frequency = tsc_freq; +} + static int sysctl_machdep_tsc_freq(SYSCTL_HANDLER_ARGS) { ==== //depot/projects/uart/arm/at91/at91_st.c#7 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_st.c,v 1.8 2007/02/23 12:18:27 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_st.c,v 1.9 2007/03/27 21:03:35 n_hibma Exp $"); #include #include @@ -171,13 +171,11 @@ int t; t = cmd & WD_INTERVAL; - if (cmd > 0 && t >= 22 && t <= 37) { + if (t >= 22 && t <= 37) { wdog = (1 << (t - 22)) | ST_WDMR_RSTEN; *error = 0; } else { wdog = 0; - if (cmd > 0) - *error = EINVAL; } WR4(ST_WDMR, wdog); WR4(ST_CR, ST_CR_WDRST); ==== //depot/projects/uart/arm/at91/at91_twi.c#7 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.9 2007/02/23 12:18:27 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.10 2007/03/23 22:57:24 imp Exp $"); #include #include @@ -45,6 +45,10 @@ #include #include "iicbus_if.h" +#define TWI_SLOW_CLOCK 1500 +#define TWI_FAST_CLOCK 45000 +#define TWI_FASTEST_CLOCK 90000 + struct at91_twi_softc { device_t dev; /* Myself */ @@ -123,7 +127,7 @@ AT91_TWI_LOCK_DESTROY(sc); goto out; } - sc->cwgr = TWI_CWGR_CKDIV(8 * AT91C_MASTER_CLOCK / 90000) | + sc->cwgr = TWI_CWGR_CKDIV(8 * AT91C_MASTER_CLOCK / TWI_FASTEST_CLOCK) | TWI_CWGR_CHDIV(TWI_CWGR_DIV(TWI_DEF_CLK)) | TWI_CWGR_CLDIV(TWI_CWGR_DIV(TWI_DEF_CLK)); WR4(sc, TWI_CR, TWI_CR_SWRST); @@ -226,14 +230,13 @@ int counter = 100000; uint32_t sr; - while (!((sr = RD4(sc, TWI_SR)) & bit) && counter-- > 0) + while (!((sr = RD4(sc, TWI_SR)) & bit) && counter-- > 0 && + !(sr & TWI_SR_NACK)) continue; if (counter <= 0) err = EBUSY; else if (sr & TWI_SR_NACK) - err = EADDRNOTAVAIL; - if (sr & ~bit) - printf("status is %x\n", sr); + err = ENXIO; // iic nack convention return (err); } @@ -253,17 +256,17 @@ */ switch (speed) { case IIC_SLOW: - clk = 1500; + clk = TWI_SLOW_CLOCK; break; case IIC_FAST: - clk = 45000; + clk = TWI_FAST_CLOCK; break; case IIC_UNKNOWN: case IIC_FASTEST: default: - clk = 90000; + clk = TWI_FASTEST_CLOCK; break; } sc->cwgr = TWI_CWGR_CKDIV(1) | TWI_CWGR_CHDIV(TWI_CWGR_DIV(clk)) | @@ -302,6 +305,7 @@ int i, len, err; uint32_t rdwr; uint8_t *buf; + uint32_t sr; sc = device_get_softc(dev); err = 0; @@ -320,26 +324,36 @@ WR4(sc, TWI_MMR, TWI_MMR_DADR(msgs[i].slave) | rdwr); len = msgs[i].len; buf = msgs[i].buf; - if (len != 0 && buf == NULL) - return (EINVAL); - WR4(sc, TWI_CR, TWI_CR_START); + /* zero byte transfers aren't allowed */ + if (len == 0 || buf == NULL) { + err = EINVAL; + goto out; + } + if (len == 1) + WR4(sc, TWI_CR, TWI_CR_START | TWI_CR_STOP); + else + WR4(sc, TWI_CR, TWI_CR_START); if (msgs[i].flags & IIC_M_RD) { - while (len--) { - if (len == 0) - WR4(sc, TWI_CR, TWI_CR_STOP); - if ((err = at91_twi_wait(sc, TWI_SR_RXRDY))) - goto out; - *buf++ = RD4(sc, TWI_RHR) & 0xff; + sr = RD4(sc, TWI_SR); + while (!(sr & TWI_SR_TXCOMP)) { + if ((sr = RD4(sc, TWI_SR)) & TWI_SR_RXRDY) { + len--; + *buf++ = RD4(sc, TWI_RHR) & 0xff; + if (len == 0 && msgs[i].len != 1) + WR4(sc, TWI_CR, TWI_CR_STOP); + } + } + if (len > 0 || (sr & TWI_SR_NACK)) { + err = ENXIO; // iic nack convention + goto out; } } else { while (len--) { - WR4(sc, TWI_THR, *buf++); - if (len == 0) + if (len == 0 && msgs[i].len != 1) WR4(sc, TWI_CR, TWI_CR_STOP); - if ((err = at91_twi_wait(sc, TWI_SR_TXRDY))) { - printf("Len %d\n", len); + if ((err = at91_twi_wait(sc, TWI_SR_TXRDY))) goto out; - } + WR4(sc, TWI_THR, *buf++); } } if ((err = at91_twi_wait(sc, TWI_SR_TXCOMP))) @@ -347,8 +361,9 @@ } out:; if (err) { - WR4(sc, TWI_CR, TWI_CR_STOP); - printf("Err is %d\n", err); + WR4(sc, TWI_CR, TWI_CR_SWRST); + WR4(sc, TWI_CR, TWI_CR_MSEN | TWI_CR_SVDIS); + WR4(sc, TWI_CWGR, sc->cwgr); } AT91_TWI_UNLOCK(sc); return (err); ==== //depot/projects/uart/arm/at91/at91_twireg.h#2 (text) ==== @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD: src/sys/arm/at91/at91_twireg.h,v 1.1 2006/02/04 23:32:13 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_twireg.h,v 1.2 2007/03/23 22:57:24 imp Exp $ */ #ifndef ARM_AT91_AT91_TWIREG_H #define ARM_AT91_AT91_TWIREG_H @@ -56,7 +56,7 @@ #define TWI_MMR_IADRSZ(n) ((n) << 8) /* Set size of transfer */ #define TWI_MMR_MWRITE 0U /* Master Read Direction */ #define TWI_MMR_MREAD (1U << 12) /* Master Read Direction */ -#define TWI_MMR_DADR(n) ((n) << 16) /* Device Address */ +#define TWI_MMR_DADR(n) ((n) << 15) /* Device Address */ /* TWI_CWGR */ #define TWI_CWGR_CKDIV(x) ((x) << 16) /* Clock Divider */ ==== //depot/projects/uart/arm/at91/kb920x_machdep.c#9 (text) ==== @@ -48,7 +48,7 @@ #include "opt_at91.h" #include -__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.20 2006/12/06 06:34:53 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.21 2007/03/27 06:29:19 kevlo Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -136,7 +136,6 @@ struct pv_addr undstack; struct pv_addr abtstack; struct pv_addr kernelstack; -struct pv_addr minidataclean; static struct trapframe proc0_tf; @@ -355,7 +354,6 @@ valloc_pages(abtstack, ABT_STACK_SIZE); valloc_pages(undstack, UND_STACK_SIZE); valloc_pages(kernelstack, KSTACK_PAGES); - alloc_pages(minidataclean.pv_pa, 1); valloc_pages(msgbufpv, round_page(MSGBUF_SIZE) / PAGE_SIZE); /* * Now we start construction of the L1 page table @@ -379,9 +377,6 @@ pmap_link_l2pt(l1pagetable, afterkern + i * 0x00100000, &kernel_pt_table[KERNEL_PT_AFKERNEL + i]); } - pmap_map_entry(l1pagetable, afterkern, minidataclean.pv_pa, - VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); - /* Map the vector page. */ pmap_map_entry(l1pagetable, ARM_VECTORS_HIGH, systempage.pv_pa, ==== //depot/projects/uart/arm/conf/KB920X#7 (text) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/KB920X,v 1.11 2006/10/26 22:11:35 jb Exp $ +# $FreeBSD: src/sys/arm/conf/KB920X,v 1.12 2007/03/23 23:47:59 imp Exp $ machine arm ident KB920X @@ -24,6 +24,7 @@ include "../at91/std.kb920x" #To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" #Default places to look for devices. +hints "KB920X.hints" makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols options DDB @@ -38,12 +39,12 @@ #options UFS_DIRHASH #Improve performance on big directories #options MD_ROOT #MD is a potential root device #options MD_ROOT_SIZE=4096 # 3MB ram disk -#options ROOTDEVNAME=\"ufs:md0\" +options ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\" options NFSCLIENT #Network Filesystem Client #options NFSSERVER #Network Filesystem Server -options NFS_ROOT #NFS usable as /, requires NFSCLIENT -options BOOTP_NFSROOT -options BOOTP +#options NFS_ROOT #NFS usable as /, requires NFSCLIENT +#options BOOTP_NFSROOT +#options BOOTP #options MSDOSFS #MSDOS Filesystem #options CD9660 #ISO 9660 Filesystem @@ -79,6 +80,16 @@ device mem # Memory and kernel memory devices device md -# device at91_twi # TWI: Two Wire Interface +device at91_twi # TWI: Two Wire Interface device at91_spi # SPI: device spibus +# MMC/SD +device at91_mci +device mmc +device mmcsd +# iic +device iic +device iicbus +device icee + +device bpf ==== //depot/projects/uart/arm/xscale/i80321/i80321_wdog.c#3 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_wdog.c,v 1.3 2006/12/15 21:44:48 n_hibma Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_wdog.c,v 1.4 2007/03/27 21:03:35 n_hibma Exp $"); #include #include @@ -111,18 +111,15 @@ cmd &= WD_INTERVAL; if (cmd > 0 && cmd <= 63 - && (uint64_t)1 << (cmd & WD_INTERVAL) <= - (uint64_t)sc->wdog_period * 1000000000) { + && (uint64_t)1<wdog_period * 1000000000) { /* Valid value -> Enable watchdog */ iopwdog_tickle(sc); sc->armed = 1; *error = 0; } else { - /* XXX Can't disable this watchdog? */ + /* Can't disable this watchdog! */ if (sc->armed) *error = EOPNOTSUPP; - else if (cmd > 0) - *error = EINVAL; } } ==== //depot/projects/uart/arm/xscale/ixp425/ixp425_wdog.c#2 (text+ko) ==== @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_wdog.c,v 1.1 2006/11/19 23:55:23 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_wdog.c,v 1.2 2007/03/27 21:03:36 n_hibma Exp $"); /* * IXP425 Watchdog Timer Support. @@ -70,7 +70,7 @@ u_int u = cmd & WD_INTERVAL; WR4(sc, IXP425_OST_WDOG_KEY, OST_WDOG_KEY_MAJICK); - if (cmd && 4 <= u && u <= 35) { + if (4 <= u && u <= 35) { WR4(sc, IXP425_OST_WDOG_ENAB, 0); /* approximate 66.66MHz cycles */ WR4(sc, IXP425_OST_WDOG, 2<<(u - 4)); ==== //depot/projects/uart/boot/ficl/ficl.h#3 (text+ko) ==== @@ -41,7 +41,7 @@ ** SUCH DAMAGE. */ -/* $FreeBSD: src/sys/boot/ficl/ficl.h,v 1.21 2004/11/30 11:35:30 scottl Exp $ */ +/* $FreeBSD: src/sys/boot/ficl/ficl.h,v 1.22 2007/03/23 22:26:01 jkim Exp $ */ #if !defined (__FICL_H__) #define __FICL_H__ @@ -237,9 +237,9 @@ /* ** the Good Stuff starts here... */ -#define FICL_VER "3.02" +#define FICL_VER "3.03" #define FICL_VER_MAJOR 3 -#define FICL_VER_MINOR 2 +#define FICL_VER_MINOR 3 #if !defined (FICL_PROMPT) #define FICL_PROMPT "ok> " #endif @@ -857,7 +857,7 @@ FICL_WORD *pDoesParen; FICL_WORD *pExitInner; FICL_WORD *pExitParen; - FICL_WORD *pIfParen; + FICL_WORD *pBranch0; FICL_WORD *pInterpret; FICL_WORD *pLitParen; FICL_WORD *pTwoLitParen; @@ -865,7 +865,9 @@ FICL_WORD *pPLoopParen; FICL_WORD *pQDoParen; FICL_WORD *pSemiParen; + FICL_WORD *pOfParen; FICL_WORD *pStore; + FICL_WORD *pDrop; FICL_WORD *pCStringLit; FICL_WORD *pStringLit; @@ -1086,6 +1088,7 @@ IF, LITERAL, LOOP, + OF, PLOOP, PRIMITIVE, QDO, ==== //depot/projects/uart/boot/ficl/float.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ ** SUCH DAMAGE. */ -/* $FreeBSD: src/sys/boot/ficl/float.c,v 1.1 2002/04/09 17:45:11 dcs Exp $ */ +/* $FreeBSD: src/sys/boot/ficl/float.c,v 1.2 2007/03/23 22:26:01 jkim Exp $ */ #include #include @@ -977,6 +977,8 @@ } PUSHFLOAT(accum); + if (pVM->state == COMPILE) + fliteralIm(pVM); return(1); } @@ -1062,3 +1064,4 @@ #endif return; } + ==== //depot/projects/uart/boot/ficl/softwords/fileaccess.fr#2 (text+ko) ==== @@ -4,7 +4,7 @@ \ ** submitted by Larry Hastings, larry@hastings.org \ ** \ -\ $FreeBSD: src/sys/boot/ficl/softwords/fileaccess.fr,v 1.1 2002/04/09 17:45:27 dcs Exp $ +\ $FreeBSD: src/sys/boot/ficl/softwords/fileaccess.fr,v 1.2 2007/03/23 22:26:01 jkim Exp $ : r/o 1 ; : r/w 3 ; @@ -15,12 +15,11 @@ r/o bin open-file 0= if locals| f | end-locals f include-file - f close-file drop else drop endif ; -: include parse-word included ; immediate +: include parse-word included ; \ #endif ==== //depot/projects/uart/boot/ficl/softwords/jhlocal.fr#2 (text+ko) ==== @@ -14,11 +14,13 @@ \ \ revised 2 June 2000 - { | a -- } now works correctly \ -\ $FreeBSD: src/sys/boot/ficl/softwords/jhlocal.fr,v 1.4 2001/04/29 02:36:36 dcs Exp $ +\ $FreeBSD: src/sys/boot/ficl/softwords/jhlocal.fr,v 1.5 2007/03/23 22:26:01 jkim Exp $ hide + 0 constant zero + : ?-- ( c-addr u -- c-addr u flag ) 2dup s" --" compare 0= ; : ?} ( c-addr u -- c-addr u flag ) @@ -74,23 +76,24 @@ parse-word ?delim dup to locstate 0= while - ?2loc if - postpone zero postpone zero (2local) - else - postpone zero (local) - endif + ?2loc if + postpone zero postpone zero (2local) + else + postpone zero (local) + endif repeat endif 0 0 (local) \ toss words until } + \ (explicitly allow | and -- in the comment) locstate 2 = if begin parse-word - ?delim dup to locstate - 0= while - 2drop + ?delim dup to locstate + 3 < while + locstate 0= if 2drop endif repeat endif ==== //depot/projects/uart/boot/ficl/softwords/oo.fr#2 (text+ko) ==== @@ -3,7 +3,7 @@ \ ** F I C L O - O E X T E N S I O N S \ ** john sadler aug 1998 \ -\ $FreeBSD: src/sys/boot/ficl/softwords/oo.fr,v 1.4 2002/04/09 17:45:28 dcs Exp $ +\ $FreeBSD: src/sys/boot/ficl/softwords/oo.fr,v 1.5 2007/03/23 22:26:01 jkim Exp $ 17 ficl-vocabulary oop also oop definitions @@ -86,8 +86,6 @@ \ execute it at run-time... \ -hide - \ p a r s e - m e t h o d \ compiles a method name so that it pushes \ the string base address and count at run-time. @@ -97,6 +95,13 @@ postpone sliteral ; compile-only + + +: (lookup-method) { class 2:name -- class 0 | class xt 1 | class xt -1 } + class name class cell+ @ ( class c-addr u wid ) + search-wordlist +; + \ l o o k u p - m e t h o d \ takes a counted string method name from the stack (as compiled \ by parse-method) and attempts to look this method up in the method list of @@ -104,22 +109,18 @@ \ and pushes the xt of the method. If not, it aborts with an error message. : lookup-method { class 2:name -- class xt } - name class cell+ @ ( c-addr u wid ) - search-wordlist ( 0 | xt 1 | xt -1 ) + class name (lookup-method) ( 0 | xt 1 | xt -1 ) 0= if name type ." not found in " class body> >name type cr abort endif - class swap ; : find-method-xt \ name ( class -- class xt ) parse-word lookup-method ; -set-current ( stop hiding definitions ) - : catch-method ( instance class c-addr u -- exc-flag ) lookup-method catch ; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Mar 28 14:18:45 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7BCC216A406; Wed, 28 Mar 2007 14:18:45 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 53AC416A401 for ; Wed, 28 Mar 2007 14:18:45 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 366F813C4BB for ; Wed, 28 Mar 2007 14:18:45 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2SEIjrV089559 for ; Wed, 28 Mar 2007 14:18:45 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2SEIjVh089553 for perforce@freebsd.org; Wed, 28 Mar 2007 14:18:45 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 28 Mar 2007 14:18:45 GMT Message-Id: <200703281418.l2SEIjVh089553@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 116733 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Mar 2007 14:18:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=116733 Change 116733 by hselasky@hselasky_mini_itx on 2007/03/28 14:17:51 Fix debugging message: csw->dCSWTag is 32-bit and not 16-bit. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/umass.c#10 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/umass.c#10 (text+ko) ==== @@ -3168,11 +3168,11 @@ umass_bbb_dump_csw(struct umass_softc *sc, umass_bbb_csw_t *csw) { u_int32_t sig = UGETDW(csw->dCSWSignature); - u_int16_t tag = UGETW(csw->dCSWTag); + u_int32_t tag = UGETDW(csw->dCSWTag); u_int32_t res = UGETDW(csw->dCSWDataResidue); u_int8_t status = csw->bCSWStatus; - DPRINTF(sc, UDMASS_BBB, "CSW %d: sig = 0x%08x (%s), tag = %d, " + DPRINTF(sc, UDMASS_BBB, "CSW %d: sig = 0x%08x (%s), tag = 0x%08x, " "res = %d, status = 0x%02x (%s)\n", tag, sig, (sig == CSWSIGNATURE? "valid":"invalid"), tag, res, From owner-p4-projects@FreeBSD.ORG Wed Mar 28 14:36:16 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C9BCF16A40B; Wed, 28 Mar 2007 14:36:15 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6134A16A406 for ; Wed, 28 Mar 2007 14:36:15 +0000 (UTC) (envelope-from jkoshy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4396D13C4BC for ; Wed, 28 Mar 2007 14:36:15 +0000 (UTC) (envelope-from jkoshy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2SEaFKa000495 for ; Wed, 28 Mar 2007 14:36:15 GMT (envelope-from jkoshy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2SEaDM2000311 for perforce@freebsd.org; Wed, 28 Mar 2007 14:36:13 GMT (envelope-from jkoshy@freebsd.org) Date: Wed, 28 Mar 2007 14:36:13 GMT Message-Id: <200703281436.l2SEaDM2000311@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jkoshy@freebsd.org using -f From: Joseph Koshy To: Perforce Change Reviews Cc: Subject: PERFORCE change 116734 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Mar 2007 14:36:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=116734 Change 116734 by jkoshy@jkoshy_freefall_libelf_deployment on 2007/03/28 14:24:57 Branch FreeBSD -CURRENT. Affected files ... .. //depot/projects/elftoolchain/src/COPYRIGHT#1 branch .. //depot/projects/elftoolchain/src/LOCKS#1 branch .. //depot/projects/elftoolchain/src/MAINTAINERS#1 branch .. //depot/projects/elftoolchain/src/Makefile#1 branch .. //depot/projects/elftoolchain/src/Makefile.inc1#1 branch .. //depot/projects/elftoolchain/src/ObsoleteFiles.inc#1 branch .. //depot/projects/elftoolchain/src/README#1 branch .. //depot/projects/elftoolchain/src/UPDATING#1 branch .. //depot/projects/elftoolchain/src/bin/Makefile#1 branch .. //depot/projects/elftoolchain/src/bin/Makefile.inc#1 branch .. //depot/projects/elftoolchain/src/bin/cat/Makefile#1 branch .. //depot/projects/elftoolchain/src/bin/cat/cat.1#1 branch .. //depot/projects/elftoolchain/src/bin/cat/cat.c#1 branch .. //depot/projects/elftoolchain/src/bin/chflags/Makefile#1 branch .. //depot/projects/elftoolchain/src/bin/chflags/chflags.1#1 branch .. //depot/projects/elftoolchain/src/bin/chflags/chflags.c#1 branch .. //depot/projects/elftoolchain/src/bin/chio/Makefile#1 branch .. //depot/projects/elftoolchain/src/bin/chio/chio.1#1 branch .. //depot/projects/elftoolchain/src/bin/chio/chio.c#1 branch .. //depot/projects/elftoolchain/src/bin/chio/defs.h#1 branch .. //depot/projects/elftoolchain/src/bin/chio/pathnames.h#1 branch .. //depot/projects/elftoolchain/src/bin/chmod/Makefile#1 branch .. //depot/projects/elftoolchain/src/bin/chmod/chmod.1#1 branch .. //depot/projects/elftoolchain/src/bin/chmod/chmod.c#1 branch .. //depot/projects/elftoolchain/src/bin/cp/Makefile#1 branch .. //depot/projects/elftoolchain/src/bin/cp/cp.1#1 branch .. //depot/projects/elftoolchain/src/bin/cp/cp.c#1 branch .. //depot/projects/elftoolchain/src/bin/cp/extern.h#1 branch .. //depot/projects/elftoolchain/src/bin/cp/utils.c#1 branch .. //depot/projects/elftoolchain/src/bin/csh/Makefile#1 branch .. //depot/projects/elftoolchain/src/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/elftoolchain/src/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/elftoolchain/src/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/elftoolchain/src/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/elftoolchain/src/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/elftoolchain/src/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/elftoolchain/src/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/elftoolchain/src/bin/csh/config.h#1 branch .. //depot/projects/elftoolchain/src/bin/csh/config_p.h#1 branch .. //depot/projects/elftoolchain/src/bin/csh/host.defs#1 branch .. //depot/projects/elftoolchain/src/bin/csh/iconv.h#1 branch .. //depot/projects/elftoolchain/src/bin/csh/iconv_stub.c#1 branch .. //depot/projects/elftoolchain/src/bin/date/Makefile#1 branch .. //depot/projects/elftoolchain/src/bin/date/date.1#1 branch .. //depot/projects/elftoolchain/src/bin/date/date.c#1 branch .. //depot/projects/elftoolchain/src/bin/date/extern.h#1 branch .. //depot/projects/elftoolchain/src/bin/date/netdate.c#1 branch .. //depot/projects/elftoolchain/src/bin/date/vary.c#1 branch .. //depot/projects/elftoolchain/src/bin/date/vary.h#1 branch .. //depot/projects/elftoolchain/src/bin/dd/Makefile#1 branch .. //depot/projects/elftoolchain/src/bin/dd/args.c#1 branch .. //depot/projects/elftoolchain/src/bin/dd/conv.c#1 branch .. //depot/projects/elftoolchain/src/bin/dd/conv_tab.c#1 branch .. //depot/projects/elftoolchain/src/bin/dd/dd.1#1 branch .. //depot/projects/elftoolchain/src/bin/dd/dd.c#1 branch .. //depot/projects/elftoolchain/src/bin/dd/dd.h#1 branch .. //depot/projects/elftoolchain/src/bin/dd/extern.h#1 branch .. //depot/projects/elftoolchain/src/bin/dd/gen.c#1 branch .. //depot/projects/elftoolchain/src/bin/dd/misc.c#1 branch .. //depot/projects/elftoolchain/src/bin/dd/position.c#1 branch .. //depot/projects/elftoolchain/src/bin/dd/ref.ascii#1 branch .. //depot/projects/elftoolchain/src/bin/dd/ref.ebcdic#1 branch .. //depot/projects/elftoolchain/src/bin/dd/ref.ibm#1 branch .. //depot/projects/elftoolchain/src/bin/dd/ref.lcase#1 branch .. //depot/projects/elftoolchain/src/bin/dd/ref.oldascii#1 branch .. //depot/projects/elftoolchain/src/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/elftoolchain/src/bin/dd/ref.oldibm#1 branch .. //depot/projects/elftoolchain/src/bin/dd/ref.pareven#1 branch .. //depot/projects/elftoolchain/src/bin/dd/ref.parnone#1 branch .. //depot/projects/elftoolchain/src/bin/dd/ref.parodd#1 branch .. //depot/projects/elftoolchain/src/bin/dd/ref.parset#1 branch .. //depot/projects/elftoolchain/src/bin/dd/ref.swab#1 branch .. //depot/projects/elftoolchain/src/bin/dd/ref.ucase#1 branch .. //depot/projects/elftoolchain/src/bin/df/Makefile#1 branch .. //depot/projects/elftoolchain/src/bin/df/df.1#1 branch .. //depot/projects/elftoolchain/src/bin/df/df.c#1 branch .. //depot/projects/elftoolchain/src/bin/domainname/Makefile#1 branch .. //depot/projects/elftoolchain/src/bin/domainname/domainname.1#1 branch .. //depot/projects/elftoolchain/src/bin/domainname/domainname.c#1 branch .. //depot/projects/elftoolchain/src/bin/echo/Makefile#1 branch .. //depot/projects/elftoolchain/src/bin/echo/echo.1#1 branch .. //depot/projects/elftoolchain/src/bin/echo/echo.c#1 branch .. //depot/projects/elftoolchain/src/bin/ed/Makefile#1 branch .. //depot/projects/elftoolchain/src/bin/ed/POSIX#1 branch .. //depot/projects/elftoolchain/src/bin/ed/README#1 branch .. //depot/projects/elftoolchain/src/bin/ed/buf.c#1 branch .. //depot/projects/elftoolchain/src/bin/ed/cbc.c#1 branch .. //depot/projects/elftoolchain/src/bin/ed/ed.1#1 branch .. //depot/projects/elftoolchain/src/bin/ed/ed.h#1 branch .. //depot/projects/elftoolchain/src/bin/ed/glbl.c#1 branch .. //depot/projects/elftoolchain/src/bin/ed/io.c#1 branch .. //depot/projects/elftoolchain/src/bin/ed/main.c#1 branch .. //depot/projects/elftoolchain/src/bin/ed/re.c#1 branch .. //depot/projects/elftoolchain/src/bin/ed/sub.c#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/=.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/Makefile#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/README#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/TODO#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/a.d#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/a.r#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/a.t#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/a1.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/a2.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/addr.d#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/addr.r#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/addr.t#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/addr1.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/addr2.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/ascii.t#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/bang1.d#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/bang1.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/bang1.r#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/bang1.t#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/bang2.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/c.d#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/c.r#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/c.t#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/c1.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/c2.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/d.d#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/d.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/d.r#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/d.t#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/e1.d#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/e1.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/e1.r#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/e1.t#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/e2.d#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/e2.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/e2.r#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/e2.t#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/e3.d#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/e3.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/e3.r#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/e3.t#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/e4.d#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/e4.r#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/e4.t#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/f1.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/f2.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/g1.d#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/g1.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/g1.r#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/g1.t#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/g2.d#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/g2.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/g2.r#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/g2.t#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/g3.d#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/g3.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/g3.r#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/g3.t#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/g4.d#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/g4.r#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/g4.t#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/g5.d#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/g5.r#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/g5.t#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/h.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/i.d#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/i.r#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/i.t#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/i1.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/i2.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/i3.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/j.d#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/j.r#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/j.t#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/k.d#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/k.r#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/k.t#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/k1.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/k2.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/k3.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/k4.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/l.d#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/l.r#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/l.t#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/m.d#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/m.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/m.r#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/m.t#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/n.d#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/n.r#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/n.t#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/nl.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/nl1.d#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/nl1.r#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/nl1.t#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/nl2.d#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/nl2.r#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/nl2.t#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/p.d#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/p.r#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/p.t#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/q.d#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/q.r#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/q.t#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/q1.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/r1.d#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/r1.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/r1.r#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/r1.t#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/r2.d#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/r2.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/r2.r#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/r2.t#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/r3.d#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/r3.r#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/r3.t#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/s1.d#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/s1.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/s1.r#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/s1.t#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/s10.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/s2.d#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/s2.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/s2.r#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/s2.t#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/s3.d#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/s3.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/s3.r#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/s3.t#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/s4.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/s5.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/s6.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/s7.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/s8.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/s9.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/t.d#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/t.r#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/t1.d#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/t1.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/t1.r#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/t1.t#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/t2.d#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/t2.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/t2.r#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/t2.t#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/u.d#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/u.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/u.r#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/u.t#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/v.d#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/v.r#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/v.t#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/w.d#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/w.r#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/w.t#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/w1.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/w2.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/w3.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/x.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/test/z.err#1 branch .. //depot/projects/elftoolchain/src/bin/ed/undo.c#1 branch .. //depot/projects/elftoolchain/src/bin/expr/Makefile#1 branch .. //depot/projects/elftoolchain/src/bin/expr/expr.1#1 branch .. //depot/projects/elftoolchain/src/bin/expr/expr.y#1 branch .. //depot/projects/elftoolchain/src/bin/getfacl/Makefile#1 branch .. //depot/projects/elftoolchain/src/bin/getfacl/getfacl.1#1 branch .. //depot/projects/elftoolchain/src/bin/getfacl/getfacl.c#1 branch .. //depot/projects/elftoolchain/src/bin/hostname/Makefile#1 branch .. //depot/projects/elftoolchain/src/bin/hostname/hostname.1#1 branch .. //depot/projects/elftoolchain/src/bin/hostname/hostname.c#1 branch .. //depot/projects/elftoolchain/src/bin/kenv/Makefile#1 branch .. //depot/projects/elftoolchain/src/bin/kenv/kenv.1#1 branch .. //depot/projects/elftoolchain/src/bin/kenv/kenv.c#1 branch .. //depot/projects/elftoolchain/src/bin/kill/Makefile#1 branch .. //depot/projects/elftoolchain/src/bin/kill/kill.1#1 branch .. //depot/projects/elftoolchain/src/bin/kill/kill.c#1 branch .. //depot/projects/elftoolchain/src/bin/ln/Makefile#1 branch .. //depot/projects/elftoolchain/src/bin/ln/ln.1#1 branch .. //depot/projects/elftoolchain/src/bin/ln/ln.c#1 branch .. //depot/projects/elftoolchain/src/bin/ln/symlink.7#1 branch .. //depot/projects/elftoolchain/src/bin/ls/Makefile#1 branch .. //depot/projects/elftoolchain/src/bin/ls/cmp.c#1 branch .. //depot/projects/elftoolchain/src/bin/ls/extern.h#1 branch .. //depot/projects/elftoolchain/src/bin/ls/ls.1#1 branch .. //depot/projects/elftoolchain/src/bin/ls/ls.c#1 branch .. //depot/projects/elftoolchain/src/bin/ls/ls.h#1 branch .. //depot/projects/elftoolchain/src/bin/ls/print.c#1 branch .. //depot/projects/elftoolchain/src/bin/ls/util.c#1 branch .. //depot/projects/elftoolchain/src/bin/mkdir/Makefile#1 branch .. //depot/projects/elftoolchain/src/bin/mkdir/mkdir.1#1 branch .. //depot/projects/elftoolchain/src/bin/mkdir/mkdir.c#1 branch .. //depot/projects/elftoolchain/src/bin/mv/Makefile#1 branch .. //depot/projects/elftoolchain/src/bin/mv/mv.1#1 branch .. //depot/projects/elftoolchain/src/bin/mv/mv.c#1 branch .. //depot/projects/elftoolchain/src/bin/pax/Makefile#1 branch .. //depot/projects/elftoolchain/src/bin/pax/ar_io.c#1 branch .. //depot/projects/elftoolchain/src/bin/pax/ar_subs.c#1 branch .. //depot/projects/elftoolchain/src/bin/pax/buf_subs.c#1 branch .. //depot/projects/elftoolchain/src/bin/pax/cache.c#1 branch .. //depot/projects/elftoolchain/src/bin/pax/cache.h#1 branch .. //depot/projects/elftoolchain/src/bin/pax/cpio.1#1 branch .. //depot/projects/elftoolchain/src/bin/pax/cpio.c#1 branch .. //depot/projects/elftoolchain/src/bin/pax/cpio.h#1 branch .. //depot/projects/elftoolchain/src/bin/pax/extern.h#1 branch .. //depot/projects/elftoolchain/src/bin/pax/file_subs.c#1 branch .. //depot/projects/elftoolchain/src/bin/pax/ftree.c#1 branch .. //depot/projects/elftoolchain/src/bin/pax/ftree.h#1 branch .. //depot/projects/elftoolchain/src/bin/pax/gen_subs.c#1 branch .. //depot/projects/elftoolchain/src/bin/pax/getoldopt.c#1 branch .. //depot/projects/elftoolchain/src/bin/pax/options.c#1 branch .. //depot/projects/elftoolchain/src/bin/pax/options.h#1 branch .. //depot/projects/elftoolchain/src/bin/pax/pat_rep.c#1 branch .. //depot/projects/elftoolchain/src/bin/pax/pat_rep.h#1 branch .. //depot/projects/elftoolchain/src/bin/pax/pax.1#1 branch .. //depot/projects/elftoolchain/src/bin/pax/pax.c#1 branch .. //depot/projects/elftoolchain/src/bin/pax/pax.h#1 branch .. //depot/projects/elftoolchain/src/bin/pax/sel_subs.c#1 branch .. //depot/projects/elftoolchain/src/bin/pax/sel_subs.h#1 branch .. //depot/projects/elftoolchain/src/bin/pax/tables.c#1 branch .. //depot/projects/elftoolchain/src/bin/pax/tables.h#1 branch .. //depot/projects/elftoolchain/src/bin/pax/tar.1#1 branch .. //depot/projects/elftoolchain/src/bin/pax/tar.c#1 branch .. //depot/projects/elftoolchain/src/bin/pax/tar.h#1 branch .. //depot/projects/elftoolchain/src/bin/pax/tty_subs.c#1 branch .. //depot/projects/elftoolchain/src/bin/ps/Makefile#1 branch .. //depot/projects/elftoolchain/src/bin/ps/extern.h#1 branch .. //depot/projects/elftoolchain/src/bin/ps/fmt.c#1 branch .. //depot/projects/elftoolchain/src/bin/ps/keyword.c#1 branch .. //depot/projects/elftoolchain/src/bin/ps/nlist.c#1 branch .. //depot/projects/elftoolchain/src/bin/ps/print.c#1 branch .. //depot/projects/elftoolchain/src/bin/ps/ps.1#1 branch .. //depot/projects/elftoolchain/src/bin/ps/ps.c#1 branch .. //depot/projects/elftoolchain/src/bin/ps/ps.h#1 branch .. //depot/projects/elftoolchain/src/bin/pwd/Makefile#1 branch .. //depot/projects/elftoolchain/src/bin/pwd/pwd.1#1 branch .. //depot/projects/elftoolchain/src/bin/pwd/pwd.c#1 branch .. //depot/projects/elftoolchain/src/bin/rcp/Makefile#1 branch .. //depot/projects/elftoolchain/src/bin/rcp/extern.h#1 branch .. //depot/projects/elftoolchain/src/bin/rcp/rcp.1#1 branch .. //depot/projects/elftoolchain/src/bin/rcp/rcp.c#1 branch .. //depot/projects/elftoolchain/src/bin/rcp/util.c#1 branch .. //depot/projects/elftoolchain/src/bin/realpath/Makefile#1 branch .. //depot/projects/elftoolchain/src/bin/realpath/realpath.1#1 branch .. //depot/projects/elftoolchain/src/bin/realpath/realpath.c#1 branch .. //depot/projects/elftoolchain/src/bin/rm/Makefile#1 branch .. //depot/projects/elftoolchain/src/bin/rm/rm.1#1 branch .. //depot/projects/elftoolchain/src/bin/rm/rm.c#1 branch .. //depot/projects/elftoolchain/src/bin/rmail/Makefile#1 branch .. //depot/projects/elftoolchain/src/bin/rmdir/Makefile#1 branch .. //depot/projects/elftoolchain/src/bin/rmdir/rmdir.1#1 branch .. //depot/projects/elftoolchain/src/bin/rmdir/rmdir.c#1 branch .. //depot/projects/elftoolchain/src/bin/setfacl/Makefile#1 branch .. //depot/projects/elftoolchain/src/bin/setfacl/file.c#1 branch .. //depot/projects/elftoolchain/src/bin/setfacl/mask.c#1 branch .. //depot/projects/elftoolchain/src/bin/setfacl/merge.c#1 branch .. //depot/projects/elftoolchain/src/bin/setfacl/remove.c#1 branch .. //depot/projects/elftoolchain/src/bin/setfacl/setfacl.1#1 branch .. //depot/projects/elftoolchain/src/bin/setfacl/setfacl.c#1 branch .. //depot/projects/elftoolchain/src/bin/setfacl/setfacl.h#1 branch .. //depot/projects/elftoolchain/src/bin/setfacl/util.c#1 branch .. //depot/projects/elftoolchain/src/bin/sh/Makefile#1 branch .. //depot/projects/elftoolchain/src/bin/sh/TOUR#1 branch .. //depot/projects/elftoolchain/src/bin/sh/alias.c#1 branch .. //depot/projects/elftoolchain/src/bin/sh/alias.h#1 branch .. //depot/projects/elftoolchain/src/bin/sh/arith.h#1 branch .. //depot/projects/elftoolchain/src/bin/sh/arith.y#1 branch .. //depot/projects/elftoolchain/src/bin/sh/arith_lex.l#1 branch .. //depot/projects/elftoolchain/src/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/elftoolchain/src/bin/sh/bltin/echo.1#1 branch .. //depot/projects/elftoolchain/src/bin/sh/bltin/echo.c#1 branch .. //depot/projects/elftoolchain/src/bin/sh/builtins.def#1 branch .. //depot/projects/elftoolchain/src/bin/sh/cd.c#1 branch .. //depot/projects/elftoolchain/src/bin/sh/cd.h#1 branch .. //depot/projects/elftoolchain/src/bin/sh/error.c#1 branch .. //depot/projects/elftoolchain/src/bin/sh/error.h#1 branch .. //depot/projects/elftoolchain/src/bin/sh/eval.c#1 branch .. //depot/projects/elftoolchain/src/bin/sh/eval.h#1 branch .. //depot/projects/elftoolchain/src/bin/sh/exec.c#1 branch .. //depot/projects/elftoolchain/src/bin/sh/exec.h#1 branch .. //depot/projects/elftoolchain/src/bin/sh/expand.c#1 branch .. //depot/projects/elftoolchain/src/bin/sh/expand.h#1 branch .. //depot/projects/elftoolchain/src/bin/sh/funcs/cmv#1 branch .. //depot/projects/elftoolchain/src/bin/sh/funcs/dirs#1 branch .. //depot/projects/elftoolchain/src/bin/sh/funcs/kill#1 branch .. //depot/projects/elftoolchain/src/bin/sh/funcs/login#1 branch .. //depot/projects/elftoolchain/src/bin/sh/funcs/newgrp#1 branch .. //depot/projects/elftoolchain/src/bin/sh/funcs/popd#1 branch .. //depot/projects/elftoolchain/src/bin/sh/funcs/pushd#1 branch .. //depot/projects/elftoolchain/src/bin/sh/funcs/suspend#1 branch .. //depot/projects/elftoolchain/src/bin/sh/histedit.c#1 branch .. //depot/projects/elftoolchain/src/bin/sh/init.h#1 branch .. //depot/projects/elftoolchain/src/bin/sh/input.c#1 branch .. //depot/projects/elftoolchain/src/bin/sh/input.h#1 branch .. //depot/projects/elftoolchain/src/bin/sh/jobs.c#1 branch .. //depot/projects/elftoolchain/src/bin/sh/jobs.h#1 branch .. //depot/projects/elftoolchain/src/bin/sh/mail.c#1 branch .. //depot/projects/elftoolchain/src/bin/sh/mail.h#1 branch .. //depot/projects/elftoolchain/src/bin/sh/main.c#1 branch .. //depot/projects/elftoolchain/src/bin/sh/main.h#1 branch .. //depot/projects/elftoolchain/src/bin/sh/memalloc.c#1 branch .. //depot/projects/elftoolchain/src/bin/sh/memalloc.h#1 branch .. //depot/projects/elftoolchain/src/bin/sh/miscbltin.c#1 branch .. //depot/projects/elftoolchain/src/bin/sh/mkbuiltins#1 branch .. //depot/projects/elftoolchain/src/bin/sh/mkinit.c#1 branch .. //depot/projects/elftoolchain/src/bin/sh/mknodes.c#1 branch .. //depot/projects/elftoolchain/src/bin/sh/mksyntax.c#1 branch .. //depot/projects/elftoolchain/src/bin/sh/mktokens#1 branch .. //depot/projects/elftoolchain/src/bin/sh/myhistedit.h#1 branch .. //depot/projects/elftoolchain/src/bin/sh/mystring.c#1 branch .. //depot/projects/elftoolchain/src/bin/sh/mystring.h#1 branch .. //depot/projects/elftoolchain/src/bin/sh/nodes.c.pat#1 branch .. //depot/projects/elftoolchain/src/bin/sh/nodetypes#1 branch .. //depot/projects/elftoolchain/src/bin/sh/options.c#1 branch .. //depot/projects/elftoolchain/src/bin/sh/options.h#1 branch .. //depot/projects/elftoolchain/src/bin/sh/output.c#1 branch .. //depot/projects/elftoolchain/src/bin/sh/output.h#1 branch .. //depot/projects/elftoolchain/src/bin/sh/parser.c#1 branch .. //depot/projects/elftoolchain/src/bin/sh/parser.h#1 branch .. //depot/projects/elftoolchain/src/bin/sh/redir.c#1 branch .. //depot/projects/elftoolchain/src/bin/sh/redir.h#1 branch .. //depot/projects/elftoolchain/src/bin/sh/sh.1#1 branch .. //depot/projects/elftoolchain/src/bin/sh/shell.h#1 branch .. //depot/projects/elftoolchain/src/bin/sh/show.c#1 branch .. //depot/projects/elftoolchain/src/bin/sh/show.h#1 branch .. //depot/projects/elftoolchain/src/bin/sh/trap.c#1 branch .. //depot/projects/elftoolchain/src/bin/sh/trap.h#1 branch .. //depot/projects/elftoolchain/src/bin/sh/var.c#1 branch .. //depot/projects/elftoolchain/src/bin/sh/var.h#1 branch .. //depot/projects/elftoolchain/src/bin/sleep/Makefile#1 branch .. //depot/projects/elftoolchain/src/bin/sleep/sleep.1#1 branch .. //depot/projects/elftoolchain/src/bin/sleep/sleep.c#1 branch .. //depot/projects/elftoolchain/src/bin/stty/Makefile#1 branch .. //depot/projects/elftoolchain/src/bin/stty/cchar.c#1 branch .. //depot/projects/elftoolchain/src/bin/stty/extern.h#1 branch .. //depot/projects/elftoolchain/src/bin/stty/gfmt.c#1 branch .. //depot/projects/elftoolchain/src/bin/stty/key.c#1 branch .. //depot/projects/elftoolchain/src/bin/stty/modes.c#1 branch .. //depot/projects/elftoolchain/src/bin/stty/print.c#1 branch .. //depot/projects/elftoolchain/src/bin/stty/stty.1#1 branch .. //depot/projects/elftoolchain/src/bin/stty/stty.c#1 branch .. //depot/projects/elftoolchain/src/bin/stty/stty.h#1 branch .. //depot/projects/elftoolchain/src/bin/stty/util.c#1 branch .. //depot/projects/elftoolchain/src/bin/sync/Makefile#1 branch .. //depot/projects/elftoolchain/src/bin/sync/sync.8#1 branch .. //depot/projects/elftoolchain/src/bin/sync/sync.c#1 branch .. //depot/projects/elftoolchain/src/bin/test/Makefile#1 branch .. //depot/projects/elftoolchain/src/bin/test/TEST.README#1 branch .. //depot/projects/elftoolchain/src/bin/test/TEST.csh#1 branch .. //depot/projects/elftoolchain/src/bin/test/TEST.sh#1 branch .. //depot/projects/elftoolchain/src/bin/test/test.1#1 branch .. //depot/projects/elftoolchain/src/bin/test/test.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/AUTHORS#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/BUGS#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/COPYING#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/ChangeLog#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/FREEBSD-Xlist#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/FREEBSD-upgrade#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/INSTALL#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/MIRRORS.html#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/MIRRORS.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/NEWS#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/README#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/README.ldap#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/README.y2k#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/am_ops.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/amd.8#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/amd.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/amd.h#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/amfs_auto.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/amfs_direct.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/amfs_error.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/amfs_host.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/amfs_inherit.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/amfs_link.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/amfs_linkx.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/amfs_nfsl.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/amfs_nfsx.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/amfs_program.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/amfs_root.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/amfs_toplvl.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/amfs_union.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/amq_subr.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/amq_svc.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/autil.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/clock.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/conf.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/conf_parse.y#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/conf_tok.l#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/get_args.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/info_file.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/info_hesiod.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/info_ldap.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/info_ndbm.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/info_nis.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/info_nisplus.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/info_passwd.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/info_union.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/map.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/mapc.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/mntfs.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/nfs_prot_svc.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/nfs_start.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/nfs_subr.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/ops_TEMPLATE.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/ops_cachefs.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/ops_cdfs.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/ops_efs.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/ops_lofs.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/ops_mfs.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/ops_nfs.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/ops_nfs3.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/ops_nullfs.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/ops_pcfs.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/ops_tfs.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/ops_tmpfs.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/ops_ufs.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/ops_umapfs.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/ops_unionfs.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/ops_xfs.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/opts.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/restart.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/rpc_fwd.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/sched.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/srvr_amfs_auto.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amd/srvr_nfs.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amq/amq.8#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amq/amq.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amq/amq.h#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amq/amq_clnt.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amq/amq_xdr.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amq/pawd.1#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/amq/pawd.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/aux_conf.h.in#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/bootstrap#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/conf/checkmount/checkmount_bsd44.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/conf/mtab/mtab_bsd.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/conf/transp/transp_sockets.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/conf/trap/trap_default.h#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/conf/umount/umount_bsd44.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/doc/am-utils.texi#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/doc/texinfo.tex#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/doc/version.texi#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/fixmount/fixmount.8#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/fixmount/fixmount.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/fsinfo/fsi_analyze.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/fsinfo/fsi_data.h#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/fsinfo/fsi_dict.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/fsinfo/fsi_gram.y#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/fsinfo/fsi_lex.l#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/fsinfo/fsi_util.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/fsinfo/fsinfo.8#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/fsinfo/fsinfo.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/fsinfo/fsinfo.h#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/fsinfo/wr_atab.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/fsinfo/wr_bparam.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/fsinfo/wr_dumpset.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/fsinfo/wr_exportfs.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/fsinfo/wr_fstab.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/hlfsd/hlfsd.8#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/hlfsd/hlfsd.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/hlfsd/hlfsd.h#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/hlfsd/homedir.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/hlfsd/nfs_prot_svc.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/hlfsd/stubs.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/include/am_compat.h#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/include/am_defs.h#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/include/am_utils.h#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/include/am_xdr_func.h#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/include/amq_defs.h#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/include/mount_headers1.h#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/include/mount_headers2.h#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/ldap-id.ms#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/ldap-id.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/libamu/alloca.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/libamu/amu.h#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/libamu/hasmntopt.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/libamu/misc_rpc.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/libamu/mount_fs.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/libamu/mtab.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/libamu/nfs_prot_xdr.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/libamu/strerror.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/libamu/util.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/libamu/wire.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/libamu/xdr_func.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/libamu/xutil.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/m4/GNUmakefile#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/m4/amdgrep#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/m4/amindent#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/m4/autopat#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/m4/chop-aclocal.pl#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/m4/copy-if-newbig#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/m4/macros/HEADER#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/m4/macros/TRAILER#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/m4/mk-aclocal#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/m4/mkconf#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/m4/rmtspc#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/m4/update_build_version#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/mk-amd-map/mk-amd-map.8#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/mk-amd-map/mk-amd-map.c#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/scripts/Makefile.am#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/scripts/Makefile.in#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/scripts/am-eject.in#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/scripts/amd.conf-sample#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/scripts/amd.conf.5#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/scripts/amd2ldif.in#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/scripts/amd2sun.in#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/scripts/automount2amd.8#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/scripts/automount2amd.in#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/scripts/ctl-amd.in#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/scripts/ctl-hlfsd.in#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/scripts/expn.1#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/scripts/expn.in#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/scripts/fix-amd-map.in#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/scripts/fixrmtab.in#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/scripts/redhat-ctl-amd.in#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/scripts/wait4amd.in#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/scripts/wait4amd2die.in#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/tasks#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/wire-test/wire-test.8#1 branch .. //depot/projects/elftoolchain/src/contrib/amd/wire-test/wire-test.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/AUTHORS#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/ChangeLog#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/Examples/ckbook.b#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/Examples/pi.b#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/Examples/primes.b#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/Examples/twins.b#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/FAQ#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/FREEBSD-upgrade#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/INSTALL#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/Makefile.am#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/Makefile.in#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/NEWS#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/README#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/Test/BUG.bc#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/Test/array.b#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/Test/arrayp.b#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/Test/aryprm.b#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/Test/atan.b#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/Test/checklib.b#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/Test/div.b#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/Test/exp.b#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/Test/fact.b#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/Test/jn.b#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/Test/ln.b#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/Test/mul.b#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/Test/raise.b#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/Test/signum#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/Test/sine.b#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/Test/sqrt.b#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/Test/sqrt1.b#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/Test/sqrt2.b#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/Test/testfn.b#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/Test/timetest#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/acconfig.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/aclocal.m4#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/bc/Makefile.am#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/bc/Makefile.in#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/bc/bc.y#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/bc/bcdefs.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/bc/const.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/bc/execute.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/bc/fix-libmath_h#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/bc/global.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/bc/global.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/bc/libmath.b#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/bc/libmath.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/bc/load.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/bc/main.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/bc/proto.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/bc/sbc.y#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/bc/scan.l#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/bc/storage.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/bc/util.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/config.h.in#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/configure#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/configure.in#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/dc/Makefile.am#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/dc/Makefile.in#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/dc/array.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/dc/dc-proto.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/dc/dc-regdef.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/dc/dc.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/dc/dc.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/dc/eval.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/dc/misc.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/dc/numeric.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/dc/stack.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/dc/string.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/doc/Makefile.am#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/doc/Makefile.in#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/doc/bc.1#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/doc/bc.texi#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/doc/dc.1#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/doc/dc.texi#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/h/number.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/install-sh#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/lib/Makefile.am#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/lib/Makefile.in#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/lib/number.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/lib/testmul.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/lib/vfprintf.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/missing#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/mkinstalldirs#1 branch .. //depot/projects/elftoolchain/src/contrib/bc/stamp-h.in#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/CHANGES#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/COPYRIGHT#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/FAQ#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/FAQ.xml#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/FREEBSD-Upgrade#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/FREEBSD-Xlist#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/Makefile.in#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/README#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/acconfig.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/Makefile.in#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/check/Makefile.in#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/check/check-tool.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/check/check-tool.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/check/named-checkconf.8#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/check/named-checkconf.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/check/named-checkconf.docbook#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/check/named-checkconf.html#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/check/named-checkzone.8#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/check/named-checkzone.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/check/named-checkzone.docbook#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/check/named-checkzone.html#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/dig/Makefile.in#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/dig/dig.1#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/dig/dig.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/dig/dig.docbook#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/dig/dig.html#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/dig/dighost.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/dig/host.1#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/dig/host.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/dig/host.docbook#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/dig/host.html#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/dig/include/dig/dig.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/dig/nslookup.1#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/dig/nslookup.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/dig/nslookup.docbook#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/dig/nslookup.html#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/dnssec/Makefile.in#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/dnssec/dnssec-keygen.8#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/dnssec/dnssec-keygen.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/dnssec/dnssec-keygen.html#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/dnssec/dnssec-signzone.8#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/dnssec/dnssec-signzone.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/dnssec/dnssec-signzone.html#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/dnssec/dnssectool.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/dnssec/dnssectool.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/Makefile.in#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/aclconf.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/builtin.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/client.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/config.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/control.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/controlconf.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/include/named/aclconf.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/include/named/builtin.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/include/named/client.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/include/named/config.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/include/named/control.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/include/named/globals.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/include/named/interfacemgr.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/include/named/listenlist.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/include/named/log.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/include/named/logconf.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/include/named/lwaddr.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/include/named/lwdclient.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/include/named/lwresd.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/include/named/lwsearch.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/include/named/main.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/include/named/notify.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/include/named/query.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/include/named/server.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/include/named/sortlist.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/include/named/tkeyconf.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/include/named/tsigconf.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/include/named/types.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/include/named/update.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/include/named/xfrout.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/include/named/zoneconf.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/interfacemgr.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/listenlist.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/log.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/logconf.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/lwaddr.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/lwdclient.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/lwderror.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/lwdgabn.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/lwdgnba.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/lwdgrbn.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/lwdnoop.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/lwresd.8#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/lwresd.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/lwresd.docbook#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/lwresd.html#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/lwsearch.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/main.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/named.8#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/named.conf.5#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/named.conf.docbook#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/named.conf.html#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/named.docbook#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/named.html#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/notify.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/query.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/server.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/sortlist.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/tkeyconf.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/tsigconf.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/unix/Makefile.in#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/unix/include/named/os.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/unix/os.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/update.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/xfrout.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/named/zoneconf.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/nsupdate/Makefile.in#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/nsupdate/nsupdate.8#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/nsupdate/nsupdate.docbook#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/nsupdate/nsupdate.html#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/rndc/Makefile.in#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/rndc/include/rndc/os.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/rndc/rndc-confgen.8#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/rndc/rndc-confgen.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/rndc/rndc-confgen.docbook#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/rndc/rndc-confgen.html#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/rndc/rndc.8#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/rndc/rndc.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/rndc/rndc.conf#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/rndc/rndc.conf.5#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/rndc/rndc.conf.docbook#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/rndc/rndc.conf.html#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/rndc/rndc.docbook#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/rndc/rndc.html#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/rndc/unix/Makefile.in#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/rndc/unix/os.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/rndc/util.c#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/bin/rndc/util.h#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/config.guess#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/config.sub#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/config.threads.in#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/configure.in#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/Makefile.in#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/arm/Bv9ARM.ch01.html#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/arm/Bv9ARM.ch02.html#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/arm/Bv9ARM.ch03.html#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/arm/Bv9ARM.ch04.html#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/arm/Bv9ARM.ch05.html#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/arm/Bv9ARM.ch06.html#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/arm/Bv9ARM.ch07.html#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/arm/Bv9ARM.ch08.html#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/arm/Bv9ARM.ch09.html#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/arm/Bv9ARM.html#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/arm/Makefile.in#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/arm/README-SGML#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/draft/update#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/misc/Makefile.in#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/misc/dnssec#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/misc/format-options.pl#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/misc/ipv6#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/misc/migration#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/misc/migration-4to9#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/misc/options#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/misc/rfc-compliance#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/misc/roadmap#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/misc/sdb#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/index#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc1032.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc1033.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc1034.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc1035.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc1101.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc1122.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc1123.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc1183.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc1348.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc1535.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc1536.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc1537.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc1591.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc1611.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc1612.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc1706.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc1712.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc1750.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc1876.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc1886.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc1982.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc1995.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc1996.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc2052.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc2104.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc2119.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc2133.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc2136.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc2137.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc2163.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc2168.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc2181.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc2230.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc2308.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc2317.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc2373.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc2374.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc2375.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc2418.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc2535.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc2536.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc2537.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc2538.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc2539.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc2540.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc2541.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc2553.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc2671.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc2672.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc2673.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc2782.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc2825.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc2826.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc2845.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc2874.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc2915.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc2929.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc2930.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc2931.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc3007.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc3008.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc3071.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc3090.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc3110.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc3123.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc3152.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc3197.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc3225.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc3226.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc3258.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc3363.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc3364.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc3425.txt#1 branch .. //depot/projects/elftoolchain/src/contrib/bind9/doc/rfc/rfc3445.txt#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Mar 28 15:29:21 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1268716A409; Wed, 28 Mar 2007 15:29:21 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DD89516A404 for ; Wed, 28 Mar 2007 15:29:20 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CD38E13C4BB for ; Wed, 28 Mar 2007 15:29:20 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2SFTK3N086268 for ; Wed, 28 Mar 2007 15:29:20 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2SFTKuB086256 for perforce@freebsd.org; Wed, 28 Mar 2007 15:29:20 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 28 Mar 2007 15:29:20 GMT Message-Id: <200703281529.l2SFTKuB086256@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 116736 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Mar 2007 15:29:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=116736 Change 116736 by hselasky@hselasky_mini_itx on 2007/03/28 15:28:22 Make changes to the config thread system, like suggested by Sam Leffler. Basically this means, split the two parts of the config thread function into pre- and post-functions. Also extend the config thread system to allow N-phase semantics, where N-1 is a number that can be passed to the usbd_config_td_queue_command() function. Default is 0 which means 1-phase semantics are used. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/if_aue.c#18 edit .. //depot/projects/usb/src/sys/dev/usb/if_axe.c#16 edit .. //depot/projects/usb/src/sys/dev/usb/if_cue.c#14 edit .. //depot/projects/usb/src/sys/dev/usb/if_kue.c#16 edit .. //depot/projects/usb/src/sys/dev/usb/if_rue.c#15 edit .. //depot/projects/usb/src/sys/dev/usb/if_udav.c#15 edit .. //depot/projects/usb/src/sys/dev/usb/if_ural.c#19 edit .. //depot/projects/usb/src/sys/dev/usb/if_zyd.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/ufoma.c#11 edit .. //depot/projects/usb/src/sys/dev/usb/uftdi.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/umct.c#10 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#29 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#34 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/if_aue.c#18 (text+ko) ==== @@ -221,9 +221,17 @@ static miibus_writereg_t aue_cfg_miibus_writereg; static miibus_statchg_t aue_cfg_miibus_statchg; -static void -aue_cfg_setmulti(struct aue_softc *sc, - struct aue_config_copy *cc, u_int16_t refcount); +static usbd_config_td_command_t aue_cfg_setmulti; +static usbd_config_td_command_t aue_cfg_first_time_setup; +static usbd_config_td_command_t aue_config_copy; +static usbd_config_td_command_t aue_cfg_tick; +static usbd_config_td_command_t aue_cfg_pre_init; +static usbd_config_td_command_t aue_cfg_init; +static usbd_config_td_command_t aue_cfg_promisc_upd; +static usbd_config_td_command_t aue_cfg_ifmedia_upd; +static usbd_config_td_command_t aue_cfg_pre_stop; +static usbd_config_td_command_t aue_cfg_stop; + static void aue_cfg_reset_pegasus_II(struct aue_softc *sc); @@ -231,9 +239,6 @@ aue_cfg_reset(struct aue_softc *sc); static void -aue_cfg_first_time_setup(struct aue_softc *sc, - struct aue_config_copy *cc, u_int16_t refcount); -static void aue_intr_clear_stall_callback(struct usbd_xfer *xfer); static void @@ -252,12 +257,6 @@ aue_bulk_write_callback(struct usbd_xfer *xfer); static void -aue_config_copy(struct aue_softc *sc, - struct aue_config_copy *cc, u_int16_t refcount); -static void -aue_cfg_tick(struct aue_softc *sc, - struct aue_config_copy *cc, u_int16_t refcount); -static void aue_start_cb(struct ifnet *ifp); static void @@ -266,19 +265,10 @@ static void aue_start_transfers(struct aue_softc *sc); -static void -aue_cfg_init(struct aue_softc *sc, - struct aue_config_copy *cc, u_int16_t refcount); -static void -aue_cfg_promisc_upd(struct aue_softc *sc, - struct aue_config_copy *cc, u_int16_t refcount); static int aue_ifmedia_upd_cb(struct ifnet *ifp); static void -aue_cfg_ifmedia_upd(struct aue_softc *sc, - struct aue_config_copy *cc, u_int16_t refcount); -static void aue_ifmedia_sts_cb(struct ifnet *ifp, struct ifmediareq *ifmr); static int @@ -287,10 +277,6 @@ static void aue_watchdog(void *arg); -static void -aue_cfg_stop(struct aue_softc *sc, - struct aue_config_copy *cc, u_int16_t refcount); - static const struct usbd_config aue_config[AUE_ENDPT_MAX] = { [0] = { @@ -680,11 +666,6 @@ { u_int16_t i; - if (cc == NULL) { - /* nothing to do */ - return; - } - if ((cc->if_flags & IFF_ALLMULTI) || (cc->if_flags & IFF_PROMISC)) { AUE_CFG_SETBIT(sc, AUE_CTL0, AUE_CTL0_ALLMULTI); @@ -849,8 +830,7 @@ } error = usbd_config_td_setup(&(sc->sc_config_td), sc, &(sc->sc_mtx), - &aue_config_copy, NULL, - sizeof(struct aue_config_copy), 16); + NULL, sizeof(struct aue_config_copy), 16); if (error) { device_printf(dev, "could not setup config " "thread!\n"); @@ -864,7 +844,7 @@ /* start setup */ usbd_config_td_queue_command - (&(sc->sc_config_td), &aue_cfg_first_time_setup, 0); + (&(sc->sc_config_td), NULL, &aue_cfg_first_time_setup, 0, 0); /* start watchdog (will exit mutex) */ @@ -885,10 +865,6 @@ int error; u_int8_t eaddr[min(ETHER_ADDR_LEN,6)]; - if (cc == NULL) { - return; - } - /* reset the adapter */ aue_cfg_reset(sc); @@ -985,7 +961,7 @@ __callout_stop(&(sc->sc_watchdog)); - aue_cfg_stop(sc, NULL, 0); + aue_cfg_pre_stop(sc, NULL, 0); ifp = sc->sc_ifp; @@ -1355,8 +1331,7 @@ struct ifnet * ifp = sc->sc_ifp; struct mii_data * mii = GET_MII(sc); - if ((cc == NULL) || - (ifp == NULL) || + if ((ifp == NULL) || (mii == NULL)) { /* not ready */ return; @@ -1403,7 +1378,7 @@ mtx_lock(&(sc->sc_mtx)); usbd_config_td_queue_command - (&(sc->sc_config_td), &aue_cfg_init, 0); + (&(sc->sc_config_td), &aue_cfg_pre_init, &aue_cfg_init, 0, 0); mtx_unlock(&(sc->sc_mtx)); return; @@ -1426,27 +1401,28 @@ } static void -aue_cfg_init(struct aue_softc *sc, - struct aue_config_copy *cc, u_int16_t refcount) +aue_cfg_pre_init(struct aue_softc *sc, + struct aue_config_copy *cc, u_int16_t refcount) { - struct mii_data *mii = GET_MII(sc); - u_int8_t i; + struct ifnet *ifp = sc->sc_ifp; - if (cc == NULL) { + /* immediate configuration */ - /* immediate configuration */ + aue_cfg_pre_stop(sc, cc, 0); - struct ifnet *ifp = sc->sc_ifp; + ifp->if_drv_flags |= IFF_DRV_RUNNING; + ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; - aue_cfg_stop(sc, NULL, 0); + sc->sc_flags |= AUE_FLAG_HL_READY; + return; +} - ifp->if_drv_flags |= IFF_DRV_RUNNING; - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; - - sc->sc_flags |= AUE_FLAG_HL_READY; - - return; - } +static void +aue_cfg_init(struct aue_softc *sc, + struct aue_config_copy *cc, u_int16_t refcount) +{ + struct mii_data *mii = GET_MII(sc); + u_int8_t i; /* * Cancel pending I/O @@ -1486,11 +1462,6 @@ aue_cfg_promisc_upd(struct aue_softc *sc, struct aue_config_copy *cc, u_int16_t refcount) { - if (cc == NULL) { - /* nothing to do */ - return; - } - /* if we want promiscuous mode, set the allframes bit: */ if (cc->if_flags & IFF_PROMISC) { AUE_CFG_SETBIT(sc, AUE_CTL2, AUE_CTL2_RX_PROMISC); @@ -1510,7 +1481,7 @@ mtx_lock(&(sc->sc_mtx)); usbd_config_td_queue_command - (&(sc->sc_config_td), &aue_cfg_ifmedia_upd, 0); + (&(sc->sc_config_td), NULL, &aue_cfg_ifmedia_upd, 0, 0); mtx_unlock(&(sc->sc_mtx)); return 0; @@ -1523,8 +1494,7 @@ struct ifnet * ifp = sc->sc_ifp; struct mii_data * mii = GET_MII(sc); - if ((cc == NULL) || - (ifp == NULL) || + if ((ifp == NULL) || (mii == NULL)) { /* not ready */ return; @@ -1576,15 +1546,18 @@ if (ifp->if_flags & IFF_UP) { if (ifp->if_drv_flags & IFF_DRV_RUNNING) { usbd_config_td_queue_command - (&(sc->sc_config_td), &aue_cfg_promisc_upd, 0); + (&(sc->sc_config_td), &aue_config_copy, + &aue_cfg_promisc_upd, 0, 0); } else { usbd_config_td_queue_command - (&(sc->sc_config_td), &aue_cfg_init, 0); + (&(sc->sc_config_td), &aue_cfg_pre_init, + &aue_cfg_init, 0, 0); } } else { if (ifp->if_drv_flags & IFF_DRV_RUNNING) { usbd_config_td_queue_command - (&(sc->sc_config_td), &aue_cfg_stop, 0); + (&(sc->sc_config_td), &aue_cfg_pre_stop, + &aue_cfg_stop, 0, 0); } } break; @@ -1592,7 +1565,8 @@ case SIOCADDMULTI: case SIOCDELMULTI: usbd_config_td_queue_command - (&(sc->sc_config_td), &aue_cfg_setmulti, 0); + (&(sc->sc_config_td), &aue_config_copy, + &aue_cfg_setmulti, 0, 0); break; case SIOCGIFMEDIA: @@ -1624,7 +1598,7 @@ mtx_assert(&(sc->sc_mtx), MA_OWNED); usbd_config_td_queue_command - (&(sc->sc_config_td), &aue_cfg_tick, 0); + (&(sc->sc_config_td), NULL, &aue_cfg_tick, 0, 0); __callout_reset(&(sc->sc_watchdog), hz, &aue_watchdog, sc); @@ -1640,50 +1614,57 @@ * NOTE: can be called when "ifp" is NULL */ static void -aue_cfg_stop(struct aue_softc *sc, - struct aue_config_copy *cc, u_int16_t refcount) +aue_cfg_pre_stop(struct aue_softc *sc, + struct aue_config_copy *cc, uint16_t refcount) { - if (cc == NULL) { + struct ifnet *ifp = sc->sc_ifp; - /* immediate configuration */ + if (cc) { + /* copy the needed configuration */ + aue_config_copy(sc, cc, refcount); + } - struct ifnet *ifp = sc->sc_ifp; + /* immediate configuration */ - if (ifp) { - /* clear flags */ - ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | - IFF_DRV_OACTIVE); - } + if (ifp) { + /* clear flags */ + ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | + IFF_DRV_OACTIVE); + } - sc->sc_flags &= ~(AUE_FLAG_HL_READY| - AUE_FLAG_LL_READY); + sc->sc_flags &= ~(AUE_FLAG_HL_READY| + AUE_FLAG_LL_READY); - sc->sc_flags |= AUE_FLAG_WAIT_LINK; + sc->sc_flags |= AUE_FLAG_WAIT_LINK; - /* stop all the transfers, - * if not already stopped: - */ - if (sc->sc_xfer[0]) { - usbd_transfer_stop(sc->sc_xfer[0]); - } - if (sc->sc_xfer[1]) { - usbd_transfer_stop(sc->sc_xfer[1]); - } - if (sc->sc_xfer[2]) { - usbd_transfer_stop(sc->sc_xfer[2]); - } - if (sc->sc_xfer[3]) { - usbd_transfer_stop(sc->sc_xfer[3]); - } - if (sc->sc_xfer[4]) { - usbd_transfer_stop(sc->sc_xfer[4]); - } - if (sc->sc_xfer[5]) { - usbd_transfer_stop(sc->sc_xfer[5]); - } - return; + /* stop all the transfers, + * if not already stopped: + */ + if (sc->sc_xfer[0]) { + usbd_transfer_stop(sc->sc_xfer[0]); + } + if (sc->sc_xfer[1]) { + usbd_transfer_stop(sc->sc_xfer[1]); + } + if (sc->sc_xfer[2]) { + usbd_transfer_stop(sc->sc_xfer[2]); + } + if (sc->sc_xfer[3]) { + usbd_transfer_stop(sc->sc_xfer[3]); + } + if (sc->sc_xfer[4]) { + usbd_transfer_stop(sc->sc_xfer[4]); + } + if (sc->sc_xfer[5]) { + usbd_transfer_stop(sc->sc_xfer[5]); } + return; +} +static void +aue_cfg_stop(struct aue_softc *sc, + struct aue_config_copy *cc, u_int16_t refcount) +{ aue_cfg_csr_write_1(sc, AUE_CTL0, 0); aue_cfg_csr_write_1(sc, AUE_CTL1, 0); aue_cfg_reset(sc); @@ -1702,7 +1683,8 @@ mtx_lock(&(sc->sc_mtx)); usbd_config_td_queue_command - (&(sc->sc_config_td), &aue_cfg_stop, 0); + (&(sc->sc_config_td), &aue_cfg_pre_stop, + &aue_cfg_stop, 0, 0); mtx_unlock(&(sc->sc_mtx)); ==== //depot/projects/usb/src/sys/dev/usb/if_axe.c#16 (text+ko) ==== @@ -154,28 +154,27 @@ static miibus_writereg_t axe_cfg_miibus_writereg; static miibus_statchg_t axe_cfg_miibus_statchg; +static usbd_config_td_command_t axe_cfg_ifmedia_upd; +static usbd_config_td_command_t axe_config_copy; +static usbd_config_td_command_t axe_cfg_setmulti; +static usbd_config_td_command_t axe_cfg_first_time_setup; +static usbd_config_td_command_t axe_cfg_tick; +static usbd_config_td_command_t axe_cfg_pre_init; +static usbd_config_td_command_t axe_cfg_init; +static usbd_config_td_command_t axe_cfg_promisc_upd; +static usbd_config_td_command_t axe_cfg_pre_stop; +static usbd_config_td_command_t axe_cfg_stop; + static int axe_ifmedia_upd_cb(struct ifnet *ifp); static void -axe_cfg_ifmedia_upd(struct axe_softc *sc, - struct axe_config_copy *cc, u_int16_t refcount); -static void axe_ifmedia_sts_cb(struct ifnet *ifp, struct ifmediareq *ifmr); static void -axe_config_copy(struct axe_softc *sc, - struct axe_config_copy *cc, u_int16_t refcount); -static void -axe_cfg_setmulti(struct axe_softc *sc, - struct axe_config_copy *cc, u_int16_t refcount); -static void axe_cfg_reset(struct axe_softc *sc); static void -axe_cfg_first_time_setup(struct axe_softc *sc, - struct axe_config_copy *cc, u_int16_t refcount); -static void axe_intr_clear_stall_callback(struct usbd_xfer *xfer); static void @@ -194,9 +193,6 @@ axe_bulk_write_callback(struct usbd_xfer *xfer); static void -axe_cfg_tick(struct axe_softc *sc, - struct axe_config_copy *cc, u_int16_t refcount); -static void axe_start_cb(struct ifnet *ifp); static void @@ -205,22 +201,12 @@ static void axe_init_cb(void *arg); -static void -axe_cfg_init(struct axe_softc *sc, - struct axe_config_copy *cc, u_int16_t refcount); -static void -axe_cfg_promisc_upd(struct axe_softc *sc, - struct axe_config_copy *cc, u_int16_t refcount); static int axe_ioctl_cb(struct ifnet *ifp, u_long command, caddr_t data); static void axe_watchdog(void *arg); -static void -axe_cfg_stop(struct axe_softc *sc, - struct axe_config_copy *cc, u_int16_t refcount); - static const struct usbd_config axe_config[AXE_ENDPT_MAX] = { [0] = { @@ -430,7 +416,7 @@ mtx_lock(&(sc->sc_mtx)); usbd_config_td_queue_command - (&(sc->sc_config_td), &axe_cfg_ifmedia_upd, 0); + (&(sc->sc_config_td), NULL, &axe_cfg_ifmedia_upd, 0, 0); mtx_unlock(&(sc->sc_mtx)); return 0; @@ -443,8 +429,7 @@ struct ifnet * ifp = sc->sc_ifp; struct mii_data * mii = GET_MII(sc); - if ((cc == NULL) || - (ifp == NULL) || + if ((ifp == NULL) || (mii == NULL)) { /* not ready */ return; @@ -526,11 +511,6 @@ { u_int16_t rxmode; - if (cc == NULL) { - /* nothing to do */ - return; - } - axe_cfg_cmd(sc, AXE_CMD_RXCTL_READ, 0, 0, &rxmode); rxmode = le16toh(rxmode); @@ -647,8 +627,7 @@ } error = usbd_config_td_setup(&(sc->sc_config_td), sc, &(sc->sc_mtx), - &axe_config_copy, NULL, - sizeof(struct axe_config_copy), 16); + NULL, sizeof(struct axe_config_copy), 16); if (error) { device_printf(dev, "could not setup config " "thread!\n"); @@ -662,7 +641,7 @@ /* start setup */ usbd_config_td_queue_command - (&(sc->sc_config_td), &axe_cfg_first_time_setup, 0); + (&(sc->sc_config_td), NULL, &axe_cfg_first_time_setup, 0, 0); /* start watchdog (will exit mutex) */ @@ -683,10 +662,6 @@ int error; u_int8_t eaddr[min(ETHER_ADDR_LEN,6)]; - if (cc == NULL) { - return; - } - /* set default value */ bzero(eaddr, sizeof(eaddr)); @@ -781,7 +756,7 @@ __callout_stop(&sc->sc_watchdog); - axe_cfg_stop(sc, NULL, 0); + axe_cfg_pre_stop(sc, NULL, 0); ifp = sc->sc_ifp; @@ -1049,8 +1024,7 @@ struct ifnet * ifp = sc->sc_ifp; struct mii_data * mii = GET_MII(sc); - if ((cc == NULL) || - (ifp == NULL) || + if ((ifp == NULL) || (mii == NULL)) { /* not ready */ return; @@ -1113,35 +1087,36 @@ mtx_lock(&(sc->sc_mtx)); usbd_config_td_queue_command - (&(sc->sc_config_td), &axe_cfg_init, 0); + (&(sc->sc_config_td), &axe_cfg_pre_init, &axe_cfg_init, 0, 0); mtx_unlock(&(sc->sc_mtx)); return; } static void -axe_cfg_init(struct axe_softc *sc, - struct axe_config_copy *cc, u_int16_t refcount) +axe_cfg_pre_init(struct axe_softc *sc, + struct axe_config_copy *cc, u_int16_t refcount) { - struct mii_data *mii = GET_MII(sc); - u_int16_t rxmode; + struct ifnet *ifp = sc->sc_ifp; - if (cc == NULL) { + /* immediate configuration */ - /* immediate configuration */ + axe_cfg_pre_stop(sc, cc, 0); - struct ifnet *ifp = sc->sc_ifp; + ifp->if_drv_flags |= IFF_DRV_RUNNING; + ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; - axe_cfg_stop(sc, NULL, 0); + sc->sc_flags |= AXE_FLAG_HL_READY; + return; +} - ifp->if_drv_flags |= IFF_DRV_RUNNING; - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; - - sc->sc_flags |= AXE_FLAG_HL_READY; +static void +axe_cfg_init(struct axe_softc *sc, + struct axe_config_copy *cc, u_int16_t refcount) +{ + struct mii_data *mii = GET_MII(sc); + u_int16_t rxmode; - return; - } - /* * Cancel pending I/O */ @@ -1192,11 +1167,6 @@ { u_int16_t rxmode; - if (cc == NULL) { - /* nothing to do */ - return; - } - axe_cfg_cmd(sc, AXE_CMD_RXCTL_READ, 0, 0, &rxmode); rxmode = le16toh(rxmode); @@ -1229,15 +1199,18 @@ if (ifp->if_flags & IFF_UP) { if (ifp->if_drv_flags & IFF_DRV_RUNNING) { usbd_config_td_queue_command - (&(sc->sc_config_td), &axe_cfg_promisc_upd, 0); + (&(sc->sc_config_td), &axe_config_copy, + &axe_cfg_promisc_upd, 0, 0); } else { usbd_config_td_queue_command - (&(sc->sc_config_td), &axe_cfg_init, 0); + (&(sc->sc_config_td), &axe_cfg_pre_init, + &axe_cfg_init, 0, 0); } } else { if (ifp->if_drv_flags & IFF_DRV_RUNNING) { usbd_config_td_queue_command - (&(sc->sc_config_td), &axe_cfg_stop, 0); + (&(sc->sc_config_td), &axe_cfg_pre_stop, + &axe_cfg_stop, 0, 0); } } break; @@ -1245,7 +1218,8 @@ case SIOCADDMULTI: case SIOCDELMULTI: usbd_config_td_queue_command - (&(sc->sc_config_td), &axe_cfg_setmulti, 0); + (&(sc->sc_config_td), &axe_config_copy, + &axe_cfg_setmulti, 0, 0); break; case SIOCGIFMEDIA: @@ -1277,7 +1251,7 @@ mtx_assert(&(sc->sc_mtx), MA_OWNED); usbd_config_td_queue_command - (&(sc->sc_config_td), &axe_cfg_tick, 0); + (&(sc->sc_config_td), NULL, &axe_cfg_tick, 0, 0); __callout_reset(&(sc->sc_watchdog), hz, &axe_watchdog, sc); @@ -1290,50 +1264,57 @@ * NOTE: can be called when "ifp" is NULL */ static void -axe_cfg_stop(struct axe_softc *sc, - struct axe_config_copy *cc, u_int16_t refcount) +axe_cfg_pre_stop(struct axe_softc *sc, + struct axe_config_copy *cc, u_int16_t refcount) { - if (cc == NULL) { + struct ifnet *ifp = sc->sc_ifp; - /* immediate configuration */ + if (cc) { + /* copy the needed configuration */ + axe_config_copy(sc, cc, refcount); + } - struct ifnet *ifp = sc->sc_ifp; + /* immediate configuration */ - if (ifp) { - /* clear flags */ - ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | - IFF_DRV_OACTIVE); - } + if (ifp) { + /* clear flags */ + ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | + IFF_DRV_OACTIVE); + } - sc->sc_flags &= ~(AXE_FLAG_HL_READY| - AXE_FLAG_LL_READY); + sc->sc_flags &= ~(AXE_FLAG_HL_READY| + AXE_FLAG_LL_READY); - sc->sc_flags |= AXE_FLAG_WAIT_LINK; + sc->sc_flags |= AXE_FLAG_WAIT_LINK; - /* stop all the transfers, - * if not already stopped: - */ - if (sc->sc_xfer[0]) { - usbd_transfer_stop(sc->sc_xfer[0]); - } - if (sc->sc_xfer[1]) { - usbd_transfer_stop(sc->sc_xfer[1]); - } - if (sc->sc_xfer[2]) { - usbd_transfer_stop(sc->sc_xfer[2]); - } - if (sc->sc_xfer[3]) { - usbd_transfer_stop(sc->sc_xfer[3]); - } - if (sc->sc_xfer[4]) { - usbd_transfer_stop(sc->sc_xfer[4]); - } - if (sc->sc_xfer[5]) { - usbd_transfer_stop(sc->sc_xfer[5]); - } - return; + /* stop all the transfers, + * if not already stopped: + */ + if (sc->sc_xfer[0]) { + usbd_transfer_stop(sc->sc_xfer[0]); + } + if (sc->sc_xfer[1]) { + usbd_transfer_stop(sc->sc_xfer[1]); + } + if (sc->sc_xfer[2]) { + usbd_transfer_stop(sc->sc_xfer[2]); + } + if (sc->sc_xfer[3]) { + usbd_transfer_stop(sc->sc_xfer[3]); + } + if (sc->sc_xfer[4]) { + usbd_transfer_stop(sc->sc_xfer[4]); + } + if (sc->sc_xfer[5]) { + usbd_transfer_stop(sc->sc_xfer[5]); } + return; +} +static void +axe_cfg_stop(struct axe_softc *sc, + struct axe_config_copy *cc, u_int16_t refcount) +{ axe_cfg_reset(sc); return; } @@ -1350,7 +1331,8 @@ mtx_lock(&(sc->sc_mtx)); usbd_config_td_queue_command - (&(sc->sc_config_td), &axe_cfg_stop, 0); + (&(sc->sc_config_td), &axe_cfg_pre_stop, + &axe_cfg_stop, 0, 0); mtx_unlock(&(sc->sc_mtx)); ==== //depot/projects/usb/src/sys/dev/usb/if_cue.c#14 (text+ko) ==== @@ -103,6 +103,15 @@ static device_detach_t cue_detach; static device_shutdown_t cue_shutdown; +static usbd_config_td_command_t cue_cfg_promisc_upd; +static usbd_config_td_command_t cue_config_copy; +static usbd_config_td_command_t cue_cfg_first_time_setup; +static usbd_config_td_command_t cue_cfg_tick; +static usbd_config_td_command_t cue_cfg_pre_init; +static usbd_config_td_command_t cue_cfg_init; +static usbd_config_td_command_t cue_cfg_pre_stop; +static usbd_config_td_command_t cue_cfg_stop; + static void cue_cfg_do_request(struct cue_softc *sc, usb_device_request_t *req, void *data); @@ -125,27 +134,15 @@ cue_mchash(const uint8_t *addr); static void -cue_cfg_promisc_upd(struct cue_softc *sc, - struct cue_config_copy *cc, u_int16_t refcount); -static void -cue_config_copy(struct cue_softc *sc, - struct cue_config_copy *cc, u_int16_t refcount); -static void cue_cfg_reset(struct cue_softc *sc); static void -cue_cfg_first_time_setup(struct cue_softc *sc, - struct cue_config_copy *cc, u_int16_t refcount); -static void cue_bulk_read_clear_stall_callback(struct usbd_xfer *xfer); static void cue_bulk_read_callback(struct usbd_xfer *xfer); static void -cue_cfg_tick(struct cue_softc *sc, - struct cue_config_copy *cc, u_int16_t refcount); -static void cue_start_cb(struct ifnet *ifp); static void @@ -160,19 +157,12 @@ static void cue_init_cb(void *arg); -static void -cue_cfg_init(struct cue_softc *sc, - struct cue_config_copy *cc, u_int16_t refcount); static int cue_ioctl_cb(struct ifnet *ifp, u_long command, caddr_t data); static void cue_watchdog(void *arg); -static void -cue_cfg_stop(struct cue_softc *sc, - struct cue_config_copy *cc, u_int16_t refcount); - #define DPRINTF(...) static const struct usbd_config cue_config[CUE_ENDPT_MAX] = { @@ -373,11 +363,6 @@ cue_cfg_promisc_upd(struct cue_softc *sc, struct cue_config_copy *cc, u_int16_t refcount) { - if (cc == NULL) { - /* nothing to do */ - return; - } - /* if we want promiscuous mode, set the allframes bit */ if (cc->if_flags & IFF_PROMISC) { @@ -525,8 +510,7 @@ } error = usbd_config_td_setup(&(sc->sc_config_td), sc, &(sc->sc_mtx), - &cue_config_copy, NULL, - sizeof(struct cue_config_copy), 16); + NULL, sizeof(struct cue_config_copy), 16); if (error) { device_printf(dev, "could not setup config " "thread!\n"); @@ -538,7 +522,7 @@ /* start setup */ usbd_config_td_queue_command - (&(sc->sc_config_td), &cue_cfg_first_time_setup, 0); + (&(sc->sc_config_td), NULL, &cue_cfg_first_time_setup, 0, 0); /* start watchdog (will exit mutex) */ @@ -558,9 +542,6 @@ u_int8_t eaddr[ETHER_ADDR_LEN]; struct ifnet * ifp; - if (cc == NULL) { - return; - } #if 0 /* Reset the adapter. */ cue_cfg_reset(sc); @@ -619,7 +600,7 @@ __callout_stop(&(sc->sc_watchdog)); - cue_cfg_stop(sc, NULL, 0); + cue_cfg_pre_stop(sc, NULL, 0); ifp = sc->sc_ifp; @@ -739,8 +720,7 @@ { struct ifnet * ifp = sc->sc_ifp; - if ((cc == NULL) || - (ifp == NULL)) { + if ((ifp == NULL)) { /* not ready */ return; } @@ -897,34 +877,37 @@ mtx_lock(&(sc->sc_mtx)); usbd_config_td_queue_command - (&(sc->sc_config_td), &cue_cfg_init, 0); + (&(sc->sc_config_td), &cue_cfg_pre_init, + &cue_cfg_init, 0, 0); mtx_unlock(&(sc->sc_mtx)); return; } static void -cue_cfg_init(struct cue_softc *sc, - struct cue_config_copy *cc, u_int16_t refcount) +cue_cfg_pre_init(struct cue_softc *sc, + struct cue_config_copy *cc, u_int16_t refcount) { - u_int8_t i; + struct ifnet *ifp = sc->sc_ifp; - if (cc == NULL) { + /* immediate configuration */ - /* immediate configuration */ + cue_cfg_pre_stop(sc, cc, 0); - struct ifnet *ifp = sc->sc_ifp; + ifp->if_drv_flags |= IFF_DRV_RUNNING; + ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; - cue_cfg_stop(sc, NULL, 0); + sc->sc_flags |= CUE_FLAG_HL_READY; - ifp->if_drv_flags |= IFF_DRV_RUNNING; - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; + return; +} - sc->sc_flags |= CUE_FLAG_HL_READY; +static void +cue_cfg_init(struct cue_softc *sc, + struct cue_config_copy *cc, u_int16_t refcount) +{ + u_int8_t i; - return; - } - /* * Cancel pending I/O and free all RX/TX buffers. */ @@ -979,15 +962,18 @@ if (ifp->if_flags & IFF_UP) { if (ifp->if_drv_flags & IFF_DRV_RUNNING) { usbd_config_td_queue_command - (&(sc->sc_config_td), &cue_cfg_promisc_upd, 0); + (&(sc->sc_config_td), &cue_config_copy, + &cue_cfg_promisc_upd, 0, 0); } else { usbd_config_td_queue_command - (&(sc->sc_config_td), &cue_cfg_init, 0); + (&(sc->sc_config_td), &cue_cfg_pre_init, + &cue_cfg_init, 0, 0); } } else { if (ifp->if_drv_flags & IFF_DRV_RUNNING) { usbd_config_td_queue_command - (&(sc->sc_config_td), &cue_cfg_stop, 0); + (&(sc->sc_config_td), &cue_cfg_pre_stop, + &cue_cfg_stop, 0, 0); } } break; @@ -995,7 +981,8 @@ case SIOCADDMULTI: case SIOCDELMULTI: usbd_config_td_queue_command - (&(sc->sc_config_td), &cue_cfg_promisc_upd, 0); + (&(sc->sc_config_td), &cue_config_copy, + &cue_cfg_promisc_upd, 0, 0); break; default: @@ -1016,7 +1003,7 @@ mtx_assert(&(sc->sc_mtx), MA_OWNED); usbd_config_td_queue_command - (&(sc->sc_config_td), &cue_cfg_tick, 0); + (&(sc->sc_config_td), NULL, &cue_cfg_tick, 0, 0); __callout_reset(&(sc->sc_watchdog), hz, &cue_watchdog, sc); @@ -1030,42 +1017,49 @@ * RX and TX lists. */ static void -cue_cfg_stop(struct cue_softc *sc, - struct cue_config_copy *cc, u_int16_t refcount) +cue_cfg_pre_stop(struct cue_softc *sc, + struct cue_config_copy *cc, u_int16_t refcount) { - if (cc == NULL) { + struct ifnet *ifp = sc->sc_ifp; - /* immediate configuration */ + if (cc) { + /* copy the needed configuration */ + cue_config_copy(sc, cc, refcount); + } - struct ifnet *ifp = sc->sc_ifp; + /* immediate configuration */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Mar 28 15:30:23 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1852916A407; Wed, 28 Mar 2007 15:30:23 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D17CF16A403 for ; Wed, 28 Mar 2007 15:30:22 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id BF91113C46E for ; Wed, 28 Mar 2007 15:30:22 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2SFUMe1087531 for ; Wed, 28 Mar 2007 15:30:22 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2SFUMO2087525 for perforce@freebsd.org; Wed, 28 Mar 2007 15:30:22 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 28 Mar 2007 15:30:22 GMT Message-Id: <200703281530.l2SFUMO2087525@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 116737 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Mar 2007 15:30:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=116737 Change 116737 by hselasky@hselasky_mini_itx on 2007/03/28 15:29:32 Remove some unused code, and remove the open-delay. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ucom.c#13 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ucom.c#13 (text+ko) ==== @@ -407,6 +407,7 @@ return ENXIO; } +#if 0 /* * wait a little for previous commands * to be flushed out: @@ -416,6 +417,7 @@ if (error && (error != EWOULDBLOCK)) { return error; } +#endif DPRINTF(0, "tp = %p\n", tp); @@ -688,14 +690,6 @@ return 0; } -#if 0 - sc->sc_flag &= ~UCOM_FLAG_READ_ON; - - if (sc->sc_callback->ucom_stop_read) { - (sc->sc_callback->ucom_stop_read)(sc); - } -#endif - error = (sc->sc_callback->ucom_param)(sc, t); if (error) { DPRINTF(0, "callback error = %d\n", error); @@ -713,14 +707,6 @@ ttyldoptim(tp); -#if 0 - sc->sc_flag |= UCOM_FLAG_READ_ON; - - if (sc->sc_callback->ucom_start_read) { - (sc->sc_callback->ucom_start_read)(sc); - } -#endif - return 0; } @@ -824,8 +810,9 @@ goto done; } + DPRINTF(0, "cnt=%d\n", cnt); + if (cnt == 0) { - DPRINTF(0, "cnt == 0\n"); goto done; } From owner-p4-projects@FreeBSD.ORG Wed Mar 28 18:02:56 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3ABE16A40A; Wed, 28 Mar 2007 18:02:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9A37F16A406 for ; Wed, 28 Mar 2007 18:02:55 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8A61B13C4F9 for ; Wed, 28 Mar 2007 18:02:55 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2SI2twg012727 for ; Wed, 28 Mar 2007 18:02:55 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2SI2tOe012718 for perforce@freebsd.org; Wed, 28 Mar 2007 18:02:55 GMT (envelope-from scottl@freebsd.org) Date: Wed, 28 Mar 2007 18:02:55 GMT Message-Id: <200703281802.l2SI2tOe012718@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 116754 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Mar 2007 18:02:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=116754 Change 116754 by scottl@scottl-x64 on 2007/03/28 18:01:55 Basic locking for ahc driver, enough to get it doing normal I/O things Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx.c#6 edit .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.c#10 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx.c#6 (text+ko) ==== @@ -6944,6 +6944,7 @@ struct ahc_softc *ahc; ahc = scb->ahc_softc; + ahc_lock(ahc, NULL); if ((scb->flags & SCB_ACTIVE) != 0) { if ((scb->flags & SCB_TIMEDOUT) == 0) { LIST_INSERT_HEAD(&ahc->timedout_scbs, scb, @@ -6952,6 +6953,7 @@ } ahc_wakeup_recovery_thread(ahc); } + ahc_unlock(ahc, NULL); } /* ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.c#10 (text+ko) ==== @@ -107,8 +107,8 @@ /* Hook up our interrupt handler */ error = bus_setup_intr(ahc->dev_softc, ahc->platform_data->irq, - INTR_TYPE_CAM, ahc_platform_intr, ahc, - &ahc->platform_data->ih); + INTR_TYPE_CAM|INTR_MPSAFE, ahc_platform_intr, + ahc, &ahc->platform_data->ih); if (error != 0) device_printf(ahc->dev_softc, "bus_setup_intr() failed: %d\n", @@ -161,6 +161,11 @@ path = NULL; path2 = NULL; + + ahc_lockinit(ahc); + ahc_done_lockinit(ahc); + ahc_list_lockinit(); + /* * Create a thread to perform all recovery. */ @@ -196,7 +201,7 @@ */ sim = cam_sim_alloc(ahc_action, ahc_poll, "ahc", ahc, device_get_unit(ahc->dev_softc), - &Giant, 1, AHC_MAX_QUEUE, devq); + &ahc->platform_data->mtx, 1, AHC_MAX_QUEUE, devq); if (sim == NULL) { cam_simq_free(devq); goto fail; @@ -228,7 +233,8 @@ if (ahc->features & AHC_TWIN) { sim2 = cam_sim_alloc(ahc_action, ahc_poll, "ahc", ahc, device_get_unit(ahc->dev_softc), - &Giant, 1, AHC_MAX_QUEUE, devq); + &ahc->platform_data->mtx, 1, + AHC_MAX_QUEUE, devq); if (sim2 == NULL) { printf("ahc_attach: Unable to attach second " @@ -278,6 +284,7 @@ ahc->platform_data->sim_b = sim2; ahc->platform_data->path_b = path2; } + ahc_unlock(ahc, &s); if (count != 0) { /* We have to wait until after any system dumps... */ @@ -287,7 +294,6 @@ ahc_intr_enable(ahc, TRUE); } - ahc_unlock(ahc, &s); return (count); } @@ -300,7 +306,9 @@ struct ahc_softc *ahc; ahc = (struct ahc_softc *)arg; + ahc_lock(ahc, NULL); ahc_intr(ahc); + ahc_unlock(ahc, NULL); } /* @@ -331,7 +339,7 @@ ahc_run_untagged_queue(ahc, untagged_q); } - untimeout(ahc_platform_timeout, (caddr_t)scb, ccb->ccb_h.timeout_ch); + callout_stop(&ccb->ccb_h.callout); if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) { bus_dmasync_op_t op; @@ -441,7 +449,6 @@ struct ahc_tmode_lstate *lstate; u_int target_id; u_int our_id; - long s; CAM_DEBUG(ccb->ccb_h.path, CAM_DEBUG_TRACE, ("ahc_action\n")); @@ -474,13 +481,11 @@ } if (ccb->ccb_h.func_code == XPT_ACCEPT_TARGET_IO) { - ahc_lock(ahc, &s); SLIST_INSERT_HEAD(&lstate->accept_tios, &ccb->ccb_h, sim_links.sle); ccb->ccb_h.status = CAM_REQ_INPROG; if ((ahc->flags & AHC_TQINFIFO_BLOCKED) != 0) ahc_run_tqinfifo(ahc, /*paused*/FALSE); - ahc_unlock(ahc, &s); break; } @@ -510,17 +515,14 @@ /* * get an scb to use. */ - ahc_lock(ahc, &s); if ((scb = ahc_get_scb(ahc)) == NULL) { xpt_freeze_simq(sim, /*count*/1); ahc->flags |= AHC_RESOURCE_SHORTAGE; - ahc_unlock(ahc, &s); ccb->ccb_h.status = CAM_REQUEUE_REQ; xpt_done(ccb); return; } - ahc_unlock(ahc, &s); hscb = scb->hscb; @@ -650,8 +652,6 @@ break; } - ahc_lock(ahc, &s); - if ((spi->valid & CTS_SPI_VALID_DISC) != 0) { if ((spi->flags & CTS_SPI_FLAGS_DISC_ENB) != 0) *discenable |= devinfo.target_mask; @@ -727,7 +727,6 @@ spi->ppr_options, update_type, /*paused*/FALSE); } - ahc_unlock(ahc, &s); ccb->ccb_h.status = CAM_REQ_CMP; xpt_done(ccb); break; @@ -736,10 +735,8 @@ /* Get default/user set transfer settings for the target */ { - ahc_lock(ahc, &s); ahc_get_tran_settings(ahc, SIM_SCSI_ID(ahc, sim), SIM_CHANNEL(ahc, sim), &ccb->cts); - ahc_unlock(ahc, &s); xpt_done(ccb); break; } @@ -758,10 +755,8 @@ { int found; - ahc_lock(ahc, &s); found = ahc_reset_channel(ahc, SIM_CHANNEL(ahc, sim), /*initiate reset*/TRUE); - ahc_unlock(ahc, &s); if (bootverbose) { xpt_print_path(SIM_PATH(ahc, sim)); printf("SCSI bus reset delivered. " @@ -909,7 +904,6 @@ case AC_LOST_DEVICE: { struct ahc_devinfo devinfo; - long s; ahc_compile_devinfo(&devinfo, SIM_SCSI_ID(ahc, sim), xpt_path_target_id(path), @@ -921,14 +915,12 @@ * Revert to async/narrow transfers * for the next device. */ - ahc_lock(ahc, &s); ahc_set_width(ahc, &devinfo, MSG_EXT_WDTR_BUS_8_BIT, AHC_TRANS_GOAL|AHC_TRANS_CUR, /*paused*/FALSE); ahc_set_syncrate(ahc, &devinfo, /*syncrate*/NULL, /*period*/0, /*offset*/0, /*ppr_options*/0, AHC_TRANS_GOAL|AHC_TRANS_CUR, /*paused*/FALSE); - ahc_unlock(ahc, &s); break; } default: @@ -946,7 +938,6 @@ struct ahc_initiator_tinfo *tinfo; struct ahc_tmode_tstate *tstate; u_int mask; - long s; scb = (struct scb *)arg; ccb = scb->io_ctx; @@ -959,9 +950,7 @@ aic_set_transaction_status(scb, CAM_REQ_CMP_ERR); if (nsegments != 0) bus_dmamap_unload(ahc->buffer_dmat, scb->dmamap); - ahc_lock(ahc, &s); ahc_free_scb(ahc, scb); - ahc_unlock(ahc, &s); xpt_done(ccb); return; } @@ -1034,9 +1023,7 @@ CAM_REQ_TOO_BIG); bus_dmamap_unload(ahc->buffer_dmat, scb->dmamap); - ahc_lock(ahc, &s); ahc_free_scb(ahc, scb); - ahc_unlock(ahc, &s); xpt_done(ccb); return; } @@ -1059,8 +1046,6 @@ scb->sg_count = nsegments; - ahc_lock(ahc, &s); - /* * Last time we need to check if this SCB needs to * be aborted. @@ -1069,7 +1054,6 @@ if (nsegments != 0) bus_dmamap_unload(ahc->buffer_dmat, scb->dmamap); ahc_free_scb(ahc, scb); - ahc_unlock(ahc, &s); xpt_done(ccb); return; } @@ -1120,7 +1104,6 @@ TAILQ_INSERT_TAIL(untagged_q, scb, links.tqe); scb->flags |= SCB_UNTAGGEDQ; if (TAILQ_FIRST(untagged_q) != scb) { - ahc_unlock(ahc, &s); return; } } @@ -1142,8 +1125,6 @@ } else { ahc_queue_scb(ahc, scb); } - - ahc_unlock(ahc, &s); } static void From owner-p4-projects@FreeBSD.ORG Wed Mar 28 18:03:57 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6BD8316A409; Wed, 28 Mar 2007 18:03:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 30D1816A401 for ; Wed, 28 Mar 2007 18:03:57 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2174113C46A for ; Wed, 28 Mar 2007 18:03:57 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2SI3vkM016041 for ; Wed, 28 Mar 2007 18:03:57 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2SI3u28016029 for perforce@freebsd.org; Wed, 28 Mar 2007 18:03:56 GMT (envelope-from scottl@freebsd.org) Date: Wed, 28 Mar 2007 18:03:56 GMT Message-Id: <200703281803.l2SI3u28016029@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 116755 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Mar 2007 18:03:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=116755 Change 116755 by scottl@scottl-x64 on 2007/03/28 18:03:15 Work around malloc locking constraints. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#15 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#15 (text+ko) ==== @@ -725,6 +725,7 @@ * WORM peripheral driver. WORM drives will also have the WORM * driver attached to them. */ + cam_periph_unlock(periph); softc->disk = disk_alloc(); softc->disk->d_devstat = devstat_new_entry("cd", periph->unit_number, 0, @@ -740,6 +741,7 @@ softc->disk->d_drv1 = periph; softc->disk->d_flags = 0; disk_create(softc->disk, DISK_VERSION); + cam_periph_lock(periph); /* * Add an async callback so that we get @@ -1358,7 +1360,8 @@ softc->changer->flags |= CHANGER_MANUAL_CALL; cdrunchangerqueue(softc->changer); } else - tsleep(&softc->changer, PRIBIO, "cgticb", 0); + msleep(&softc->changer, periph->sim->mtx, + PRIBIO, "cgticb", 0); } } return(cam_periph_getccb(periph, priority)); @@ -2885,8 +2888,11 @@ ccb = cdgetccb(periph, /* priority */ 1); + /* XXX Should be M_WAITOK */ rcap_buf = malloc(sizeof(struct scsi_read_capacity_data), - M_TEMP, M_WAITOK); + M_TEMP, M_NOWAIT); + if (rcap_buf == NULL) + return (ENOMEM); scsi_read_capacity(&ccb->csio, /*retries*/ 1, From owner-p4-projects@FreeBSD.ORG Wed Mar 28 18:04:08 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 50B7316A40E; Wed, 28 Mar 2007 18:03:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 23DDE16A4E6 for ; Wed, 28 Mar 2007 18:03:57 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 75FFF13C46C for ; Wed, 28 Mar 2007 18:03:57 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2SI3vLb016058 for ; Wed, 28 Mar 2007 18:03:57 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2SI3vL8016048 for perforce@freebsd.org; Wed, 28 Mar 2007 18:03:57 GMT (envelope-from scottl@freebsd.org) Date: Wed, 28 Mar 2007 18:03:57 GMT Message-Id: <200703281803.l2SI3vL8016048@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 116756 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Mar 2007 18:04:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=116756 Change 116756 by scottl@scottl-x64 on 2007/03/28 18:03:28 Start scsi_sa locking. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sa.c#11 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sa.c#11 (text+ko) ==== @@ -451,17 +451,12 @@ unit = SAUNIT(dev); periph = (struct cam_periph *)dev->si_drv1; - if (periph == NULL) { - return (ENXIO); - } - softc = (struct sa_softc *)periph->softc; - if (cam_periph_acquire(periph) != CAM_REQ_CMP) { - cam_periph_unlock(periph); return (ENXIO); } cam_periph_lock(periph); + softc = (struct sa_softc *)periph->softc; CAM_DEBUG(periph->path, CAM_DEBUG_TRACE|CAM_DEBUG_INFO, ("saopen(%d): dev=0x%x softc=0x%x\n", unit, unit, softc->flags)); @@ -672,7 +667,6 @@ { struct cam_periph *periph; struct sa_softc *softc; - int s; bp->bio_resid = bp->bio_bcount; if (SA_IS_CTRL(bp->bio_dev)) { @@ -686,16 +680,16 @@ } softc = (struct sa_softc *)periph->softc; - s = splsoftcam(); + cam_periph_lock(periph); if (softc->flags & SA_FLAG_INVALID) { - splx(s); + cam_periph_unlock(periph); biofinish(bp, NULL, ENXIO); return; } if (softc->flags & SA_FLAG_TAPE_FROZEN) { - splx(s); + cam_periph_unlock(periph); biofinish(bp, NULL, EPERM); return; } @@ -706,16 +700,15 @@ * file descriptor. */ if (bp->bio_cmd == BIO_WRITE && softc->open_rdonly) { - splx(s); + cam_periph_unlock(periph); biofinish(bp, NULL, EBADF); return; } - splx(s); - if (softc->open_pending_mount) { int error = samount(periph, 0, bp->bio_dev); if (error) { + cam_periph_unlock(periph); biofinish(bp, NULL, ENXIO); return; } @@ -728,6 +721,7 @@ * If it's a null transfer, return immediately */ if (bp->bio_bcount == 0) { + cam_periph_unlock(periph); biodone(bp); return; } @@ -745,6 +739,7 @@ xpt_print(periph->path, "Invalid request. Fixed block " "device requests must be a multiple of %d bytes\n", softc->min_blk); + cam_periph_unlock(periph); biofinish(bp, NULL, EINVAL); return; } @@ -760,18 +755,12 @@ } printf("between %d and %d bytes\n", softc->min_blk, softc->max_blk); + cam_periph_unlock(periph); biofinish(bp, NULL, EINVAL); return; } /* - * Mask interrupts so that the device cannot be invalidated until - * after we are in the queue. Otherwise, we might not properly - * clean up one of the buffers. - */ - s = splbio(); - - /* * Place it at the end of the queue. */ bioq_insert_tail(&softc->bio_queue, bp); @@ -786,12 +775,12 @@ CAM_DEBUG(periph->path, CAM_DEBUG_INFO, ("sastrategy: queue count now %d\n", softc->queue_count)); } - splx(s); /* * Schedule ourselves for performing the work. */ xpt_schedule(periph, 1); + cam_periph_unlock(periph); return; } From owner-p4-projects@FreeBSD.ORG Wed Mar 28 18:37:24 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A34D716A404; Wed, 28 Mar 2007 18:37:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 401A116A402 for ; Wed, 28 Mar 2007 18:37:24 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2E85B13C4B0 for ; Wed, 28 Mar 2007 18:37:24 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2SIbOMo081363 for ; Wed, 28 Mar 2007 18:37:24 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2SIafc0080684 for perforce@freebsd.org; Wed, 28 Mar 2007 18:36:41 GMT (envelope-from scottl@freebsd.org) Date: Wed, 28 Mar 2007 18:36:41 GMT Message-Id: <200703281836.l2SIafc0080684@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 116762 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Mar 2007 18:37:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=116762 Change 116762 by scottl@scottl-x64 on 2007/03/28 18:36:06 IFC Affected files ... .. //depot/projects/scottl-camlock/src/sys/Makefile#11 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/acpica/OsdEnvironment.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/acpica/madt.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/busdma_machdep.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/identcpu.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/intr_machdep.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/io_apic.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/legacy.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/local_apic.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mp_machdep.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mptable.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/msi.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/nexus.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/prof_machdep.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/trap.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/tsc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/uma_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC#15 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/NOTES#12 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/acpica_machdep.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/apicvar.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/gdb_machdep.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/intr_machdep.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/pcpu.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/smp.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/specialreg.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/isa/clock.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/isa/isa.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_machdep.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_proto.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_syscall.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_sysent.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/syscalls.master#12 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/busdma_machdep.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/cpufunc.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/cpufunc_asm_arm9.S#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/db_interface.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/elf_trampoline.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/intr.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/locore.S#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/machdep.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/mem.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/nexus.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/support.S#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/sys_machdep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/trap.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_mci.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_pio.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_rtc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_spi.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_ssc.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_st.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_twi.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_twireg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/if_ate.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/kb920x_machdep.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/ohci_atmelarm.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/AVILA#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/EP80219#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/IQ31244#7 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/KB920X#7 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/KB920X.hints#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/conf/SIMICS#7 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/bootconfig.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/cpufunc.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/intr.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/pcpu.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/undefined.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/sa11x0.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/sa11x0_ost.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/i80321_pci.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/i80321_timer.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/i80321_wdog.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/iq80321.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/avila_ata.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/if_npe.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425_npe.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425_pci.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425_timer.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425_wdog.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425reg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/bootspi/loader_prompt.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ficl/ficl.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ficl/float.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ficl/softwords/fileaccess.fr#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ficl/softwords/jhlocal.fr#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ficl/softwords/oo.fr#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ficl/softwords/prefix.fr#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ficl/softwords/softcore.awk#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ficl/tools.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ficl/unix.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ficl/vm.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ficl/words.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/boot0/boot0.S#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/cdboot/cdboot.s#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/biosacpi.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ia64/ski/acpi_stub.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot0.5/boot.s#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot0.5/boot0.5.s#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot0.5/disk.s#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/cdboot/cdboot.s#2 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#50 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#28 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_target.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/coda/coda_vnops.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linprocfs/linprocfs.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linsysfs/linsysfs.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_emul.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_futex.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_futex.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_misc.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_stats.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_uid16.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_util.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/kern_ndis.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#19 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#18 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.powerpc#11 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.sparc64#12 integrate .. //depot/projects/scottl-camlock/src/sys/conf/kern.post.mk#12 integrate .. //depot/projects/scottl-camlock/src/sys/conf/kmod.mk#14 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options#17 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.arm#12 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_subr.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/CHANGES.txt#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acapps.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acconfig.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acdebug.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acdisasm.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acdispat.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acefi.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acenv.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acevents.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acexcep.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acfreebsd.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acgcc.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acglobal.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/achware.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acinterp.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/aclocal.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acmacros.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acnames.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acnamesp.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acobject.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acopcode.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acoutput.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acparser.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acpi.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acpica_prep.sh#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acpiosxf.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acpixf.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acresrc.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acstruct.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/actables.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/actbl.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/actbl1.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/actbl2.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/actypes.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acutils.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/aecommon.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/aeexec.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/amlcode.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/amlresrc.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/adfile.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/adisasm.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/adwalk.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/dmrestag.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/dmtable.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/dmtbdump.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/dmtbinfo.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/getopt.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslanalyze.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslcodegen.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslcompile.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslcompiler.l#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asldefine.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslerror.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslfiles.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslfold.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslglobal.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asllength.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asllisting.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslload.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asllookup.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslmain.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslmap.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslopcodes.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asloperands.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslopt.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslresource.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslrestype1.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslrestype2.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslstubs.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asltransform.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asltree.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asltypes.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslutils.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dbcmds.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dbdisply.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dbexec.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dbfileio.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dbhistry.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dbinput.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dbstats.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dbutils.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dbxface.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dmbuffer.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dmnames.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dmobject.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dmopcode.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dmresrc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dmresrcl.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dmresrcs.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dmutils.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dmwalk.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dsfield.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dsinit.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dsmethod.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dsmthdat.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dsobject.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dsopcode.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dsutils.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dswexec.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dswload.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dswscope.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dswstate.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/evevent.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/evgpe.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/evgpeblk.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/evmisc.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/evregion.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/evrgnini.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/evsci.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/evxface.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/evxfevnt.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/evxfregn.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exconfig.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exconvrt.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/excreate.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exdump.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exfield.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exfldio.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exmisc.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exmutex.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exnames.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exoparg1.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exoparg2.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exoparg3.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exoparg6.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exprep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exregion.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exresnte.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exresolv.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exresop.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exstore.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exstoren.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exstorob.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exsystem.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exutils.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/hwacpi.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/hwgpe.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/hwregs.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/hwsleep.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/hwtimer.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nsaccess.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nsalloc.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nsdump.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nsdumpdv.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nseval.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nsinit.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nsload.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nsnames.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nsobject.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nsparse.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nssearch.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nsutils.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nswalk.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nsxfeval.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nsxfname.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nsxfobj.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/osunixxf.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/psargs.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/psloop.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/psopcode.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/psparse.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/psscope.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/pstree.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/psutils.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/pswalk.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/psxface.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/rsaddr.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/rscalc.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/rscreate.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/rsdump.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/rsinfo.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/rsio.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/rsirq.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/rslist.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/rsmemory.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/rsmisc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/rsutils.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/rsxface.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tbconvrt.c#4 delete .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tbfadt.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tbfind.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tbget.c#4 delete .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tbgetall.c#3 delete .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tbinstal.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tbrsdt.c#4 delete .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tbutils.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tbxface.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tbxfroot.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utalloc.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utcache.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utclib.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utcopy.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utdebug.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utdelete.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/uteval.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utglobal.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utinit.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utmath.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utmisc.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utmutex.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utobject.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utresrc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utstate.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/uttrack.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utxface.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ipw/LICENSE#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ipw/ipw2100-1.3-i.fw.uu#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ipw/ipw2100-1.3-p.fw.uu#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ipw/ipw2100-1.3.fw.uu#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/iwi/LICENSE#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/iwi/ipw2200-bss.fw.uu#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/iwi/ipw2200-ibss.fw.uu#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/iwi/ipw2200-sniffer.fw.uu#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/oltr/if_oltr.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/if_pfsync.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/if_pfsync.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/crypto/via/padlock.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aacvar.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_asus.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_fujitsu.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_ibm.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/Osd/OsdDebug.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/Osd/OsdInterrupt.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/Osd/OsdMemory.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/Osd/OsdSchedule.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/Osd/OsdSynch.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/Osd/OsdTable.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_acad.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_button.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_cmbat.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_cpu.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_dock.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_ec.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_lid.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_pci_link.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_perf.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_quirk.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_resource.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_thermal.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_throttle.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_timer.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpivar.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/adlink/adlink.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/advansys/adv_eisa.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/advansys/adv_isa.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/advansys/adv_pci.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/advansys/adwcam.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aha/aha_isa.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aha/aha_mca.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ahb/ahb.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic/aic_cbus.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic/aic_isa.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic/aic_pccard.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx.seq#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amd/amd.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amr/amr_pci.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/an/if_an_isa.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/an/if_an_pccard.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/an/if_an_pci.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ar/if_ar.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/arcmsr/arcmsr.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/arcmsr/arcmsr.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/arl/if_arl_isa.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/asr/asr.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-card.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-cbus.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-chipset.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-disk.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-disk.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-dma.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-isa.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-lowlevel.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-queue.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-raid.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-raid.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-usb.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cam.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cd.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cd.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-fd.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-fd.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-tape.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-tape.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath_pci.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_athvar.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/atkbdc/atkbd_atkbdc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/atkbdc/psm.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/awi/if_awi_pccard.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bce/if_bce.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bfe/if_bfe.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bgereg.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bktr/bktr_os.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/buslogic/bt.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ce/if_ce.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ciss/ciss.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cm/if_cm_isa.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cm/smc90cx6.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cnw/if_cnw.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cp/if_cp.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cs/if_cs_isa.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cs/if_cs_pccard.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ct/ct_isa.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ctau/if_ct.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cx/if_cx.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_ael1002.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_common.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_firmware_exports.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_mc5.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_regs.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_sge_defs.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_t3_hw.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_tcb.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_version.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_vsc8211.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_xgmac.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_adapter.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_config.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_ioctl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_lro.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_main.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_osdep.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_sge.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/t3fw-3.2.bin.gz.uu#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cy/cy.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cy/cy_isa.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cy/cy_pci.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cy/cyvar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/dc/if_dc.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/de/if_de.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/dpt/dpt_eisa.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/dpt/dpt_pci.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_irq.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ed/if_ed.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ed/if_ed_cbus.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ed/if_ed_isa.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ed/if_ed_pccard.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ed/if_ed_pci.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/em/if_em.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/en/if_en_pci.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ep/if_ep_eisa.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ep/if_ep_isa.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ep/if_ep_mca.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ep/if_ep_pccard.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/esp/esp_sbus.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ex/if_ex_isa.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ex/if_ex_pccard.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/exca/exca.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fatm/if_fatm.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/creator.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fdc/fdc.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fe/if_fe.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/firewire.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/firewirereg.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/fwdev.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/fwmem.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/fwohci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/fwohci_pci.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/fwohcivar.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/if_fwe.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/if_fwip.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/sbp.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/sbp_targ.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fxp/if_fxp.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/gem/if_gem_pci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hatm/if_hatm.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hfa/hfa_pci.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hifn/hifn7751.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hifn/hifn7751reg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hifn/hifn7751var.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hme/if_hme_pci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hme/if_hme_sbus.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/entry.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/ioctl.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_mod.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ichsmb/ichsmb.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ichwd/ichwd.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ida/ida_eisa.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ida/ida_pci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/idt/idt_pci.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ie/if_ie_isa.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ieee488/pcii.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ieee488/tnt4882.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndis.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iicbus/icee.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/iicbus/iic.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iicbus/iicbb.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iicbus/iicbus.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iicbus/iicbus.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iicbus/iiconf.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iir/iir_pci.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ipmi/ipmi.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ipmi/ipmi_ssif.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ips/ips_pci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ipw/if_ipw.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ipw/if_ipwvar.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_ioctl.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_library.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_library.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_pci.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_sbus.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_stds.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_target.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_target.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_tpublic.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/ispmbox.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/ispreg.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/ispvar.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iwi/if_iwi.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iwi/if_iwireg.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iwi/if_iwivar.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgb/if_ixgb.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/le/if_le_cbus.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/le/if_le_isa.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/le/if_le_lebuffer.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/le/if_le_ledma.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/le/if_le_pci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/lge/if_lge.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/lmc/if_lmc.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mfi/mfi.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/brgphy.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/brgphyreg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/miidevs#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/rlphy.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mk48txx/mk48txx.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mlx/mlx.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mly/mly.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt.h#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_cam.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_cam.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_pci.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mse/mse.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/msk/if_msk.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/eth_z8e.dat.gz.uu#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/ethp_z8e.dat.gz.uu#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/if_mxge.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/if_mxge_var.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/my/if_my.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ncv/ncr53c500_pccard.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/nfe/if_nfe.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/nge/if_nge.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/nsp/nsp_pccard.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/nve/if_nve.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/patm/if_patm_attach.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pccard/pccard.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pccard/pccard_cis.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pccard/pccarddevs#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pccard/pccardvarp.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pccbb/pccbb.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pccbb/pccbb_pci.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pccbb/pccbbvar.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pcf/envctrl.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pcf/pcf_ebus.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pcf/pcf_isa.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pci.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pcireg.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pcivar.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pdq/if_fea.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pdq/if_fpa.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ppbus/if_plip.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ppbus/lpt.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ppbus/ppbconf.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ppbus/ppi.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ppbus/pps.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ppc/ppc.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ppc/ppcvar.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pst/pst-iop.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/puc/puc.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/puc/puc_bfe.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ral/if_ral_pci.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2560.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2661.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/random/randomdev_soft.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ray/if_ray.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/rc/rc.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/re/if_re.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/rr232x/osm_bsd.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/safe/safe.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sbni/if_sbni_isa.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sbni/if_sbni_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sbsh/if_sbsh.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/scc/scc_bfe.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/scc/scc_bfe_ebus.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/scc/scc_bfe_macio.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/scc/scc_bfe_sbus.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/scc/scc_core.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/scd/scd.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/si/si_eisa.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/si/si_isa.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/si/si_pci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sio/sio.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sk/if_sk.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sn/if_sn.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/snc/if_snc_cbus.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/snc/if_snc_pccard.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/snp/snp.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/ad1816.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/ess.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/gusc.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/mss.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/sb16.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/sb8.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/sbc.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/midi.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/midi.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/midiq.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/mpu401.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/mpu401.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/mpu_if.m#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/mpufoi_if.m#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/sequencer.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/sequencer.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/synth_if.m#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/als4000.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/atiixp.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/au88x0.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/aureal.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/cmi.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/cs4281.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/csa.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/csapcm.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/ds1.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/emu10k1.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/emu10kx-pcm.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/emu10kx.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/envy24.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/envy24ht.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/es137x.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/fm801.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/hda/hdac.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/hda/hdac_private.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/ich.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/maestro.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/maestro3.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/solo.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/spicds.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/t4dwave.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/via8233.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/via82c686.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/vibes.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/ac97.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/buffer.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/channel.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/channel_if.m#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/dsp.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/fake.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/feeder.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/feeder.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/feeder_fmt.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/feeder_rate.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/feeder_volume.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/sndstat.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/sound.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/sound.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/vchan.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/sbus/cs4231.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/usb/uaudio.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/usb/uaudio.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/usb/uaudio_pcm.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sr/if_sr.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/stg/tmc18c30_isa.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/stg/tmc18c30_pccard.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/stg/tmc18c30_pci.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/stge/if_stge.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sym/sym_hipd.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/syscons/fire/fire_saver.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/syscons/logo/logo_saver.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/syscons/rain/rain_saver.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/syscons/warp/warp_saver.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ti/if_ti.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/trm/trm.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/twa/tw_osl_freebsd.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/twe/twe_freebsd.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/tx/if_tx.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/txp/if_txp.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_core.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ubsec/ubsec.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ehci_pci.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_ural.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ohci_pci.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/sl811hs.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/sl811hsvar.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/slhci_pccard.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ubsa.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uhci.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uhci_pci.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/umass.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uplcom.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_quirks.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_subr.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uvscom.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/vge/if_vge.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/vx/if_vx_eisa.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/vx/if_vx_pci.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/watchdog/watchdog.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/wds/wd7000.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/wi/if_wi.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/wl/if_wl.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/xe/if_xe.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/zs/z8530reg.h#4 delete .. //depot/projects/scottl-camlock/src/sys/dev/zs/z8530var.h#3 delete .. //depot/projects/scottl-camlock/src/sys/dev/zs/zs.c#8 delete .. //depot/projects/scottl-camlock/src/sys/dev/zs/zs_macio.c#4 delete .. //depot/projects/scottl-camlock/src/sys/fs/cd9660/TODO#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/cd9660/TODO.hibler#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/cd9660/cd9660_bmap.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/cd9660/cd9660_iconv.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/cd9660/cd9660_lookup.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/cd9660/cd9660_mount.h#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/cd9660/cd9660_node.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/cd9660/cd9660_node.h#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/cd9660/cd9660_rrip.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/cd9660/cd9660_rrip.h#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/cd9660/cd9660_util.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/cd9660/cd9660_vfsops.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/cd9660/cd9660_vnops.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/cd9660/iso.h#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/cd9660/iso_rrip.h#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/devfs/devfs_vnops.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/fs/fdescfs/fdesc_vnops.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/fs/fifofs/fifo_vnops.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/fs/hpfs/hpfs_vfsops.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/fs/hpfs/hpfs_vnops.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/fs/msdosfs/msdosfs_denode.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/fs/msdosfs/msdosfs_vfsops.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/fs/msdosfs/msdosfs_vnops.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/fs/ntfs/ntfs_vfsops.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/fs/ntfs/ntfs_vnops.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nullfs/null_subr.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nullfs/null_vfsops.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nullfs/null_vnops.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nwfs/nwfs_node.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/fs/portalfs/portal_vfsops.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/fs/portalfs/portal_vnops.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/fs/procfs/procfs.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/fs/procfs/procfs_ioctl.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/fs/pseudofs/pseudofs.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/fs/pseudofs/pseudofs.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/fs/pseudofs/pseudofs_vncache.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/fs/smbfs/smbfs_node.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/fs/smbfs/smbfs_smb.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/fs/udf/udf.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/fs/udf/udf_vfsops.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/fs/udf/udf_vnops.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/fs/umapfs/umap_subr.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/fs/umapfs/umap_vfsops.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/fs/umapfs/umap_vnops.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/fs/unionfs/union_subr.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/fs/unionfs/union_vfsops.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/fs/unionfs/union_vnops.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/geom/eli/g_eli.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/geom/eli/g_eli_crypto.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/geom/eli/g_eli_ctl.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_apple.c#5 delete .. //depot/projects/scottl-camlock/src/sys/geom/geom_dev.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_disk.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_gpt.c#11 delete .. //depot/projects/scottl-camlock/src/sys/geom/geom_io.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/geom/journal/g_journal.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/geom/multipath/g_multipath.c#1 branch .. //depot/projects/scottl-camlock/src/sys/geom/multipath/g_multipath.h#1 branch .. //depot/projects/scottl-camlock/src/sys/geom/part/g_part.c#1 branch .. //depot/projects/scottl-camlock/src/sys/geom/part/g_part.h#1 branch .. //depot/projects/scottl-camlock/src/sys/geom/part/g_part_apm.c#1 branch .. //depot/projects/scottl-camlock/src/sys/geom/part/g_part_gpt.c#1 branch .. //depot/projects/scottl-camlock/src/sys/geom/part/g_part_if.m#1 branch .. //depot/projects/scottl-camlock/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/ext2fs/ext2_vnops.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/reiserfs/reiserfs_inode.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/reiserfs/reiserfs_vnops.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/acpica/OsdEnvironment.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/i386/acpica/acpi_machdep.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/i386/acpica/acpi_wakeup.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/i386/acpica/madt.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/bios/smapi.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/bios/smbios.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/i386/bios/vpd.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/GENERIC#15 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/NOTES#15 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/busdma_machdep.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/db_trace.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/elan-mmcr.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/geode.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/identcpu.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/intr_machdep.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/io_apic.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/legacy.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/local_apic.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/locore.s#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/machdep.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/mp_machdep.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/mptable.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/msi.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/nexus.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/trap.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/tsc.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/vm_machdep.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_misc.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_xenix.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/acpica_machdep.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/apicvar.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/intr_machdep.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/pcpu.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/pmap.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/smp.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/specialreg.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/i386/isa/clock.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/i386/isa/isa.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/isa/npx.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/i386/isa/prof_machdep.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/imgact_linux.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_machdep.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_proto.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_syscall.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_sysent.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/syscalls.master#15 integrate .. //depot/projects/scottl-camlock/src/sys/i4b/capi/iavc/iavc_isa.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/i4b/capi/iavc/iavc_pci.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i4b/layer1/isic/i4b_avm_a1.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/i4b/layer1/isic/i4b_isic_pnp.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/i4b/layer1/isic/i4b_itk_ix1.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i4b/layer1/isic/i4b_tel_s016.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i4b/layer1/isic/i4b_tel_s0163.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i4b/layer1/isic/i4b_tel_s08.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i4b/layer1/isic/i4b_usr_sti.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i4b/layer1/itjc/i4b_itjc_pci.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/i4b/layer1/iwic/i4b_iwic_pci.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/acpica/OsdEnvironment.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/acpica/madt.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/conf/DEFAULTS#7 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/conf/GENERIC#11 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/busdma_machdep.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/interrupt.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/nexus.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/pmap.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/trap.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/uma_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/acpica_machdep.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/intr.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/pcpu.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/isa/isa.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/isa/isa_common.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/isa/syscons_isa.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/isofs/cd9660/TODO#2 delete .. //depot/projects/scottl-camlock/src/sys/isofs/cd9660/TODO.hibler#2 delete .. //depot/projects/scottl-camlock/src/sys/isofs/cd9660/cd9660_bmap.c#4 delete .. //depot/projects/scottl-camlock/src/sys/isofs/cd9660/cd9660_iconv.c#2 delete .. //depot/projects/scottl-camlock/src/sys/isofs/cd9660/cd9660_lookup.c#6 delete .. //depot/projects/scottl-camlock/src/sys/isofs/cd9660/cd9660_mount.h#4 delete .. //depot/projects/scottl-camlock/src/sys/isofs/cd9660/cd9660_node.c#7 delete .. //depot/projects/scottl-camlock/src/sys/isofs/cd9660/cd9660_node.h#6 delete .. //depot/projects/scottl-camlock/src/sys/isofs/cd9660/cd9660_rrip.c#5 delete .. //depot/projects/scottl-camlock/src/sys/isofs/cd9660/cd9660_rrip.h#4 delete .. //depot/projects/scottl-camlock/src/sys/isofs/cd9660/cd9660_util.c#3 delete .. //depot/projects/scottl-camlock/src/sys/isofs/cd9660/cd9660_vfsops.c#10 delete .. //depot/projects/scottl-camlock/src/sys/isofs/cd9660/cd9660_vnops.c#6 delete .. //depot/projects/scottl-camlock/src/sys/isofs/cd9660/iso.h#6 delete .. //depot/projects/scottl-camlock/src/sys/isofs/cd9660/iso_rrip.h#3 delete .. //depot/projects/scottl-camlock/src/sys/kern/Make.tags.inc#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/bus_if.m#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/init_main.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_acct.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_acl.c#7 delete .. //depot/projects/scottl-camlock/src/sys/kern/kern_alq.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_clock.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_condvar.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_context.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_cpu.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_descrip.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_environment.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_event.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_exec.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_exit.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_fork.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_intr.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_jail.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_kse.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_ktrace.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_linker.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_lock.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_module.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_mutex.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_ntptime.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_proc.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_prot.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_resource.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_rwlock.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_shutdown.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_sig.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_switch.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_sx.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_synch.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_sysctl.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_thread.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_time.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_umtx.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_uuid.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_xxx.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/kern/link_elf.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/p1003_1b.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sched_4bsd.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sched_core.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sched_ule.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_firmware.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_lock.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_prf.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_prof.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_rman.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_smp.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_trap.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_witness.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sys_generic.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sys_pipe.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sys_process.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sys_socket.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sysv_ipc.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sysv_msg.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sysv_sem.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sysv_shm.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_debug.c#1 branch .. //depot/projects/scottl-camlock/src/sys/kern/uipc_mqueue.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_sem.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_sockbuf.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_socket.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_socket2.c#11 delete .. //depot/projects/scottl-camlock/src/sys/kern/uipc_syscalls.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_usrreq.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_acl.c#1 branch .. //depot/projects/scottl-camlock/src/sys/kern/vfs_aio.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_bio.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_cache.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_cluster.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_default.c#10 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Mar 28 18:55:51 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F8E216A563; Wed, 28 Mar 2007 18:55:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4439316A4D5 for ; Wed, 28 Mar 2007 18:55:48 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6FF1B13C4BF for ; Wed, 28 Mar 2007 18:55:47 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2SItloN011145 for ; Wed, 28 Mar 2007 18:55:47 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2SItlu2011136 for perforce@freebsd.org; Wed, 28 Mar 2007 18:55:47 GMT (envelope-from scottl@freebsd.org) Date: Wed, 28 Mar 2007 18:55:47 GMT Message-Id: <200703281855.l2SItlu2011136@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 116764 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Mar 2007 18:55:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=116764 Change 116764 by scottl@scottl-x64 on 2007/03/28 18:55:25 Lock the xpt_rescan functions. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#51 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#51 (text+ko) ==== @@ -247,6 +247,9 @@ STAILQ_HEAD(highpowerlist, ccb_hdr) highpowerq; int num_highpower; + /* queue for handling async rescan requests. */ + TAILQ_HEAD(, ccb_hdr) ccb_scanq; + /* Registered busses */ TAILQ_HEAD(,cam_eb) xpt_busses; u_int bus_generation; @@ -1405,22 +1408,40 @@ } /* thread to handle bus rescans */ -static TAILQ_HEAD(, ccb_hdr) ccb_scanq; static void xpt_scanner_thread(void *dummy) { - mtx_lock(&Giant); + cam_isrq_t queue; + union ccb *ccb; + struct cam_sim *sim; + for (;;) { - union ccb *ccb; - tsleep(&ccb_scanq, PRIBIO, "ccb_scanq", 0); - while ((ccb = (union ccb *)TAILQ_FIRST(&ccb_scanq)) != NULL) { - TAILQ_REMOVE(&ccb_scanq, &ccb->ccb_h, sim_links.tqe); + /* + * Wait for a rescan request to come in. When it does, splice + * it onto a queue from local storage so that the xpt lock + * doesn't need to be held while the requests are being + * processed. + */ + xpt_lock_buses(); + msleep(&xsoftc.ccb_scanq, &xsoftc.xpt_lock, PRIBIO, + "ccb_scanq", 0); + TAILQ_INIT(&queue); + TAILQ_CONCAT(&queue, &xsoftc.ccb_scanq, sim_links.tqe); + xpt_unlock_buses(); + + while ((ccb = (union ccb *)TAILQ_FIRST(&queue)) != NULL) { + TAILQ_REMOVE(&queue, &ccb->ccb_h, sim_links.tqe); + + sim = ccb->ccb_h.path->bus->sim; + mtx_lock(sim->mtx); + ccb->ccb_h.func_code = XPT_SCAN_BUS; ccb->ccb_h.cbfcnp = xptdone; xpt_setup_ccb(&ccb->ccb_h, ccb->ccb_h.path, 5); cam_periph_runccb(ccb, NULL, 0, 0, NULL); xpt_free_path(ccb->ccb_h.path); xpt_free_ccb(ccb); + mtx_unlock(sim->mtx); } } } @@ -1429,20 +1450,23 @@ xpt_rescan(union ccb *ccb) { struct ccb_hdr *hdr; - GIANT_REQUIRED; + /* * Don't make duplicate entries for the same paths. */ - TAILQ_FOREACH(hdr, &ccb_scanq, sim_links.tqe) { + xpt_lock_buses(); + TAILQ_FOREACH(hdr, &xsoftc.ccb_scanq, sim_links.tqe) { if (xpt_path_comp(hdr->path, ccb->ccb_h.path) == 0) { + xpt_unlock_buses(); xpt_print(ccb->ccb_h.path, "rescan already queued\n"); xpt_free_path(ccb->ccb_h.path); xpt_free_ccb(ccb); return; } } - TAILQ_INSERT_TAIL(&ccb_scanq, &ccb->ccb_h, sim_links.tqe); - wakeup(&ccb_scanq); + TAILQ_INSERT_TAIL(&xsoftc.ccb_scanq, &ccb->ccb_h, sim_links.tqe); + wakeup(&xsoftc.ccb_scanq); + xpt_unlock_buses(); } /* Functions accessed by the peripheral drivers */ @@ -1456,7 +1480,7 @@ TAILQ_INIT(&xsoftc.xpt_busses); TAILQ_INIT(&cam_bioq); - TAILQ_INIT(&ccb_scanq); + TAILQ_INIT(&xsoftc.ccb_scanq); STAILQ_INIT(&xsoftc.highpowerq); xsoftc.num_highpower = CAM_MAX_HIGHPOWER; From owner-p4-projects@FreeBSD.ORG Wed Mar 28 19:19:59 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 90B6216A403; Wed, 28 Mar 2007 19:19:59 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4B70516A400 for ; Wed, 28 Mar 2007 19:19:59 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 39FB513C4BA for ; Wed, 28 Mar 2007 19:19:59 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2SJJxQp051902 for ; Wed, 28 Mar 2007 19:19:59 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2SJJtGg051516 for perforce@freebsd.org; Wed, 28 Mar 2007 19:19:55 GMT (envelope-from scottl@freebsd.org) Date: Wed, 28 Mar 2007 19:19:55 GMT Message-Id: <200703281919.l2SJJtGg051516@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 116771 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Mar 2007 19:20:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=116771 Change 116771 by scottl@scottl-x64 on 2007/03/28 19:12:44 Bring in all of the src tree so that camcontrol will build properly. Affected files ... .. //depot/projects/scottl-camlock/src/COPYRIGHT#1 branch .. //depot/projects/scottl-camlock/src/LOCKS#1 branch .. //depot/projects/scottl-camlock/src/MAINTAINERS#1 branch .. //depot/projects/scottl-camlock/src/Makefile#1 branch .. //depot/projects/scottl-camlock/src/Makefile.inc1#1 branch .. //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#1 branch .. //depot/projects/scottl-camlock/src/README#1 branch .. //depot/projects/scottl-camlock/src/UPDATING#1 branch .. //depot/projects/scottl-camlock/src/bin/Makefile#1 branch .. //depot/projects/scottl-camlock/src/bin/Makefile.inc#1 branch .. //depot/projects/scottl-camlock/src/bin/cat/Makefile#1 branch .. //depot/projects/scottl-camlock/src/bin/cat/cat.1#1 branch .. //depot/projects/scottl-camlock/src/bin/cat/cat.c#1 branch .. //depot/projects/scottl-camlock/src/bin/chflags/Makefile#1 branch .. //depot/projects/scottl-camlock/src/bin/chflags/chflags.1#1 branch .. //depot/projects/scottl-camlock/src/bin/chflags/chflags.c#1 branch .. //depot/projects/scottl-camlock/src/bin/chio/Makefile#1 branch .. //depot/projects/scottl-camlock/src/bin/chio/chio.1#1 branch .. //depot/projects/scottl-camlock/src/bin/chio/chio.c#1 branch .. //depot/projects/scottl-camlock/src/bin/chio/defs.h#1 branch .. //depot/projects/scottl-camlock/src/bin/chio/pathnames.h#1 branch .. //depot/projects/scottl-camlock/src/bin/chmod/Makefile#1 branch .. //depot/projects/scottl-camlock/src/bin/chmod/chmod.1#1 branch .. //depot/projects/scottl-camlock/src/bin/chmod/chmod.c#1 branch .. //depot/projects/scottl-camlock/src/bin/cp/Makefile#1 branch .. //depot/projects/scottl-camlock/src/bin/cp/cp.1#1 branch .. //depot/projects/scottl-camlock/src/bin/cp/cp.c#1 branch .. //depot/projects/scottl-camlock/src/bin/cp/extern.h#1 branch .. //depot/projects/scottl-camlock/src/bin/cp/utils.c#1 branch .. //depot/projects/scottl-camlock/src/bin/csh/Makefile#1 branch .. //depot/projects/scottl-camlock/src/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/scottl-camlock/src/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/scottl-camlock/src/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/scottl-camlock/src/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/scottl-camlock/src/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/scottl-camlock/src/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/scottl-camlock/src/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/scottl-camlock/src/bin/csh/config.h#1 branch .. //depot/projects/scottl-camlock/src/bin/csh/config_p.h#1 branch .. //depot/projects/scottl-camlock/src/bin/csh/host.defs#1 branch .. //depot/projects/scottl-camlock/src/bin/csh/iconv.h#1 branch .. //depot/projects/scottl-camlock/src/bin/csh/iconv_stub.c#1 branch .. //depot/projects/scottl-camlock/src/bin/date/Makefile#1 branch .. //depot/projects/scottl-camlock/src/bin/date/date.1#1 branch .. //depot/projects/scottl-camlock/src/bin/date/date.c#1 branch .. //depot/projects/scottl-camlock/src/bin/date/extern.h#1 branch .. //depot/projects/scottl-camlock/src/bin/date/netdate.c#1 branch .. //depot/projects/scottl-camlock/src/bin/date/vary.c#1 branch .. //depot/projects/scottl-camlock/src/bin/date/vary.h#1 branch .. //depot/projects/scottl-camlock/src/bin/dd/Makefile#1 branch .. //depot/projects/scottl-camlock/src/bin/dd/args.c#1 branch .. //depot/projects/scottl-camlock/src/bin/dd/conv.c#1 branch .. //depot/projects/scottl-camlock/src/bin/dd/conv_tab.c#1 branch .. //depot/projects/scottl-camlock/src/bin/dd/dd.1#1 branch .. //depot/projects/scottl-camlock/src/bin/dd/dd.c#1 branch .. //depot/projects/scottl-camlock/src/bin/dd/dd.h#1 branch .. //depot/projects/scottl-camlock/src/bin/dd/extern.h#1 branch .. //depot/projects/scottl-camlock/src/bin/dd/gen.c#1 branch .. //depot/projects/scottl-camlock/src/bin/dd/misc.c#1 branch .. //depot/projects/scottl-camlock/src/bin/dd/position.c#1 branch .. //depot/projects/scottl-camlock/src/bin/dd/ref.ascii#1 branch .. //depot/projects/scottl-camlock/src/bin/dd/ref.ebcdic#1 branch .. //depot/projects/scottl-camlock/src/bin/dd/ref.ibm#1 branch .. //depot/projects/scottl-camlock/src/bin/dd/ref.lcase#1 branch .. //depot/projects/scottl-camlock/src/bin/dd/ref.oldascii#1 branch .. //depot/projects/scottl-camlock/src/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/scottl-camlock/src/bin/dd/ref.oldibm#1 branch .. //depot/projects/scottl-camlock/src/bin/dd/ref.pareven#1 branch .. //depot/projects/scottl-camlock/src/bin/dd/ref.parnone#1 branch .. //depot/projects/scottl-camlock/src/bin/dd/ref.parodd#1 branch .. //depot/projects/scottl-camlock/src/bin/dd/ref.parset#1 branch .. //depot/projects/scottl-camlock/src/bin/dd/ref.swab#1 branch .. //depot/projects/scottl-camlock/src/bin/dd/ref.ucase#1 branch .. //depot/projects/scottl-camlock/src/bin/df/Makefile#1 branch .. //depot/projects/scottl-camlock/src/bin/df/df.1#1 branch .. //depot/projects/scottl-camlock/src/bin/df/df.c#1 branch .. //depot/projects/scottl-camlock/src/bin/domainname/Makefile#1 branch .. //depot/projects/scottl-camlock/src/bin/domainname/domainname.1#1 branch .. //depot/projects/scottl-camlock/src/bin/domainname/domainname.c#1 branch .. //depot/projects/scottl-camlock/src/bin/echo/Makefile#1 branch .. //depot/projects/scottl-camlock/src/bin/echo/echo.1#1 branch .. //depot/projects/scottl-camlock/src/bin/echo/echo.c#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/Makefile#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/POSIX#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/README#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/buf.c#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/cbc.c#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/ed.1#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/ed.h#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/glbl.c#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/io.c#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/main.c#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/re.c#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/sub.c#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/=.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/Makefile#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/README#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/TODO#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/a.d#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/a.r#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/a.t#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/a1.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/a2.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/addr.d#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/addr.r#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/addr.t#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/addr1.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/addr2.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/ascii.t#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/bang1.d#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/bang1.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/bang1.r#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/bang1.t#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/bang2.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/c.d#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/c.r#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/c.t#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/c1.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/c2.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/d.d#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/d.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/d.r#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/d.t#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/e1.d#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/e1.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/e1.r#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/e1.t#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/e2.d#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/e2.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/e2.r#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/e2.t#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/e3.d#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/e3.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/e3.r#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/e3.t#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/e4.d#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/e4.r#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/e4.t#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/f1.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/f2.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/g1.d#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/g1.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/g1.r#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/g1.t#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/g2.d#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/g2.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/g2.r#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/g2.t#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/g3.d#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/g3.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/g3.r#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/g3.t#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/g4.d#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/g4.r#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/g4.t#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/g5.d#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/g5.r#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/g5.t#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/h.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/i.d#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/i.r#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/i.t#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/i1.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/i2.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/i3.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/j.d#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/j.r#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/j.t#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/k.d#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/k.r#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/k.t#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/k1.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/k2.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/k3.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/k4.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/l.d#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/l.r#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/l.t#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/m.d#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/m.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/m.r#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/m.t#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/n.d#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/n.r#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/n.t#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/nl.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/nl1.d#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/nl1.r#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/nl1.t#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/nl2.d#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/nl2.r#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/nl2.t#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/p.d#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/p.r#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/p.t#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/q.d#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/q.r#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/q.t#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/q1.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/r1.d#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/r1.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/r1.r#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/r1.t#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/r2.d#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/r2.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/r2.r#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/r2.t#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/r3.d#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/r3.r#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/r3.t#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/s1.d#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/s1.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/s1.r#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/s1.t#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/s10.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/s2.d#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/s2.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/s2.r#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/s2.t#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/s3.d#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/s3.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/s3.r#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/s3.t#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/s4.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/s5.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/s6.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/s7.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/s8.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/s9.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/t.d#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/t.r#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/t1.d#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/t1.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/t1.r#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/t1.t#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/t2.d#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/t2.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/t2.r#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/t2.t#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/u.d#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/u.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/u.r#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/u.t#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/v.d#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/v.r#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/v.t#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/w.d#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/w.r#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/w.t#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/w1.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/w2.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/w3.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/x.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/test/z.err#1 branch .. //depot/projects/scottl-camlock/src/bin/ed/undo.c#1 branch .. //depot/projects/scottl-camlock/src/bin/expr/Makefile#1 branch .. //depot/projects/scottl-camlock/src/bin/expr/expr.1#1 branch .. //depot/projects/scottl-camlock/src/bin/expr/expr.y#1 branch .. //depot/projects/scottl-camlock/src/bin/getfacl/Makefile#1 branch .. //depot/projects/scottl-camlock/src/bin/getfacl/getfacl.1#1 branch .. //depot/projects/scottl-camlock/src/bin/getfacl/getfacl.c#1 branch .. //depot/projects/scottl-camlock/src/bin/hostname/Makefile#1 branch .. //depot/projects/scottl-camlock/src/bin/hostname/hostname.1#1 branch .. //depot/projects/scottl-camlock/src/bin/hostname/hostname.c#1 branch .. //depot/projects/scottl-camlock/src/bin/kenv/Makefile#1 branch .. //depot/projects/scottl-camlock/src/bin/kenv/kenv.1#1 branch .. //depot/projects/scottl-camlock/src/bin/kenv/kenv.c#1 branch .. //depot/projects/scottl-camlock/src/bin/kill/Makefile#1 branch .. //depot/projects/scottl-camlock/src/bin/kill/kill.1#1 branch .. //depot/projects/scottl-camlock/src/bin/kill/kill.c#1 branch .. //depot/projects/scottl-camlock/src/bin/ln/Makefile#1 branch .. //depot/projects/scottl-camlock/src/bin/ln/ln.1#1 branch .. //depot/projects/scottl-camlock/src/bin/ln/ln.c#1 branch .. //depot/projects/scottl-camlock/src/bin/ln/symlink.7#1 branch .. //depot/projects/scottl-camlock/src/bin/ls/Makefile#1 branch .. //depot/projects/scottl-camlock/src/bin/ls/cmp.c#1 branch .. //depot/projects/scottl-camlock/src/bin/ls/extern.h#1 branch .. //depot/projects/scottl-camlock/src/bin/ls/ls.1#1 branch .. //depot/projects/scottl-camlock/src/bin/ls/ls.c#1 branch .. //depot/projects/scottl-camlock/src/bin/ls/ls.h#1 branch .. //depot/projects/scottl-camlock/src/bin/ls/print.c#1 branch .. //depot/projects/scottl-camlock/src/bin/ls/util.c#1 branch .. //depot/projects/scottl-camlock/src/bin/mkdir/Makefile#1 branch .. //depot/projects/scottl-camlock/src/bin/mkdir/mkdir.1#1 branch .. //depot/projects/scottl-camlock/src/bin/mkdir/mkdir.c#1 branch .. //depot/projects/scottl-camlock/src/bin/mv/Makefile#1 branch .. //depot/projects/scottl-camlock/src/bin/mv/mv.1#1 branch .. //depot/projects/scottl-camlock/src/bin/mv/mv.c#1 branch .. //depot/projects/scottl-camlock/src/bin/pax/Makefile#1 branch .. //depot/projects/scottl-camlock/src/bin/pax/ar_io.c#1 branch .. //depot/projects/scottl-camlock/src/bin/pax/ar_subs.c#1 branch .. //depot/projects/scottl-camlock/src/bin/pax/buf_subs.c#1 branch .. //depot/projects/scottl-camlock/src/bin/pax/cache.c#1 branch .. //depot/projects/scottl-camlock/src/bin/pax/cache.h#1 branch .. //depot/projects/scottl-camlock/src/bin/pax/cpio.1#1 branch .. //depot/projects/scottl-camlock/src/bin/pax/cpio.c#1 branch .. //depot/projects/scottl-camlock/src/bin/pax/cpio.h#1 branch .. //depot/projects/scottl-camlock/src/bin/pax/extern.h#1 branch .. //depot/projects/scottl-camlock/src/bin/pax/file_subs.c#1 branch .. //depot/projects/scottl-camlock/src/bin/pax/ftree.c#1 branch .. //depot/projects/scottl-camlock/src/bin/pax/ftree.h#1 branch .. //depot/projects/scottl-camlock/src/bin/pax/gen_subs.c#1 branch .. //depot/projects/scottl-camlock/src/bin/pax/getoldopt.c#1 branch .. //depot/projects/scottl-camlock/src/bin/pax/options.c#1 branch .. //depot/projects/scottl-camlock/src/bin/pax/options.h#1 branch .. //depot/projects/scottl-camlock/src/bin/pax/pat_rep.c#1 branch .. //depot/projects/scottl-camlock/src/bin/pax/pat_rep.h#1 branch .. //depot/projects/scottl-camlock/src/bin/pax/pax.1#1 branch .. //depot/projects/scottl-camlock/src/bin/pax/pax.c#1 branch .. //depot/projects/scottl-camlock/src/bin/pax/pax.h#1 branch .. //depot/projects/scottl-camlock/src/bin/pax/sel_subs.c#1 branch .. //depot/projects/scottl-camlock/src/bin/pax/sel_subs.h#1 branch .. //depot/projects/scottl-camlock/src/bin/pax/tables.c#1 branch .. //depot/projects/scottl-camlock/src/bin/pax/tables.h#1 branch .. //depot/projects/scottl-camlock/src/bin/pax/tar.1#1 branch .. //depot/projects/scottl-camlock/src/bin/pax/tar.c#1 branch .. //depot/projects/scottl-camlock/src/bin/pax/tar.h#1 branch .. //depot/projects/scottl-camlock/src/bin/pax/tty_subs.c#1 branch .. //depot/projects/scottl-camlock/src/bin/ps/Makefile#1 branch .. //depot/projects/scottl-camlock/src/bin/ps/extern.h#1 branch .. //depot/projects/scottl-camlock/src/bin/ps/fmt.c#1 branch .. //depot/projects/scottl-camlock/src/bin/ps/keyword.c#1 branch .. //depot/projects/scottl-camlock/src/bin/ps/nlist.c#1 branch .. //depot/projects/scottl-camlock/src/bin/ps/print.c#1 branch .. //depot/projects/scottl-camlock/src/bin/ps/ps.1#1 branch .. //depot/projects/scottl-camlock/src/bin/ps/ps.c#1 branch .. //depot/projects/scottl-camlock/src/bin/ps/ps.h#1 branch .. //depot/projects/scottl-camlock/src/bin/pwd/Makefile#1 branch .. //depot/projects/scottl-camlock/src/bin/pwd/pwd.1#1 branch .. //depot/projects/scottl-camlock/src/bin/pwd/pwd.c#1 branch .. //depot/projects/scottl-camlock/src/bin/rcp/Makefile#1 branch .. //depot/projects/scottl-camlock/src/bin/rcp/extern.h#1 branch .. //depot/projects/scottl-camlock/src/bin/rcp/rcp.1#1 branch .. //depot/projects/scottl-camlock/src/bin/rcp/rcp.c#1 branch .. //depot/projects/scottl-camlock/src/bin/rcp/util.c#1 branch .. //depot/projects/scottl-camlock/src/bin/realpath/Makefile#1 branch .. //depot/projects/scottl-camlock/src/bin/realpath/realpath.1#1 branch .. //depot/projects/scottl-camlock/src/bin/realpath/realpath.c#1 branch .. //depot/projects/scottl-camlock/src/bin/rm/Makefile#1 branch .. //depot/projects/scottl-camlock/src/bin/rm/rm.1#1 branch .. //depot/projects/scottl-camlock/src/bin/rm/rm.c#1 branch .. //depot/projects/scottl-camlock/src/bin/rmail/Makefile#1 branch .. //depot/projects/scottl-camlock/src/bin/rmdir/Makefile#1 branch .. //depot/projects/scottl-camlock/src/bin/rmdir/rmdir.1#1 branch .. //depot/projects/scottl-camlock/src/bin/rmdir/rmdir.c#1 branch .. //depot/projects/scottl-camlock/src/bin/setfacl/Makefile#1 branch .. //depot/projects/scottl-camlock/src/bin/setfacl/file.c#1 branch .. //depot/projects/scottl-camlock/src/bin/setfacl/mask.c#1 branch .. //depot/projects/scottl-camlock/src/bin/setfacl/merge.c#1 branch .. //depot/projects/scottl-camlock/src/bin/setfacl/remove.c#1 branch .. //depot/projects/scottl-camlock/src/bin/setfacl/setfacl.1#1 branch .. //depot/projects/scottl-camlock/src/bin/setfacl/setfacl.c#1 branch .. //depot/projects/scottl-camlock/src/bin/setfacl/setfacl.h#1 branch .. //depot/projects/scottl-camlock/src/bin/setfacl/util.c#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/Makefile#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/TOUR#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/alias.c#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/alias.h#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/arith.h#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/arith.y#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/arith_lex.l#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/bltin/echo.1#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/bltin/echo.c#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/builtins.def#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/cd.c#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/cd.h#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/error.c#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/error.h#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/eval.c#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/eval.h#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/exec.c#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/exec.h#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/expand.c#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/expand.h#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/funcs/cmv#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/funcs/dirs#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/funcs/kill#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/funcs/login#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/funcs/newgrp#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/funcs/popd#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/funcs/pushd#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/funcs/suspend#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/histedit.c#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/init.h#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/input.c#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/input.h#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/jobs.c#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/jobs.h#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/mail.c#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/mail.h#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/main.c#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/main.h#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/memalloc.c#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/memalloc.h#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/miscbltin.c#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/mkbuiltins#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/mkinit.c#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/mknodes.c#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/mksyntax.c#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/mktokens#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/myhistedit.h#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/mystring.c#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/mystring.h#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/nodes.c.pat#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/nodetypes#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/options.c#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/options.h#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/output.c#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/output.h#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/parser.c#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/parser.h#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/redir.c#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/redir.h#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/sh.1#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/shell.h#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/show.c#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/show.h#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/trap.c#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/trap.h#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/var.c#1 branch .. //depot/projects/scottl-camlock/src/bin/sh/var.h#1 branch .. //depot/projects/scottl-camlock/src/bin/sleep/Makefile#1 branch .. //depot/projects/scottl-camlock/src/bin/sleep/sleep.1#1 branch .. //depot/projects/scottl-camlock/src/bin/sleep/sleep.c#1 branch .. //depot/projects/scottl-camlock/src/bin/stty/Makefile#1 branch .. //depot/projects/scottl-camlock/src/bin/stty/cchar.c#1 branch .. //depot/projects/scottl-camlock/src/bin/stty/extern.h#1 branch .. //depot/projects/scottl-camlock/src/bin/stty/gfmt.c#1 branch .. //depot/projects/scottl-camlock/src/bin/stty/key.c#1 branch .. //depot/projects/scottl-camlock/src/bin/stty/modes.c#1 branch .. //depot/projects/scottl-camlock/src/bin/stty/print.c#1 branch .. //depot/projects/scottl-camlock/src/bin/stty/stty.1#1 branch .. //depot/projects/scottl-camlock/src/bin/stty/stty.c#1 branch .. //depot/projects/scottl-camlock/src/bin/stty/stty.h#1 branch .. //depot/projects/scottl-camlock/src/bin/stty/util.c#1 branch .. //depot/projects/scottl-camlock/src/bin/sync/Makefile#1 branch .. //depot/projects/scottl-camlock/src/bin/sync/sync.8#1 branch .. //depot/projects/scottl-camlock/src/bin/sync/sync.c#1 branch .. //depot/projects/scottl-camlock/src/bin/test/Makefile#1 branch .. //depot/projects/scottl-camlock/src/bin/test/TEST.README#1 branch .. //depot/projects/scottl-camlock/src/bin/test/TEST.csh#1 branch .. //depot/projects/scottl-camlock/src/bin/test/TEST.sh#1 branch .. //depot/projects/scottl-camlock/src/bin/test/test.1#1 branch .. //depot/projects/scottl-camlock/src/bin/test/test.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/AUTHORS#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/BUGS#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/COPYING#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/ChangeLog#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/FREEBSD-Xlist#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/FREEBSD-upgrade#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/INSTALL#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/MIRRORS.html#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/MIRRORS.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/NEWS#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/README#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/README.ldap#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/README.y2k#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/am_ops.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/amd.8#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/amd.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/amd.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/amfs_auto.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/amfs_direct.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/amfs_error.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/amfs_host.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/amfs_inherit.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/amfs_link.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/amfs_linkx.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/amfs_nfsl.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/amfs_nfsx.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/amfs_program.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/amfs_root.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/amfs_toplvl.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/amfs_union.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/amq_subr.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/amq_svc.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/autil.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/clock.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/conf.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/conf_parse.y#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/conf_tok.l#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/get_args.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/info_file.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/info_hesiod.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/info_ldap.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/info_ndbm.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/info_nis.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/info_nisplus.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/info_passwd.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/info_union.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/map.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/mapc.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/mntfs.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/nfs_prot_svc.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/nfs_start.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/nfs_subr.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/ops_TEMPLATE.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/ops_cachefs.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/ops_cdfs.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/ops_efs.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/ops_lofs.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/ops_mfs.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/ops_nfs.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/ops_nfs3.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/ops_nullfs.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/ops_pcfs.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/ops_tfs.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/ops_tmpfs.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/ops_ufs.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/ops_umapfs.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/ops_unionfs.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/ops_xfs.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/opts.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/restart.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/rpc_fwd.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/sched.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/srvr_amfs_auto.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amd/srvr_nfs.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amq/amq.8#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amq/amq.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amq/amq.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amq/amq_clnt.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amq/amq_xdr.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amq/pawd.1#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/amq/pawd.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/aux_conf.h.in#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/bootstrap#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/conf/checkmount/checkmount_bsd44.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/conf/mtab/mtab_bsd.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/conf/transp/transp_sockets.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/conf/trap/trap_default.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/conf/umount/umount_bsd44.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/doc/am-utils.texi#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/doc/texinfo.tex#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/doc/version.texi#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/fixmount/fixmount.8#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/fixmount/fixmount.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/fsinfo/fsi_analyze.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/fsinfo/fsi_data.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/fsinfo/fsi_dict.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/fsinfo/fsi_gram.y#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/fsinfo/fsi_lex.l#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/fsinfo/fsi_util.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/fsinfo/fsinfo.8#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/fsinfo/fsinfo.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/fsinfo/fsinfo.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/fsinfo/wr_atab.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/fsinfo/wr_bparam.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/fsinfo/wr_dumpset.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/fsinfo/wr_exportfs.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/fsinfo/wr_fstab.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/hlfsd/hlfsd.8#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/hlfsd/hlfsd.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/hlfsd/hlfsd.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/hlfsd/homedir.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/hlfsd/nfs_prot_svc.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/hlfsd/stubs.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/include/am_compat.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/include/am_defs.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/include/am_utils.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/include/am_xdr_func.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/include/amq_defs.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/include/mount_headers1.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/include/mount_headers2.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/ldap-id.ms#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/ldap-id.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/libamu/alloca.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/libamu/amu.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/libamu/hasmntopt.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/libamu/misc_rpc.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/libamu/mount_fs.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/libamu/mtab.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/libamu/nfs_prot_xdr.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/libamu/strerror.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/libamu/util.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/libamu/wire.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/libamu/xdr_func.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/libamu/xutil.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/m4/GNUmakefile#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/m4/amdgrep#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/m4/amindent#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/m4/autopat#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/m4/chop-aclocal.pl#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/m4/copy-if-newbig#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/m4/macros/HEADER#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/m4/macros/TRAILER#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/m4/mk-aclocal#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/m4/mkconf#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/m4/rmtspc#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/m4/update_build_version#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/mk-amd-map/mk-amd-map.8#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/mk-amd-map/mk-amd-map.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/scripts/Makefile.am#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/scripts/Makefile.in#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/scripts/am-eject.in#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/scripts/amd.conf-sample#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/scripts/amd.conf.5#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/scripts/amd2ldif.in#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/scripts/amd2sun.in#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/scripts/automount2amd.8#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/scripts/automount2amd.in#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/scripts/ctl-amd.in#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/scripts/ctl-hlfsd.in#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/scripts/expn.1#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/scripts/expn.in#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/scripts/fix-amd-map.in#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/scripts/fixrmtab.in#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/scripts/redhat-ctl-amd.in#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/scripts/wait4amd.in#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/scripts/wait4amd2die.in#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/tasks#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/wire-test/wire-test.8#1 branch .. //depot/projects/scottl-camlock/src/contrib/amd/wire-test/wire-test.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/AUTHORS#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/ChangeLog#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/Examples/ckbook.b#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/Examples/pi.b#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/Examples/primes.b#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/Examples/twins.b#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/FAQ#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/FREEBSD-upgrade#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/INSTALL#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/Makefile.am#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/Makefile.in#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/NEWS#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/README#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/Test/BUG.bc#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/Test/array.b#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/Test/arrayp.b#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/Test/aryprm.b#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/Test/atan.b#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/Test/checklib.b#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/Test/div.b#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/Test/exp.b#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/Test/fact.b#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/Test/jn.b#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/Test/ln.b#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/Test/mul.b#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/Test/raise.b#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/Test/signum#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/Test/sine.b#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/Test/sqrt.b#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/Test/sqrt1.b#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/Test/sqrt2.b#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/Test/testfn.b#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/Test/timetest#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/acconfig.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/aclocal.m4#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/bc/Makefile.am#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/bc/Makefile.in#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/bc/bc.y#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/bc/bcdefs.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/bc/const.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/bc/execute.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/bc/fix-libmath_h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/bc/global.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/bc/global.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/bc/libmath.b#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/bc/libmath.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/bc/load.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/bc/main.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/bc/proto.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/bc/sbc.y#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/bc/scan.l#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/bc/storage.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/bc/util.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/config.h.in#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/configure#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/configure.in#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/dc/Makefile.am#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/dc/Makefile.in#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/dc/array.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/dc/dc-proto.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/dc/dc-regdef.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/dc/dc.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/dc/dc.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/dc/eval.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/dc/misc.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/dc/numeric.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/dc/stack.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/dc/string.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/doc/Makefile.am#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/doc/Makefile.in#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/doc/bc.1#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/doc/bc.texi#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/doc/dc.1#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/doc/dc.texi#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/h/number.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/install-sh#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/lib/Makefile.am#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/lib/Makefile.in#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/lib/number.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/lib/testmul.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/lib/vfprintf.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/missing#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/mkinstalldirs#1 branch .. //depot/projects/scottl-camlock/src/contrib/bc/stamp-h.in#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/CHANGES#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/COPYRIGHT#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/FAQ#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/FAQ.xml#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/FREEBSD-Upgrade#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/FREEBSD-Xlist#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/Makefile.in#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/README#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/acconfig.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/Makefile.in#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/check/Makefile.in#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/check/check-tool.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/check/check-tool.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/check/named-checkconf.8#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/check/named-checkconf.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/check/named-checkconf.docbook#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/check/named-checkconf.html#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/check/named-checkzone.8#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/check/named-checkzone.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/check/named-checkzone.docbook#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/check/named-checkzone.html#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/dig/Makefile.in#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/dig/dig.1#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/dig/dig.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/dig/dig.docbook#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/dig/dig.html#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/dig/dighost.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/dig/host.1#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/dig/host.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/dig/host.docbook#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/dig/host.html#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/dig/include/dig/dig.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/dig/nslookup.1#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/dig/nslookup.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/dig/nslookup.docbook#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/dig/nslookup.html#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/dnssec/Makefile.in#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/dnssec/dnssec-keygen.8#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/dnssec/dnssec-keygen.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/dnssec/dnssec-keygen.html#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/dnssec/dnssec-signzone.8#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/dnssec/dnssec-signzone.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/dnssec/dnssec-signzone.html#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/dnssec/dnssectool.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/dnssec/dnssectool.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/Makefile.in#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/aclconf.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/builtin.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/client.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/config.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/control.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/controlconf.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/include/named/aclconf.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/include/named/builtin.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/include/named/client.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/include/named/config.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/include/named/control.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/include/named/globals.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/include/named/interfacemgr.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/include/named/listenlist.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/include/named/log.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/include/named/logconf.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/include/named/lwaddr.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/include/named/lwdclient.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/include/named/lwresd.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/include/named/lwsearch.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/include/named/main.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/include/named/notify.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/include/named/query.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/include/named/server.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/include/named/sortlist.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/include/named/tkeyconf.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/include/named/tsigconf.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/include/named/types.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/include/named/update.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/include/named/xfrout.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/include/named/zoneconf.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/interfacemgr.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/listenlist.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/log.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/logconf.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/lwaddr.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/lwdclient.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/lwderror.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/lwdgabn.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/lwdgnba.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/lwdgrbn.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/lwdnoop.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/lwresd.8#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/lwresd.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/lwresd.docbook#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/lwresd.html#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/lwsearch.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/main.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/named.8#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/named.conf.5#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/named.conf.docbook#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/named.conf.html#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/named.docbook#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/named.html#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/notify.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/query.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/server.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/sortlist.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/tkeyconf.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/tsigconf.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/unix/Makefile.in#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/unix/include/named/os.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/unix/os.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/update.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/xfrout.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/zoneconf.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/nsupdate/Makefile.in#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/nsupdate/nsupdate.8#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/nsupdate/nsupdate.docbook#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/nsupdate/nsupdate.html#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/rndc/Makefile.in#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/rndc/include/rndc/os.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/rndc/rndc-confgen.8#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/rndc/rndc-confgen.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/rndc/rndc-confgen.docbook#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/rndc/rndc-confgen.html#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/rndc/rndc.8#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/rndc/rndc.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/rndc/rndc.conf#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/rndc/rndc.conf.5#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/rndc/rndc.conf.docbook#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/rndc/rndc.conf.html#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/rndc/rndc.docbook#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/rndc/rndc.html#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/rndc/unix/Makefile.in#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/rndc/unix/os.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/rndc/util.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/rndc/util.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/config.guess#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/config.sub#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/config.threads.in#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/configure.in#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/Makefile.in#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/arm/Bv9ARM.ch01.html#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/arm/Bv9ARM.ch02.html#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/arm/Bv9ARM.ch03.html#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/arm/Bv9ARM.ch04.html#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/arm/Bv9ARM.ch05.html#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/arm/Bv9ARM.ch06.html#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/arm/Bv9ARM.ch07.html#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/arm/Bv9ARM.ch08.html#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/arm/Bv9ARM.ch09.html#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/arm/Bv9ARM.html#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/arm/Makefile.in#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/arm/README-SGML#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/draft/update#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/misc/Makefile.in#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/misc/dnssec#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/misc/format-options.pl#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/misc/ipv6#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/misc/migration#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/misc/migration-4to9#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/misc/options#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/misc/rfc-compliance#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/misc/roadmap#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/misc/sdb#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/index#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc1032.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc1033.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc1034.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc1035.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc1101.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc1122.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc1123.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc1183.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc1348.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc1535.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc1536.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc1537.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc1591.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc1611.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc1612.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc1706.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc1712.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc1750.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc1876.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc1886.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc1982.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc1995.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc1996.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc2052.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc2104.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc2119.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc2133.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc2136.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc2137.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc2163.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc2168.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc2181.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc2230.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc2308.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc2317.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc2373.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc2374.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc2375.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc2418.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc2535.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc2536.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc2537.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc2538.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc2539.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc2540.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc2541.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc2553.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc2671.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc2672.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc2673.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc2782.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc2825.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc2826.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc2845.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc2874.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc2915.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc2929.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc2930.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc2931.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc3007.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc3008.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc3071.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc3090.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc3110.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc3123.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc3152.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc3197.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc3225.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc3226.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc3258.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc3363.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc3364.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc3425.txt#1 branch .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/rfc/rfc3445.txt#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Mar 28 19:22:18 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 85ADE16A413; Wed, 28 Mar 2007 19:22:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 291EA16A40B; Wed, 28 Mar 2007 19:22:18 +0000 (UTC) (envelope-from hselasky@c2i.net) Received: from swip.net (mailfe02.swip.net [212.247.154.33]) by mx1.freebsd.org (Postfix) with ESMTP id 51B8C13C4EE; Wed, 28 Mar 2007 19:22:16 +0000 (UTC) (envelope-from hselasky@c2i.net) X-Cloudmark-Score: 0.000000 [] Received: from [193.217.102.48] (account mc467741@c2i.net HELO [10.0.0.249]) by mailfe02.swip.net (CommuniGate Pro SMTP 5.1.7) with ESMTPA id 452927742; Wed, 28 Mar 2007 20:22:14 +0200 From: Hans Petter Selasky To: Scott Long Date: Wed, 28 Mar 2007 20:21:54 +0200 User-Agent: KMail/1.9.5 References: <200703281803.l2SI3u28016029@repoman.freebsd.org> In-Reply-To: <200703281803.l2SI3u28016029@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200703282021.54511.hselasky@c2i.net> Cc: Perforce Change Reviews Subject: Re: PERFORCE change 116755 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Mar 2007 19:22:18 -0000 On Wednesday 28 March 2007 20:03, Scott Long wrote: > http://perforce.freebsd.org/chv.cgi?CH=116755 > > Change 116755 by scottl@scottl-x64 on 2007/03/28 18:03:15 > > Work around malloc locking constraints. > > Affected files ... > > .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#15 edit > > Differences ... > Isn't it possible to pre-allocate this memory somewhere? > > + /* XXX Should be M_WAITOK */ > rcap_buf = malloc(sizeof(struct scsi_read_capacity_data), > - M_TEMP, M_WAITOK); > + M_TEMP, M_NOWAIT); > + if (rcap_buf == NULL) > + return (ENOMEM); > > scsi_read_capacity(&ccb->csio, > /*retries*/ 1, --HPS From owner-p4-projects@FreeBSD.ORG Wed Mar 28 19:43:25 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E39216A406; Wed, 28 Mar 2007 19:43:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E708D16A400 for ; Wed, 28 Mar 2007 19:43:24 +0000 (UTC) (envelope-from scottl@samsco.org) Received: from pooker.samsco.org (pooker.samsco.org [168.103.85.57]) by mx1.freebsd.org (Postfix) with ESMTP id A0DBE13C4BC for ; Wed, 28 Mar 2007 19:43:24 +0000 (UTC) (envelope-from scottl@samsco.org) Received: from phobos.samsco.home (phobos.samsco.home [192.168.254.11]) (authenticated bits=0) by pooker.samsco.org (8.13.8/8.13.8) with ESMTP id l2SJPoTD050837; Wed, 28 Mar 2007 13:25:55 -0600 (MDT) (envelope-from scottl@samsco.org) Message-ID: <460AC13B.4080601@samsco.org> Date: Wed, 28 Mar 2007 13:25:47 -0600 From: Scott Long User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.1.2pre) Gecko/20070111 SeaMonkey/1.1 MIME-Version: 1.0 To: Hans Petter Selasky References: <200703281803.l2SI3u28016029@repoman.freebsd.org> <200703282021.54511.hselasky@c2i.net> In-Reply-To: <200703282021.54511.hselasky@c2i.net> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (pooker.samsco.org [168.103.85.57]); Wed, 28 Mar 2007 12:25:55 -0700 (MST) X-Spam-Status: No, score=-1.4 required=3.8 tests=ALL_TRUSTED autolearn=failed version=3.1.1 X-Spam-Checker-Version: SpamAssassin 3.1.1 (2006-03-10) on pooker.samsco.org Cc: Perforce Change Reviews , Scott Long Subject: Re: PERFORCE change 116755 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Mar 2007 19:43:25 -0000 Hans Petter Selasky wrote: > On Wednesday 28 March 2007 20:03, Scott Long wrote: >> http://perforce.freebsd.org/chv.cgi?CH=116755 >> >> Change 116755 by scottl@scottl-x64 on 2007/03/28 18:03:15 >> >> Work around malloc locking constraints. >> >> Affected files ... >> >> .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#15 edit >> >> Differences ... >> > > Isn't it possible to pre-allocate this memory somewhere? > Not very easily, no. Many other places in the driver pre-allocate, but not here. I'll fix this fragment at some point, but for now I need to push forward with other things. If you're interested in helping, I be thrilled =-) Scott From owner-p4-projects@FreeBSD.ORG Wed Mar 28 21:27:58 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 78DFB16A402; Wed, 28 Mar 2007 21:27:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 571CF16A411 for ; Wed, 28 Mar 2007 21:27:58 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 46F9B13C46E for ; Wed, 28 Mar 2007 21:27:58 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2SLRwOW062323 for ; Wed, 28 Mar 2007 21:27:58 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2SLRvd6062303 for perforce@freebsd.org; Wed, 28 Mar 2007 21:27:57 GMT (envelope-from marcel@freebsd.org) Date: Wed, 28 Mar 2007 21:27:57 GMT Message-Id: <200703282127.l2SLRvd6062303@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 Cc: Subject: PERFORCE change 116788 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Mar 2007 21:27:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=116788 Change 116788 by marcel@marcel_jnpr on 2007/03/28 21:27:26 IFC @116786 Affected files ... .. //depot/projects/uart/boot/arm/at91/boot2/boot2.c#3 integrate .. //depot/projects/uart/boot/arm/at91/libat91/memcmp.c#2 integrate .. //depot/projects/uart/boot/arm/at91/libat91/strlen.c#2 integrate .. //depot/projects/uart/dev/fxp/if_fxp.c#27 integrate .. //depot/projects/uart/dev/isp/isp_sbus.c#15 integrate .. //depot/projects/uart/dev/re/if_re.c#22 integrate .. //depot/projects/uart/dev/scc/scc_bfe.h#22 integrate .. //depot/projects/uart/dev/scc/scc_core.c#29 integrate .. //depot/projects/uart/dev/scc/scc_if.m#10 integrate .. //depot/projects/uart/dev/sio/sio_pci.c#7 integrate .. //depot/projects/uart/dev/uart/uart_core.c#58 integrate .. //depot/projects/uart/dev/uart/uart_dev_ns8250.c#48 integrate .. //depot/projects/uart/netgraph/netflow/ng_netflow.c#8 integrate .. //depot/projects/uart/netgraph/netflow/ng_netflow.h#6 integrate .. //depot/projects/uart/netinet/tcp_input.c#31 integrate Differences ... ==== //depot/projects/uart/boot/arm/at91/boot2/boot2.c#3 (text+ko) ==== @@ -14,7 +14,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/boot2.c,v 1.3 2006/11/16 00:47:31 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/boot2.c,v 1.4 2007/03/28 21:18:45 imp Exp $"); #include #include @@ -114,12 +114,10 @@ char *s; s = cmd; - if (c) - *s++ = c; + if (c == 0) + c = getc(10000); for (;;) { - c = getc(10000); - - switch (c = getc(10000)) { + switch (c) { case 0: break; case '\177': @@ -138,6 +136,7 @@ *s++ = c; xputchar(c); } + c = getc(10000); } } @@ -170,7 +169,8 @@ /* Present the user with the boot2 prompt. */ - strcpy(kname, PATH_KERNEL); + if (*kname == '\0') + strcpy(kname, PATH_KERNEL); for (;;) { printf("\nDefault: %s\nboot: ", kname); if (!autoboot || (c = getc(2)) != -1) @@ -252,6 +252,7 @@ opts ^= OPT_SET(flags[i]); } } else { + arg--; if ((i = ep - arg)) { if ((size_t)i >= sizeof(kname)) return -1; ==== //depot/projects/uart/boot/arm/at91/libat91/memcmp.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/arm/at91/libat91/memcmp.c,v 1.2 2006/11/09 20:32:36 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/arm/at91/libat91/memcmp.c,v 1.3 2007/03/28 21:15:50 imp Exp $"); #include "lib.h" @@ -34,5 +34,5 @@ while ((--size) && (*to++ == *from++)) continue; - return (*to != *from); + return (size || (*to != *from)); } ==== //depot/projects/uart/boot/arm/at91/libat91/strlen.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/arm/at91/libat91/strlen.c,v 1.2 2006/11/09 20:32:36 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/arm/at91/libat91/strlen.c,v 1.3 2007/03/28 21:12:43 imp Exp $"); /****************************************************************************** * @@ -64,5 +64,5 @@ const char *ptr = buffer; while (*ptr++) continue; - return (ptr - buffer); + return (ptr - buffer - 1); } ==== //depot/projects/uart/dev/fxp/if_fxp.c#27 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.264 2007/02/23 12:18:41 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.265 2007/03/28 18:10:50 remko Exp $"); /* * Intel EtherExpress Pro/100B PCI Fast Ethernet driver @@ -178,6 +178,7 @@ { 0x1065, -1, "Intel 82562ET/EZ/GT/GZ PRO/100 VE Ethernet" }, { 0x1068, -1, "Intel 82801FBM (ICH6-M) Pro/100 VE Ethernet" }, { 0x1069, -1, "Intel 82562EM/EX/GX Pro/100 Ethernet" }, + { 0x1091, -1, "Intel 82562GX Pro/100 Ethernet" }, { 0x1092, -1, "Intel Pro/100 VE Network Connection" }, { 0x1093, -1, "Intel Pro/100 VM Network Connection" }, { 0x1094, -1, "Intel Pro/100 946GZ (ICH7) Network Connection" }, ==== //depot/projects/uart/dev/isp/isp_sbus.c#15 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_sbus.c,v 1.30 2007/03/13 06:46:08 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_sbus.c,v 1.31 2007/03/28 16:34:11 mjacob Exp $"); #include #include @@ -193,8 +193,6 @@ sbs->sbus_dev = dev; sbs->sbus_reg = regs; sbs->sbus_mdvec = mdvec; - isp->isp_bus_tag = rman_get_bustag(regs); - isp->isp_bus_handle = rman_get_bushandle(regs); sbs->sbus_poff[BIU_BLOCK >> _BLK_REG_SHFT] = BIU_REGS_OFF; sbs->sbus_poff[MBOX_BLOCK >> _BLK_REG_SHFT] = SBUS_MBOX_REGS_OFF; @@ -202,6 +200,8 @@ sbs->sbus_poff[RISC_BLOCK >> _BLK_REG_SHFT] = SBUS_RISC_REGS_OFF; sbs->sbus_poff[DMA_BLOCK >> _BLK_REG_SHFT] = DMA_REGS_OFF; isp = &sbs->sbus_isp; + isp->isp_bus_tag = rman_get_bustag(regs); + isp->isp_bus_handle = rman_get_bushandle(regs); isp->isp_mdvec = &sbs->sbus_mdvec; isp->isp_bustype = ISP_BT_SBUS; isp->isp_type = ISP_HA_SCSI_UNKNOWN; ==== //depot/projects/uart/dev/re/if_re.c#22 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.87 2007/03/04 03:38:07 csjp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.88 2007/03/28 18:07:12 remko Exp $"); /* * RealTek 8139C+/8169/8169S/8110S/8168/8111/8101E PCI NIC driver @@ -182,6 +182,8 @@ "RealTek 8169S Single-chip Gigabit Ethernet" }, { RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8169_8110SB, "RealTek 8169SB/8110SB Single-chip Gigabit Ethernet" }, + { RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8169_8110SC, + "RealTek 8169SC/8110SC Single-chip Gigabit Ethernet" }, { RT_VENDORID, RT_DEVICEID_8169SC, RL_HWREV_8169_8110SC, "RealTek 8169SC/8110SC Single-chip Gigabit Ethernet" }, { RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8110S, ==== //depot/projects/uart/dev/scc/scc_bfe.h#22 (text) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/scc/scc_bfe.h,v 1.5 2007/03/22 23:45:25 marcel Exp $ + * $FreeBSD: src/sys/dev/scc/scc_bfe.h,v 1.6 2007/03/28 18:05:17 marcel Exp $ */ #ifndef _DEV_SCC_BFE_H_ @@ -92,6 +92,7 @@ struct scc_mode ch_mode[SCC_NMODES]; u_int ch_nr; + int ch_enabled:1; int ch_sysdev:1; uint32_t ch_ipend; ==== //depot/projects/uart/dev/scc/scc_core.c#29 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/scc/scc_core.c,v 1.9 2007/03/28 06:45:33 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/scc/scc_core.c,v 1.10 2007/03/28 18:05:17 marcel Exp $"); #include #include @@ -162,6 +162,10 @@ resource_list_init(&ch->ch_rlist); ch->ch_nr = c + 1; + if (!SCC_ENABLED(sc, ch)) + goto next; + + ch->ch_enabled = 1; resource_list_add(&ch->ch_rlist, sc->sc_rtype, 0, start, start + sz - 1, sz); rle = resource_list_find(&ch->ch_rlist, sc->sc_rtype, 0); @@ -192,6 +196,7 @@ } } + next: start += (cl->cl_range < 0) ? -size : size; sysdev |= ch->ch_sysdev; } ==== //depot/projects/uart/dev/scc/scc_if.m#10 (text) ==== @@ -23,7 +23,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $FreeBSD: src/sys/dev/scc/scc_if.m,v 1.1 2006/03/30 18:33:22 marcel Exp $ +# $FreeBSD: src/sys/dev/scc/scc_if.m,v 1.2 2007/03/28 18:05:17 marcel Exp $ #include #include @@ -38,6 +38,15 @@ INTERFACE scc; +# Default implementations of some methods. +CODE { + static int + default_enabled(struct scc_softc *this, struct scc_chan *ch) + { + return (1); + } +} + # attach() - attach hardware. # This method is called when the device is being attached. All resources # have been allocated. The intend of this method is to setup the hardware @@ -50,6 +59,13 @@ int reset; }; +# enabled() +METHOD int enabled { + struct scc_softc *this; + struct scc_chan *chan; +} DEFAULT default_enabled; + +# iclear() METHOD void iclear { struct scc_softc *this; struct scc_chan *chan; ==== //depot/projects/uart/dev/sio/sio_pci.c#7 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sio/sio_pci.c,v 1.21 2005/05/29 04:42:25 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sio/sio_pci.c,v 1.22 2007/03/28 18:56:27 maxim Exp $"); #include #include @@ -78,6 +78,7 @@ { 0x0000151f, "SmartLink 5634PCV SurfRider", 0x10 }, { 0x0103115d, "Xircom Cardbus modem", 0x10 }, { 0x432214e4, "Broadcom 802.11g/GPRS CardBus (Serial)", 0x10 }, + { 0x98359710, "MosChip MCS9835 PCI Dual UART", 0x10 }, { 0x01c0135c, "Quatech SSCLP-200/300", 0x18 /* * NB: You must mount the "SPAD" jumper to correctly detect ==== //depot/projects/uart/dev/uart/uart_core.c#58 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_core.c,v 1.20 2007/02/23 12:18:57 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_core.c,v 1.21 2007/03/28 18:26:12 marcel Exp $"); #ifndef KLD_MODULE #include "opt_comconsole.h" @@ -371,7 +371,7 @@ uart_cpu_eqres(&sc->sc_bas, &sysdev->bas)) { /* XXX check if ops matches class. */ sc->sc_sysdev = sysdev; - break; + sysdev->bas.rclk = sc->sc_bas.rclk; } } ==== //depot/projects/uart/dev/uart/uart_dev_ns8250.c#48 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_ns8250.c,v 1.24 2007/01/18 22:01:19 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_ns8250.c,v 1.25 2007/03/28 18:34:59 marcel Exp $"); #include #include @@ -81,7 +81,9 @@ uart_barrier(bas); /* 1/10th the time to transmit 1 character (estimate). */ - return (16000000 * divisor / bas->rclk); + if (divisor <= 134) + return (16000000 * divisor / bas->rclk); + return (16000 * divisor / (bas->rclk / 1000)); } static int ==== //depot/projects/uart/netgraph/netflow/ng_netflow.c#8 (text+ko) ==== @@ -28,11 +28,12 @@ */ static const char rcs_id[] = - "@(#) $FreeBSD: src/sys/netgraph/netflow/ng_netflow.c,v 1.13 2006/10/11 15:27:13 glebius Exp $"; + "@(#) $FreeBSD: src/sys/netgraph/netflow/ng_netflow.c,v 1.14 2007/03/28 13:59:13 glebius Exp $"; #include #include #include +#include #include #include #include ==== //depot/projects/uart/netgraph/netflow/ng_netflow.h#6 (text+ko) ==== @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $SourceForge: ng_netflow.h,v 1.26 2004/09/04 15:44:55 glebius Exp $ - * $FreeBSD: src/sys/netgraph/netflow/ng_netflow.h,v 1.9 2006/02/09 11:42:17 glebius Exp $ + * $FreeBSD: src/sys/netgraph/netflow/ng_netflow.h,v 1.10 2007/03/28 13:59:13 glebius Exp $ */ #ifndef _NG_NETFLOW_H_ @@ -34,7 +34,7 @@ #define NG_NETFLOW_NODE_TYPE "netflow" #define NGM_NETFLOW_COOKIE 1137078102 -#define NG_NETFLOW_MAXIFACES 2048 +#define NG_NETFLOW_MAXIFACES USHRT_MAX /* Hook names */ ==== //depot/projects/uart/netinet/tcp_input.c#31 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)tcp_input.c 8.12 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.329 2007/03/24 22:15:02 maxim Exp $ + * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.330 2007/03/28 12:58:13 andre Exp $ */ #include "opt_ipfw.h" /* for ipfw_fwd */ @@ -726,7 +726,7 @@ */ if ((blackhole == 1 && (thflags & TH_SYN)) || blackhole == 2) - goto drop; + goto dropunlock; rstreason = BANDLIM_RST_CLOSEDPORT; goto dropwithreset; From owner-p4-projects@FreeBSD.ORG Wed Mar 28 21:31:04 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2441C16A476; Wed, 28 Mar 2007 21:31:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D3D0516A40A for ; Wed, 28 Mar 2007 21:31:03 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C184013C4BB for ; Wed, 28 Mar 2007 21:31:03 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2SLV3gN067755 for ; Wed, 28 Mar 2007 21:31:03 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2SLV3Hv067736 for perforce@freebsd.org; Wed, 28 Mar 2007 21:31:03 GMT (envelope-from gabor@freebsd.org) Date: Wed, 28 Mar 2007 21:31:03 GMT Message-Id: <200703282131.l2SLV3Hv067736@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 116791 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Mar 2007 21:31:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=116791 Change 116791 by gabor@gabor_server on 2007/03/28 21:30:35 Add missing endline escape Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#8 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#8 (text+ko) ==== @@ -1592,7 +1592,7 @@ PLIST_SUB+= OSREL=${OSREL} PREFIX=%D LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} SUB_LIST+= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \ - DATADIR=${DATADIR} DOCSDIR=${DOCSDIR} EXAMPLESDIR=${EXAMPLESDIR} + DATADIR=${DATADIR} DOCSDIR=${DOCSDIR} EXAMPLESDIR=${EXAMPLESDIR} \ WWWDIR=${WWWDIR} PLIST_REINPLACE+= dirrmtry stopdaemon From owner-p4-projects@FreeBSD.ORG Thu Mar 29 04:56:19 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5126B16A402; Thu, 29 Mar 2007 04:56:19 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EA49816A400 for ; Thu, 29 Mar 2007 04:56:18 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C397F13C457 for ; Thu, 29 Mar 2007 04:56:18 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2T4uInv051565 for ; Thu, 29 Mar 2007 04:56:18 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2T4uIlE051505 for perforce@freebsd.org; Thu, 29 Mar 2007 04:56:18 GMT (envelope-from scottl@freebsd.org) Date: Thu, 29 Mar 2007 04:56:18 GMT Message-Id: <200703290456.l2T4uIlE051505@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 116813 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Mar 2007 04:56:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=116813 Change 116813 by scottl@scottl-x64 on 2007/03/29 04:55:27 Use xpt_alloc_ccb_nowait() to avoid malloc problems. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pass.c#21 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pass.c#21 (text+ko) ==== @@ -490,7 +490,7 @@ inccb->ccb_h.pinfo.priority); ccb_malloced = 0; } else { - ccb = xpt_alloc_ccb(periph->sim); + ccb = xpt_alloc_ccb_nowait(periph->sim); if (ccb != NULL) xpt_setup_ccb(&ccb->ccb_h, periph->path, From owner-p4-projects@FreeBSD.ORG Thu Mar 29 05:04:34 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9477316A404; Thu, 29 Mar 2007 05:04:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6E49316A402 for ; Thu, 29 Mar 2007 05:04:34 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5FECE13C459 for ; Thu, 29 Mar 2007 05:04:34 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2T54Til089767 for ; Thu, 29 Mar 2007 05:04:29 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2T54ThK089734 for perforce@freebsd.org; Thu, 29 Mar 2007 05:04:29 GMT (envelope-from scottl@freebsd.org) Date: Thu, 29 Mar 2007 05:04:29 GMT Message-Id: <200703290504.l2T54ThK089734@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 116814 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Mar 2007 05:04:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=116814 Change 116814 by scottl@scottl-x64 on 2007/03/29 05:04:02 The changer-mini-scheduler is fundamentally broken; as soon as an I/O needs to be deferred, an unescapable spinloop is triggered with the SIM lock held. Avoid this by moving a code block around that probably should have been moved around anyways. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#16 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#16 (text+ko) ==== @@ -1165,6 +1165,14 @@ */ if (changer->devq.qfrozen_cnt > 0) { + /* + * We always need to reset the frozen count and clear the + * active flag. + */ + changer->devq.qfrozen_cnt--; + changer->cur_device->flags &= ~CD_FLAG_ACTIVE; + changer->cur_device->flags &= ~CD_FLAG_SCHED_ON_COMP; + if (changer->cur_device->outstanding_cmds > 0) { changer->cur_device->flags |= CD_FLAG_SCHED_ON_COMP; changer->cur_device->bufs_left = @@ -1179,14 +1187,6 @@ } /* - * We always need to reset the frozen count and clear the - * active flag. - */ - changer->devq.qfrozen_cnt--; - changer->cur_device->flags &= ~CD_FLAG_ACTIVE; - changer->cur_device->flags &= ~CD_FLAG_SCHED_ON_COMP; - - /* * Check to see whether the current device has any I/O left * to do. If so, requeue it at the end of the queue. If * not, there is no need to requeue it. From owner-p4-projects@FreeBSD.ORG Thu Mar 29 07:15:08 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BFFD816A406; Thu, 29 Mar 2007 07:15:08 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9485D16A401 for ; Thu, 29 Mar 2007 07:15:08 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6DDC913C44C for ; Thu, 29 Mar 2007 07:15:08 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2T7F8qv038892 for ; Thu, 29 Mar 2007 07:15:08 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2T7F7r3038874 for perforce@freebsd.org; Thu, 29 Mar 2007 07:15:07 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 29 Mar 2007 07:15:07 GMT Message-Id: <200703290715.l2T7F7r3038874@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 116815 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Mar 2007 07:15:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=116815 Change 116815 by hselasky@hselasky_mini_itx on 2007/03/29 07:14:37 Make UMASS more in line with the BBB specification. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/umass.c#11 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/umass.c#11 (text+ko) ==== @@ -1718,6 +1718,13 @@ tr_transferred: + /* Do a full reset if there is something + * wrong with the CSW: + */ + sc->sc_status_try = 1; + + /* Zero missing parts of the CSW: */ + if (xfer->actlen < sizeof(sc->csw)) { bzero(&(sc->csw), sizeof(sc->csw)); } From owner-p4-projects@FreeBSD.ORG Thu Mar 29 11:12:07 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B503016A403; Thu, 29 Mar 2007 11:12:07 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 583BD16A401 for ; Thu, 29 Mar 2007 11:12:07 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 498C513C457 for ; Thu, 29 Mar 2007 11:12:07 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2TBC2Ix062514 for ; Thu, 29 Mar 2007 11:12:02 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2TBC29m062507 for perforce@freebsd.org; Thu, 29 Mar 2007 11:12:02 GMT (envelope-from gonzo@FreeBSD.org) Date: Thu, 29 Mar 2007 11:12:02 GMT Message-Id: <200703291112.l2TBC29m062507@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 116824 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Mar 2007 11:12:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=116824 Change 116824 by gonzo@gonzo_jeeves on 2007/03/29 11:11:01 o Ensure presence of global bit in TLB entry for KVA with KASSERT. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/tlb.c#13 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/tlb.c#13 (text+ko) ==== @@ -140,6 +140,7 @@ panic("pmap %p entering invalid mapping for va %lx to pa %lx [%lx]", pmap, (u_long)va, (u_long)pa, (u_long)bits); + *pte &= PG_G; *pte |= (MIPS_PA_TO_PFN(pa) << MIPS_PFN_SHIFT) | bits; *pte |= PG_C_UNCACHED; @@ -184,6 +185,15 @@ register_t ehi, old_ehi; int i; + /* + * Bailout if we're trying to add TLB entry for KVA without + * PG_G bit set. + */ + KASSERT(!((va > VM_MAXUSER_ADDRESS) && (((pte0) & PG_G) == 0)), + ("tlb_enter for KVA without global bit set")); + KASSERT(!((va > VM_MAXUSER_ADDRESS) && (((pte1) & PG_G) == 0)), + ("tlb_enter for KVA without global bit set")); + va &= ~PAGE_MASK; ehi = MIPS_HI_ENTRY(va, asid); old_ehi = mips_rd_entryhi(); From owner-p4-projects@FreeBSD.ORG Thu Mar 29 13:11:28 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CDC1A16A407; Thu, 29 Mar 2007 13:11:27 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8CA1916A404 for ; Thu, 29 Mar 2007 13:11:27 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7E22F13C45D for ; Thu, 29 Mar 2007 13:11:27 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2TDBR6N017861 for ; Thu, 29 Mar 2007 13:11:27 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2TDBRe8017858 for perforce@freebsd.org; Thu, 29 Mar 2007 13:11:27 GMT (envelope-from gonzo@FreeBSD.org) Date: Thu, 29 Mar 2007 13:11:27 GMT Message-Id: <200703291311.l2TDBRe8017858@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 116827 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Mar 2007 13:11:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=116827 Change 116827 by gonzo@gonzo_jeeves on 2007/03/29 13:10:44 o Add generic interface for cache handling based on cfg0, cfg1 COP0 registers. Obtained from: NetBSD Affected files ... .. //depot/projects/mips2/src/sys/conf/files.mips#17 edit .. //depot/projects/mips2/src/sys/mips/include/cache_mipsNN.h#1 add .. //depot/projects/mips2/src/sys/mips/mips/cache_mipsNN.c#1 add Differences ... ==== //depot/projects/mips2/src/sys/conf/files.mips#17 (text+ko) ==== @@ -2,6 +2,7 @@ mips/mips/autoconf.c standard mips/mips/busdma_machdep.c standard mips/mips/cache.c standard +mips/mips/cache_mipsNN.c standard mips/mips/copystr.S standard mips/mips/cpu.c standard mips/mips/db_disasm.c optional ddb From owner-p4-projects@FreeBSD.ORG Thu Mar 29 13:50:18 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 895A016A409; Thu, 29 Mar 2007 13:50:18 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4033B16A407 for ; Thu, 29 Mar 2007 13:50:18 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 30F5013C455 for ; Thu, 29 Mar 2007 13:50:18 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2TDoIDm024962 for ; Thu, 29 Mar 2007 13:50:18 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2TDoHp3024959 for perforce@freebsd.org; Thu, 29 Mar 2007 13:50:17 GMT (envelope-from gonzo@FreeBSD.org) Date: Thu, 29 Mar 2007 13:50:17 GMT Message-Id: <200703291350.l2TDoHp3024959@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 116831 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Mar 2007 13:50:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=116831 Change 116831 by gonzo@gonzo_jeeves on 2007/03/29 13:49:17 o Use vm_offset_t instead of vm_paddr_t o Add *_intern_* family of cache operations which are required by mipsNN. o Replace cache ops stubs with implementations. Affected files ... .. //depot/projects/mips2/src/sys/mips/include/cache.h#3 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/include/cache.h#3 (text+ko) ==== @@ -125,21 +125,30 @@ struct mips_cache_ops { void (*mco_icache_sync_all)(void); - void (*mco_icache_sync_range)(vm_paddr_t, vm_size_t); - void (*mco_icache_sync_range_index)(vm_paddr_t, vm_size_t); + void (*mco_icache_sync_range)(vm_offset_t, vm_size_t); + void (*mco_icache_sync_range_index)(vm_offset_t, vm_size_t); void (*mco_pdcache_wbinv_all)(void); - void (*mco_pdcache_wbinv_range)(vm_paddr_t, vm_size_t); - void (*mco_pdcache_wbinv_range_index)(vm_paddr_t, vm_size_t); - void (*mco_pdcache_inv_range)(vm_paddr_t, vm_size_t); - void (*mco_pdcache_wb_range)(vm_paddr_t, vm_size_t); + void (*mco_pdcache_wbinv_range)(vm_offset_t, vm_size_t); + void (*mco_pdcache_wbinv_range_index)(vm_offset_t, vm_size_t); + void (*mco_pdcache_inv_range)(vm_offset_t, vm_size_t); + void (*mco_pdcache_wb_range)(vm_offset_t, vm_size_t); /* These are called only by the (mipsNN) icache functions. */ + void (*mco_intern_pdcache_wbinv_all)(void); + void (*mco_intern_pdcache_wbinv_range_index)(vm_offset_t, vm_size_t); + void (*mco_intern_pdcache_wb_range)(vm_offset_t, vm_size_t); + void (*mco_sdcache_wbinv_all)(void); - void (*mco_sdcache_wbinv_range)(vm_paddr_t, vm_size_t); - void (*mco_sdcache_wbinv_range_index)(vm_paddr_t, vm_size_t); - void (*mco_sdcache_inv_range)(vm_paddr_t, vm_size_t); - void (*mco_sdcache_wb_range)(vm_paddr_t, vm_size_t); + void (*mco_sdcache_wbinv_range)(vm_offset_t, vm_size_t); + void (*mco_sdcache_wbinv_range_index)(vm_offset_t, vm_size_t); + void (*mco_sdcache_inv_range)(vm_offset_t, vm_size_t); + void (*mco_sdcache_wb_range)(vm_offset_t, vm_size_t); + + /* These are called only by the (mipsNN) icache functions. */ + void (*mco_intern_sdcache_wbinv_all)(void); + void (*mco_intern_sdcache_wbinv_range_index)(vm_offset_t, vm_size_t); + void (*mco_intern_sdcache_wb_range)(vm_offset_t, vm_size_t); }; extern struct mips_cache_ops mips_cache_ops; @@ -204,10 +213,6 @@ (*mips_cache_ops.mco_ ## prefix ## s ## x )((a), (b)); \ } while (/*CONSTCOND*/0) -/* - * XXXMIPS: remove this calles while mipc cache ops are not defined - */ -#ifdef notyet #define mips_icache_sync_all() \ (*mips_cache_ops.mco_icache_sync_all)() @@ -231,18 +236,24 @@ #define mips_dcache_wb_range(v, s) \ __mco_2args(, dcache_wb_range, (v), (s)) -#else -#define mips_icache_sync_all() -#define mips_icache_sync_range(v, s) -#define mips_icache_sync_range_index(v, s) -#define mips_dcache_wbinv_all() -#define mips_dcache_wbinv_range(v, s) -#define mips_dcache_wbinv_range_index(v, s) -#define mips_dcache_inv_range(v, s) -#define mips_dcache_wb_range(v, s) -#endif + +/* + * Private D-cache functions only called from (currently only the + * mipsNN) I-cache functions. + */ +#define mips_intern_dcache_wbinv_all() \ + __mco_noargs(intern_, dcache_wbinv_all) + +#define mips_intern_dcache_wbinv_range_index(v, s) \ + __mco_2args(intern_, dcache_wbinv_range_index, (v), (s)) + +#define mips_intern_dcache_wb_range(v, s) \ + __mco_2args(intern_, dcache_wb_range, (v), (s)) +/* forward declaration */ +struct mips_cpuinfo; +void mips_config_cache(struct mips_cpuinfo *); +void mips_dcache_compute_align(void); -void mips_config_cache(void); -void mips_dcache_compute_align(void); +#include From owner-p4-projects@FreeBSD.ORG Thu Mar 29 13:51:20 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 66B6616A406; Thu, 29 Mar 2007 13:51:20 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2C33E16A404 for ; Thu, 29 Mar 2007 13:51:20 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1CCAF13C45B for ; Thu, 29 Mar 2007 13:51:20 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2TDpJQ5025574 for ; Thu, 29 Mar 2007 13:51:19 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2TDpJpB025569 for perforce@freebsd.org; Thu, 29 Mar 2007 13:51:19 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 29 Mar 2007 13:51:19 GMT Message-Id: <200703291351.l2TDpJpB025569@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 116832 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Mar 2007 13:51:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=116832 Change 116832 by hselasky@hselasky_mini_itx on 2007/03/29 13:50:38 Add more documentation to the config thread system. Make "usbd_config_td_stop()" lock the mutex it requires. Check if the config thread is gone in "usbd_config_td_queue_command()" before queueing a command. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#30 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#30 (text+ko) ==== @@ -2412,6 +2412,52 @@ break; } + /* NOTE to reimplementors: dequeueing a command from the + * "used" queue and executing it must be atomic, with + * regard to the "p_mtx" mutex. That means any attempt to + * queue a command by another thread must be blocked until + * either: + * + * 1) the command sleeps + * + * 2) the command returns + * + * Here is a practical example that shows how this + * helps solving a problem: + * + * Assume that you want to set the baud rate on a USB + * serial device. During the programming of the device you + * don't want to receive nor transmit any data, because it + * will be garbage most likely anyway. The programming of + * our USB device takes 20 milliseconds and it needs to + * call functions that sleep. + * + * Non-working solution: Before we queue the programming command, + * we stop transmission and reception of data. Then we + * queue a programming command. At the end of the programming + * command we enable transmission and reception of data. + * + * Problem: If a second programming command is queued + * while the first one is sleeping, we end up enabling + * transmission and reception of data too early. + * + * Working solution: Before we queue the programming + * command, we stop transmission and reception of + * data. Then we queue a programming command. Then we + * queue a second command that only enables transmission + * and reception of data. + * + * Why it works: If a second programming command is queued + * while the first one is sleeping, then the queueing of a + * second command to enable the data transfers, will cause + * the previous one, which is still on the queue, to be + * removed from the queue, and re-inserted after the last + * baud rate programming command, which then gives the + * desired result. + * + * This example assumes that you use a "qcount" of zero. + */ + USBD_IF_DEQUEUE(&(ctd->cmd_used), m); if (m) { @@ -2519,24 +2565,37 @@ void usbd_config_td_stop(struct usbd_config_td *ctd) { - register int error; + uint32_t level; + int error; - while (ctd->config_thread) { + if (ctd->p_mtx) { - mtx_assert(ctd->p_mtx, MA_OWNED); + mtx_lock(ctd->p_mtx); - ctd->flag_config_td_gone = 1; + while (ctd->config_thread) { usbd_config_td_queue_command(ctd, NULL, &usbd_config_td_dummy_cmd, 0, 0); + /* set the gone flag after queueing the + * last command: + */ + ctd->flag_config_td_gone = 1; + if (cold) { panic("%s:%d: cannot stop config thread!\n", __FUNCTION__, __LINE__); } + level = mtx_drop_recurse(ctd->p_mtx); + error = msleep(&(ctd->wakeup_config_td_gone), ctd->p_mtx, 0, "wait config TD", 0); + + mtx_pickup_recurse(ctd->p_mtx, level); + } + + mtx_unlock(ctd->p_mtx); } return; } @@ -2550,11 +2609,8 @@ void usbd_config_td_unsetup(struct usbd_config_td *ctd) { - if (ctd->p_mtx) { - mtx_lock(ctd->p_mtx); - usbd_config_td_stop(ctd); - mtx_unlock(ctd->p_mtx); - } + usbd_config_td_stop(ctd); + if (ctd->p_cmd_queue) { free(ctd->p_cmd_queue, M_DEVBUF); ctd->p_cmd_queue = NULL; @@ -2576,7 +2632,10 @@ struct usbd_mbuf *m; int32_t qlen; - mtx_assert(ctd->p_mtx, MA_OWNED); + if (usbd_config_td_is_gone(ctd)) { + /* nothing more to do */ + return; + } /* * first check if the command was From owner-p4-projects@FreeBSD.ORG Thu Mar 29 14:29:07 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED2AE16A501; Thu, 29 Mar 2007 14:29:06 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B467C16A50C for ; Thu, 29 Mar 2007 14:29:06 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 97FCE13C458 for ; Thu, 29 Mar 2007 14:29:06 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2TET6fJ036917 for ; Thu, 29 Mar 2007 14:29:06 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2TET6C9036914 for perforce@freebsd.org; Thu, 29 Mar 2007 14:29:06 GMT (envelope-from gonzo@FreeBSD.org) Date: Thu, 29 Mar 2007 14:29:06 GMT Message-Id: <200703291429.l2TET6C9036914@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 116833 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Mar 2007 14:29:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=116833 Change 116833 by gonzo@gonzo_jeeves on 2007/03/29 14:28:45 o Add cache total size fields and virtual icache flag to cpuinfo struct. Affected files ... .. //depot/projects/mips2/src/sys/mips/include/cpuinfo.h#3 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/include/cpuinfo.h#3 (text+ko) ==== @@ -54,10 +54,13 @@ u_int8_t cpu_impl; u_int8_t tlb_type; u_int16_t tlb_nentries; + u_int8_t icache_virtual; struct { + u_int8_t ic_size; u_int8_t ic_linesize; u_int8_t ic_nways; u_int16_t ic_nsets; + u_int8_t dc_size; u_int8_t dc_linesize; u_int8_t dc_nways; u_int16_t dc_nsets; From owner-p4-projects@FreeBSD.ORG Thu Mar 29 14:42:23 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A1CF716A402; Thu, 29 Mar 2007 14:42:23 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 79A6716A400 for ; Thu, 29 Mar 2007 14:42:23 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6A67C13C44C for ; Thu, 29 Mar 2007 14:42:23 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2TEgNhE039623 for ; Thu, 29 Mar 2007 14:42:23 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2TEgNVs039617 for perforce@freebsd.org; Thu, 29 Mar 2007 14:42:23 GMT (envelope-from gonzo@FreeBSD.org) Date: Thu, 29 Mar 2007 14:42:23 GMT Message-Id: <200703291442.l2TEgNVs039617@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 116834 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Mar 2007 14:42:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=116834 Change 116834 by gonzo@gonzo_jeeves on 2007/03/29 14:41:43 o Fill new cpuinfo fields with values based on config0 and config1. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/cpu.c#17 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/cpu.c#17 (text+ko) ==== @@ -138,6 +138,7 @@ cfg0 = mips_rd_config(); cpuinfo->tlb_type = ((cfg0 & MIPS_CONFIG0_MT_MASK) >> MIPS_CONFIG0_MT_SHIFT); + cpuinfo->icache_virtual = cfg0 & MIPS_CONFIG0_VI; /* If config register selection 1 does not exist, exit. */ if (!(cfg0 & MIPS3_CONFIG_CM)) @@ -153,6 +154,8 @@ cpuinfo->l1.ic_linesize = tmp; cpuinfo->l1.ic_nways = (((cfg1 & MIPS_CONFIG1_IA_MASK) >> MIPS_CONFIG1_IA_SHIFT)) + 1; cpuinfo->l1.ic_nsets = 1 << (((cfg1 & MIPS_CONFIG1_IS_MASK) >> MIPS_CONFIG1_IS_SHIFT) + 6); + cpuinfo->l1.ic_size = cpuinfo->l1.ic_linesize * cpuinfo->l1.ic_nsets + * cpuinfo->l1.ic_nways; } /* L1 data cache. */ @@ -161,6 +164,8 @@ cpuinfo->l1.dc_linesize = tmp; cpuinfo->l1.dc_nways = (((cfg1 & MIPS_CONFIG1_DA_MASK) >> MIPS_CONFIG1_DA_SHIFT)) + 1; cpuinfo->l1.dc_nsets = 1 << (((cfg1 & MIPS_CONFIG1_DS_MASK) >> MIPS_CONFIG1_DS_SHIFT) + 6); + cpuinfo->l1.dc_size = cpuinfo->l1.dc_linesize * cpuinfo->l1.dc_nsets + * cpuinfo->l1.dc_nways; } } @@ -171,7 +176,7 @@ mips_get_identity(&cpuinfo); mips_num_tlb_entries = cpuinfo.tlb_nentries; - mips_config_cache(); + mips_config_cache(&cpuinfo); mips_vector_init(); mips_icache_sync_all(); From owner-p4-projects@FreeBSD.ORG Thu Mar 29 14:46:34 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C07C16A404; Thu, 29 Mar 2007 14:46:34 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4F85B16A402 for ; Thu, 29 Mar 2007 14:46:34 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3380C13C448 for ; Thu, 29 Mar 2007 14:46:34 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2TEkT9V040193 for ; Thu, 29 Mar 2007 14:46:29 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2TEkS4Q040190 for perforce@freebsd.org; Thu, 29 Mar 2007 14:46:28 GMT (envelope-from gonzo@FreeBSD.org) Date: Thu, 29 Mar 2007 14:46:28 GMT Message-Id: <200703291446.l2TEkS4Q040190@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 116835 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Mar 2007 14:46:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=116835 Change 116835 by gonzo@gonzo_jeeves on 2007/03/29 14:45:45 o Fill out cache ops structure with mipsNN routines. o Perform presence check for every type of cache ops. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/cache.c#2 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/cache.c#2 (text+ko) ==== @@ -26,16 +26,166 @@ */ #include +#include +#include #include struct mips_cache_ops mips_cache_ops; -/* - * XXXMIPS: Implement mips_cache_ops initialization - */ void -mips_config_cache() +mips_config_cache(struct mips_cpuinfo * cpuinfo) { + switch (cpuinfo->l1.ic_linesize) { + case 16: + mips_cache_ops.mco_icache_sync_all = mipsNN_icache_sync_all_16; + mips_cache_ops.mco_icache_sync_range = + mipsNN_icache_sync_range_16; + mips_cache_ops.mco_icache_sync_range_index = + mipsNN_icache_sync_range_index_16; + break; + case 32: + mips_cache_ops.mco_icache_sync_all = mipsNN_icache_sync_all_32; + mips_cache_ops.mco_icache_sync_range = + mipsNN_icache_sync_range_32; + mips_cache_ops.mco_icache_sync_range_index = + mipsNN_icache_sync_range_index_32; + break; +#ifdef MIPS_DISABLE_L1_CACHE + case 0: + mips_cache_ops.mco_icache_sync_all = cache_noop; + mips_cache_ops.mco_icache_sync_range = + (void (*)(vaddr_t, vsize_t))cache_noop; + mips_cache_ops.mco_icache_sync_range_index = + (void (*)(vaddr_t, vsize_t))cache_noop; + break; +#endif + default: + panic("no Icache ops for %d byte lines", + cpuinfo->l1.ic_linesize); + } + + switch (cpuinfo->l1.dc_linesize) { + case 16: + mips_cache_ops.mco_pdcache_wbinv_all = + mips_cache_ops.mco_intern_pdcache_wbinv_all = + mipsNN_pdcache_wbinv_all_16; + mips_cache_ops.mco_pdcache_wbinv_range = + mipsNN_pdcache_wbinv_range_16; + mips_cache_ops.mco_pdcache_wbinv_range_index = + mips_cache_ops.mco_intern_pdcache_wbinv_range_index = + mipsNN_pdcache_wbinv_range_index_16; + mips_cache_ops.mco_pdcache_inv_range = + mipsNN_pdcache_inv_range_16; + mips_cache_ops.mco_pdcache_wb_range = + mips_cache_ops.mco_intern_pdcache_wb_range = + mipsNN_pdcache_wb_range_16; + break; + case 32: + mips_cache_ops.mco_pdcache_wbinv_all = + mips_cache_ops.mco_intern_pdcache_wbinv_all = + mipsNN_pdcache_wbinv_all_32; + mips_cache_ops.mco_pdcache_wbinv_range = + mipsNN_pdcache_wbinv_range_32; + mips_cache_ops.mco_pdcache_wbinv_range_index = + mips_cache_ops.mco_intern_pdcache_wbinv_range_index = + mipsNN_pdcache_wbinv_range_index_32; + mips_cache_ops.mco_pdcache_inv_range = + mipsNN_pdcache_inv_range_32; + mips_cache_ops.mco_pdcache_wb_range = + mips_cache_ops.mco_intern_pdcache_wb_range = + mipsNN_pdcache_wb_range_32; + break; +#ifdef MIPS_DISABLE_L1_CACHE + case 0: + mips_cache_ops.mco_pdcache_wbinv_all = cache_noop; + mips_cache_ops.mco_intern_pdcache_wbinv_all = cache_noop; + mips_cache_ops.mco_pdcache_wbinv_range = + (void (*)(vaddr_t, vsize_t))cache_noop; + mips_cache_ops.mco_pdcache_wbinv_range_index = + (void (*)(vaddr_t, vsize_t))cache_noop; + mips_cache_ops.mco_intern_pdcache_wbinv_range_index = + (void (*)(vaddr_t, vsize_t))cache_noop; + mips_cache_ops.mco_pdcache_inv_range = + (void (*)(vaddr_t, vsize_t))cache_noop; + mips_cache_ops.mco_pdcache_wb_range = + (void (*)(vaddr_t, vsize_t))cache_noop; + mips_cache_ops.mco_intern_pdcache_wb_range = + (void (*)(vaddr_t, vsize_t))cache_noop; + break; +#endif + default: + panic("no Dcache ops for %d byte lines", + cpuinfo->l1.dc_linesize); + } + + mipsNN_cache_init(cpuinfo); + printf("mips_cache_ops.mco_pdcache_wbinv_all == %p\n", mips_cache_ops.mco_pdcache_wbinv_all ); + +#if 0 + if (mips_cpu_flags & + (CPU_MIPS_D_CACHE_COHERENT | CPU_MIPS_I_D_CACHE_COHERENT)) { +#ifdef CACHE_DEBUG + printf(" Dcache is coherent\n"); +#endif + mips_cache_ops.mco_pdcache_wbinv_all = cache_noop; + mips_cache_ops.mco_pdcache_wbinv_range = + (void (*)(vaddr_t, vsize_t))cache_noop; + mips_cache_ops.mco_pdcache_wbinv_range_index = + (void (*)(vaddr_t, vsize_t))cache_noop; + mips_cache_ops.mco_pdcache_inv_range = + (void (*)(vaddr_t, vsize_t))cache_noop; + mips_cache_ops.mco_pdcache_wb_range = + (void (*)(vaddr_t, vsize_t))cache_noop; + } + if (mips_cpu_flags & CPU_MIPS_I_D_CACHE_COHERENT) { +#ifdef CACHE_DEBUG + printf(" Icache is coherent against Dcache\n"); +#endif + mips_cache_ops.mco_intern_pdcache_wbinv_all = + cache_noop; + mips_cache_ops.mco_intern_pdcache_wbinv_range_index = + (void (*)(vaddr_t, vsize_t))cache_noop; + mips_cache_ops.mco_intern_pdcache_wb_range = + (void (*)(vaddr_t, vsize_t))cache_noop; + } +#endif + + /* Check that all cache ops are set up. */ + if (mips_picache_size || 1) { /* XXX- must have primary Icache */ + if (!mips_cache_ops.mco_icache_sync_all) + panic("no icache_sync_all cache op"); + if (!mips_cache_ops.mco_icache_sync_range) + panic("no icache_sync_range cache op"); + if (!mips_cache_ops.mco_icache_sync_range_index) + panic("no icache_sync_range_index cache op"); + } + if (mips_pdcache_size || 1) { /* XXX- must have primary Icache */ + if (!mips_cache_ops.mco_pdcache_wbinv_all) + panic("no pdcache_wbinv_all"); + if (!mips_cache_ops.mco_pdcache_wbinv_range) + panic("no pdcache_wbinv_range"); + if (!mips_cache_ops.mco_pdcache_wbinv_range_index) + panic("no pdcache_wbinv_range_index"); + if (!mips_cache_ops.mco_pdcache_inv_range) + panic("no pdcache_inv_range"); + if (!mips_cache_ops.mco_pdcache_wb_range) + panic("no pdcache_wb_range"); + } + + /* XXXMIPS: No secondary cache handlers yet */ +#ifdef notyet + if (mips_sdcache_size) { + if (!mips_cache_ops.mco_sdcache_wbinv_all) + panic("no sdcache_wbinv_all"); + if (!mips_cache_ops.mco_sdcache_wbinv_range) + panic("no sdcache_wbinv_range"); + if (!mips_cache_ops.mco_sdcache_wbinv_range_index) + panic("no sdcache_wbinv_range_index"); + if (!mips_cache_ops.mco_sdcache_inv_range) + panic("no sdcache_inv_range"); + if (!mips_cache_ops.mco_sdcache_wb_range) + panic("no sdcache_wb_range"); + } +#endif } - From owner-p4-projects@FreeBSD.ORG Thu Mar 29 18:27:07 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C58A16A406; Thu, 29 Mar 2007 18:27:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C0BDE16A401 for ; Thu, 29 Mar 2007 18:27:06 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id AFAAC13C4B0 for ; Thu, 29 Mar 2007 18:27:06 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2TIR60U000852 for ; Thu, 29 Mar 2007 18:27:06 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2TIR6FD000849 for perforce@freebsd.org; Thu, 29 Mar 2007 18:27:06 GMT (envelope-from marcel@freebsd.org) Date: Thu, 29 Mar 2007 18:27:06 GMT Message-Id: <200703291827.l2TIR6FD000849@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 Cc: Subject: PERFORCE change 116855 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Mar 2007 18:27:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=116855 Change 116855 by marcel@marcel_jnpr on 2007/03/29 18:26:39 o White-space fixes. o Make the bug work-around specific to PowerPC, as it applies to the Apple chipset. Affected files ... .. //depot/projects/uart/dev/uart/uart_dev_z8530.c#36 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_dev_z8530.c#36 (text+ko) ==== @@ -162,15 +162,16 @@ if (bas->rclk == 0) bas->rclk = DEFAULT_RCLK; +#ifdef __powerpc__ switch (bas->chan) { case 1: uart_setmreg(bas, WR_MIC, MIC_NV | MIC_CRA); - break; - case 2: - uart_setmreg(bas, WR_MIC, MIC_NV | MIC_CRB); - break; - } - uart_barrier(bas); + break; + case 2: + uart_setmreg(bas, WR_MIC, MIC_NV | MIC_CRB); + break; + } + uart_barrier(bas); uart_setmreg(bas, WR_MPM, MPM_CM1 | MPM_MONO | MPM_SYNC); uart_setmreg(bas, WR_RPC, RPC_RB8); uart_setmreg(bas, WR_TPC, TPC_TB8 | TPC_RTS); @@ -188,6 +189,7 @@ uart_getreg(bas, REG_DATA); uart_setreg(bas, REG_CTRL, CR_RSTXSI); uart_setreg(bas, REG_CTRL, CR_RSTERR); +#endif /* Assume we don't need to perform a full hardware reset. */ switch (bas->chan) { From owner-p4-projects@FreeBSD.ORG Thu Mar 29 18:29:10 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A8A0216A403; Thu, 29 Mar 2007 18:29:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3CC1C16A400 for ; Thu, 29 Mar 2007 18:29:10 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1327213C468 for ; Thu, 29 Mar 2007 18:29:09 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2TIT9D5000936 for ; Thu, 29 Mar 2007 18:29:09 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2TIT9uu000933 for perforce@freebsd.org; Thu, 29 Mar 2007 18:29:09 GMT (envelope-from marcel@freebsd.org) Date: Thu, 29 Mar 2007 18:29:09 GMT Message-Id: <200703291829.l2TIT9uu000933@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 Cc: Subject: PERFORCE change 116856 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Mar 2007 18:29:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=116856 Change 116856 by marcel@marcel_jnpr on 2007/03/29 18:28:33 Fix merge conflict: di->ops is a pointer. Missed in some prior integration. Affected files ... .. //depot/projects/uart/dev/uart/uart_cpu.h#23 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_cpu.h#23 (text+ko) ==== @@ -141,7 +141,7 @@ int res; uart_lock(di->hwmtx); - res = di->ops.rxready(&di->bas); + res = di->ops->rxready(&di->bas); uart_unlock(di->hwmtx); return (res); } From owner-p4-projects@FreeBSD.ORG Thu Mar 29 19:45:56 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A6A616A46B; Thu, 29 Mar 2007 19:45:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D473416A468 for ; Thu, 29 Mar 2007 19:45:55 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C310B13C484 for ; Thu, 29 Mar 2007 19:45:55 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2TJjtEA015858 for ; Thu, 29 Mar 2007 19:45:55 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2TJjtgp015855 for perforce@freebsd.org; Thu, 29 Mar 2007 19:45:55 GMT (envelope-from marcel@freebsd.org) Date: Thu, 29 Mar 2007 19:45:55 GMT Message-Id: <200703291945.l2TJjtgp015855@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 Cc: Subject: PERFORCE change 116868 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Mar 2007 19:45:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=116868 Change 116868 by marcel@marcel_jnpr on 2007/03/29 19:45:01 In ns8250_putc() and ns8250_getc(), don't calculate the a delay value of about 1/10th the time it takes to send a character. In ns8250_putc() we only want to avoid waiting indefinitely for some status change and in ns8250_getc() we just want to back-off from the bus when we wait for some status change (and unlocking the hardware while we're at it). This really doesn't need exact timing. It's sufficient to assume that regardless of the baudrate, we should not have to wait longer than a second for the status to change and we can express everything in terms of a fixed delay (DELAY(4) in this case). The upshot is that we eliminate expensive calculations for every character we send, with a positive side-effect that if we lack the precision (e.g. the exact frequency of the baudrate clock) we don't mess up any low-level I/O. Affected files ... .. //depot/projects/uart/dev/uart/uart_dev_ns8250.c#49 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_dev_ns8250.c#49 (text+ko) ==== @@ -285,19 +285,16 @@ static void ns8250_putc(struct uart_bas *bas, int c) { - int delay, limit; + int limit; - /* 1/10th the time to transmit 1 character (estimate). */ - delay = ns8250_delay(bas); - - limit = 20; + limit = 250000; while ((uart_getreg(bas, REG_LSR) & LSR_THRE) == 0 && --limit) - DELAY(delay); + DELAY(4); uart_setreg(bas, REG_DATA, c); uart_barrier(bas); - limit = 40; + limit = 250000; while ((uart_getreg(bas, REG_LSR) & LSR_TEMT) == 0 && --limit) - DELAY(delay); + DELAY(4); } static int @@ -310,16 +307,13 @@ static int ns8250_getc(struct uart_bas *bas, struct mtx *hwmtx) { - int c, delay; + int c; uart_lock(hwmtx); - /* 1/10th the time to transmit 1 character (estimate). */ - delay = ns8250_delay(bas); - while ((uart_getreg(bas, REG_LSR) & LSR_RXRDY) == 0) { uart_unlock(hwmtx); - DELAY(delay); + DELAY(4); uart_lock(hwmtx); } From owner-p4-projects@FreeBSD.ORG Thu Mar 29 20:32:59 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF65F16A400; Thu, 29 Mar 2007 20:32:58 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8BE9D16A403 for ; Thu, 29 Mar 2007 20:32:58 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 78C2113C43E for ; Thu, 29 Mar 2007 20:32:58 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2TKWwZa024793 for ; Thu, 29 Mar 2007 20:32:58 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2TKWuLk024788 for perforce@freebsd.org; Thu, 29 Mar 2007 20:32:56 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 29 Mar 2007 20:32:56 GMT Message-Id: <200703292032.l2TKWuLk024788@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 116873 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Mar 2007 20:32:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=116873 Change 116873 by rdivacky@rdivacky_witten on 2007/03/29 20:32:06 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#26 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_dummy.c#11 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h#22 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_syscall.h#22 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysent.c#21 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/syscalls.master#22 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91_st.c#5 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/i80321_wdog.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_wdog.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/boot2/boot2.c#4 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#4 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#4 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/emac.c#5 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/getc.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/memcmp.c#3 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/sd-card.c#4 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/spi_flash.c#4 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/strlen.c#3 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#17 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_util.h#4 integrate .. //depot/projects/linuxolator/src/sys/conf/options#20 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/fxp/if_fxp.c#8 integrate .. //depot/projects/linuxolator/src/sys/dev/ichwd/ichwd.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/ipmi/ipmi.c#8 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_sbus.c#9 integrate .. //depot/projects/linuxolator/src/sys/dev/mk48txx/mk48txx.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/re/if_re.c#11 integrate .. //depot/projects/linuxolator/src/sys/dev/scc/scc_bfe.h#4 integrate .. //depot/projects/linuxolator/src/sys/dev/scc/scc_core.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/scc/scc_if.m#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sio/sio_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart_core.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart_dev_ns8250.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/uhci.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/watchdog/watchdog.c#3 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/elan-mmcr.c#3 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/geode.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux.h#22 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_dummy.c#11 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_proto.h#22 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_syscall.h#21 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_sysent.c#21 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/syscalls.master#21 integrate .. //depot/projects/linuxolator/src/sys/kern/init_main.c#9 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_thread.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_bio.c#11 integrate .. //depot/projects/linuxolator/src/sys/net/rtsock.c#4 integrate .. //depot/projects/linuxolator/src/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c#2 integrate .. //depot/projects/linuxolator/src/sys/netgraph/netflow/ng_netflow.c#3 integrate .. //depot/projects/linuxolator/src/sys/netgraph/netflow/ng_netflow.h#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/in_pcb.h#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_input.c#13 integrate .. //depot/projects/linuxolator/src/sys/sys/mount.h#8 integrate .. //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_softdep.c#8 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#26 (text+ko) ==== @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.14 2007/03/02 00:08:47 jkim Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.15 2007/03/29 02:11:46 julian Exp $ */ #ifndef _AMD64_LINUX_H_ ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_dummy.c#11 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.7 2006/12/31 13:16:00 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.8 2007/03/29 02:11:46 julian Exp $"); #include #include ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h#22 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.30 2007/03/29 02:11:46 julian Exp $ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.26 2007/02/15 01:13:36 jkim Exp */ ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_syscall.h#22 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.30 2007/03/29 02:11:46 julian Exp $ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.26 2007/02/15 01:13:36 jkim Exp */ ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysent.c#21 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.30 2007/03/29 02:11:46 julian Exp $ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.26 2007/02/15 01:13:36 jkim Exp */ ==== //depot/projects/linuxolator/src/sys/amd64/linux32/syscalls.master#22 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.26 2007/02/15 01:13:36 jkim Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.27 2007/03/29 02:11:46 julian Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). ==== //depot/projects/linuxolator/src/sys/arm/at91/at91_st.c#5 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_st.c,v 1.8 2007/02/23 12:18:27 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_st.c,v 1.9 2007/03/27 21:03:35 n_hibma Exp $"); #include #include @@ -171,13 +171,11 @@ int t; t = cmd & WD_INTERVAL; - if (cmd > 0 && t >= 22 && t <= 37) { + if (t >= 22 && t <= 37) { wdog = (1 << (t - 22)) | ST_WDMR_RSTEN; *error = 0; } else { wdog = 0; - if (cmd > 0) - *error = EINVAL; } WR4(ST_WDMR, wdog); WR4(ST_CR, ST_CR_WDRST); ==== //depot/projects/linuxolator/src/sys/arm/xscale/i80321/i80321_wdog.c#3 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_wdog.c,v 1.3 2006/12/15 21:44:48 n_hibma Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_wdog.c,v 1.4 2007/03/27 21:03:35 n_hibma Exp $"); #include #include @@ -111,18 +111,15 @@ cmd &= WD_INTERVAL; if (cmd > 0 && cmd <= 63 - && (uint64_t)1 << (cmd & WD_INTERVAL) <= - (uint64_t)sc->wdog_period * 1000000000) { + && (uint64_t)1<wdog_period * 1000000000) { /* Valid value -> Enable watchdog */ iopwdog_tickle(sc); sc->armed = 1; *error = 0; } else { - /* XXX Can't disable this watchdog? */ + /* Can't disable this watchdog! */ if (sc->armed) *error = EOPNOTSUPP; - else if (cmd > 0) - *error = EINVAL; } } ==== //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_wdog.c#2 (text+ko) ==== @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_wdog.c,v 1.1 2006/11/19 23:55:23 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_wdog.c,v 1.2 2007/03/27 21:03:36 n_hibma Exp $"); /* * IXP425 Watchdog Timer Support. @@ -70,7 +70,7 @@ u_int u = cmd & WD_INTERVAL; WR4(sc, IXP425_OST_WDOG_KEY, OST_WDOG_KEY_MAJICK); - if (cmd && 4 <= u && u <= 35) { + if (4 <= u && u <= 35) { WR4(sc, IXP425_OST_WDOG_ENAB, 0); /* approximate 66.66MHz cycles */ WR4(sc, IXP425_OST_WDOG, 2<<(u - 4)); ==== //depot/projects/linuxolator/src/sys/boot/arm/at91/boot2/boot2.c#4 (text+ko) ==== @@ -14,7 +14,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/boot2.c,v 1.3 2006/11/16 00:47:31 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/boot2.c,v 1.4 2007/03/28 21:18:45 imp Exp $"); #include #include @@ -114,12 +114,10 @@ char *s; s = cmd; - if (c) - *s++ = c; + if (c == 0) + c = getc(10000); for (;;) { - c = getc(10000); - - switch (c = getc(10000)) { + switch (c) { case 0: break; case '\177': @@ -138,6 +136,7 @@ *s++ = c; xputchar(c); } + c = getc(10000); } } @@ -170,7 +169,8 @@ /* Present the user with the boot2 prompt. */ - strcpy(kname, PATH_KERNEL); + if (*kname == '\0') + strcpy(kname, PATH_KERNEL); for (;;) { printf("\nDefault: %s\nboot: ", kname); if (!autoboot || (c = getc(2)) != -1) @@ -252,6 +252,7 @@ opts ^= OPT_SET(flags[i]); } } else { + arg--; if ((i = ep - arg)) { if ((size_t)i >= sizeof(kname)) return -1; ==== //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#4 (text) ==== @@ -24,7 +24,7 @@ * This software is derived from software provide by Kwikbyte who specifically * disclaimed copyright on the code. * - * $FreeBSD: src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c,v 1.4 2006/11/09 20:32:36 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c,v 1.5 2007/03/28 22:40:37 imp Exp $ */ #include "at91rm9200.h" @@ -53,6 +53,7 @@ register unsigned value; volatile sdram_size_t *p = (sdram_size_t *)SDRAM_BASE; + AT91C_BASE_ST->ST_RTMR = 1; #ifdef BOOT_TSC // For the TSC board, we turn ON the one LED we have while // early in boot. ==== //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#4 (text) ==== @@ -21,7 +21,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h,v 1.4 2006/12/20 18:18:24 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h,v 1.5 2007/03/28 22:40:37 imp Exp $ */ #ifndef _AT91RM9200_LOWLEVEL_H_ @@ -58,7 +58,8 @@ /* Master clock frequency at power-up */ #define AT91C_MASTER_CLOCK 60000000 -#define GetSeconds() (AT91C_BASE_RTC->RTC_TIMR & AT91C_RTC_SEC) +/* #define GetSeconds() (AT91C_BASE_RTC->RTC_TIMR & AT91C_RTC_SEC) */ +#define GetSeconds() (AT91C_BASE_ST->ST_CRTR >> 15) extern void _init(void); ==== //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/emac.c#5 (text) ==== @@ -19,7 +19,7 @@ * only. * END_BLOCK * - * $FreeBSD: src/sys/boot/arm/at91/libat91/emac.c,v 1.6 2006/12/20 18:26:37 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/libat91/emac.c,v 1.7 2007/03/28 22:40:37 imp Exp $ ******************************************************************************/ #include "at91rm9200.h" @@ -412,7 +412,8 @@ break; printf("."); sec = GetSeconds(); - while (GetSeconds() <= sec) continue; + while (GetSeconds() == sec) + continue; } if (stat2 & MII_STS_LINK_STAT) break; @@ -541,7 +542,7 @@ dlAddress = (char*)address; lastSize = 0; timeout = 10; - thisSeconds = GetSeconds() + 1; + thisSeconds = (GetSeconds() + 2) % 32; serverPort = SWAP16(69); ++localPort; ackBlock = -1; @@ -551,10 +552,10 @@ if (ackBlock == -2) break; timeout = 10; - thisSeconds = GetSeconds() + 1; - } else if (GetSeconds() > thisSeconds) { + thisSeconds = (GetSeconds() + 2) % 32; + } else if (GetSeconds() == thisSeconds) { --timeout; - thisSeconds = GetSeconds() + 1; + thisSeconds = (GetSeconds() + 2) % 32; if (!serverMACSet) GetServerAddress(); else if (ackBlock == -1) ==== //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/getc.c#2 (text) ==== @@ -31,7 +31,7 @@ * owners. This software is not copyrighted and is intended for reference * only. * - * $FreeBSD: src/sys/boot/arm/at91/libat91/getc.c,v 1.2 2006/04/21 13:58:51 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/libat91/getc.c,v 1.3 2007/03/28 22:40:37 imp Exp $ */ #include "at91rm9200.h" @@ -50,13 +50,15 @@ AT91PS_USART pUSART = (AT91PS_USART)AT91C_BASE_DBGU; unsigned thisSecond; + // Clamp to 20s + if (seconds > 20) + seconds = 20; thisSecond = GetSeconds(); seconds = thisSecond + seconds; - do { if ((pUSART->US_CSR & AT91C_US_RXRDY)) return (pUSART->US_RHR & 0xFF); thisSecond = GetSeconds(); - } while (thisSecond < seconds); + } while (thisSecond != seconds); return (-1); } ==== //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/memcmp.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/arm/at91/libat91/memcmp.c,v 1.2 2006/11/09 20:32:36 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/arm/at91/libat91/memcmp.c,v 1.3 2007/03/28 21:15:50 imp Exp $"); #include "lib.h" @@ -34,5 +34,5 @@ while ((--size) && (*to++ == *from++)) continue; - return (*to != *from); + return (size || (*to != *from)); } ==== //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/sd-card.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ * This software is derived from software provide by Kwikbyte who specifically * disclaimed copyright on the code. * - * $FreeBSD: src/sys/boot/arm/at91/libat91/sd-card.c,v 1.3 2006/11/09 20:32:36 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/libat91/sd-card.c,v 1.4 2007/03/28 22:31:32 imp Exp $ */ //*---------------------------------------------------------------------------- @@ -157,8 +157,9 @@ static int MCI_ReadBlock(int src, unsigned int *dataBuffer, int sizeToRead) { - unsigned log2sl = MCI_Device.READ_BL_LEN; - unsigned sectorLength = 1 << log2sl; +// unsigned log2sl = MCI_Device.READ_BL_LEN; +// unsigned sectorLength = 1 << log2sl; + unsigned sectorLength = 512; /////////////////////////////////////////////////////////////////////// if (MCI_Device.state != AT91C_MCI_IDLE) @@ -195,8 +196,9 @@ int MCI_read(char* dest, unsigned source, unsigned length) { - unsigned log2sl = MCI_Device.READ_BL_LEN; - unsigned sectorLength = 1 << log2sl; +// unsigned log2sl = MCI_Device.READ_BL_LEN; +// unsigned sectorLength = 1 << log2sl; + unsigned sectorLength = 512; int sizeToRead; unsigned int *walker; ==== //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/spi_flash.c#4 (text+ko) ==== @@ -19,7 +19,7 @@ * only. * END_BLOCK * - * $FreeBSD: src/sys/boot/arm/at91/libat91/spi_flash.c,v 1.3 2006/12/20 18:25:16 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/libat91/spi_flash.c,v 1.4 2007/03/28 22:38:01 imp Exp $ *****************************************************************************/ #include "at91rm9200.h" @@ -256,9 +256,6 @@ value = pSPI->SPI_RDR; value = pSPI->SPI_SR; - // Increment real time counter every SLCK - AT91C_BASE_ST->ST_RTMR = 1; - #ifdef BOOT_BWCT if (((value = GetFlashStatus()) & 0xFC) != 0xB4) printf(" Bad SPI status: 0x%x\n", value); ==== //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/strlen.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/arm/at91/libat91/strlen.c,v 1.2 2006/11/09 20:32:36 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/arm/at91/libat91/strlen.c,v 1.3 2007/03/28 21:12:43 imp Exp $"); /****************************************************************************** * @@ -64,5 +64,5 @@ const char *ptr = buffer; while (*ptr++) continue; - return (ptr - buffer); + return (ptr - buffer - 1); } ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#17 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.101 2007/01/18 10:42:10 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.102 2007/03/29 02:11:45 julian Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -234,6 +234,116 @@ return error; } +/* + * common code for linux *at set of syscalls + * + * works like this: + * if filename is absolute + * ignore dirfd + * else + * if dirfd == AT_FDCWD + * return CWD/filename + * else + * return DIRFD/filename + */ +static int +linux_at(struct thread *td, int dirfd, char *filename, char **newpath, char **freebuf) +{ + struct file *fp; + int error = 0; + struct vnode *dvp; + struct filedesc *fdp = td->td_proc->p_fd; + char *fullpath = "unknown"; + char *freepath = NULL; + + /* don't do anything if the pathname is absolute */ + if (*filename == '/') { + *newpath= filename; + return (0); + } + + /* check for AT_FDWCD */ + if (dirfd == LINUX_AT_FDCWD) { + FILEDESC_LOCK(fdp); + dvp = fdp->fd_cdir; + FILEDESC_UNLOCK(fdp); + } else { + error = fget(td, dirfd, &fp); + if (error) + return (error); + dvp = fp->f_vnode; + /* only a dir can be dfd */ + if (dvp->v_type != VDIR) { + fdrop(fp, td); + return (ENOTDIR); + } + fdrop(fp, td); + } + + error = vn_fullpath(td, dvp, &fullpath, &freepath); + if (!error) { + *newpath = malloc(strlen(fullpath) + strlen(filename) + 2, M_TEMP, M_WAITOK | M_ZERO); + *freebuf = freepath; + sprintf(*newpath, "%s/%s", fullpath, filename); + } + + return (error); +} + +int +linux_openat(struct thread *td, struct linux_openat_args *args) +{ + char *newpath, *oldpath, *freebuf = NULL, *path; + int error; + + oldpath = malloc(MAXPATHLEN, M_TEMP, M_WAITOK); + error = copyinstr(args->filename, oldpath, MAXPATHLEN, NULL); + +#ifdef DEBUG + if (ldebug(openat)) + printf(ARGS(openat, "%i, %s, 0x%x, 0x%x"), args->dfd, + oldpath, args->flags, args->mode); +#endif + + error = linux_at(td, args->dfd, oldpath, &newpath, &freebuf); + if (error) + return (error); +#ifdef DEBUG + printf(LMSG("newpath: %s"), newpath); +#endif + if (args->flags & LINUX_O_CREAT) + LCONVPATH_SEG(td, newpath, &path, 1, UIO_SYSSPACE); + else + LCONVPATH_SEG(td, newpath, &path, 0, UIO_SYSSPACE); + if (freebuf) + free(freebuf, M_TEMP); + if (*oldpath != '/') + free(newpath, M_TEMP); + + error = linux_common_open(td, path, args->flags, args->mode, 1); + free(oldpath, M_TEMP); + return (error); +} + +int +linux_open(struct thread *td, struct linux_open_args *args) +{ + char *path; + + if (args->flags & LINUX_O_CREAT) + LCONVPATHCREAT(td, args->path, &path); + else + LCONVPATHEXIST(td, args->path, &path); + +#ifdef DEBUG + if (ldebug(open)) + printf(ARGS(open, "%s, 0x%x, 0x%x"), + path, args->flags, args->mode); +#endif + + return linux_common_open(td, path, args->flags, args->mode, 0); +} + int linux_openat(struct thread *td, struct linux_openat_args *args) { ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_util.h#4 (text+ko) ==== @@ -28,7 +28,7 @@ * * from: svr4_util.h,v 1.5 1994/11/18 02:54:31 christos Exp * from: linux_util.h,v 1.2 1995/03/05 23:23:50 fvdl Exp - * $FreeBSD: src/sys/compat/linux/linux_util.h,v 1.28 2006/06/27 18:30:49 jhb Exp $ + * $FreeBSD: src/sys/compat/linux/linux_util.h,v 1.29 2007/03/29 02:11:45 julian Exp $ */ /* ==== //depot/projects/linuxolator/src/sys/conf/options#20 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.582 2007/03/22 18:16:39 jkim Exp $ +# $FreeBSD: src/sys/conf/options,v 1.583 2007/03/27 19:32:40 jhb Exp $ # # On the handling of kernel options # @@ -59,7 +59,6 @@ # Miscellaneous options. ADAPTIVE_GIANT opt_adaptive_mutexes.h -NO_ADAPTIVE_MUTEXES opt_adaptive_mutexes.h ALQ AUDIT opt_global.h CODA_COMPAT_5 opt_coda.h @@ -124,6 +123,7 @@ MPROF_BUFFERS opt_mprof.h MPROF_HASH_SIZE opt_mprof.h MUTEX_WAKE_ALL +NO_ADAPTIVE_MUTEXES opt_adaptive_mutexes.h NO_ADAPTIVE_RWLOCKS NSWBUF_MIN opt_swap.h PANIC_REBOOT_WAIT_TIME opt_panic.h ==== //depot/projects/linuxolator/src/sys/dev/acpica/acpi_hpet.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_hpet.c,v 1.5 2006/08/11 17:12:16 des Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_hpet.c,v 1.6 2007/03/28 22:28:48 njl Exp $"); #include "opt_acpi.h" #include @@ -154,6 +154,18 @@ return (EBUSY); } +static int +acpi_hpet_resume(device_t dev) +{ + struct acpi_hpet_softc *sc; + + /* Re-enable the timer after a resume to keep the clock advancing. */ + sc = device_get_softc(dev); + bus_write_4(sc->mem_res, HPET_OFFSET_ENABLE, 1); + + return (0); +} + /* Print some basic latency/rate information to assist in debugging. */ static void acpi_hpet_test(struct acpi_hpet_softc *sc) @@ -188,6 +200,7 @@ DEVMETHOD(device_probe, acpi_hpet_probe), DEVMETHOD(device_attach, acpi_hpet_attach), DEVMETHOD(device_detach, acpi_hpet_detach), + DEVMETHOD(device_resume, acpi_hpet_resume), {0, 0} }; ==== //depot/projects/linuxolator/src/sys/dev/fxp/if_fxp.c#8 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.264 2007/02/23 12:18:41 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.265 2007/03/28 18:10:50 remko Exp $"); /* * Intel EtherExpress Pro/100B PCI Fast Ethernet driver @@ -178,6 +178,7 @@ { 0x1065, -1, "Intel 82562ET/EZ/GT/GZ PRO/100 VE Ethernet" }, { 0x1068, -1, "Intel 82801FBM (ICH6-M) Pro/100 VE Ethernet" }, { 0x1069, -1, "Intel 82562EM/EX/GX Pro/100 Ethernet" }, + { 0x1091, -1, "Intel 82562GX Pro/100 Ethernet" }, { 0x1092, -1, "Intel Pro/100 VE Network Connection" }, { 0x1093, -1, "Intel Pro/100 VM Network Connection" }, { 0x1094, -1, "Intel Pro/100 946GZ (ICH7) Network Connection" }, ==== //depot/projects/linuxolator/src/sys/dev/ichwd/ichwd.c#4 (text+ko) ==== @@ -54,7 +54,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ichwd/ichwd.c,v 1.8 2007/03/13 15:54:26 n_hibma Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ichwd/ichwd.c,v 1.9 2007/03/27 21:03:36 n_hibma Exp $"); #include #include @@ -194,8 +194,6 @@ } else { if (sc->active) ichwd_tmr_disable(sc); - if (cmd > 0) - *error = EINVAL; } } ==== //depot/projects/linuxolator/src/sys/dev/ipmi/ipmi.c#8 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ipmi/ipmi.c,v 1.9 2007/02/23 12:18:44 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ipmi/ipmi.c,v 1.10 2007/03/27 21:03:36 n_hibma Exp $"); #include #include @@ -656,8 +656,6 @@ *error = 0; } else { ipmi_set_watchdog(sc, 0); - if (cmd > 0) - *error = 0; } } ==== //depot/projects/linuxolator/src/sys/dev/isp/isp_sbus.c#9 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_sbus.c,v 1.30 2007/03/13 06:46:08 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_sbus.c,v 1.31 2007/03/28 16:34:11 mjacob Exp $"); #include #include @@ -193,8 +193,6 @@ sbs->sbus_dev = dev; sbs->sbus_reg = regs; sbs->sbus_mdvec = mdvec; - isp->isp_bus_tag = rman_get_bustag(regs); - isp->isp_bus_handle = rman_get_bushandle(regs); sbs->sbus_poff[BIU_BLOCK >> _BLK_REG_SHFT] = BIU_REGS_OFF; sbs->sbus_poff[MBOX_BLOCK >> _BLK_REG_SHFT] = SBUS_MBOX_REGS_OFF; @@ -202,6 +200,8 @@ sbs->sbus_poff[RISC_BLOCK >> _BLK_REG_SHFT] = SBUS_RISC_REGS_OFF; sbs->sbus_poff[DMA_BLOCK >> _BLK_REG_SHFT] = DMA_REGS_OFF; isp = &sbs->sbus_isp; + isp->isp_bus_tag = rman_get_bustag(regs); + isp->isp_bus_handle = rman_get_bushandle(regs); isp->isp_mdvec = &sbs->sbus_mdvec; isp->isp_bustype = ISP_BT_SBUS; isp->isp_type = ISP_HA_SCSI_UNKNOWN; ==== //depot/projects/linuxolator/src/sys/dev/mk48txx/mk48txx.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mk48txx/mk48txx.c,v 1.8 2006/12/15 21:44:49 n_hibma Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mk48txx/mk48txx.c,v 1.9 2007/03/27 21:03:36 n_hibma Exp $"); /* * Mostek MK48T02, MK48T08, MK48T18, MK48T59 time-of-day chip subroutines. @@ -295,9 +295,9 @@ dev = arg; sc = device_get_softc(dev); - wdog = 0; t = cmd & WD_INTERVAL; - if (cmd > 0 && t >= 26 && t <= 37) { + if (t >= 26 && t <= 37) { + wdog = 0; if (t <= WD_TO_2SEC) { wdog |= MK48TXX_WDOG_RB_1_16; t -= 26; @@ -317,8 +317,8 @@ if (sc->sc_flag & MK48TXX_WDOG_ENABLE_WDS) wdog |= MK48TXX_WDOG_WDS; *error = 0; - } else if (cmd > 0) { - *error = EINVAL; + } else { + wdog = 0; } mtx_lock(&sc->sc_mtx); (*sc->sc_nvwr)(dev, sc->sc_clkoffset + MK48TXX_WDOG, wdog); ==== //depot/projects/linuxolator/src/sys/dev/re/if_re.c#11 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.87 2007/03/04 03:38:07 csjp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.88 2007/03/28 18:07:12 remko Exp $"); /* * RealTek 8139C+/8169/8169S/8110S/8168/8111/8101E PCI NIC driver @@ -182,6 +182,8 @@ "RealTek 8169S Single-chip Gigabit Ethernet" }, { RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8169_8110SB, "RealTek 8169SB/8110SB Single-chip Gigabit Ethernet" }, + { RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8169_8110SC, + "RealTek 8169SC/8110SC Single-chip Gigabit Ethernet" }, { RT_VENDORID, RT_DEVICEID_8169SC, RL_HWREV_8169_8110SC, "RealTek 8169SC/8110SC Single-chip Gigabit Ethernet" }, { RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8110S, ==== //depot/projects/linuxolator/src/sys/dev/scc/scc_bfe.h#4 (text) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/scc/scc_bfe.h,v 1.5 2007/03/22 23:45:25 marcel Exp $ + * $FreeBSD: src/sys/dev/scc/scc_bfe.h,v 1.6 2007/03/28 18:05:17 marcel Exp $ */ #ifndef _DEV_SCC_BFE_H_ @@ -92,6 +92,7 @@ struct scc_mode ch_mode[SCC_NMODES]; u_int ch_nr; + int ch_enabled:1; int ch_sysdev:1; uint32_t ch_ipend; ==== //depot/projects/linuxolator/src/sys/dev/scc/scc_core.c#4 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/scc/scc_core.c,v 1.8 2007/03/22 23:45:25 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/scc/scc_core.c,v 1.10 2007/03/28 18:05:17 marcel Exp $"); #include #include @@ -103,7 +103,7 @@ struct scc_softc *sc, *sc0; const char *sep; bus_space_handle_t bh; - u_long base, size, start; + u_long base, size, start, sz; int c, error, mode, sysdev; /* @@ -155,18 +155,23 @@ */ sysdev = 0; base = rman_get_start(sc->sc_rres); + sz = (size != 0) ? size : rman_get_size(sc->sc_rres); start = base + ((cl->cl_range < 0) ? size * (cl->cl_channels - 1) : 0); for (c = 0; c < cl->cl_channels; c++) { ch = &sc->sc_chan[c]; resource_list_init(&ch->ch_rlist); ch->ch_nr = c + 1; + if (!SCC_ENABLED(sc, ch)) + goto next; + + ch->ch_enabled = 1; resource_list_add(&ch->ch_rlist, sc->sc_rtype, 0, start, - start + size - 1, size); + start + sz - 1, sz); rle = resource_list_find(&ch->ch_rlist, sc->sc_rtype, 0); rle->res = &ch->ch_rres; bus_space_subregion(rman_get_bustag(sc->sc_rres), - rman_get_bushandle(sc->sc_rres), start - base, size, &bh); + rman_get_bushandle(sc->sc_rres), start - base, sz, &bh); rman_set_bushandle(rle->res, bh); rman_set_bustag(rle->res, rman_get_bustag(sc->sc_rres)); @@ -191,6 +196,7 @@ } } + next: start += (cl->cl_range < 0) ? -size : size; sysdev |= ch->ch_sysdev; } @@ -336,7 +342,7 @@ { struct scc_softc *sc; struct scc_class *cl; - u_long size; + u_long size, sz; int error; /* @@ -378,9 +384,10 @@ * Fill in the bus access structure and call the hardware specific * probe method. */ + sz = (size != 0) ? size : rman_get_size(sc->sc_rres); sc->sc_bas.bsh = rman_get_bushandle(sc->sc_rres); sc->sc_bas.bst = rman_get_bustag(sc->sc_rres); - sc->sc_bas.range = size; + sc->sc_bas.range = sz; sc->sc_bas.rclk = rclk; sc->sc_bas.regshft = regshft; ==== //depot/projects/linuxolator/src/sys/dev/scc/scc_if.m#2 (text) ==== @@ -23,7 +23,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $FreeBSD: src/sys/dev/scc/scc_if.m,v 1.1 2006/03/30 18:33:22 marcel Exp $ +# $FreeBSD: src/sys/dev/scc/scc_if.m,v 1.2 2007/03/28 18:05:17 marcel Exp $ #include #include @@ -38,6 +38,15 @@ INTERFACE scc; +# Default implementations of some methods. +CODE { + static int + default_enabled(struct scc_softc *this, struct scc_chan *ch) + { + return (1); + } +} + # attach() - attach hardware. # This method is called when the device is being attached. All resources # have been allocated. The intend of this method is to setup the hardware @@ -50,6 +59,13 @@ int reset; }; +# enabled() +METHOD int enabled { + struct scc_softc *this; + struct scc_chan *chan; +} DEFAULT default_enabled; + +# iclear() METHOD void iclear { struct scc_softc *this; struct scc_chan *chan; ==== //depot/projects/linuxolator/src/sys/dev/sio/sio_pci.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sio/sio_pci.c,v 1.21 2005/05/29 04:42:25 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sio/sio_pci.c,v 1.23 2007/03/29 04:26:52 maxim Exp $"); #include #include ==== //depot/projects/linuxolator/src/sys/dev/uart/uart_core.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_core.c,v 1.20 2007/02/23 12:18:57 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_core.c,v 1.21 2007/03/28 18:26:12 marcel Exp $"); #ifndef KLD_MODULE #include "opt_comconsole.h" @@ -344,7 +344,7 @@ uart_cpu_eqres(&sc->sc_bas, &sysdev->bas)) { /* XXX check if ops matches class. */ sc->sc_sysdev = sysdev; - break; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Mar 29 20:39:07 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4492316A405; Thu, 29 Mar 2007 20:39:07 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1A07216A401 for ; Thu, 29 Mar 2007 20:39:07 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 08BB213C448 for ; Thu, 29 Mar 2007 20:39:07 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2TKd68B025432 for ; Thu, 29 Mar 2007 20:39:06 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2TKd6XA025429 for perforce@freebsd.org; Thu, 29 Mar 2007 20:39:06 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 29 Mar 2007 20:39:06 GMT Message-Id: <200703292039.l2TKd6XA025429@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 116875 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Mar 2007 20:39:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=116875 Change 116875 by rdivacky@rdivacky_witten on 2007/03/29 20:38:55 Fix a mismerge of linux_file.c Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#18 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#18 (text+ko) ==== @@ -234,116 +234,6 @@ return error; } -/* - * common code for linux *at set of syscalls - * - * works like this: - * if filename is absolute - * ignore dirfd - * else - * if dirfd == AT_FDCWD - * return CWD/filename - * else - * return DIRFD/filename - */ -static int -linux_at(struct thread *td, int dirfd, char *filename, char **newpath, char **freebuf) -{ - struct file *fp; - int error = 0; - struct vnode *dvp; - struct filedesc *fdp = td->td_proc->p_fd; - char *fullpath = "unknown"; - char *freepath = NULL; - - /* don't do anything if the pathname is absolute */ - if (*filename == '/') { - *newpath= filename; - return (0); - } - - /* check for AT_FDWCD */ - if (dirfd == LINUX_AT_FDCWD) { - FILEDESC_LOCK(fdp); - dvp = fdp->fd_cdir; - FILEDESC_UNLOCK(fdp); - } else { - error = fget(td, dirfd, &fp); - if (error) - return (error); - dvp = fp->f_vnode; - /* only a dir can be dfd */ - if (dvp->v_type != VDIR) { - fdrop(fp, td); - return (ENOTDIR); - } - fdrop(fp, td); - } - - error = vn_fullpath(td, dvp, &fullpath, &freepath); - if (!error) { - *newpath = malloc(strlen(fullpath) + strlen(filename) + 2, M_TEMP, M_WAITOK | M_ZERO); - *freebuf = freepath; - sprintf(*newpath, "%s/%s", fullpath, filename); - } - - return (error); -} - -int -linux_openat(struct thread *td, struct linux_openat_args *args) -{ - char *newpath, *oldpath, *freebuf = NULL, *path; - int error; - - oldpath = malloc(MAXPATHLEN, M_TEMP, M_WAITOK); - error = copyinstr(args->filename, oldpath, MAXPATHLEN, NULL); - -#ifdef DEBUG - if (ldebug(openat)) - printf(ARGS(openat, "%i, %s, 0x%x, 0x%x"), args->dfd, - oldpath, args->flags, args->mode); -#endif - - error = linux_at(td, args->dfd, oldpath, &newpath, &freebuf); - if (error) - return (error); -#ifdef DEBUG - printf(LMSG("newpath: %s"), newpath); -#endif - if (args->flags & LINUX_O_CREAT) - LCONVPATH_SEG(td, newpath, &path, 1, UIO_SYSSPACE); - else - LCONVPATH_SEG(td, newpath, &path, 0, UIO_SYSSPACE); - if (freebuf) - free(freebuf, M_TEMP); - if (*oldpath != '/') - free(newpath, M_TEMP); - - error = linux_common_open(td, path, args->flags, args->mode, 1); - free(oldpath, M_TEMP); - return (error); -} - -int -linux_open(struct thread *td, struct linux_open_args *args) -{ - char *path; - - if (args->flags & LINUX_O_CREAT) - LCONVPATHCREAT(td, args->path, &path); - else - LCONVPATHEXIST(td, args->path, &path); - -#ifdef DEBUG - if (ldebug(open)) - printf(ARGS(open, "%s, 0x%x, 0x%x"), - path, args->flags, args->mode); -#endif - - return linux_common_open(td, path, args->flags, args->mode, 0); -} - int linux_openat(struct thread *td, struct linux_openat_args *args) { From owner-p4-projects@FreeBSD.ORG Thu Mar 29 23:08:46 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5033B16A405; Thu, 29 Mar 2007 23:08:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DE1DE16A403 for ; Thu, 29 Mar 2007 23:08:45 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CDD4813C469 for ; Thu, 29 Mar 2007 23:08:45 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2TN8jad065578 for ; Thu, 29 Mar 2007 23:08:45 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2TN8KbC065574 for perforce@freebsd.org; Thu, 29 Mar 2007 23:08:20 GMT (envelope-from peter@freebsd.org) Date: Thu, 29 Mar 2007 23:08:20 GMT Message-Id: <200703292308.l2TN8KbC065574@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 116890 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Mar 2007 23:08:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=116890 Change 116890 by peter@peter_daintree on 2007/03/29 23:07:42 IFC @116884 Affected files ... .. //depot/projects/hammer/ObsoleteFiles.inc#23 integrate .. //depot/projects/hammer/crypto/openssl/CHANGES#7 integrate .. //depot/projects/hammer/crypto/openssl/Configure#7 integrate .. //depot/projects/hammer/crypto/openssl/FAQ#7 integrate .. //depot/projects/hammer/crypto/openssl/FREEBSD-upgrade#2 integrate .. //depot/projects/hammer/crypto/openssl/INSTALL#5 integrate .. //depot/projects/hammer/crypto/openssl/LICENSE#5 integrate .. //depot/projects/hammer/crypto/openssl/Makefile#3 integrate .. //depot/projects/hammer/crypto/openssl/NEWS#7 integrate .. //depot/projects/hammer/crypto/openssl/README#7 integrate .. //depot/projects/hammer/crypto/openssl/apps/CA.pl#7 integrate .. //depot/projects/hammer/crypto/openssl/apps/Makefile#3 integrate .. //depot/projects/hammer/crypto/openssl/apps/ca.c#7 integrate .. //depot/projects/hammer/crypto/openssl/apps/dgst.c#6 integrate .. //depot/projects/hammer/crypto/openssl/apps/ec.c#2 integrate .. //depot/projects/hammer/crypto/openssl/apps/enc.c#6 integrate .. //depot/projects/hammer/crypto/openssl/apps/ocsp.c#5 integrate .. //depot/projects/hammer/crypto/openssl/apps/pkcs12.c#5 integrate .. //depot/projects/hammer/crypto/openssl/apps/s_client.c#5 integrate .. //depot/projects/hammer/crypto/openssl/apps/s_server.c#5 integrate .. //depot/projects/hammer/crypto/openssl/certs/aol1.pem#1 branch .. //depot/projects/hammer/crypto/openssl/certs/aol2.pem#1 branch .. //depot/projects/hammer/crypto/openssl/certs/aoltw1.pem#1 branch .. //depot/projects/hammer/crypto/openssl/certs/aoltw2.pem#1 branch .. //depot/projects/hammer/crypto/openssl/config#7 integrate .. //depot/projects/hammer/crypto/openssl/crypto/aes/Makefile#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/aes/aes_misc.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/asn1/a_strex.c#7 integrate .. //depot/projects/hammer/crypto/openssl/crypto/asn1/asn1_err.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/asn1/asn1_lib.c#6 integrate .. //depot/projects/hammer/crypto/openssl/crypto/asn1/asn1t.h#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/asn1/t_x509.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/asn1/tasn_dec.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/asn1/x_x509.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/bf/bf_ecb.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/bio/bio.h#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/bio/bio_err.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/bio/bio_lib.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/bn/bn_err.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/bn/bn_lib.c#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/bn/bn_print.c#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/buffer/buf_err.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/camellia/Makefile#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/camellia/camellia.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/camellia/cmll_cbc.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/camellia/cmll_locl.h#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/camellia/cmll_misc.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/cast/c_ecb.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/comp/c_zlib.c#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/comp/comp_err.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/conf/conf_def.c#6 integrate .. //depot/projects/hammer/crypto/openssl/crypto/conf/conf_err.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/conf/conf_lib.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/cpt_err.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/cryptlib.c#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/des/INSTALL#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/des/des_ver.h#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/des/ecb_enc.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/dh/dh_err.c#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/dh/dh_lib.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/dsa/dsa_err.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/dsa/dsa_lib.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/dso/dso_err.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/ec/ec_asn1.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/ec/ec_err.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/ecdh/ech_err.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/ecdh/ech_lib.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/ecdsa/ecdsa.h#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/ecdsa/ecs_err.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/ecdsa/ecs_lib.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/ecdsa/ecs_ossl.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/engine/eng_all.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/engine/eng_err.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/engine/eng_padlock.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/engine/tb_ecdh.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/engine/tb_ecdsa.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/err/err_all.c#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/evp/bio_md.c#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/evp/evp.h#6 integrate .. //depot/projects/hammer/crypto/openssl/crypto/evp/evp_enc.c#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/evp/evp_err.c#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/evp/evp_lib.c#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/evp/evp_locl.h#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/idea/i_ecb.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/idea/idea_lcl.h#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/lhash/lhash.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/md2/md2.h#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/md2/md2_dgst.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/md4/md4.h#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/md4/md4_dgst.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/md5/md5.h#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/md5/md5_dgst.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/objects/obj_dat.h#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/objects/obj_err.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/objects/obj_mac.h#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/objects/obj_mac.num#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/objects/objects.txt#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/ocsp/ocsp_asn.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/ocsp/ocsp_err.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/ocsp/ocsp_vfy.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/opensslconf.h#6 integrate .. //depot/projects/hammer/crypto/openssl/crypto/opensslv.h#7 integrate .. //depot/projects/hammer/crypto/openssl/crypto/pem/pem.h#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/pem/pem_err.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/pem/pem_lib.c#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/pem/pem_pkey.c#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/pkcs12/pk12err.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/pkcs7/pk7_doit.c#7 integrate .. //depot/projects/hammer/crypto/openssl/crypto/pkcs7/pk7_lib.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/pkcs7/pk7_smime.c#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/pkcs7/pkcs7err.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/rand/md_rand.c#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/rand/rand_err.c#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/rc2/rc2_ecb.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/rc4/rc4_skey.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/ripemd/ripemd.h#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/ripemd/rmd_dgst.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/rsa/rsa_err.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/rsa/rsa_lib.c#6 integrate .. //depot/projects/hammer/crypto/openssl/crypto/sha/sha.h#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/sha/sha1dgst.c#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/sha/sha256.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/sha/sha512.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/sha/sha_dgst.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/stack/safestack.h#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/stack/stack.c#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/store/str_err.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/txt_db/txt_db.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/ui/ui_err.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509/by_dir.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509/x509.h#6 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509/x509_err.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509/x509_req.c#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509/x509_txt.c#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509/x509_vfy.c#7 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509/x509_vfy.h#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509v3/Makefile#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509v3/ext_dat.h#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509v3/pcy_tree.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509v3/v3_addr.c#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/x509v3/v3_akey.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509v3/v3_alt.c#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509v3/v3_asid.c#1 branch .. //depot/projects/hammer/crypto/openssl/crypto/x509v3/v3_bcons.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509v3/v3_bitst.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509v3/v3_cpols.c#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509v3/v3_crld.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509v3/v3_enum.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509v3/v3_extku.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509v3/v3_ia5.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509v3/v3_info.c#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509v3/v3_int.c#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509v3/v3_ncons.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509v3/v3_ocsp.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509v3/v3_pci.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509v3/v3_pcons.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509v3/v3_pku.c#3 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509v3/v3_pmaps.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509v3/v3_purp.c#5 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509v3/v3_skey.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509v3/v3_sxnet.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509v3/v3_utl.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509v3/v3err.c#4 integrate .. //depot/projects/hammer/crypto/openssl/crypto/x509v3/x509v3.h#4 integrate .. //depot/projects/hammer/crypto/openssl/doc/apps/ciphers.pod#4 integrate .. //depot/projects/hammer/crypto/openssl/doc/apps/s_client.pod#6 integrate .. //depot/projects/hammer/crypto/openssl/doc/apps/x509.pod#4 integrate .. //depot/projects/hammer/crypto/openssl/doc/crypto/ASN1_STRING_print_ex.pod#3 integrate .. //depot/projects/hammer/crypto/openssl/doc/crypto/BIO_set_callback.pod#2 integrate .. //depot/projects/hammer/crypto/openssl/doc/crypto/CONF_modules_free.pod#2 integrate .. //depot/projects/hammer/crypto/openssl/doc/crypto/RAND_egd.pod#3 integrate .. //depot/projects/hammer/crypto/openssl/doc/crypto/RSA_get_ex_new_index.pod#2 integrate .. //depot/projects/hammer/crypto/openssl/doc/crypto/md5.pod#2 integrate .. //depot/projects/hammer/crypto/openssl/doc/crypto/mdc2.pod#2 integrate .. //depot/projects/hammer/crypto/openssl/doc/crypto/ripemd.pod#2 integrate .. //depot/projects/hammer/crypto/openssl/doc/crypto/sha.pod#2 integrate .. //depot/projects/hammer/crypto/openssl/doc/ssl/SSL_CTX_set_tmp_rsa_callback.pod#2 integrate .. //depot/projects/hammer/crypto/openssl/doc/ssl/SSL_SESSION_get_time.pod#3 integrate .. //depot/projects/hammer/crypto/openssl/openssl.spec#7 integrate .. //depot/projects/hammer/crypto/openssl/ssl/d1_lib.c#2 integrate .. //depot/projects/hammer/crypto/openssl/ssl/d1_pkt.c#2 integrate .. //depot/projects/hammer/crypto/openssl/ssl/kssl.c#5 integrate .. //depot/projects/hammer/crypto/openssl/ssl/s23_clnt.c#5 integrate .. //depot/projects/hammer/crypto/openssl/ssl/s23_srvr.c#5 integrate .. //depot/projects/hammer/crypto/openssl/ssl/s2_enc.c#5 integrate .. //depot/projects/hammer/crypto/openssl/ssl/s2_lib.c#5 integrate .. //depot/projects/hammer/crypto/openssl/ssl/s3_clnt.c#7 integrate .. //depot/projects/hammer/crypto/openssl/ssl/s3_enc.c#5 integrate .. //depot/projects/hammer/crypto/openssl/ssl/s3_lib.c#6 integrate .. //depot/projects/hammer/crypto/openssl/ssl/s3_pkt.c#6 integrate .. //depot/projects/hammer/crypto/openssl/ssl/s3_srvr.c#8 integrate .. //depot/projects/hammer/crypto/openssl/ssl/ssl.h#6 integrate .. //depot/projects/hammer/crypto/openssl/ssl/ssl_ciph.c#7 integrate .. //depot/projects/hammer/crypto/openssl/ssl/ssl_err.c#4 integrate .. //depot/projects/hammer/crypto/openssl/ssl/ssl_lib.c#7 integrate .. //depot/projects/hammer/crypto/openssl/ssl/ssl_sess.c#7 integrate .. //depot/projects/hammer/crypto/openssl/ssl/t1_enc.c#5 integrate .. //depot/projects/hammer/crypto/openssl/ssl/t1_lib.c#3 integrate .. //depot/projects/hammer/crypto/openssl/test/Makefile#3 integrate .. //depot/projects/hammer/crypto/openssl/tools/c_rehash#7 integrate .. //depot/projects/hammer/crypto/openssl/util/libeay.num#6 integrate .. //depot/projects/hammer/crypto/openssl/util/mk1mf.pl#7 integrate .. //depot/projects/hammer/crypto/openssl/util/mkdef.pl#7 integrate .. //depot/projects/hammer/crypto/openssl/util/mkerr.pl#6 integrate .. //depot/projects/hammer/crypto/openssl/util/ssleay.num#4 integrate .. //depot/projects/hammer/etc/rc.d/dhclient#19 integrate .. //depot/projects/hammer/etc/rc.d/syscons#13 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#64 integrate .. //depot/projects/hammer/lib/libarchive/Makefile#38 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_bzip2.c#11 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_disk.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_none.c#13 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_disk_perms.c#2 integrate .. //depot/projects/hammer/lib/libc/net/inet.3#9 integrate .. //depot/projects/hammer/lib/libc/net/sctp_sys_calls.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/tmpnam.3#8 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.c#34 integrate .. //depot/projects/hammer/lib/libelf/elf_data.c#2 integrate .. //depot/projects/hammer/lib/libelf/elf_getarhdr.3#2 integrate .. //depot/projects/hammer/lib/libelf/elf_rand.3#2 integrate .. //depot/projects/hammer/lib/libelf/libelf_ar.c#2 integrate .. //depot/projects/hammer/lib/libmemstat/memstat.h#7 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_unix/pam_unix.8#6 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_unix/pam_unix.c#10 integrate .. //depot/projects/hammer/lib/libpmc/pmc.3#10 integrate .. //depot/projects/hammer/lib/libufs/type.c#7 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#90 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/article.sgml#4 integrate .. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#42 integrate .. //depot/projects/hammer/sbin/geom/core/geom.c#16 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.c#32 integrate .. //depot/projects/hammer/secure/lib/libcrypto/Makefile#23 integrate .. //depot/projects/hammer/secure/lib/libcrypto/Makefile.inc#12 integrate .. //depot/projects/hammer/secure/lib/libcrypto/Makefile.man#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ASN1_OBJECT_new.3#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ASN1_STRING_length.3#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ASN1_STRING_new.3#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ASN1_generate_nconf.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_ctrl.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_f_base64.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_f_buffer.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_f_cipher.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_f_md.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_f_null.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_f_ssl.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_find_type.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_new.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_push.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_read.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_s_accept.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_s_bio.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_s_connect.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_s_fd.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_s_file.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_s_mem.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_s_null.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_s_socket.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_set_callback.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BIO_should_retry.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_BLINDING_new.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_CTX_new.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_CTX_start.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_add.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_add_word.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_bn2bin.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_cmp.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_copy.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_generate_prime.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_mod_inverse.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_new.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_num_bytes.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_rand.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_set_bit.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_swap.3#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/BN_zero.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/CONF_modules_free.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/CONF_modules_load_file.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DH_generate_key.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DH_generate_parameters.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DH_get_ex_new_index.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DH_new.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DH_set_method.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DH_size.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_SIG_new.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_do_sign.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_dup_DH.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_generate_key.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_generate_parameters.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_get_ex_new_index.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_new.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_set_method.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_sign.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/DSA_size.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ERR_GET_LIB.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ERR_clear_error.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ERR_error_string.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ERR_get_error.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ERR_load_crypto_strings.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ERR_load_strings.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ERR_print_errors.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ERR_put_error.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ERR_remove_state.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ERR_set_mark.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/EVP_BytesToKey.3#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/EVP_DigestInit.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/EVP_EncryptInit.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/EVP_OpenInit.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/EVP_PKEY_new.3#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/EVP_SealInit.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/EVP_SignInit.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/EVP_VerifyInit.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/OBJ_nid2obj.3#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/OPENSSL_Applink.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/OPENSSL_config.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/OPENSSL_ia32cap.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/PKCS12_create.3#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/PKCS12_parse.3#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/PKCS7_decrypt.3#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/PKCS7_encrypt.3#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/PKCS7_sign.3#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/PKCS7_verify.3#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RAND_add.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RAND_bytes.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RAND_cleanup.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RAND_egd.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RAND_load_file.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RAND_set_rand_method.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_blinding_on.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_check_key.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_generate_key.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_get_ex_new_index.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_new.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_print.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_private_encrypt.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_public_encrypt.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_set_method.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_sign.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/RSA_size.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/SMIME_read_PKCS7.3#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/SMIME_write_PKCS7.3#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/X509_NAME_print_ex.3#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/X509_new.3#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/bio.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/blowfish.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/bn.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/bn_internal.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/buffer.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/crypto.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_DHparams.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_DSAPublicKey.3#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_RSAPublicKey.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_X509.3#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_X509_ALGOR.3#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_X509_CRL.3#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_X509_NAME.3#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_X509_REQ.3#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/d2i_X509_SIG.3#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/des.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/dh.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/dsa.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ecdsa.3#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/engine.3#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/err.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/evp.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/hmac.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/lh_stats.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/lhash.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/md5.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/mdc2.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/pem.3#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/rand.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/rc4.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ripemd.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/rsa.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/sha.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/threads.3#6 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ui.3#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/ui_compat.3#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/man/x509.3#2 integrate .. //depot/projects/hammer/secure/lib/libssl/Makefile.man#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_CIPHER_get_name.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_COMP_add_compression_method.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_CTX_add_session.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_CTX_ctrl.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_CTX_flush_sessions.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_CTX_free.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_CTX_new.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_CTX_sess_number.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_CTX_sessions.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_CTX_set_cert_store.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_CTX_set_info_callback.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_CTX_set_mode.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_CTX_set_options.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_CTX_set_timeout.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_CTX_set_verify.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_CTX_use_certificate.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_SESSION_free.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_SESSION_get_time.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_accept.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_alert_type_string.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_clear.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_connect.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_do_handshake.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_free.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_get_SSL_CTX.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_get_ciphers.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_get_client_CA_list.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_get_current_cipher.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_get_default_timeout.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_get_error.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_get_ex_new_index.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_get_fd.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_get_peer_cert_chain.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_get_peer_certificate.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_get_rbio.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_get_session.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_get_verify_result.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_get_version.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_library_init.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_load_client_CA_file.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_new.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_pending.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_read.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_rstate_string.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_session_reused.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_set_bio.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_set_connect_state.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_set_fd.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_set_session.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_set_shutdown.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_set_verify_result.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_shutdown.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_state_string.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_want.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/SSL_write.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/d2i_SSL_SESSION.3#3 integrate .. //depot/projects/hammer/secure/lib/libssl/man/ssl.3#3 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/Makefile.man#4 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/CA.pl.1#4 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/asn1parse.1#4 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/ca.1#4 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/ciphers.1#4 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/crl.1#4 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/crl2pkcs7.1#4 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/dgst.1#4 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/dhparam.1#4 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/dsa.1#4 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/dsaparam.1#4 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/ec.1#2 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/ecparam.1#2 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/enc.1#4 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/errstr.1#2 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/gendsa.1#4 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/genrsa.1#4 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/nseq.1#4 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/ocsp.1#4 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/openssl.1#4 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/passwd.1#4 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/pkcs12.1#4 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/pkcs7.1#4 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/pkcs8.1#4 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/rand.1#4 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/req.1#4 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/rsa.1#4 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/rsautl.1#4 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/s_client.1#4 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/s_server.1#4 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/s_time.1#3 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/sess_id.1#4 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/smime.1#4 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/speed.1#4 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/spkac.1#4 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/verify.1#4 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/version.1#4 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/x509.1#4 integrate .. //depot/projects/hammer/secure/usr.bin/openssl/man/x509v3_config.1#2 integrate .. //depot/projects/hammer/share/man/man4/Makefile#87 integrate .. //depot/projects/hammer/share/man/man4/acpi_thermal.4#5 integrate .. //depot/projects/hammer/share/man/man4/cxgb.4#1 branch .. //depot/projects/hammer/share/man/man4/edsc.4#1 branch .. //depot/projects/hammer/share/man/man4/ip.4#20 integrate .. //depot/projects/hammer/share/man/man4/multicast.4#5 integrate .. //depot/projects/hammer/share/man/man4/ng_fec.4#4 integrate .. //depot/projects/hammer/share/man/man4/sbp.4#7 integrate .. //depot/projects/hammer/share/man/man4/tap.4#8 integrate .. //depot/projects/hammer/share/man/man9/condvar.9#7 integrate .. //depot/projects/hammer/share/man/man9/ifnet.9#23 integrate .. //depot/projects/hammer/share/man/man9/locking.9#1 branch .. //depot/projects/hammer/share/man/man9/priv.9#3 integrate .. //depot/projects/hammer/sys/Makefile#14 integrate .. //depot/projects/hammer/sys/amd64/acpica/OsdEnvironment.c#14 integrate .. //depot/projects/hammer/sys/amd64/acpica/madt.c#48 integrate .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#55 integrate .. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#54 integrate .. //depot/projects/hammer/sys/amd64/amd64/legacy.c#21 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#71 integrate .. //depot/projects/hammer/sys/amd64/amd64/nexus.c#41 integrate .. //depot/projects/hammer/sys/amd64/amd64/prof_machdep.c#6 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#95 integrate .. //depot/projects/hammer/sys/amd64/amd64/tsc.c#16 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#98 integrate .. //depot/projects/hammer/sys/amd64/include/acpica_machdep.h#14 integrate .. //depot/projects/hammer/sys/amd64/include/apicvar.h#46 integrate .. //depot/projects/hammer/sys/amd64/include/specialreg.h#23 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux.h#6 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_dummy.c#4 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_proto.h#10 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_syscall.h#10 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_sysent.c#10 integrate .. //depot/projects/hammer/sys/amd64/linux32/syscalls.master#10 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_arm9.S#5 integrate .. //depot/projects/hammer/sys/arm/at91/at91_st.c#6 integrate .. //depot/projects/hammer/sys/arm/at91/at91_twi.c#6 integrate .. //depot/projects/hammer/sys/arm/at91/at91_twireg.h#2 integrate .. //depot/projects/hammer/sys/arm/at91/kb920x_machdep.c#6 integrate .. //depot/projects/hammer/sys/arm/conf/KB920X#4 integrate .. //depot/projects/hammer/sys/arm/conf/KB920X.hints#1 branch .. //depot/projects/hammer/sys/arm/include/bootconfig.h#3 integrate .. //depot/projects/hammer/sys/arm/include/cpufunc.h#10 integrate .. //depot/projects/hammer/sys/arm/include/undefined.h#3 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/i80321_wdog.c#3 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/avila_ata.c#3 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425.c#4 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425_wdog.c#2 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425reg.h#2 integrate .. //depot/projects/hammer/sys/boot/arm/at91/boot2/boot2.c#2 integrate .. //depot/projects/hammer/sys/boot/arm/at91/bootspi/loader_prompt.c#2 integrate .. //depot/projects/hammer/sys/boot/arm/at91/libat91/Makefile#3 integrate .. //depot/projects/hammer/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#3 integrate .. //depot/projects/hammer/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#3 integrate .. //depot/projects/hammer/sys/boot/arm/at91/libat91/emac.c#3 integrate .. //depot/projects/hammer/sys/boot/arm/at91/libat91/getc.c#2 integrate .. //depot/projects/hammer/sys/boot/arm/at91/libat91/memcmp.c#2 integrate .. //depot/projects/hammer/sys/boot/arm/at91/libat91/sd-card.c#2 integrate .. //depot/projects/hammer/sys/boot/arm/at91/libat91/spi_flash.c#2 integrate .. //depot/projects/hammer/sys/boot/arm/at91/libat91/strlen.c#2 integrate .. //depot/projects/hammer/sys/boot/ficl/ficl.h#3 integrate .. //depot/projects/hammer/sys/boot/ficl/float.c#2 integrate .. //depot/projects/hammer/sys/boot/ficl/softwords/fileaccess.fr#2 integrate .. //depot/projects/hammer/sys/boot/ficl/softwords/jhlocal.fr#2 integrate .. //depot/projects/hammer/sys/boot/ficl/softwords/oo.fr#2 integrate .. //depot/projects/hammer/sys/boot/ficl/softwords/prefix.fr#2 integrate .. //depot/projects/hammer/sys/boot/ficl/softwords/softcore.awk#2 integrate .. //depot/projects/hammer/sys/boot/ficl/tools.c#2 integrate .. //depot/projects/hammer/sys/boot/ficl/unix.c#2 integrate .. //depot/projects/hammer/sys/boot/ficl/vm.c#2 integrate .. //depot/projects/hammer/sys/boot/ficl/words.c#4 integrate .. //depot/projects/hammer/sys/boot/i386/boot0/boot0.S#10 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/biosacpi.c#9 integrate .. //depot/projects/hammer/sys/boot/ia64/ski/acpi_stub.c#5 integrate .. //depot/projects/hammer/sys/boot/pc98/boot0.5/boot.s#2 integrate .. //depot/projects/hammer/sys/boot/pc98/boot0.5/boot0.5.s#2 integrate .. //depot/projects/hammer/sys/boot/pc98/boot0.5/disk.s#2 integrate .. //depot/projects/hammer/sys/cam/cam_xpt.c#29 integrate .. //depot/projects/hammer/sys/compat/linux/linux_file.c#19 integrate .. //depot/projects/hammer/sys/compat/linux/linux_util.h#10 integrate .. //depot/projects/hammer/sys/conf/NOTES#115 integrate .. //depot/projects/hammer/sys/conf/files#147 integrate .. //depot/projects/hammer/sys/conf/kern.post.mk#41 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#62 integrate .. //depot/projects/hammer/sys/conf/options#102 integrate .. //depot/projects/hammer/sys/contrib/altq/altq/altq_subr.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/CHANGES.txt#13 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acapps.h#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acconfig.h#15 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acdebug.h#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acdisasm.h#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acdispat.h#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acefi.h#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acenv.h#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acevents.h#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acexcep.h#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acfreebsd.h#17 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acgcc.h#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acglobal.h#14 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/achware.h#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acinterp.h#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/aclocal.h#13 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acmacros.h#13 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acnames.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acnamesp.h#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acobject.h#12 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acopcode.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acoutput.h#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acparser.h#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acpi.h#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acpica_prep.sh#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acpiosxf.h#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acpixf.h#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acresrc.h#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acstruct.h#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/actables.h#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/actbl.h#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/actbl1.h#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/actbl2.h#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/actypes.h#13 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acutils.h#13 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/aecommon.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/aeexec.c#2 delete .. //depot/projects/hammer/sys/contrib/dev/acpica/amlcode.h#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/amlresrc.h#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/common/adfile.c#1 branch .. //depot/projects/hammer/sys/contrib/dev/acpica/common/adisasm.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/common/adwalk.c#1 branch .. //depot/projects/hammer/sys/contrib/dev/acpica/common/dmrestag.c#1 branch .. //depot/projects/hammer/sys/contrib/dev/acpica/common/dmtable.c#1 branch .. //depot/projects/hammer/sys/contrib/dev/acpica/common/dmtbdump.c#1 branch .. //depot/projects/hammer/sys/contrib/dev/acpica/common/dmtbinfo.c#1 branch .. //depot/projects/hammer/sys/contrib/dev/acpica/common/getopt.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslanalyze.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslcodegen.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslcompile.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslcompiler.h#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslcompiler.l#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslcompiler.y#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asldefine.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslerror.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslfiles.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslfold.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslglobal.h#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asllength.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asllisting.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslload.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asllookup.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslmain.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslmap.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslopcodes.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asloperands.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslopt.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslresource.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslrestype1.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslrestype2.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslstubs.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asltransform.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asltree.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asltypes.h#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslutils.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbcmds.c#16 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbdisply.c#13 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbexec.c#14 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbfileio.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbhistry.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbinput.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbstats.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbutils.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbxface.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmbuffer.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmnames.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmobject.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmopcode.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmresrc.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmresrcl.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmresrcs.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmutils.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmwalk.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsfield.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsinit.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsmethod.c#14 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsmthdat.c#14 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsobject.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsopcode.c#13 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsutils.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dswexec.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dswload.c#12 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dswscope.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dswstate.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evevent.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evgpe.c#12 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evgpeblk.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evmisc.c#14 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evregion.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evrgnini.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evsci.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evxface.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evxfevnt.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evxfregn.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exconfig.c#12 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exconvrt.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/excreate.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exdump.c#13 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exfield.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exfldio.c#15 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exmisc.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exmutex.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exnames.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exoparg1.c#12 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exoparg2.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exoparg3.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exoparg6.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exprep.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exregion.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exresnte.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exresolv.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exresop.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exstore.c#15 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exstoren.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exstorob.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exsystem.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exutils.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hwacpi.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hwgpe.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hwregs.c#14 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hwsleep.c#14 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hwtimer.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsaccess.c#14 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsalloc.c#14 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsdump.c#12 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsdumpdv.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nseval.c#12 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsinit.c#12 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsload.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsnames.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsobject.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsparse.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nssearch.c#12 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsutils.c#13 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nswalk.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsxfeval.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsxfname.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsxfobj.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/osunixxf.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/psargs.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/psloop.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/psopcode.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/psparse.c#12 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/psscope.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/pstree.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/psutils.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/pswalk.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/psxface.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsaddr.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rscalc.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rscreate.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsdump.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsinfo.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsio.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsirq.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rslist.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsmemory.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsmisc.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsutils.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsxface.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbconvrt.c#11 delete .. //depot/projects/hammer/sys/contrib/dev/acpica/tbfadt.c#1 branch .. //depot/projects/hammer/sys/contrib/dev/acpica/tbfind.c#1 branch .. //depot/projects/hammer/sys/contrib/dev/acpica/tbget.c#12 delete .. //depot/projects/hammer/sys/contrib/dev/acpica/tbgetall.c#10 delete .. //depot/projects/hammer/sys/contrib/dev/acpica/tbinstal.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbrsdt.c#10 delete .. //depot/projects/hammer/sys/contrib/dev/acpica/tbutils.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbxface.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbxfroot.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utalloc.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utcache.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utclib.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utcopy.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utdebug.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utdelete.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/uteval.c#13 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utglobal.c#15 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utinit.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utmath.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utmisc.c#12 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utmutex.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utobject.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utresrc.c#1 branch .. //depot/projects/hammer/sys/contrib/dev/acpica/utstate.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/uttrack.c#1 branch .. //depot/projects/hammer/sys/contrib/dev/acpica/utxface.c#9 integrate .. //depot/projects/hammer/sys/contrib/pf/net/if_pfsync.c#24 integrate .. //depot/projects/hammer/sys/contrib/pf/net/if_pfsync.h#6 integrate .. //depot/projects/hammer/sys/crypto/via/padlock.c#5 integrate .. //depot/projects/hammer/sys/dev/acpi_support/acpi_asus.c#9 integrate .. //depot/projects/hammer/sys/dev/acpi_support/acpi_fujitsu.c#5 integrate .. //depot/projects/hammer/sys/dev/acpi_support/acpi_ibm.c#10 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdDebug.c#9 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdMemory.c#7 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdSchedule.c#19 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdSynch.c#12 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdTable.c#11 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#73 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_acad.c#21 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_button.c#12 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cmbat.c#26 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#36 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_dock.c#4 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#36 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_hpet.c#4 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_lid.c#13 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pci_link.c#35 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_perf.c#13 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_quirk.c#4 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_resource.c#23 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_throttle.c#10 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_timer.c#15 integrate .. //depot/projects/hammer/sys/dev/acpica/acpivar.h#52 integrate .. //depot/projects/hammer/sys/dev/ar/if_ar.c#20 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-cam.c#26 integrate .. //depot/projects/hammer/sys/dev/ce/if_ce.c#5 integrate .. //depot/projects/hammer/sys/dev/cm/smc90cx6.c#13 integrate .. //depot/projects/hammer/sys/dev/cp/if_cp.c#24 integrate .. //depot/projects/hammer/sys/dev/ctau/if_ct.c#26 integrate .. //depot/projects/hammer/sys/dev/cx/if_cx.c#34 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_ael1002.c#1 branch .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_common.h#1 branch .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_firmware_exports.h#1 branch .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_mc5.c#1 branch .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#1 branch .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_regs.h#1 branch .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_sge_defs.h#1 branch .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_t3_cpl.h#1 branch .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_t3_hw.c#1 branch .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_tcb.h#1 branch .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_version.h#1 branch .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_vsc8211.c#1 branch .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_xgmac.c#1 branch .. //depot/projects/hammer/sys/dev/cxgb/cxgb_adapter.h#1 branch .. //depot/projects/hammer/sys/dev/cxgb/cxgb_config.h#1 branch .. //depot/projects/hammer/sys/dev/cxgb/cxgb_ioctl.h#1 branch .. //depot/projects/hammer/sys/dev/cxgb/cxgb_lro.c#1 branch .. //depot/projects/hammer/sys/dev/cxgb/cxgb_main.c#1 branch .. //depot/projects/hammer/sys/dev/cxgb/cxgb_osdep.h#1 branch .. //depot/projects/hammer/sys/dev/cxgb/cxgb_sge.c#1 branch .. //depot/projects/hammer/sys/dev/cxgb/t3fw-3.2.bin.gz.uu#1 branch .. //depot/projects/hammer/sys/dev/ed/if_ed.c#39 integrate .. //depot/projects/hammer/sys/dev/exca/exca.c#16 integrate .. //depot/projects/hammer/sys/dev/firewire/firewire.c#32 integrate .. //depot/projects/hammer/sys/dev/firewire/firewirereg.h#19 integrate .. //depot/projects/hammer/sys/dev/firewire/fwdev.c#20 integrate .. //depot/projects/hammer/sys/dev/firewire/fwmem.c#18 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci.c#29 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci_pci.c#36 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohcivar.h#10 integrate .. //depot/projects/hammer/sys/dev/firewire/if_fwe.c#26 integrate .. //depot/projects/hammer/sys/dev/firewire/if_fwip.c#11 integrate .. //depot/projects/hammer/sys/dev/firewire/sbp.c#37 integrate .. //depot/projects/hammer/sys/dev/firewire/sbp_targ.c#8 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#63 integrate .. //depot/projects/hammer/sys/dev/hifn/hifn7751.c#20 integrate .. //depot/projects/hammer/sys/dev/hifn/hifn7751reg.h#7 integrate .. //depot/projects/hammer/sys/dev/hifn/hifn7751var.h#9 integrate .. //depot/projects/hammer/sys/dev/ichwd/ichwd.c#9 integrate .. //depot/projects/hammer/sys/dev/iicbus/icee.c#1 branch .. //depot/projects/hammer/sys/dev/iicbus/iic.c#11 integrate .. //depot/projects/hammer/sys/dev/iicbus/iicbb.c#6 integrate .. //depot/projects/hammer/sys/dev/iicbus/iicbus.c#8 integrate .. //depot/projects/hammer/sys/dev/iicbus/iicbus.h#4 integrate .. //depot/projects/hammer/sys/dev/iicbus/iiconf.c#4 integrate .. //depot/projects/hammer/sys/dev/ipmi/ipmi.c#5 integrate .. //depot/projects/hammer/sys/dev/ipw/if_ipw.c#16 integrate .. //depot/projects/hammer/sys/dev/isp/isp.c#23 integrate .. //depot/projects/hammer/sys/dev/isp/isp_library.c#5 integrate .. //depot/projects/hammer/sys/dev/isp/isp_library.h#4 integrate .. //depot/projects/hammer/sys/dev/isp/isp_pci.c#26 integrate .. //depot/projects/hammer/sys/dev/isp/isp_sbus.c#16 integrate .. //depot/projects/hammer/sys/dev/isp/ispvar.h#19 integrate .. //depot/projects/hammer/sys/dev/iwi/if_iwi.c#22 integrate .. //depot/projects/hammer/sys/dev/mii/brgphy.c#28 integrate .. //depot/projects/hammer/sys/dev/mk48txx/mk48txx.c#7 integrate .. //depot/projects/hammer/sys/dev/mxge/if_mxge.c#5 integrate .. //depot/projects/hammer/sys/dev/pcf/envctrl.c#7 integrate .. //depot/projects/hammer/sys/dev/pcf/pcf_ebus.c#6 integrate .. //depot/projects/hammer/sys/dev/pcf/pcf_isa.c#6 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#58 integrate .. //depot/projects/hammer/sys/dev/pci/pcivar.h#14 integrate .. //depot/projects/hammer/sys/dev/ppc/ppc.c#12 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#45 integrate .. //depot/projects/hammer/sys/dev/safe/safe.c#10 integrate .. //depot/projects/hammer/sys/dev/scc/scc_bfe.h#4 integrate .. //depot/projects/hammer/sys/dev/scc/scc_bfe_ebus.c#2 integrate .. //depot/projects/hammer/sys/dev/scc/scc_bfe_macio.c#2 integrate .. //depot/projects/hammer/sys/dev/scc/scc_bfe_sbus.c#2 integrate .. //depot/projects/hammer/sys/dev/scc/scc_core.c#5 integrate .. //depot/projects/hammer/sys/dev/scc/scc_if.m#2 integrate .. //depot/projects/hammer/sys/dev/sio/sio_pci.c#12 integrate .. //depot/projects/hammer/sys/dev/snp/snp.c#21 integrate .. //depot/projects/hammer/sys/dev/sound/isa/ad1816.c#17 integrate .. //depot/projects/hammer/sys/dev/sound/isa/mss.c#20 integrate .. //depot/projects/hammer/sys/dev/sound/isa/sbc.c#11 integrate .. //depot/projects/hammer/sys/dev/sound/midi/midi.c#8 integrate .. //depot/projects/hammer/sys/dev/sound/midi/sequencer.c#8 integrate .. //depot/projects/hammer/sys/dev/sound/pci/als4000.c#14 integrate .. //depot/projects/hammer/sys/dev/sound/pci/atiixp.c#8 integrate .. //depot/projects/hammer/sys/dev/sound/pci/cmi.c#19 integrate .. //depot/projects/hammer/sys/dev/sound/pci/csa.c#11 integrate .. //depot/projects/hammer/sys/dev/sound/pci/ds1.c#16 integrate .. //depot/projects/hammer/sys/dev/sound/pci/emu10k1.c#22 integrate .. //depot/projects/hammer/sys/dev/sound/pci/emu10kx-pcm.c#3 integrate .. //depot/projects/hammer/sys/dev/sound/pci/envy24.c#4 integrate .. //depot/projects/hammer/sys/dev/sound/pci/envy24ht.c#3 integrate .. //depot/projects/hammer/sys/dev/sound/pci/es137x.c#19 integrate .. //depot/projects/hammer/sys/dev/sound/pci/hda/hdac.c#4 integrate .. //depot/projects/hammer/sys/dev/sound/pci/hda/hdac_private.h#3 integrate .. //depot/projects/hammer/sys/dev/sound/pci/ich.c#35 integrate .. //depot/projects/hammer/sys/dev/sound/pci/maestro.c#17 integrate .. //depot/projects/hammer/sys/dev/sound/pci/maestro3.c#14 integrate .. //depot/projects/hammer/sys/dev/sound/pci/solo.c#16 integrate .. //depot/projects/hammer/sys/dev/sound/pci/t4dwave.c#14 integrate .. //depot/projects/hammer/sys/dev/sound/pci/via8233.c#22 integrate .. //depot/projects/hammer/sys/dev/sound/pci/via82c686.c#17 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/ac97.c#23 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/buffer.c#13 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/channel.c#22 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/channel_if.m#4 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/dsp.c#30 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/fake.c#8 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/feeder.c#11 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/feeder.h#7 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/feeder_fmt.c#13 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/feeder_rate.c#13 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/feeder_volume.c#4 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/sndstat.c#13 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/sound.c#24 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/sound.h#21 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/vchan.c#17 integrate .. //depot/projects/hammer/sys/dev/sound/sbus/cs4231.c#6 integrate .. //depot/projects/hammer/sys/dev/sound/usb/uaudio.c#13 integrate .. //depot/projects/hammer/sys/dev/sound/usb/uaudio.h#6 integrate .. //depot/projects/hammer/sys/dev/sound/usb/uaudio_pcm.c#17 integrate .. //depot/projects/hammer/sys/dev/sr/if_sr.c#21 integrate .. //depot/projects/hammer/sys/dev/uart/uart_core.c#16 integrate .. //depot/projects/hammer/sys/dev/uart/uart_dev_ns8250.c#15 integrate .. //depot/projects/hammer/sys/dev/ubsec/ubsec.c#18 integrate .. //depot/projects/hammer/sys/dev/usb/uhci.c#24 integrate .. //depot/projects/hammer/sys/dev/usb/uplcom.c#24 integrate .. //depot/projects/hammer/sys/dev/usb/usb_quirks.c#16 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#75 integrate .. //depot/projects/hammer/sys/dev/watchdog/watchdog.c#5 integrate .. //depot/projects/hammer/sys/dev/wl/if_wl.c#24 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#46 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vnops.c#36 integrate .. //depot/projects/hammer/sys/geom/eli/g_eli.c#14 integrate .. //depot/projects/hammer/sys/geom/eli/g_eli_crypto.c#4 integrate .. //depot/projects/hammer/sys/geom/geom_dev.c#34 integrate .. //depot/projects/hammer/sys/geom/journal/g_journal.c#2 integrate .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_vfsops.c#10 integrate .. //depot/projects/hammer/sys/i386/acpica/OsdEnvironment.c#9 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_machdep.c#26 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_wakeup.c#26 integrate .. //depot/projects/hammer/sys/i386/acpica/madt.c#20 integrate .. //depot/projects/hammer/sys/i386/bios/smapi.c#9 integrate .. //depot/projects/hammer/sys/i386/bios/smbios.c#6 integrate .. //depot/projects/hammer/sys/i386/bios/vpd.c#6 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#88 integrate .. //depot/projects/hammer/sys/i386/i386/elan-mmcr.c#22 integrate .. //depot/projects/hammer/sys/i386/i386/geode.c#8 integrate .. //depot/projects/hammer/sys/i386/i386/identcpu.c#37 integrate .. //depot/projects/hammer/sys/i386/i386/io_apic.c#24 integrate .. //depot/projects/hammer/sys/i386/i386/legacy.c#13 integrate .. //depot/projects/hammer/sys/i386/i386/local_apic.c#28 integrate .. //depot/projects/hammer/sys/i386/i386/locore.s#16 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#75 integrate .. //depot/projects/hammer/sys/i386/i386/nexus.c#22 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#89 integrate .. //depot/projects/hammer/sys/i386/i386/trap.c#51 integrate .. //depot/projects/hammer/sys/i386/i386/tsc.c#10 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_misc.c#17 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Mar 29 23:09:48 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CDCE216A405; Thu, 29 Mar 2007 23:09:47 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 941BC16A400 for ; Thu, 29 Mar 2007 23:09:47 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 84EE513C4BF for ; Thu, 29 Mar 2007 23:09:47 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2TN9lT6065636 for ; Thu, 29 Mar 2007 23:09:47 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2TN9lnx065633 for perforce@freebsd.org; Thu, 29 Mar 2007 23:09:47 GMT (envelope-from scottl@freebsd.org) Date: Thu, 29 Mar 2007 23:09:47 GMT Message-Id: <200703292309.l2TN9lnx065633@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 116891 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Mar 2007 23:09:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=116891 Change 116891 by scottl@scottl-x64 on 2007/03/29 23:09:05 Elimiate the xptpriv field from the ccb_hdr. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#13 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#52 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#13 (text+ko) ==== @@ -272,7 +272,6 @@ u_int32_t flags; /* ccb_flags */ ccb_ppriv_area periph_priv; ccb_spriv_area sim_priv; - void *xptpriv; /* Holds a task object if needed */ u_int32_t timeout; /* Timeout value */ /* ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#52 (text+ko) ==== @@ -71,6 +71,12 @@ /* Datastructures internal to the xpt layer */ MALLOC_DEFINE(M_CAMXPT, "CAM XPT", "CAM XPT buffers"); +/* Object for defering XPT actions to a taskqueue */ +struct xpt_task { + struct task task; + void *data; +}; + /* * Definition of an async handler callback block. These are used to add * SIMs and peripherals to the async callback lists. @@ -2992,13 +2998,15 @@ xpt_action_sasync_cb(void *context, int pending) { union ccb *start_ccb; + struct xpt_task *task; struct ccb_setasync *csa; struct async_node *cur_entry; struct async_list *async_head; u_int32_t added; int s; - start_ccb = (union ccb *)context; + task = (struct xpt_task *)context; + start_ccb = (union ccb *)task->data; csa = &start_ccb->csa; added = csa->event_enable; async_head = &csa->ccb_h.path->device->asyncs; @@ -3063,9 +3071,9 @@ splx(s); out: - free(start_ccb->ccb_h.xptpriv, M_CAMXPT); xpt_free_path(start_ccb->ccb_h.path); xpt_free_ccb(start_ccb); + free(task, M_CAMXPT); } void @@ -3471,7 +3479,7 @@ case XPT_SASYNC_CB: { union ccb *task_ccb; - struct task *task; + struct xpt_task *task; /* * Need to decouple this operation via a taqskqueue so that @@ -3494,7 +3502,7 @@ break; } - task = malloc(sizeof(struct task), M_CAMXPT, M_NOWAIT); + task = malloc(sizeof(struct xpt_task), M_CAMXPT, M_NOWAIT); if (task == NULL) { start_ccb->ccb_h.status = CAM_RESRC_UNAVAIL; xpt_free_path(task_ccb->ccb_h.path); @@ -3502,9 +3510,9 @@ break; } - TASK_INIT(task, 0, xpt_action_sasync_cb, task_ccb); - task_ccb->ccb_h.xptpriv = task; - taskqueue_enqueue(taskqueue_thread, task); + TASK_INIT(&task->task, 0, xpt_action_sasync_cb, task); + task->data = task_ccb; + taskqueue_enqueue(taskqueue_thread, &task->task); start_ccb->ccb_h.status = CAM_REQ_CMP; break; @@ -7159,7 +7167,7 @@ static void xpt_finishconfig(struct cam_periph *periph, union ccb *done_ccb) { - struct task *task; + struct task *xpt_task; if (done_ccb != NULL) { CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_TRACE, @@ -7182,10 +7190,10 @@ } } - task = malloc(sizeof(struct task), M_CAMXPT, M_NOWAIT); + task = malloc(sizeof(struct xpt_task), M_CAMXPT, M_NOWAIT); if (task != NULL) { - TASK_INIT(task, 0, xpt_finishconfig_task, task); - taskqueue_enqueue(taskqueue_thread, task); + TASK_INIT(&task->task, 0, xpt_finishconfig_task, task); + taskqueue_enqueue(taskqueue_thread, &task->task); } if (done_ccb != NULL) From owner-p4-projects@FreeBSD.ORG Thu Mar 29 23:30:13 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 47FB316A401; Thu, 29 Mar 2007 23:30:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 04A3416A403 for ; Thu, 29 Mar 2007 23:30:13 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E66F113C489 for ; Thu, 29 Mar 2007 23:30:12 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2TNUCgX068864 for ; Thu, 29 Mar 2007 23:30:12 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2TNUCjw068861 for perforce@freebsd.org; Thu, 29 Mar 2007 23:30:12 GMT (envelope-from marcel@freebsd.org) Date: Thu, 29 Mar 2007 23:30:12 GMT Message-Id: <200703292330.l2TNUCjw068861@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 Cc: Subject: PERFORCE change 116892 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Mar 2007 23:30:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=116892 Change 116892 by marcel@marcel_xcllnt on 2007/03/29 23:29:26 Catch up with the interrupt filter changes. Affected files ... .. //depot/projects/uart/dev/bsc/bsc_core.c#2 edit .. //depot/projects/uart/dev/hdlc/hdlc_core.c#2 edit Differences ... ==== //depot/projects/uart/dev/bsc/bsc_core.c#2 (text+ko) ==== @@ -46,9 +46,11 @@ MALLOC_DEFINE(M_BSC, "BSC", "BSC driver"); -static void -bsc_bus_intr(void *arg) +static int +bsc_intr(void *arg) { + + return (FILTER_STRAY); } int @@ -70,13 +72,12 @@ sc->sc_ires = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->sc_irid, RF_ACTIVE); if (sc->sc_ires != NULL) { - error = BUS_SETUP_INTR(device_get_parent(dev), dev, - sc->sc_ires, INTR_TYPE_TTY | INTR_FAST, bsc_bus_intr, - sc, &sc->sc_icookie); + error = bus_setup_intr(dev, sc->sc_ires, INTR_TYPE_TTY, + bsc_intr, NULL, sc, &sc->sc_icookie); if (error) - error = BUS_SETUP_INTR(device_get_parent(dev), dev, - sc->sc_ires, INTR_TYPE_TTY | INTR_MPSAFE, - bsc_bus_intr, sc, &sc->sc_icookie); + error = bus_setup_intr(dev, sc->sc_ires, + INTR_TYPE_TTY | INTR_MPSAFE, NULL, + (driver_intr_t *)bsc_intr, sc, &sc->sc_icookie); else sc->sc_fastintr = 1; ==== //depot/projects/uart/dev/hdlc/hdlc_core.c#2 (text+ko) ==== @@ -46,9 +46,11 @@ MALLOC_DEFINE(M_HDLC, "HDLC", "HDLC driver"); -static void -hdlc_bus_intr(void *arg) +static int +hdlc_intr(void *arg) { + + return (FILTER_STRAY); } int @@ -70,13 +72,12 @@ sc->sc_ires = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->sc_irid, RF_ACTIVE); if (sc->sc_ires != NULL) { - error = BUS_SETUP_INTR(device_get_parent(dev), dev, - sc->sc_ires, INTR_TYPE_TTY | INTR_FAST, hdlc_bus_intr, - sc, &sc->sc_icookie); + error = bus_setup_intr(dev, sc->sc_ires, INTR_TYPE_TTY, + hdlc_intr, NULL, sc, &sc->sc_icookie); if (error) - error = BUS_SETUP_INTR(device_get_parent(dev), dev, - sc->sc_ires, INTR_TYPE_TTY | INTR_MPSAFE, - hdlc_bus_intr, sc, &sc->sc_icookie); + error = bus_setup_intr(dev, sc->sc_ires, + INTR_TYPE_TTY | INTR_MPSAFE, NULL, + (driver_intr_t *)hdlc_intr, sc, &sc->sc_icookie); else sc->sc_fastintr = 1; From owner-p4-projects@FreeBSD.ORG Fri Mar 30 00:26:23 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E81716A403; Fri, 30 Mar 2007 00:26:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7585616A401 for ; Fri, 30 Mar 2007 00:26:23 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 66D8A13C4CE for ; Fri, 30 Mar 2007 00:26:23 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2U0QNW9079136 for ; Fri, 30 Mar 2007 00:26:23 GMT (envelope-from jkim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2U0QM1R079133 for perforce@freebsd.org; Fri, 30 Mar 2007 00:26:22 GMT (envelope-from jkim@freebsd.org) Date: Fri, 30 Mar 2007 00:26:22 GMT Message-Id: <200703300026.l2U0QM1R079133@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jkim@freebsd.org using -f From: Jung-uk Kim To: Perforce Change Reviews Cc: Subject: PERFORCE change 116894 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Mar 2007 00:26:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=116894 Change 116894 by jkim@jkim_hammer on 2007/03/30 00:25:28 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/amd64/cpu_switch.S#6 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/genassym.c#7 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/machdep.c#16 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/pcb.h#4 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/segments.h#3 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_locore.s#4 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#47 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h#23 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_syscall.h#23 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysent.c#22 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysvec.c#12 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/syscalls.master#23 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp.c#14 integrate .. //depot/projects/linuxolator/src/sys/netinet/in.c#6 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/amd64/cpu_switch.S#6 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.155 2006/12/20 04:40:38 davidxu Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.156 2007/03/30 00:06:20 jkim Exp $ */ #include ==== //depot/projects/linuxolator/src/sys/amd64/amd64/genassym.c#7 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.160 2006/12/20 04:40:38 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.161 2007/03/30 00:06:20 jkim Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" ==== //depot/projects/linuxolator/src/sys/amd64/amd64/machdep.c#16 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.669 2007/01/27 18:13:24 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.670 2007/03/30 00:06:20 jkim Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" ==== //depot/projects/linuxolator/src/sys/amd64/include/pcb.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)pcb.h 5.10 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pcb.h,v 1.62 2005/09/27 21:11:35 peter Exp $ + * $FreeBSD: src/sys/amd64/include/pcb.h,v 1.63 2007/03/30 00:06:21 jkim Exp $ */ #ifndef _AMD64_PCB_H_ ==== //depot/projects/linuxolator/src/sys/amd64/include/segments.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)segments.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/segments.h,v 1.38 2004/04/05 21:25:51 imp Exp $ + * $FreeBSD: src/sys/amd64/include/segments.h,v 1.39 2007/03/30 00:06:21 jkim Exp $ */ #ifndef _MACHINE_SEGMENTS_H_ ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_locore.s#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/amd64/linux32/linux32_locore.s,v 1.1 2004/08/16 07:55:06 tjr Exp $ */ +/* $FreeBSD: src/sys/amd64/linux32/linux32_locore.s,v 1.2 2007/03/30 00:06:21 jkim Exp $ */ #include "linux32_assym.h" /* system definitions */ #include /* miscellaneous asm macros */ ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#47 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.36 2007/03/02 00:08:47 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.37 2007/03/30 00:06:21 jkim Exp $"); #include #include ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h#23 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.30 2007/03/29 02:11:46 julian Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.26 2007/02/15 01:13:36 jkim Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.31 2007/03/30 00:08:21 jkim Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.28 2007/03/30 00:06:21 jkim Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_syscall.h#23 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.30 2007/03/29 02:11:46 julian Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.26 2007/02/15 01:13:36 jkim Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.31 2007/03/30 00:08:21 jkim Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.28 2007/03/30 00:06:21 jkim Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysent.c#22 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.30 2007/03/29 02:11:46 julian Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.26 2007/02/15 01:13:36 jkim Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.31 2007/03/30 00:08:21 jkim Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.28 2007/03/30 00:06:21 jkim Exp */ #include ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysvec.c#12 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.26 2006/12/03 21:06:07 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.27 2007/03/30 00:06:21 jkim Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 ==== //depot/projects/linuxolator/src/sys/amd64/linux32/syscalls.master#23 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.27 2007/03/29 02:11:46 julian Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.28 2007/03/30 00:06:21 jkim Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). ==== //depot/projects/linuxolator/src/sys/dev/isp/isp.c#14 (text+ko) ==== @@ -46,7 +46,7 @@ #endif #ifdef __FreeBSD__ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp.c,v 1.144 2007/03/22 23:38:31 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp.c,v 1.145 2007/03/29 21:29:26 mjacob Exp $"); #include #endif #ifdef __OpenBSD__ @@ -4068,7 +4068,7 @@ } hdlidx = fcp->isp_ini_map[XS_TGT(xs)] - 1; - isp_prt(isp, ISP_LOGDEBUG1, "XS_TGT(xs)=%d- handle value %d", + isp_prt(isp, ISP_LOGDEBUG1, "XS_TGT(xs)=%d- hdlidx value %d", XS_TGT(xs), hdlidx); if (hdlidx < 0 || hdlidx >= MAX_FC_TARG) { XS_SETERR(xs, HBA_SELTIMEOUT); @@ -4296,7 +4296,7 @@ * Issue a bus reset. */ if (IS_24XX(isp)) { - isp_prt(isp, ISP_LOGWARN, "RESET BUS NOT IMPLETENTED"); + isp_prt(isp, ISP_LOGWARN, "RESET BUS NOT IMPLEMENTED"); break; } else if (IS_FC(isp)) { mbs.param[1] = 10; @@ -4325,7 +4325,7 @@ case ISPCTL_RESET_DEV: tgt = (*((int *) arg)) & 0xffff; if (IS_24XX(isp)) { - isp_prt(isp, ISP_LOGWARN, "RESET DEV NOT IMPLETENTED"); + isp_prt(isp, ISP_LOGWARN, "RESET DEV NOT IMPLEMENTED"); break; } else if (IS_FC(isp)) { if (FCPARAM(isp)->isp_2klogin) { @@ -4362,7 +4362,7 @@ break; } if (IS_24XX(isp)) { - isp_prt(isp, ISP_LOGWARN, "ABORT CMD NOT IMPLETENTED"); + isp_prt(isp, ISP_LOGWARN, "ABORT CMD NOT IMPLEMENTED"); break; } else if (IS_FC(isp)) { if (FCPARAM(isp)->isp_sccfw) { ==== //depot/projects/linuxolator/src/sys/netinet/in.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * @(#)in.c 8.4 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/netinet/in.c,v 1.97 2007/03/20 00:36:10 bms Exp $ + * $FreeBSD: src/sys/netinet/in.c,v 1.98 2007/03/29 21:39:22 bms Exp $ */ #include "opt_carp.h" @@ -224,13 +224,17 @@ register struct ifreq *ifr = (struct ifreq *)data; register struct in_ifaddr *ia = 0, *iap; register struct ifaddr *ifa; + struct in_addr allhosts_addr; struct in_addr dst; struct in_ifaddr *oia; struct in_aliasreq *ifra = (struct in_aliasreq *)data; struct sockaddr_in oldaddr; int error, hostIsNew, iaIsNew, maskIsNew, s; + int iaIsFirst; + iaIsFirst = 0; iaIsNew = 0; + allhosts_addr.s_addr = htonl(INADDR_ALLHOSTS_GROUP); switch (cmd) { case SIOCALIFADDR: @@ -281,6 +285,8 @@ break; } } + if (ia == NULL) + iaIsFirst = 1; } switch (cmd) { @@ -422,8 +428,11 @@ (struct sockaddr_in *) &ifr->ifr_addr, 1); if (error != 0 && iaIsNew) break; - if (error == 0) + if (error == 0) { + if (iaIsFirst && (ifp->if_flags & IFF_MULTICAST) != 0) + in_addmulti(&allhosts_addr, ifp); EVENTHANDLER_INVOKE(ifaddr_event, ifp); + } return (0); case SIOCSIFNETMASK: @@ -466,8 +475,11 @@ if ((ifp->if_flags & IFF_BROADCAST) && (ifra->ifra_broadaddr.sin_family == AF_INET)) ia->ia_broadaddr = ifra->ifra_broadaddr; - if (error == 0) + if (error == 0) { + if (iaIsFirst && (ifp->if_flags & IFF_MULTICAST) != 0) + in_addmulti(&allhosts_addr, ifp); EVENTHANDLER_INVOKE(ifaddr_event, ifp); + } return (error); case SIOCDIFADDR: @@ -502,8 +514,27 @@ s = splnet(); TAILQ_REMOVE(&ifp->if_addrhead, &ia->ia_ifa, ifa_link); TAILQ_REMOVE(&in_ifaddrhead, ia, ia_link); - if (ia->ia_addr.sin_family == AF_INET) + if (ia->ia_addr.sin_family == AF_INET) { LIST_REMOVE(ia, ia_hash); + /* + * If this is the last IPv4 address configured on this + * interface, leave the all-hosts group. + * XXX: This is quite ugly because of locking and structure. + */ + oia = NULL; + IFP_TO_IA(ifp, oia); + if (oia == NULL) { + struct in_multi *inm; + + IFF_LOCKGIANT(ifp); + IN_MULTI_LOCK(); + IN_LOOKUP_MULTI(allhosts_addr, ifp, inm); + if (inm != NULL) + in_delmulti_locked(inm); + IN_MULTI_UNLOCK(); + IFF_UNLOCKGIANT(ifp); + } + } IFAFREE(&ia->ia_ifa); splx(s); @@ -792,16 +823,6 @@ if ((error = in_addprefix(ia, flags)) != 0) return (error); - /* - * If the interface supports multicast, join the "all hosts" - * multicast group on that interface. - */ - if (ifp->if_flags & IFF_MULTICAST) { - struct in_addr addr; - - addr.s_addr = htonl(INADDR_ALLHOSTS_GROUP); - in_addmulti(&addr, ifp); - } return (error); } @@ -1113,6 +1134,9 @@ igmp_leavegroup(inm); ifma = inm->inm_ifma; +#ifdef DIAGNOSTIC + printf("%s: purging ifma %p\n", __func__, ifma); +#endif KASSERT(ifma->ifma_protospec == inm, ("%s: ifma_protospec != inm", __func__)); ifma->ifma_protospec = NULL; @@ -1134,6 +1158,9 @@ struct in_multi *inm; struct in_multi *oinm; +#ifdef DIAGNOSTIC + printf("%s: purging ifp %p\n", __func__, ifp); +#endif IFF_LOCKGIANT(ifp); IN_MULTI_LOCK(); LIST_FOREACH_SAFE(inm, &in_multihead, inm_link, oinm) { From owner-p4-projects@FreeBSD.ORG Fri Mar 30 00:40:51 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8324216A405; Fri, 30 Mar 2007 00:40:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4770816A400 for ; Fri, 30 Mar 2007 00:40:51 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3806C13C4BA for ; Fri, 30 Mar 2007 00:40:51 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2U0ephS080989 for ; Fri, 30 Mar 2007 00:40:51 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2U0ef4L080986 for perforce@freebsd.org; Fri, 30 Mar 2007 00:40:41 GMT (envelope-from jhb@freebsd.org) Date: Fri, 30 Mar 2007 00:40:41 GMT Message-Id: <200703300040.l2U0ef4L080986@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 Cc: Subject: PERFORCE change 116895 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Mar 2007 00:40:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=116895 Change 116895 by jhb@jhb_mutex on 2007/03/30 00:40:24 IFC @116893. Affected files ... .. //depot/projects/smpng/sys/Makefile#16 integrate .. //depot/projects/smpng/sys/amd64/acpica/OsdEnvironment.c#7 integrate .. //depot/projects/smpng/sys/amd64/acpica/madt.c#13 integrate .. //depot/projects/smpng/sys/amd64/amd64/cpu_switch.S#17 integrate .. //depot/projects/smpng/sys/amd64/amd64/genassym.c#19 integrate .. //depot/projects/smpng/sys/amd64/amd64/identcpu.c#23 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#65 integrate .. //depot/projects/smpng/sys/amd64/amd64/prof_machdep.c#6 integrate .. //depot/projects/smpng/sys/amd64/amd64/trap.c#59 integrate .. //depot/projects/smpng/sys/amd64/amd64/tsc.c#6 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#37 integrate .. //depot/projects/smpng/sys/amd64/include/acpica_machdep.h#6 integrate .. //depot/projects/smpng/sys/amd64/include/pcb.h#11 integrate .. //depot/projects/smpng/sys/amd64/include/segments.h#6 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux.h#12 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_dummy.c#8 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_locore.s#2 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_machdep.c#21 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_proto.h#21 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_syscall.h#21 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysent.c#21 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#23 integrate .. //depot/projects/smpng/sys/amd64/linux32/syscalls.master#25 integrate .. //depot/projects/smpng/sys/arm/at91/at91_st.c#9 integrate .. //depot/projects/smpng/sys/arm/at91/at91_twi.c#9 integrate .. //depot/projects/smpng/sys/arm/at91/at91_twireg.h#2 integrate .. //depot/projects/smpng/sys/arm/at91/kb920x_machdep.c#14 integrate .. //depot/projects/smpng/sys/arm/conf/KB920X#6 integrate .. //depot/projects/smpng/sys/arm/conf/KB920X.hints#1 branch .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321_wdog.c#3 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_wdog.c#2 integrate .. //depot/projects/smpng/sys/boot/arm/at91/boot2/boot2.c#4 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#4 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#5 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/emac.c#7 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/getc.c#2 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/memcmp.c#3 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/sd-card.c#4 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/spi_flash.c#4 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/strlen.c#3 integrate .. //depot/projects/smpng/sys/boot/ficl/ficl.h#4 integrate .. //depot/projects/smpng/sys/boot/ficl/float.c#2 integrate .. //depot/projects/smpng/sys/boot/ficl/softwords/fileaccess.fr#2 integrate .. //depot/projects/smpng/sys/boot/ficl/softwords/jhlocal.fr#2 integrate .. //depot/projects/smpng/sys/boot/ficl/softwords/oo.fr#3 integrate .. //depot/projects/smpng/sys/boot/ficl/softwords/prefix.fr#3 integrate .. //depot/projects/smpng/sys/boot/ficl/softwords/softcore.awk#3 integrate .. //depot/projects/smpng/sys/boot/ficl/tools.c#3 integrate .. //depot/projects/smpng/sys/boot/ficl/unix.c#2 integrate .. //depot/projects/smpng/sys/boot/ficl/vm.c#3 integrate .. //depot/projects/smpng/sys/boot/ficl/words.c#6 integrate .. //depot/projects/smpng/sys/boot/i386/boot0/boot0.S#8 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/biosacpi.c#11 integrate .. //depot/projects/smpng/sys/boot/ia64/ski/acpi_stub.c#4 integrate .. //depot/projects/smpng/sys/compat/linux/linux_file.c#35 integrate .. //depot/projects/smpng/sys/compat/linux/linux_util.h#17 integrate .. //depot/projects/smpng/sys/conf/NOTES#139 integrate .. //depot/projects/smpng/sys/conf/files#202 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#59 integrate .. //depot/projects/smpng/sys/conf/options#138 integrate .. //depot/projects/smpng/sys/contrib/altq/altq/altq_subr.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/CHANGES.txt#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acapps.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acconfig.h#25 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdebug.h#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdisasm.h#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdispat.h#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acefi.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acenv.h#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acevents.h#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acexcep.h#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acfreebsd.h#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acgcc.h#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acglobal.h#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/achware.h#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acinterp.h#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/aclocal.h#22 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acmacros.h#22 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acnames.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acnamesp.h#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acobject.h#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acopcode.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acoutput.h#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acparser.h#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpi.h#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpica_prep.sh#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpiosxf.h#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpixf.h#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acresrc.h#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acstruct.h#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actables.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actbl.h#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actbl1.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actbl2.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actypes.h#23 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acutils.h#23 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/aecommon.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/aeexec.c#2 delete .. //depot/projects/smpng/sys/contrib/dev/acpica/amlcode.h#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/amlresrc.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/adfile.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/common/adisasm.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/adwalk.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/common/dmrestag.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/common/dmtable.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/common/dmtbdump.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/common/dmtbinfo.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/common/getopt.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslanalyze.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcodegen.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompile.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.l#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.y#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asldefine.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslerror.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslfiles.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslfold.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslglobal.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asllength.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asllisting.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslload.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asllookup.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslmain.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslmap.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslopcodes.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asloperands.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslopt.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslresource.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype1.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype2.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslstubs.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltransform.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltree.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltypes.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslutils.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbcmds.c#24 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbdisply.c#22 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbexec.c#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbfileio.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbhistry.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbinput.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbstats.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbutils.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbxface.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmbuffer.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmnames.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmobject.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmopcode.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmresrc.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmresrcl.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmresrcs.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmutils.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmwalk.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsfield.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsinit.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsmethod.c#22 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsmthdat.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsobject.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsopcode.c#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsutils.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswexec.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswload.c#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswscope.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswstate.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evevent.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evgpe.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evgpeblk.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evmisc.c#22 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evregion.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evrgnini.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evsci.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxface.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxfevnt.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxfregn.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exconfig.c#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exconvrt.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/excreate.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exdump.c#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exfield.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exfldio.c#22 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exmisc.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exmutex.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exnames.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg1.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg2.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg3.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg6.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exprep.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exregion.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresnte.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresolv.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresop.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstore.c#25 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstoren.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstorob.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exsystem.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exutils.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwacpi.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwgpe.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwregs.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwsleep.c#22 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwtimer.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsaccess.c#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsalloc.c#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsdump.c#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsdumpdv.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nseval.c#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsinit.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsload.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsnames.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsobject.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsparse.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nssearch.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsutils.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nswalk.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfeval.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfname.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfobj.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/osunixxf.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psargs.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psloop.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psopcode.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psparse.c#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psscope.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/pstree.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psutils.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/pswalk.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psxface.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsaddr.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rscalc.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rscreate.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsdump.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsinfo.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsio.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsirq.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rslist.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsmemory.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsmisc.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsutils.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsxface.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbconvrt.c#18 delete .. //depot/projects/smpng/sys/contrib/dev/acpica/tbfadt.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/tbfind.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/tbget.c#20 delete .. //depot/projects/smpng/sys/contrib/dev/acpica/tbgetall.c#10 delete .. //depot/projects/smpng/sys/contrib/dev/acpica/tbinstal.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbrsdt.c#10 delete .. //depot/projects/smpng/sys/contrib/dev/acpica/tbutils.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbxface.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbxfroot.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utalloc.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utcache.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utclib.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utcopy.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utdebug.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utdelete.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/uteval.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utglobal.c#23 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utinit.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utmath.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utmisc.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utmutex.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utobject.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utresrc.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/utstate.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/uttrack.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/utxface.c#17 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_asus.c#9 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_fujitsu.c#5 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_ibm.c#9 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdDebug.c#12 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdMemory.c#11 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSchedule.c#31 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSynch.c#20 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdTable.c#12 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#99 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_acad.c#26 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_button.c#19 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cmbat.c#30 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#39 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_dock.c#4 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_ec.c#43 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_hpet.c#5 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_lid.c#17 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci_link.c#37 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_perf.c#11 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_quirk.c#4 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_resource.c#31 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_throttle.c#8 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_timer.c#23 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#65 integrate .. //depot/projects/smpng/sys/dev/ce/if_ce.c#8 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_main.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/smpng/sys/dev/exca/exca.c#23 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#81 integrate .. //depot/projects/smpng/sys/dev/ichwd/ichwd.c#7 integrate .. //depot/projects/smpng/sys/dev/iicbus/icee.c#1 branch .. //depot/projects/smpng/sys/dev/iicbus/iic.c#14 integrate .. //depot/projects/smpng/sys/dev/iicbus/iicbb.c#8 integrate .. //depot/projects/smpng/sys/dev/iicbus/iicbus.c#10 integrate .. //depot/projects/smpng/sys/dev/iicbus/iicbus.h#4 integrate .. //depot/projects/smpng/sys/dev/iicbus/iiconf.c#6 integrate .. //depot/projects/smpng/sys/dev/ipmi/ipmi.c#8 integrate .. //depot/projects/smpng/sys/dev/ipw/if_ipw.c#15 integrate .. //depot/projects/smpng/sys/dev/isp/isp.c#56 integrate .. //depot/projects/smpng/sys/dev/isp/isp_library.c#10 integrate .. //depot/projects/smpng/sys/dev/isp/isp_library.h#6 integrate .. //depot/projects/smpng/sys/dev/isp/isp_pci.c#53 integrate .. //depot/projects/smpng/sys/dev/isp/isp_sbus.c#24 integrate .. //depot/projects/smpng/sys/dev/isp/ispvar.h#37 integrate .. //depot/projects/smpng/sys/dev/mk48txx/mk48txx.c#8 integrate .. //depot/projects/smpng/sys/dev/mxge/if_mxge.c#13 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#88 integrate .. //depot/projects/smpng/sys/dev/pci/pcivar.h#26 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#54 integrate .. //depot/projects/smpng/sys/dev/scc/scc_bfe.h#3 integrate .. //depot/projects/smpng/sys/dev/scc/scc_bfe_ebus.c#2 integrate .. //depot/projects/smpng/sys/dev/scc/scc_bfe_macio.c#2 integrate .. //depot/projects/smpng/sys/dev/scc/scc_bfe_sbus.c#2 integrate .. //depot/projects/smpng/sys/dev/scc/scc_core.c#4 integrate .. //depot/projects/smpng/sys/dev/scc/scc_if.m#2 integrate .. //depot/projects/smpng/sys/dev/sio/sio_pci.c#18 integrate .. //depot/projects/smpng/sys/dev/snp/snp.c#26 integrate .. //depot/projects/smpng/sys/dev/uart/uart_core.c#15 integrate .. //depot/projects/smpng/sys/dev/uart/uart_dev_ns8250.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/uhci.c#44 integrate .. //depot/projects/smpng/sys/dev/usb/uplcom.c#29 integrate .. //depot/projects/smpng/sys/dev/usb/usb_quirks.c#23 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#102 integrate .. //depot/projects/smpng/sys/dev/watchdog/watchdog.c#5 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#62 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vnops.c#38 integrate .. //depot/projects/smpng/sys/geom/geom_dev.c#44 integrate .. //depot/projects/smpng/sys/geom/journal/g_journal.c#4 integrate .. //depot/projects/smpng/sys/i386/acpica/OsdEnvironment.c#10 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_machdep.c#25 integrate .. //depot/projects/smpng/sys/i386/acpica/madt.c#19 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#126 integrate .. //depot/projects/smpng/sys/i386/i386/elan-mmcr.c#24 integrate .. //depot/projects/smpng/sys/i386/i386/geode.c#7 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#52 integrate .. //depot/projects/smpng/sys/i386/i386/locore.s#28 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#116 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#106 integrate .. //depot/projects/smpng/sys/i386/i386/tsc.c#11 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_misc.c#32 integrate .. //depot/projects/smpng/sys/i386/include/acpica_machdep.h#8 integrate .. //depot/projects/smpng/sys/i386/isa/prof_machdep.c#9 integrate .. //depot/projects/smpng/sys/i386/linux/linux.h#19 integrate .. //depot/projects/smpng/sys/i386/linux/linux_dummy.c#19 integrate .. //depot/projects/smpng/sys/i386/linux/linux_proto.h#41 integrate .. //depot/projects/smpng/sys/i386/linux/linux_syscall.h#39 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysent.c#40 integrate .. //depot/projects/smpng/sys/i386/linux/syscalls.master#46 integrate .. //depot/projects/smpng/sys/ia64/acpica/OsdEnvironment.c#10 integrate .. //depot/projects/smpng/sys/ia64/acpica/madt.c#14 integrate .. //depot/projects/smpng/sys/ia64/include/acpica_machdep.h#5 integrate .. //depot/projects/smpng/sys/kern/init_main.c#67 integrate .. //depot/projects/smpng/sys/kern/kern_cpu.c#9 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#103 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#145 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#89 integrate .. //depot/projects/smpng/sys/kern/kern_rwlock.c#14 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#100 integrate .. //depot/projects/smpng/sys/kern/sysv_sem.c#46 integrate .. //depot/projects/smpng/sys/kern/uipc_sockbuf.c#6 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#103 integrate .. //depot/projects/smpng/sys/kern/uipc_socket2.c#58 delete .. //depot/projects/smpng/sys/kern/vfs_bio.c#102 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#138 integrate .. //depot/projects/smpng/sys/modules/Makefile#137 integrate .. //depot/projects/smpng/sys/modules/acpi/Makefile#32 integrate .. //depot/projects/smpng/sys/modules/acpi/acpi/Makefile#14 integrate .. //depot/projects/smpng/sys/modules/if_edsc/Makefile#1 branch .. //depot/projects/smpng/sys/net/if.c#92 integrate .. //depot/projects/smpng/sys/net/if_disc.c#24 integrate .. //depot/projects/smpng/sys/net/if_edsc.c#1 branch .. //depot/projects/smpng/sys/net/if_ethersubr.c#81 integrate .. //depot/projects/smpng/sys/net/rtsock.c#57 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c#7 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#19 integrate .. //depot/projects/smpng/sys/netgraph/netflow/ng_netflow.c#10 integrate .. //depot/projects/smpng/sys/netgraph/netflow/ng_netflow.h#7 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#54 integrate .. //depot/projects/smpng/sys/netinet/in.c#37 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#44 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#83 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#91 integrate .. //depot/projects/smpng/sys/netinet/tcp_debug.h#6 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#101 integrate .. //depot/projects/smpng/sys/netinet/tcp_sack.c#20 integrate .. //depot/projects/smpng/sys/netipsec/ipsec.c#20 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#59 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_serv.c#52 integrate .. //depot/projects/smpng/sys/rpc/rpcclnt.c#13 integrate .. //depot/projects/smpng/sys/sys/cpu.h#3 integrate .. //depot/projects/smpng/sys/sys/eventhandler.h#24 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#69 integrate .. //depot/projects/smpng/sys/sys/mount.h#58 integrate .. //depot/projects/smpng/sys/sys/param.h#114 integrate .. //depot/projects/smpng/sys/sys/rwlock.h#9 integrate .. //depot/projects/smpng/sys/tools/acpi_quirks2h.awk#4 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#62 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#65 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#84 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#93 integrate Differences ... ==== //depot/projects/smpng/sys/Makefile#16 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.40 2006/11/26 18:27:16 maxim Exp $ +# $FreeBSD: src/sys/Makefile,v 1.41 2007/03/24 22:21:01 maxim Exp $ .include @@ -9,7 +9,7 @@ # Directories to include in cscope name file and TAGS. CSCOPEDIRS= cam coda compat conf contrib crypto ddb dev fs geom gnu i4b \ - isa isofs kern libkern modules net net80211 netatalk netatm \ + isa kern libkern modules net net80211 netatalk netatm \ netgraph netinet netinet6 netipx netkey netnatm netncp \ netsmb nfs nfsclient nfs4client rpc pccard pci sys \ ufs vm ${ARCHDIR} ==== //depot/projects/smpng/sys/amd64/acpica/OsdEnvironment.c#7 (text+ko) ==== @@ -26,16 +26,18 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.13 2005/09/11 18:39:00 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.14 2007/03/22 18:16:38 jkim Exp $"); /* * 6.1 : Environmental support */ #include +#include #include #include #include +#include static u_long amd64_acpi_root; @@ -54,25 +56,16 @@ return(0); } -ACPI_STATUS -AcpiOsGetRootPointer(UINT32 Flags, ACPI_POINTER *RsdpPhysicalAddress) +ACPI_PHYSICAL_ADDRESS +AcpiOsGetRootPointer(void) { - ACPI_POINTER ptr; - ACPI_STATUS status; + u_long ptr; - if (amd64_acpi_root == 0) { - /* - * The loader passes the physical address at which it found the - * RSDP in a hint. We could recover this rather than searching - * manually here. - */ - status = AcpiFindRootPointer(Flags, &ptr); - if (status == AE_OK) - amd64_acpi_root = ptr.Pointer.Physical; - } else - status = AE_OK; + if (amd64_acpi_root == 0 && + (resource_long_value("acpi", 0, "rsdp", (long *)&ptr) == 0 || + AcpiFindRootPointer((ACPI_NATIVE_UINT *)&ptr) == AE_OK) && + ptr != 0) + amd64_acpi_root = ptr; - RsdpPhysicalAddress->PointerType = ACPI_PHYSICAL_POINTER; - RsdpPhysicalAddress->Pointer.Physical = amd64_acpi_root; - return (status); + return (amd64_acpi_root); } ==== //depot/projects/smpng/sys/amd64/acpica/madt.c#13 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.22 2007/03/05 20:35:16 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.23 2007/03/22 18:16:38 jkim Exp $"); #include #include @@ -56,7 +56,7 @@ #define NIOAPICS 32 /* Max number of I/O APICs */ #define NLAPICS 32 /* Max number of local APICs */ -typedef void madt_entry_handler(APIC_HEADER *entry, void *arg); +typedef void madt_entry_handler(ACPI_SUBTABLE_HEADER *entry, void *arg); /* These two arrays are indexed by APIC IDs. */ struct ioapic_info { @@ -70,26 +70,29 @@ } lapics[NLAPICS]; static int madt_found_sci_override; -static MULTIPLE_APIC_TABLE *madt; +static ACPI_TABLE_MADT *madt; static vm_paddr_t madt_physaddr; static vm_offset_t madt_length; MALLOC_DEFINE(M_MADT, "madt_table", "ACPI MADT Table Items"); -static enum intr_polarity interrupt_polarity(UINT16 Polarity, UINT8 Source); -static enum intr_trigger interrupt_trigger(UINT16 TriggerMode, UINT8 Source); +static enum intr_polarity interrupt_polarity(UINT16 IntiFlags, UINT8 Source); +static enum intr_trigger interrupt_trigger(UINT16 IntiFlags, UINT8 Source); static int madt_find_cpu(u_int acpi_id, u_int *apic_id); static int madt_find_interrupt(int intr, void **apic, u_int *pin); static void *madt_map(vm_paddr_t pa, int offset, vm_offset_t length); static void *madt_map_table(vm_paddr_t pa, int offset, const char *sig); -static void madt_parse_apics(APIC_HEADER *entry, void *arg); -static void madt_parse_interrupt_override(MADT_INTERRUPT_OVERRIDE *intr); -static void madt_parse_ints(APIC_HEADER *entry, void *arg __unused); -static void madt_parse_local_nmi(MADT_LOCAL_APIC_NMI *nmi); -static void madt_parse_nmi(MADT_NMI_SOURCE *nmi); +static void madt_parse_apics(ACPI_SUBTABLE_HEADER *entry, void *arg); +static void madt_parse_interrupt_override( + ACPI_MADT_INTERRUPT_OVERRIDE *intr); +static void madt_parse_ints(ACPI_SUBTABLE_HEADER *entry, + void *arg __unused); +static void madt_parse_local_nmi(ACPI_MADT_LOCAL_APIC_NMI *nmi); +static void madt_parse_nmi(ACPI_MADT_NMI_SOURCE *nmi); static int madt_probe(void); static int madt_probe_cpus(void); -static void madt_probe_cpus_handler(APIC_HEADER *entry, void *arg __unused); +static void madt_probe_cpus_handler(ACPI_SUBTABLE_HEADER *entry, + void *arg __unused); static int madt_probe_table(vm_paddr_t address); static void madt_register(void *dummy); static int madt_setup_local(void); @@ -161,14 +164,14 @@ void *table; header = madt_map(pa, offset, sizeof(ACPI_TABLE_HEADER)); - if (strncmp(header->Signature, sig, 4) != 0) { + if (strncmp(header->Signature, sig, ACPI_NAME_SIZE) != 0) { madt_unmap(header, sizeof(ACPI_TABLE_HEADER)); return (NULL); } length = header->Length; madt_unmap(header, sizeof(ACPI_TABLE_HEADER)); table = madt_map(pa, offset, length); - if (ACPI_FAILURE(AcpiTbVerifyTableChecksum(table))) { + if (ACPI_FAILURE(AcpiTbChecksum(table, length))) { if (bootverbose) printf("MADT: Failed checksum for table %s\n", sig); madt_unmap(table, length); @@ -192,10 +195,10 @@ static int madt_probe(void) { - ACPI_POINTER rsdp_ptr; - RSDP_DESCRIPTOR *rsdp; - RSDT_DESCRIPTOR *rsdt; - XSDT_DESCRIPTOR *xsdt; + ACPI_PHYSICAL_ADDRESS rsdp_ptr; + ACPI_TABLE_RSDP *rsdp; + ACPI_TABLE_RSDT *rsdt; + ACPI_TABLE_XSDT *xsdt; int i, count; if (resource_disabled("acpi", 0)) @@ -206,12 +209,9 @@ * calls pmap_mapbios() to find the RSDP, we assume that we can use * pmap_mapbios() to map the RSDP. */ - if (AcpiOsGetRootPointer(ACPI_LOGICAL_ADDRESSING, &rsdp_ptr) != AE_OK) + if ((rsdp_ptr = AcpiOsGetRootPointer()) == 0) return (ENXIO); -#ifdef __i386__ - KASSERT(rsdp_ptr.Pointer.Physical < KERNLOAD, ("RSDP too high")); -#endif - rsdp = pmap_mapbios(rsdp_ptr.Pointer.Physical, sizeof(RSDP_DESCRIPTOR)); + rsdp = pmap_mapbios(rsdp_ptr, sizeof(ACPI_TABLE_RSDP)); if (rsdp == NULL) { if (bootverbose) printf("MADT: Failed to map RSDP\n"); @@ -230,38 +230,40 @@ * the version 1.0 portion of the RSDP. Version 2.0 has * an additional checksum that we verify first. */ - if (AcpiTbGenerateChecksum(rsdp, ACPI_RSDP_XCHECKSUM_LENGTH)) { + if (AcpiTbChecksum((UINT8 *)rsdp, ACPI_RSDP_XCHECKSUM_LENGTH)) { if (bootverbose) printf("MADT: RSDP failed extended checksum\n"); return (ENXIO); } - xsdt = madt_map_table(rsdp->XsdtPhysicalAddress, 1, XSDT_SIG); + xsdt = madt_map_table(rsdp->XsdtPhysicalAddress, 1, + ACPI_SIG_XSDT); if (xsdt == NULL) { if (bootverbose) printf("MADT: Failed to map XSDT\n"); return (ENXIO); } - count = (xsdt->Length - sizeof(ACPI_TABLE_HEADER)) / + count = (xsdt->Header.Length - sizeof(ACPI_TABLE_HEADER)) / sizeof(UINT64); for (i = 0; i < count; i++) if (madt_probe_table(xsdt->TableOffsetEntry[i])) break; madt_unmap_table(xsdt); } else { - rsdt = madt_map_table(rsdp->RsdtPhysicalAddress, 1, RSDT_SIG); + rsdt = madt_map_table(rsdp->RsdtPhysicalAddress, 1, + ACPI_SIG_RSDT); if (rsdt == NULL) { if (bootverbose) printf("MADT: Failed to map RSDT\n"); return (ENXIO); } - count = (rsdt->Length - sizeof(ACPI_TABLE_HEADER)) / + count = (rsdt->Header.Length - sizeof(ACPI_TABLE_HEADER)) / sizeof(UINT32); for (i = 0; i < count; i++) if (madt_probe_table(rsdt->TableOffsetEntry[i])) break; madt_unmap_table(rsdt); } - pmap_unmapbios((vm_offset_t)rsdp, sizeof(RSDP_DESCRIPTOR)); + pmap_unmapbios((vm_offset_t)rsdp, sizeof(ACPI_TABLE_RSDP)); if (madt_physaddr == 0) { if (bootverbose) printf("MADT: No MADT table found\n"); @@ -275,7 +277,7 @@ * Verify that we can map the full table and that its checksum is * correct, etc. */ - madt = madt_map_table(madt_physaddr, 0, APIC_SIG); + madt = madt_map_table(madt_physaddr, 0, ACPI_SIG_MADT); if (madt == NULL) return (ENXIO); madt_unmap_table(madt); @@ -303,7 +305,7 @@ printf("Table '%.4s' at 0x%jx\n", table->Signature, (uintmax_t)address); - if (strncmp(table->Signature, APIC_SIG, 4) != 0) { + if (strncmp(table->Signature, ACPI_SIG_MADT, ACPI_NAME_SIZE) != 0) { madt_unmap(table, sizeof(ACPI_TABLE_HEADER)); return (0); } @@ -320,7 +322,7 @@ madt_probe_cpus(void) { - madt = madt_map_table(madt_physaddr, 0, APIC_SIG); + madt = madt_map_table(madt_physaddr, 0, ACPI_SIG_MADT); KASSERT(madt != NULL, ("Unable to re-map MADT")); madt_walk_table(madt_probe_cpus_handler, NULL); madt_unmap_table(madt); @@ -336,10 +338,10 @@ { madt = pmap_mapbios(madt_physaddr, madt_length); - lapic_init(madt->LocalApicAddress); + lapic_init(madt->Address); printf("ACPI APIC Table: <%.*s %.*s>\n", - (int)sizeof(madt->OemId), madt->OemId, - (int)sizeof(madt->OemTableId), madt->OemTableId); + (int)sizeof(madt->Header.OemId), madt->Header.OemId, + (int)sizeof(madt->Header.OemTableId), madt->Header.OemTableId); /* * We ignore 64-bit local APIC override entries. Should we @@ -378,10 +380,10 @@ * force it to use level trigger and active-low polarity. */ if (!madt_found_sci_override) { - if (madt_find_interrupt(AcpiGbl_FADT->SciInt, &ioapic, &pin) - != 0) - printf("MADT: Could not find APIC for SCI IRQ %d\n", - AcpiGbl_FADT->SciInt); + if (madt_find_interrupt(AcpiGbl_FADT.SciInterrupt, &ioapic, + &pin) != 0) + printf("MADT: Could not find APIC for SCI IRQ %u\n", + AcpiGbl_FADT.SciInterrupt); else { printf( "MADT: Forcing active-low polarity and level trigger for SCI\n"); @@ -416,46 +418,46 @@ static void madt_walk_table(madt_entry_handler *handler, void *arg) { - APIC_HEADER *entry; + ACPI_SUBTABLE_HEADER *entry; u_char *p, *end; - end = (u_char *)(madt) + madt->Length; + end = (u_char *)(madt) + madt->Header.Length; for (p = (u_char *)(madt + 1); p < end; ) { - entry = (APIC_HEADER *)p; + entry = (ACPI_SUBTABLE_HEADER *)p; handler(entry, arg); p += entry->Length; } } static void -madt_probe_cpus_handler(APIC_HEADER *entry, void *arg) +madt_probe_cpus_handler(ACPI_SUBTABLE_HEADER *entry, void *arg) { - MADT_PROCESSOR_APIC *proc; + ACPI_MADT_LOCAL_APIC *proc; struct lapic_info *la; switch (entry->Type) { - case APIC_PROCESSOR: + case ACPI_MADT_TYPE_LOCAL_APIC: /* * The MADT does not include a BSP flag, so we have to * let the MP code figure out which CPU is the BSP on * its own. */ - proc = (MADT_PROCESSOR_APIC *)entry; + proc = (ACPI_MADT_LOCAL_APIC *)entry; if (bootverbose) - printf("MADT: Found CPU APIC ID %d ACPI ID %d: %s\n", - proc->LocalApicId, proc->ProcessorId, - proc->ProcessorEnabled ? "enabled" : "disabled"); - if (!proc->ProcessorEnabled) + printf("MADT: Found CPU APIC ID %u ACPI ID %u: %s\n", + proc->Id, proc->ProcessorId, + (proc->LapicFlags & ACPI_MADT_ENABLED) ? + "enabled" : "disabled"); + if (!(proc->LapicFlags & ACPI_MADT_ENABLED)) break; - if (proc->LocalApicId >= NLAPICS) - panic("%s: CPU ID %d too high", __func__, - proc->LocalApicId); - la = &lapics[proc->LocalApicId]; + if (proc->Id >= NLAPICS) + panic("%s: CPU ID %u too high", __func__, proc->Id); + la = &lapics[proc->Id]; KASSERT(la->la_enabled == 0, - ("Duplicate local APIC ID %d", proc->LocalApicId)); + ("Duplicate local APIC ID %u", proc->Id)); la->la_enabled = 1; la->la_acpi_id = proc->ProcessorId; - lapic_create(proc->LocalApicId, 0); + lapic_create(proc->Id, 0); break; } } @@ -465,26 +467,26 @@ * Add an I/O APIC from an entry in the table. */ static void -madt_parse_apics(APIC_HEADER *entry, void *arg __unused) +madt_parse_apics(ACPI_SUBTABLE_HEADER *entry, void *arg __unused) { - MADT_IO_APIC *apic; + ACPI_MADT_IO_APIC *apic; switch (entry->Type) { - case APIC_IO: - apic = (MADT_IO_APIC *)entry; + case ACPI_MADT_TYPE_IO_APIC: + apic = (ACPI_MADT_IO_APIC *)entry; if (bootverbose) - printf("MADT: Found IO APIC ID %d, Interrupt %d at %p\n", - apic->IoApicId, apic->Interrupt, + printf( + "MADT: Found IO APIC ID %u, Interrupt %u at %p\n", + apic->Id, apic->GlobalIrqBase, (void *)(uintptr_t)apic->Address); - if (apic->IoApicId >= NIOAPICS) - panic("%s: I/O APIC ID %d too high", __func__, - apic->IoApicId); - if (ioapics[apic->IoApicId].io_apic != NULL) - panic("%s: Double APIC ID %d", __func__, - apic->IoApicId); - ioapics[apic->IoApicId].io_apic = ioapic_create(apic->Address, - apic->IoApicId, apic->Interrupt); - ioapics[apic->IoApicId].io_vector = apic->Interrupt; + if (apic->Id >= NIOAPICS) + panic("%s: I/O APIC ID %u too high", __func__, + apic->Id); + if (ioapics[apic->Id].io_apic != NULL) + panic("%s: Double APIC ID %u", __func__, apic->Id); + ioapics[apic->Id].io_apic = ioapic_create(apic->Address, + apic->Id, apic->GlobalIrqBase); + ioapics[apic->Id].io_vector = apic->GlobalIrqBase; break; default: break; @@ -498,18 +500,18 @@ * SCI for which we use Active Lo, Level Triggered. */ static enum intr_polarity -interrupt_polarity(UINT16 Polarity, UINT8 Source) +interrupt_polarity(UINT16 IntiFlags, UINT8 Source) { - switch (Polarity) { - case POLARITY_CONFORMS: - if (Source == AcpiGbl_FADT->SciInt) + switch (IntiFlags & ACPI_MADT_POLARITY_MASK) { + case ACPI_MADT_POLARITY_CONFORMS: + if (Source == AcpiGbl_FADT.SciInterrupt) return (INTR_POLARITY_LOW); else return (INTR_POLARITY_HIGH); - case POLARITY_ACTIVE_HIGH: + case ACPI_MADT_POLARITY_ACTIVE_HIGH: return (INTR_POLARITY_HIGH); - case POLARITY_ACTIVE_LOW: + case ACPI_MADT_POLARITY_ACTIVE_LOW: return (INTR_POLARITY_LOW); default: panic("Bogus Interrupt Polarity"); @@ -517,18 +519,18 @@ } static enum intr_trigger -interrupt_trigger(UINT16 TriggerMode, UINT8 Source) +interrupt_trigger(UINT16 IntiFlags, UINT8 Source) { - switch (TriggerMode) { - case TRIGGER_CONFORMS: - if (Source == AcpiGbl_FADT->SciInt) + switch (IntiFlags & ACPI_MADT_TRIGGER_MASK) { + case ACPI_MADT_TRIGGER_CONFORMS: + if (Source == AcpiGbl_FADT.SciInterrupt) return (INTR_TRIGGER_LEVEL); else return (INTR_TRIGGER_EDGE); - case TRIGGER_EDGE: + case ACPI_MADT_TRIGGER_EDGE: return (INTR_TRIGGER_EDGE); - case TRIGGER_LEVEL: + case ACPI_MADT_TRIGGER_LEVEL: return (INTR_TRIGGER_LEVEL); default: panic("Bogus Interrupt Trigger Mode"); @@ -586,7 +588,7 @@ * Parse an interrupt source override for an ISA interrupt. */ static void -madt_parse_interrupt_override(MADT_INTERRUPT_OVERRIDE *intr) +madt_parse_interrupt_override(ACPI_MADT_INTERRUPT_OVERRIDE *intr) { void *new_ioapic, *old_ioapic; u_int new_pin, old_pin; @@ -594,20 +596,19 @@ enum intr_polarity pol; char buf[64]; - if (acpi_quirks & ACPI_Q_MADT_IRQ0 && intr->Source == 0 && - intr->Interrupt == 2) { + if (acpi_quirks & ACPI_Q_MADT_IRQ0 && intr->SourceIrq == 0 && + intr->GlobalIrq == 2) { if (bootverbose) printf("MADT: Skipping timer override\n"); return; } if (bootverbose) printf("MADT: Interrupt override: source %u, irq %u\n", - intr->Source, intr->Interrupt); + intr->SourceIrq, intr->GlobalIrq); KASSERT(intr->Bus == 0, ("bus for interrupt overrides must be zero")); - if (madt_find_interrupt(intr->Interrupt, &new_ioapic, - &new_pin) != 0) { - printf("MADT: Could not find APIC for vector %d (IRQ %d)\n", - intr->Interrupt, intr->Source); + if (madt_find_interrupt(intr->GlobalIrq, &new_ioapic, &new_pin) != 0) { + printf("MADT: Could not find APIC for vector %u (IRQ %u)\n", + intr->GlobalIrq, intr->SourceIrq); return; } @@ -615,15 +616,15 @@ * Lookup the appropriate trigger and polarity modes for this * entry. */ - trig = interrupt_trigger(intr->TriggerMode, intr->Source); - pol = interrupt_polarity(intr->Polarity, intr->Source); + trig = interrupt_trigger(intr->IntiFlags, intr->SourceIrq); + pol = interrupt_polarity(intr->IntiFlags, intr->SourceIrq); /* * If the SCI is identity mapped but has edge trigger and * active-hi polarity or the force_sci_lo tunable is set, * force it to use level/lo. */ - if (intr->Source == AcpiGbl_FADT->SciInt) { + if (intr->SourceIrq == AcpiGbl_FADT.SciInterrupt) { madt_found_sci_override = 1; if (getenv_string("hw.acpi.sci.trigger", buf, sizeof(buf))) { if (tolower(buf[0]) == 'e') @@ -652,23 +653,24 @@ } /* Remap the IRQ if it is mapped to a different interrupt vector. */ - if (intr->Source != intr->Interrupt) { + if (intr->SourceIrq != intr->GlobalIrq) { /* * If the SCI is remapped to a non-ISA global interrupt, * then override the vector we use to setup and allocate * the interrupt. */ - if (intr->Interrupt > 15 && - intr->Source == AcpiGbl_FADT->SciInt) - acpi_OverrideInterruptLevel(intr->Interrupt); + if (intr->GlobalIrq > 15 && + intr->SourceIrq == AcpiGbl_FADT.SciInterrupt) + acpi_OverrideInterruptLevel(intr->GlobalIrq); else - ioapic_remap_vector(new_ioapic, new_pin, intr->Source); - if (madt_find_interrupt(intr->Source, &old_ioapic, + ioapic_remap_vector(new_ioapic, new_pin, + intr->SourceIrq); + if (madt_find_interrupt(intr->SourceIrq, &old_ioapic, &old_pin) != 0) - printf("MADT: Could not find APIC for source IRQ %d\n", - intr->Source); + printf("MADT: Could not find APIC for source IRQ %u\n", + intr->SourceIrq); else if (ioapic_get_vector(old_ioapic, old_pin) == - intr->Source) + intr->SourceIrq) ioapic_disable_pin(old_ioapic, old_pin); } @@ -681,31 +683,31 @@ * Parse an entry for an NMI routed to an IO APIC. */ static void -madt_parse_nmi(MADT_NMI_SOURCE *nmi) +madt_parse_nmi(ACPI_MADT_NMI_SOURCE *nmi) { void *ioapic; u_int pin; - if (madt_find_interrupt(nmi->Interrupt, &ioapic, &pin) != 0) { - printf("MADT: Could not find APIC for vector %d\n", - nmi->Interrupt); + if (madt_find_interrupt(nmi->GlobalIrq, &ioapic, &pin) != 0) { + printf("MADT: Could not find APIC for vector %u\n", + nmi->GlobalIrq); return; } ioapic_set_nmi(ioapic, pin); - if (nmi->TriggerMode != TRIGGER_CONFORMS) + if (!(nmi->IntiFlags & ACPI_MADT_TRIGGER_CONFORMS)) ioapic_set_triggermode(ioapic, pin, - interrupt_trigger(nmi->TriggerMode, 0)); - if (nmi->Polarity != TRIGGER_CONFORMS) + interrupt_trigger(nmi->IntiFlags, 0)); + if (!(nmi->IntiFlags & ACPI_MADT_TRIGGER_CONFORMS)) ioapic_set_polarity(ioapic, pin, - interrupt_polarity(nmi->Polarity, 0)); + interrupt_polarity(nmi->IntiFlags, 0)); } /* * Parse an entry for an NMI routed to a local APIC LVT pin. */ static void -madt_parse_local_nmi(MADT_LOCAL_APIC_NMI *nmi) +madt_parse_local_nmi(ACPI_MADT_LOCAL_APIC_NMI *nmi) { u_int apic_id, pin; @@ -713,8 +715,8 @@ apic_id = APIC_ID_ALL; else if (madt_find_cpu(nmi->ProcessorId, &apic_id) != 0) { if (bootverbose) - printf("MADT: Ignoring local NMI routed to ACPI CPU %u\n", - nmi->ProcessorId); + printf("MADT: Ignoring local NMI routed to " + "ACPI CPU %u\n", nmi->ProcessorId); return; } if (nmi->Lint == 0) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Mar 30 01:22:44 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF39E16A404; Fri, 30 Mar 2007 01:22:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8F56D16A401 for ; Fri, 30 Mar 2007 01:22:43 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7578013C45A for ; Fri, 30 Mar 2007 01:22:43 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2U1Mh36012415 for ; Fri, 30 Mar 2007 01:22:43 GMT (envelope-from jkim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2U1Mhar012412 for perforce@freebsd.org; Fri, 30 Mar 2007 01:22:43 GMT (envelope-from jkim@freebsd.org) Date: Fri, 30 Mar 2007 01:22:43 GMT Message-Id: <200703300122.l2U1Mhar012412@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jkim@freebsd.org using -f From: Jung-uk Kim To: Perforce Change Reviews Cc: Subject: PERFORCE change 116898 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Mar 2007 01:22:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=116898 Change 116898 by jkim@jkim_hammer on 2007/03/30 01:22:41 IFC 116897 Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/amd64/support.S#4 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_futex.c#15 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/support.s#4 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/amd64/support.S#4 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.121 2006/10/17 02:24:45 davidxu Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.122 2007/03/30 01:07:27 jkim Exp $ */ #include "opt_ddb.h" @@ -733,4 +733,3 @@ xorl %eax, %eax movq %rax, PCB_ONFAULT(%r11) ret - ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_futex.c#15 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_futex.c,v 1.8 2007/02/25 12:43:07 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_futex.c,v 1.9 2007/03/30 01:07:28 jkim Exp $"); #if 0 __KERNEL_RCSID(1, "$NetBSD: linux_futex.c,v 1.7 2006/07/24 19:01:49 manu Exp $"); #endif @@ -188,7 +188,8 @@ case 0: /* FUTEX_WAKE received */ #ifdef DEBUG if (ldebug(sys_futex)) - printf("FUTEX_WAIT %d: uaddr = %p, got FUTEX_WAKE\n", + printf("FUTEX_WAIT %d: uaddr = %p, " + "got FUTEX_WAKE\n", td->td_proc->p_pid, args->uaddr); #endif return 0; @@ -196,7 +197,8 @@ default: #ifdef DEBUG if (ldebug(sys_futex)) - printf("FUTEX_WAIT: unexpected ret = %d\n", ret); + printf("FUTEX_WAIT: unexpected ret = %d\n", + ret); #endif break; } @@ -240,7 +242,8 @@ f = futex_get(args->uaddr, FUTEX_UNLOCKED); newf = futex_get(args->uaddr2, FUTEX_UNLOCKED); - td->td_retval[0] = futex_wake(f, args->val, newf, (int)(unsigned long)args->timeout); + td->td_retval[0] = futex_wake(f, args->val, newf, + (int)(unsigned long)args->timeout); futex_put(f); futex_put(newf); @@ -252,7 +255,8 @@ f = futex_get(args->uaddr, FUTEX_UNLOCKED); newf = futex_get(args->uaddr2, FUTEX_UNLOCKED); - td->td_retval[0] = futex_wake(f, args->val, newf, (int)(unsigned long)args->timeout); + td->td_retval[0] = futex_wake(f, args->val, newf, + (int)(unsigned long)args->timeout); futex_put(f); futex_put(newf); @@ -260,7 +264,7 @@ break; case LINUX_FUTEX_FD: - /* XXX: linux plans to remove this operation */ + /* XXX: Linux plans to remove this operation */ printf("linux_sys_futex: unimplemented op %d\n", args->op); break; @@ -269,9 +273,10 @@ FUTEX_SYSTEM_LOCK; #ifdef DEBUG if (ldebug(sys_futex)) - printf("FUTEX_WAKE_OP: %d: uaddr = %p, op = %d, val = %d, uaddr2 = %p, val3 = %d\n", - td->td_proc->p_pid, args->uaddr, args->op, args->val, - args->uaddr2, args->val3); + printf("FUTEX_WAKE_OP: %d: uaddr = %p, op = %d, " + "val = %d, uaddr2 = %p, val3 = %d\n", + td->td_proc->p_pid, args->uaddr, args->op, + args->val, args->uaddr2, args->val3); #endif f = futex_get(args->uaddr, FUTEX_UNLOCKED); f2 = futex_get(args->uaddr2, FUTEX_UNLOCKED); @@ -307,7 +312,8 @@ * Linux abuses the address of the timespec parameter * as the number of retries. */ - op_ret += futex_wake(f2, (int) (unsigned long) args->timeout, NULL, 0); + op_ret += futex_wake(f2, + (int)(unsigned long)args->timeout, NULL, 0); ret += op_ret; } futex_put(f2); @@ -381,8 +387,8 @@ #ifdef DEBUG if (ldebug(sys_futex)) - printf("FUTEX --> %d tlseep timeout = %ld\n", td->td_proc->p_pid, - timeout); + printf("FUTEX --> %d tlseep timeout = %ld\n", + td->td_proc->p_pid, timeout); #endif ret = tsleep(wp, PCATCH | PZERO, "linuxfutex", timeout); #ifdef DEBUG @@ -426,7 +432,8 @@ } else { if (newf != NULL) { /* futex_put called after tsleep */ - wp->wp_new_futex = futex_get(newf->f_uaddr, FUTEX_LOCKED); + wp->wp_new_futex = futex_get(newf->f_uaddr, + FUTEX_LOCKED); wakeup_one(wp); if (count - n >= n2) break; @@ -451,8 +458,8 @@ oparg = 1 << oparg; #ifdef DEBUG - printf("futex_atomic_op: op = %d, cmp = %d, oparg = %d, cmparg = %d, uaddr = %p\n", - op, cmp, oparg, cmparg, uaddr); + printf("futex_atomic_op: op = %d, cmp = %d, oparg = %d, cmparg = %d, " + "uaddr = %p\n", op, cmp, oparg, cmparg, uaddr); #endif /* XXX: linux verifies access here and returns EFAULT */ ==== //depot/projects/linuxolator/src/sys/i386/i386/support.s#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/i386/i386/support.s,v 1.112 2006/10/17 02:24:46 davidxu Exp $ + * $FreeBSD: src/sys/i386/i386/support.s,v 1.113 2007/03/30 01:07:28 jkim Exp $ */ #include "opt_npx.h" From owner-p4-projects@FreeBSD.ORG Fri Mar 30 01:26:49 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B1AF516A40E; Fri, 30 Mar 2007 01:26:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 06AE116A401 for ; Fri, 30 Mar 2007 01:26:49 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id ECE5013C4B9 for ; Fri, 30 Mar 2007 01:26:48 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2U1Qm4c012899 for ; Fri, 30 Mar 2007 01:26:48 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2U1QmIl012896 for perforce@freebsd.org; Fri, 30 Mar 2007 01:26:48 GMT (envelope-from peter@freebsd.org) Date: Fri, 30 Mar 2007 01:26:48 GMT Message-Id: <200703300126.l2U1QmIl012896@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 116899 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Mar 2007 01:26:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=116899 Change 116899 by peter@peter_daintree on 2007/03/30 01:26:45 Deal with make variable name changes Affected files ... .. //depot/projects/hammer/Makefile.inc1#120 edit Differences ... ==== //depot/projects/hammer/Makefile.inc1#120 (text+ko) ==== @@ -432,9 +432,9 @@ cd ${.CURDIR}/lib; ${LIB32WMAKE} ${_t} cd ${.CURDIR}/gnu/lib; ${LIB32WMAKE} ${_t} cd ${.CURDIR}/usr.bin/ldd; \ - ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} + ${LIB32WMAKE} DESTDIR=${LIB32TMP} ${_t} cd ${.CURDIR}/usr.bin/gcore; \ - ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} + ${LIB32WMAKE} DESTDIR=${LIB32TMP} ${_t} .if ${MK_CRYPT} != "no" cd ${.CURDIR}/secure/lib; ${LIB32WMAKE} ${_t} .endif @@ -442,7 +442,7 @@ cd ${.CURDIR}/kerberos5/lib; ${LIB32WMAKE} ${_t} .endif cd ${.CURDIR}/gnu/usr.bin/cc/include; \ - ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} + ${LIB32WMAKE} DESTDIR=${LIB32TMP} ${_t} .endfor .for _dir in usr.bin/lex/lib cd ${.CURDIR}/${_dir}; ${LIB32WMAKE} obj @@ -457,9 +457,9 @@ cd ${.CURDIR}/libexec/rtld-elf; \ PROG=ld-elf32.so.1 ${LIB32WMAKE} ${_t} cd ${.CURDIR}/usr.bin/ldd; \ - PROG=ldd32 ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} + PROG=ldd32 ${LIB32WMAKE} DESTDIR=${LIB32TMP} ${_t} cd ${.CURDIR}/usr.bin/gcore; \ - PROG=gcore32 ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} + PROG=gcore32 ${LIB32WMAKE} DESTDIR=${LIB32TMP} ${_t} .endfor distribute32 install32: @@ -474,8 +474,8 @@ cd ${.CURDIR}/secure/lib; ${LIB32IMAKE} ${.TARGET:S/32$//} .endif cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32IMAKE} ${.TARGET:S/32$//} - cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIB32MAKE} ${.TARGET:S/32$//} - cd ${.CURDIR}/usr.bin/gcore; PROG=gcore32 ${LIB32MAKE} ${.TARGET:S/32$//} + cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIB32WMAKE} ${.TARGET:S/32$//} + cd ${.CURDIR}/usr.bin/gcore; PROG=gcore32 ${LIB32WMAKE} ${.TARGET:S/32$//} .endif From owner-p4-projects@FreeBSD.ORG Fri Mar 30 04:03:59 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2DAAC16A403; Fri, 30 Mar 2007 04:03:59 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C36F316A401 for ; Fri, 30 Mar 2007 04:03:58 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9CA7813C448 for ; Fri, 30 Mar 2007 04:03:58 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2U43r88048729 for ; Fri, 30 Mar 2007 04:03:53 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2U43rMK048726 for perforce@freebsd.org; Fri, 30 Mar 2007 04:03:53 GMT (envelope-from scottl@freebsd.org) Date: Fri, 30 Mar 2007 04:03:53 GMT Message-Id: <200703300403.l2U43rMK048726@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 116902 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Mar 2007 04:03:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=116902 Change 116902 by scottl@scottl-x64 on 2007/03/30 04:03:39 Fix an earlier typo. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#53 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#53 (text+ko) ==== @@ -7167,7 +7167,7 @@ static void xpt_finishconfig(struct cam_periph *periph, union ccb *done_ccb) { - struct task *xpt_task; + struct xpt_task *task; if (done_ccb != NULL) { CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_TRACE, From owner-p4-projects@FreeBSD.ORG Fri Mar 30 05:10:18 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D04CD16A408; Fri, 30 Mar 2007 05:10:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 76F7916A404 for ; Fri, 30 Mar 2007 05:10:17 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6381013C45B for ; Fri, 30 Mar 2007 05:10:17 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2U5AHu7082993 for ; Fri, 30 Mar 2007 05:10:17 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2U59YSI082860 for perforce@freebsd.org; Fri, 30 Mar 2007 05:09:34 GMT (envelope-from mjacob@freebsd.org) Date: Fri, 30 Mar 2007 05:09:34 GMT Message-Id: <200703300509.l2U59YSI082860@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 116904 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Mar 2007 05:10:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=116904 Change 116904 by mjacob@mjexp on 2007/03/30 05:09:14 IFC Affected files ... .. //depot/projects/mjexp/ObsoleteFiles.inc#10 integrate .. //depot/projects/mjexp/bin/csh/config.h#2 integrate .. //depot/projects/mjexp/bin/csh/config_p.h#2 integrate .. //depot/projects/mjexp/contrib/tcsh/FREEBSD-Xlist#2 integrate .. //depot/projects/mjexp/contrib/tcsh/FREEBSD-upgrade#2 integrate .. //depot/projects/mjexp/contrib/tcsh/Fixes#2 integrate .. //depot/projects/mjexp/contrib/tcsh/Imakefile#2 integrate .. //depot/projects/mjexp/contrib/tcsh/MAKEDIFFS#2 integrate .. //depot/projects/mjexp/contrib/tcsh/MAKESHAR#2 integrate .. //depot/projects/mjexp/contrib/tcsh/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/tcsh/Makefile.std#2 integrate .. //depot/projects/mjexp/contrib/tcsh/Makefile.vms#2 integrate .. //depot/projects/mjexp/contrib/tcsh/README#2 integrate .. //depot/projects/mjexp/contrib/tcsh/complete.tcsh#2 integrate .. //depot/projects/mjexp/contrib/tcsh/config.h.in#2 integrate .. //depot/projects/mjexp/contrib/tcsh/config/bsd4.4#2 integrate .. //depot/projects/mjexp/contrib/tcsh/config_f.h#2 integrate .. //depot/projects/mjexp/contrib/tcsh/configure#2 integrate .. //depot/projects/mjexp/contrib/tcsh/configure.in#2 integrate .. //depot/projects/mjexp/contrib/tcsh/ed.chared.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/ed.decls.h#2 integrate .. //depot/projects/mjexp/contrib/tcsh/ed.defns.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/ed.h#2 integrate .. //depot/projects/mjexp/contrib/tcsh/ed.init.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/ed.inputl.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/ed.refresh.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/ed.screen.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/ed.term.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/ed.term.h#2 integrate .. //depot/projects/mjexp/contrib/tcsh/ed.xmap.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/eight-bit.me#2 integrate .. //depot/projects/mjexp/contrib/tcsh/gethost.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/glob.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/glob.h#2 integrate .. //depot/projects/mjexp/contrib/tcsh/host.defs#2 integrate .. //depot/projects/mjexp/contrib/tcsh/imake.config#2 integrate .. //depot/projects/mjexp/contrib/tcsh/ma.setp.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/mi.termios.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/mi.varargs.h#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/C/set1#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/C/set10#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/C/set11#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/C/set12#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/C/set13#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/C/set14#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/C/set15#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/C/set16#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/C/set17#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/C/set18#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/C/set19#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/C/set2#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/C/set20#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/C/set21#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/C/set22#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/C/set23#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/C/set24#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/C/set25#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/C/set26#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/C/set27#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/C/set29#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/C/set3#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/C/set30#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/C/set31#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/C/set4#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/C/set5#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/C/set6#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/C/set7#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/C/set8#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/C/set9#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/Makefile#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/et/set1#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/et/set10#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/et/set11#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/et/set12#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/et/set13#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/et/set14#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/et/set15#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/et/set16#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/et/set17#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/et/set18#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/et/set19#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/et/set2#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/et/set20#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/et/set21#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/et/set22#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/et/set23#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/et/set24#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/et/set25#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/et/set26#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/et/set27#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/et/set29#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/et/set3#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/et/set30#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/et/set31#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/et/set4#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/et/set5#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/et/set6#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/et/set7#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/et/set8#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/et/set9#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/finnish/set1#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/finnish/set10#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/finnish/set11#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/finnish/set12#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/finnish/set13#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/finnish/set14#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/finnish/set15#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/finnish/set16#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/finnish/set17#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/finnish/set18#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/finnish/set19#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/finnish/set2#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/finnish/set20#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/finnish/set21#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/finnish/set22#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/finnish/set23#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/finnish/set24#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/finnish/set25#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/finnish/set26#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/finnish/set27#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/finnish/set29#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/finnish/set3#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/finnish/set30#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/finnish/set31#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/finnish/set4#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/finnish/set5#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/finnish/set6#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/finnish/set7#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/finnish/set8#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/finnish/set9#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/french/set1#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/french/set10#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/french/set11#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/french/set12#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/french/set13#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/french/set14#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/french/set15#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/french/set16#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/french/set17#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/french/set18#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/french/set19#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/french/set2#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/french/set20#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/french/set21#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/french/set22#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/french/set23#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/french/set24#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/french/set25#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/french/set26#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/french/set27#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/french/set29#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/french/set3#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/french/set30#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/french/set31#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/french/set4#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/french/set5#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/french/set6#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/french/set7#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/french/set8#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/french/set9#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/german/set1#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/german/set10#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/german/set11#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/german/set12#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/german/set13#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/german/set14#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/german/set15#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/german/set16#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/german/set17#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/german/set18#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/german/set19#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/german/set2#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/german/set20#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/german/set21#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/german/set22#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/german/set23#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/german/set24#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/german/set25#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/german/set26#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/german/set27#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/german/set29#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/german/set3#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/german/set30#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/german/set31#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/german/set4#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/german/set5#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/german/set6#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/german/set7#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/german/set8#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/german/set9#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/greek/set1#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/greek/set10#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/greek/set11#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/greek/set12#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/greek/set13#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/greek/set14#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/greek/set15#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/greek/set16#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/greek/set17#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/greek/set18#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/greek/set19#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/greek/set2#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/greek/set20#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/greek/set21#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/greek/set22#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/greek/set23#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/greek/set24#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/greek/set25#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/greek/set26#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/greek/set27#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/greek/set29#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/greek/set3#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/greek/set30#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/greek/set31#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/greek/set4#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/greek/set5#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/greek/set6#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/greek/set7#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/greek/set8#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/greek/set9#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/italian/set1#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/italian/set10#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/italian/set11#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/italian/set12#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/italian/set13#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/italian/set14#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/italian/set15#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/italian/set16#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/italian/set17#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/italian/set18#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/italian/set19#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/italian/set2#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/italian/set20#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/italian/set21#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/italian/set22#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/italian/set23#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/italian/set24#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/italian/set25#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/italian/set26#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/italian/set27#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/italian/set29#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/italian/set3#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/italian/set30#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/italian/set31#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/italian/set4#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/italian/set5#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/italian/set6#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/italian/set7#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/italian/set8#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/italian/set9#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ja/set1#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ja/set10#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ja/set11#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ja/set12#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ja/set13#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ja/set15#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ja/set16#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ja/set17#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ja/set18#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ja/set2#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ja/set21#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ja/set24#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ja/set29#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ja/set3#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ja/set30#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ja/set4#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ja/set5#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ja/set6#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ja/set7#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ja/set8#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/pl/set1#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/pl/set10#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/pl/set11#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/pl/set12#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/pl/set13#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/pl/set14#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/pl/set15#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/pl/set16#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/pl/set17#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/pl/set18#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/pl/set19#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/pl/set2#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/pl/set20#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/pl/set21#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/pl/set22#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/pl/set23#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/pl/set24#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/pl/set25#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/pl/set26#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/pl/set27#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/pl/set29#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/pl/set3#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/pl/set30#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/pl/set31#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/pl/set4#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/pl/set5#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/pl/set6#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/pl/set7#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/pl/set8#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/pl/set9#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/russian/set1#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/russian/set10#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/russian/set11#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/russian/set12#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/russian/set13#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/russian/set14#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/russian/set15#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/russian/set16#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/russian/set17#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/russian/set18#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/russian/set19#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/russian/set2#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/russian/set20#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/russian/set21#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/russian/set22#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/russian/set23#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/russian/set24#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/russian/set25#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/russian/set26#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/russian/set27#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/russian/set29#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/russian/set3#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/russian/set30#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/russian/set31#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/russian/set4#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/russian/set5#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/russian/set6#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/russian/set7#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/russian/set8#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/russian/set9#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/spanish/set1#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/spanish/set10#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/spanish/set11#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/spanish/set12#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/spanish/set13#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/spanish/set14#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/spanish/set15#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/spanish/set16#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/spanish/set17#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/spanish/set18#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/spanish/set19#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/spanish/set2#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/spanish/set20#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/spanish/set21#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/spanish/set22#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/spanish/set23#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/spanish/set24#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/spanish/set25#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/spanish/set26#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/spanish/set27#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/spanish/set29#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/spanish/set3#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/spanish/set30#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/spanish/set31#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/spanish/set4#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/spanish/set5#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/spanish/set6#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/spanish/set7#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/spanish/set8#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/spanish/set9#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ukrainian/set1#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ukrainian/set10#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ukrainian/set11#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ukrainian/set12#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ukrainian/set13#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ukrainian/set14#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ukrainian/set15#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ukrainian/set16#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ukrainian/set17#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ukrainian/set18#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ukrainian/set19#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ukrainian/set2#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ukrainian/set20#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ukrainian/set21#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ukrainian/set22#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ukrainian/set23#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ukrainian/set24#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ukrainian/set25#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ukrainian/set26#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ukrainian/set27#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ukrainian/set29#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ukrainian/set3#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ukrainian/set30#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ukrainian/set31#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ukrainian/set4#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ukrainian/set5#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ukrainian/set6#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ukrainian/set7#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ukrainian/set8#2 integrate .. //depot/projects/mjexp/contrib/tcsh/nls/ukrainian/set9#2 integrate .. //depot/projects/mjexp/contrib/tcsh/patchlevel.h#2 integrate .. //depot/projects/mjexp/contrib/tcsh/pathnames.h#2 integrate .. //depot/projects/mjexp/contrib/tcsh/sh.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/sh.char.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/sh.char.h#2 integrate .. //depot/projects/mjexp/contrib/tcsh/sh.decls.h#2 integrate .. //depot/projects/mjexp/contrib/tcsh/sh.dir.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/sh.dir.h#2 integrate .. //depot/projects/mjexp/contrib/tcsh/sh.dol.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/sh.err.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/sh.exec.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/sh.exp.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/sh.file.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/sh.func.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/sh.glob.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/sh.h#2 integrate .. //depot/projects/mjexp/contrib/tcsh/sh.hist.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/sh.init.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/sh.lex.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/sh.misc.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/sh.parse.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/sh.print.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/sh.proc.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/sh.proc.h#2 integrate .. //depot/projects/mjexp/contrib/tcsh/sh.sem.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/sh.set.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/sh.time.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/sh.types.h#2 integrate .. //depot/projects/mjexp/contrib/tcsh/snames.h#2 integrate .. //depot/projects/mjexp/contrib/tcsh/tc.alloc.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/tc.bind.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/tc.const.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/tc.decls.h#2 integrate .. //depot/projects/mjexp/contrib/tcsh/tc.disc.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/tc.func.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/tc.h#2 integrate .. //depot/projects/mjexp/contrib/tcsh/tc.nls.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/tc.nls.h#2 integrate .. //depot/projects/mjexp/contrib/tcsh/tc.os.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/tc.os.h#2 integrate .. //depot/projects/mjexp/contrib/tcsh/tc.printf.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/tc.prompt.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/tc.sched.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/tc.sig.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/tc.sig.h#2 integrate .. //depot/projects/mjexp/contrib/tcsh/tc.str.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/tc.vers.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/tc.wait.h#2 integrate .. //depot/projects/mjexp/contrib/tcsh/tc.who.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/tcsh.man#2 integrate .. //depot/projects/mjexp/contrib/tcsh/tcsh.man2html#2 integrate .. //depot/projects/mjexp/contrib/tcsh/termcap.vms#2 integrate .. //depot/projects/mjexp/contrib/tcsh/tw.color.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/tw.comp.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/tw.decls.h#2 integrate .. //depot/projects/mjexp/contrib/tcsh/tw.h#2 integrate .. //depot/projects/mjexp/contrib/tcsh/tw.help.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/tw.init.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/tw.parse.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/tw.spell.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/vms.termcap.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/CHANGES#3 integrate .. //depot/projects/mjexp/crypto/openssl/Configure#3 integrate .. //depot/projects/mjexp/crypto/openssl/FAQ#3 integrate .. //depot/projects/mjexp/crypto/openssl/FREEBSD-upgrade#2 integrate .. //depot/projects/mjexp/crypto/openssl/INSTALL#2 integrate .. //depot/projects/mjexp/crypto/openssl/LICENSE#3 integrate .. //depot/projects/mjexp/crypto/openssl/Makefile#3 integrate .. //depot/projects/mjexp/crypto/openssl/NEWS#3 integrate .. //depot/projects/mjexp/crypto/openssl/README#3 integrate .. //depot/projects/mjexp/crypto/openssl/apps/CA.pl#3 integrate .. //depot/projects/mjexp/crypto/openssl/apps/Makefile#2 integrate .. //depot/projects/mjexp/crypto/openssl/apps/ca.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/apps/dgst.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/apps/ec.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/apps/enc.c#3 integrate .. //depot/projects/mjexp/crypto/openssl/apps/ocsp.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/apps/pkcs12.c#3 integrate .. //depot/projects/mjexp/crypto/openssl/apps/s_client.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/apps/s_server.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/certs/aol1.pem#1 branch .. //depot/projects/mjexp/crypto/openssl/certs/aol2.pem#1 branch .. //depot/projects/mjexp/crypto/openssl/certs/aoltw1.pem#1 branch .. //depot/projects/mjexp/crypto/openssl/certs/aoltw2.pem#1 branch .. //depot/projects/mjexp/crypto/openssl/config#3 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/aes/Makefile#3 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/aes/aes_misc.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/asn1/a_strex.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/asn1/asn1_err.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/asn1/asn1_lib.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/asn1/asn1t.h#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/asn1/t_x509.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/asn1/tasn_dec.c#3 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/asn1/x_x509.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/bf/bf_ecb.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/bio/bio.h#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/bio/bio_err.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/bio/bio_lib.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/bn/bn_err.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/bn/bn_lib.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/bn/bn_print.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/buffer/buf_err.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/camellia/Makefile#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/camellia/camellia.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/camellia/cmll_cbc.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/camellia/cmll_locl.h#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/camellia/cmll_misc.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/cast/c_ecb.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/comp/c_zlib.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/comp/comp_err.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/conf/conf_def.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/conf/conf_err.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/conf/conf_lib.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/cpt_err.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/cryptlib.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/des/INSTALL#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/des/des_ver.h#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/des/ecb_enc.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/dh/dh_err.c#3 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/dh/dh_lib.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/dsa/dsa_err.c#3 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/dsa/dsa_lib.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/dso/dso_err.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/ec/ec_asn1.c#3 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/ec/ec_err.c#3 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/ecdh/ech_err.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/ecdh/ech_lib.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/ecdsa/ecdsa.h#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/ecdsa/ecs_err.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/ecdsa/ecs_lib.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/ecdsa/ecs_ossl.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/engine/eng_all.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/engine/eng_err.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/engine/eng_padlock.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/engine/tb_ecdh.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/engine/tb_ecdsa.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/err/err_all.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/evp/bio_md.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/evp/evp.h#3 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/evp/evp_enc.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/evp/evp_err.c#3 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/evp/evp_lib.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/evp/evp_locl.h#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/idea/i_ecb.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/idea/idea_lcl.h#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/lhash/lhash.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/md2/md2.h#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/md2/md2_dgst.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/md4/md4.h#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/md4/md4_dgst.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/md5/md5.h#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/md5/md5_dgst.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/objects/obj_dat.h#3 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/objects/obj_err.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/objects/obj_mac.h#3 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/objects/obj_mac.num#3 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/objects/objects.txt#3 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/ocsp/ocsp_asn.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/ocsp/ocsp_err.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/ocsp/ocsp_vfy.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/opensslconf.h#3 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/opensslv.h#3 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/pem/pem.h#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/pem/pem_err.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/pem/pem_lib.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/pem/pem_pkey.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/pkcs12/pk12err.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/pkcs7/pk7_doit.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/pkcs7/pk7_lib.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/pkcs7/pk7_smime.c#3 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/pkcs7/pkcs7err.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/rand/md_rand.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/rand/rand_err.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/rc2/rc2_ecb.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/rc4/rc4_skey.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/ripemd/ripemd.h#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/ripemd/rmd_dgst.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/rsa/rsa_err.c#3 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/rsa/rsa_lib.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/sha/sha.h#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/sha/sha1dgst.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/sha/sha256.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/sha/sha512.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/sha/sha_dgst.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/stack/safestack.h#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/stack/stack.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/store/str_err.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/txt_db/txt_db.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/ui/ui_err.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/x509/by_dir.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/x509/x509.h#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/x509/x509_err.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/x509/x509_req.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/x509/x509_txt.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/x509/x509_vfy.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/x509/x509_vfy.h#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/x509v3/Makefile#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/x509v3/ext_dat.h#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/x509v3/pcy_tree.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/x509v3/v3_addr.c#1 branch .. //depot/projects/mjexp/crypto/openssl/crypto/x509v3/v3_akey.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/x509v3/v3_alt.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/x509v3/v3_asid.c#1 branch .. //depot/projects/mjexp/crypto/openssl/crypto/x509v3/v3_bcons.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/x509v3/v3_bitst.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/x509v3/v3_cpols.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/x509v3/v3_crld.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/x509v3/v3_enum.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/x509v3/v3_extku.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/x509v3/v3_ia5.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/x509v3/v3_info.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/x509v3/v3_int.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/x509v3/v3_ncons.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/x509v3/v3_ocsp.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/x509v3/v3_pci.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/x509v3/v3_pcons.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/x509v3/v3_pku.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/x509v3/v3_pmaps.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/x509v3/v3_purp.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/x509v3/v3_skey.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/x509v3/v3_sxnet.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/x509v3/v3_utl.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/x509v3/v3err.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/crypto/x509v3/x509v3.h#2 integrate .. //depot/projects/mjexp/crypto/openssl/doc/apps/ciphers.pod#3 integrate .. //depot/projects/mjexp/crypto/openssl/doc/apps/s_client.pod#2 integrate .. //depot/projects/mjexp/crypto/openssl/doc/apps/x509.pod#2 integrate .. //depot/projects/mjexp/crypto/openssl/doc/crypto/ASN1_STRING_print_ex.pod#2 integrate .. //depot/projects/mjexp/crypto/openssl/doc/crypto/BIO_set_callback.pod#2 integrate .. //depot/projects/mjexp/crypto/openssl/doc/crypto/CONF_modules_free.pod#2 integrate .. //depot/projects/mjexp/crypto/openssl/doc/crypto/RAND_egd.pod#2 integrate .. //depot/projects/mjexp/crypto/openssl/doc/crypto/RSA_get_ex_new_index.pod#2 integrate .. //depot/projects/mjexp/crypto/openssl/doc/crypto/md5.pod#2 integrate .. //depot/projects/mjexp/crypto/openssl/doc/crypto/mdc2.pod#2 integrate .. //depot/projects/mjexp/crypto/openssl/doc/crypto/ripemd.pod#2 integrate .. //depot/projects/mjexp/crypto/openssl/doc/crypto/sha.pod#2 integrate .. //depot/projects/mjexp/crypto/openssl/doc/ssl/SSL_CTX_set_tmp_rsa_callback.pod#2 integrate .. //depot/projects/mjexp/crypto/openssl/doc/ssl/SSL_SESSION_get_time.pod#2 integrate .. //depot/projects/mjexp/crypto/openssl/openssl.spec#3 integrate .. //depot/projects/mjexp/crypto/openssl/ssl/d1_lib.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/ssl/d1_pkt.c#3 integrate .. //depot/projects/mjexp/crypto/openssl/ssl/kssl.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/ssl/s23_clnt.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/ssl/s23_srvr.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/ssl/s2_enc.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/ssl/s2_lib.c#3 integrate .. //depot/projects/mjexp/crypto/openssl/ssl/s3_clnt.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/ssl/s3_enc.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/ssl/s3_lib.c#3 integrate .. //depot/projects/mjexp/crypto/openssl/ssl/s3_pkt.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/ssl/s3_srvr.c#3 integrate .. //depot/projects/mjexp/crypto/openssl/ssl/ssl.h#3 integrate .. //depot/projects/mjexp/crypto/openssl/ssl/ssl_ciph.c#3 integrate .. //depot/projects/mjexp/crypto/openssl/ssl/ssl_err.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/ssl/ssl_lib.c#3 integrate .. //depot/projects/mjexp/crypto/openssl/ssl/ssl_sess.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/ssl/t1_enc.c#3 integrate .. //depot/projects/mjexp/crypto/openssl/ssl/t1_lib.c#2 integrate .. //depot/projects/mjexp/crypto/openssl/test/Makefile#3 integrate .. //depot/projects/mjexp/crypto/openssl/tools/c_rehash#3 integrate .. //depot/projects/mjexp/crypto/openssl/util/libeay.num#3 integrate .. //depot/projects/mjexp/crypto/openssl/util/mk1mf.pl#3 integrate .. //depot/projects/mjexp/crypto/openssl/util/mkdef.pl#3 integrate .. //depot/projects/mjexp/crypto/openssl/util/mkerr.pl#2 integrate .. //depot/projects/mjexp/crypto/openssl/util/ssleay.num#2 integrate .. //depot/projects/mjexp/etc/rc.d/bgfsck#2 integrate .. //depot/projects/mjexp/etc/rc.d/dhclient#5 integrate .. //depot/projects/mjexp/etc/rc.d/syscons#4 integrate .. //depot/projects/mjexp/etc/rc.subr#6 integrate .. //depot/projects/mjexp/games/fortune/datfiles/fortunes#10 integrate .. //depot/projects/mjexp/gnu/usr.bin/cc/Makefile.fe#2 integrate .. //depot/projects/mjexp/gnu/usr.bin/cc/Makefile.inc#2 integrate .. //depot/projects/mjexp/gnu/usr.bin/cc/c++filt/Makefile#2 integrate .. //depot/projects/mjexp/gnu/usr.bin/cc/cc_int/Makefile#2 integrate .. //depot/projects/mjexp/gnu/usr.bin/cc/f77/Makefile#2 integrate .. //depot/projects/mjexp/lib/libarchive/Makefile#5 integrate .. //depot/projects/mjexp/lib/libarchive/archive.h.in#8 integrate .. //depot/projects/mjexp/lib/libarchive/archive_entry.c#6 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_extract.c#6 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_support_compression_bzip2.c#6 integrate .. //depot/projects/mjexp/lib/libarchive/archive_write.c#5 integrate .. //depot/projects/mjexp/lib/libarchive/archive_write_disk.c#2 integrate .. //depot/projects/mjexp/lib/libarchive/archive_write_set_compression_none.c#5 integrate .. //depot/projects/mjexp/lib/libarchive/test/test.h#2 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_write_disk_perms.c#2 integrate .. //depot/projects/mjexp/lib/libc/net/inet.3#5 integrate .. //depot/projects/mjexp/lib/libc/net/sctp_sys_calls.c#3 integrate .. //depot/projects/mjexp/lib/libc/stdio/tmpnam.3#3 integrate .. //depot/projects/mjexp/lib/libc/stdlib/malloc.c#5 integrate .. //depot/projects/mjexp/lib/libedit/chared.h#2 integrate .. //depot/projects/mjexp/lib/libedit/common.c#2 integrate .. //depot/projects/mjexp/lib/libedit/editline.3#2 integrate .. //depot/projects/mjexp/lib/libedit/editrc.5#2 integrate .. //depot/projects/mjexp/lib/libedit/emacs.c#2 integrate .. //depot/projects/mjexp/lib/libedit/history.c#2 integrate .. //depot/projects/mjexp/lib/libedit/key.c#2 integrate .. //depot/projects/mjexp/lib/libedit/key.h#2 integrate .. //depot/projects/mjexp/lib/libedit/map.c#2 integrate .. //depot/projects/mjexp/lib/libedit/read.c#2 integrate .. //depot/projects/mjexp/lib/libedit/read.h#2 integrate .. //depot/projects/mjexp/lib/libedit/term.c#2 integrate .. //depot/projects/mjexp/lib/libedit/term.h#2 integrate .. //depot/projects/mjexp/lib/libedit/tty.c#2 integrate .. //depot/projects/mjexp/lib/libedit/vi.c#2 integrate .. //depot/projects/mjexp/lib/libelf/elf_data.c#2 integrate .. //depot/projects/mjexp/lib/libelf/elf_getarhdr.3#2 integrate .. //depot/projects/mjexp/lib/libelf/elf_rand.3#2 integrate .. //depot/projects/mjexp/lib/libelf/libelf_ar.c#3 integrate .. //depot/projects/mjexp/lib/libmemstat/memstat.h#2 integrate .. //depot/projects/mjexp/lib/libpam/modules/pam_unix/pam_unix.8#3 integrate .. //depot/projects/mjexp/lib/libpam/modules/pam_unix/pam_unix.c#2 integrate .. //depot/projects/mjexp/lib/libpmc/pmc.3#2 integrate .. //depot/projects/mjexp/lib/libufs/type.c#2 integrate .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#5 integrate .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/article.sgml#8 integrate .. //depot/projects/mjexp/release/doc/share/misc/dev.archlist.txt#5 integrate .. //depot/projects/mjexp/sbin/geom/core/geom.c#2 integrate .. //depot/projects/mjexp/sbin/ifconfig/ifconfig.c#4 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/Makefile#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/Makefile.inc#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/Makefile.man#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/ASN1_OBJECT_new.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/ASN1_STRING_length.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/ASN1_STRING_new.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/ASN1_generate_nconf.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_ctrl.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_f_base64.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_f_buffer.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_f_cipher.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_f_md.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_f_null.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_f_ssl.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_find_type.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_new.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_push.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_read.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_s_accept.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_s_bio.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_s_connect.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_s_fd.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_s_file.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_s_mem.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_s_null.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_s_socket.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_set_callback.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BIO_should_retry.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BN_BLINDING_new.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BN_CTX_new.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BN_CTX_start.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BN_add.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BN_add_word.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BN_bn2bin.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BN_cmp.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BN_copy.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BN_generate_prime.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BN_mod_inverse.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BN_new.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BN_num_bytes.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BN_rand.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BN_set_bit.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BN_swap.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/BN_zero.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/CONF_modules_free.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/CONF_modules_load_file.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/DH_generate_key.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/DH_generate_parameters.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/DH_get_ex_new_index.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/DH_new.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/DH_set_method.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/DH_size.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/DSA_SIG_new.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/DSA_do_sign.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/DSA_dup_DH.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/DSA_generate_key.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/DSA_generate_parameters.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/DSA_get_ex_new_index.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/DSA_new.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/DSA_set_method.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/DSA_sign.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/DSA_size.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/ERR_GET_LIB.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/ERR_clear_error.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/ERR_error_string.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/ERR_get_error.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/ERR_load_crypto_strings.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/ERR_load_strings.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/ERR_print_errors.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/ERR_put_error.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/ERR_remove_state.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/ERR_set_mark.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/EVP_BytesToKey.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/EVP_DigestInit.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/EVP_EncryptInit.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/EVP_OpenInit.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/EVP_PKEY_new.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/EVP_SealInit.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/EVP_SignInit.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/EVP_VerifyInit.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/OBJ_nid2obj.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/OPENSSL_Applink.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/OPENSSL_config.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/OPENSSL_ia32cap.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/PKCS12_create.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/PKCS12_parse.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/PKCS7_decrypt.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/PKCS7_encrypt.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/PKCS7_sign.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/PKCS7_verify.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/RAND_add.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/RAND_bytes.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/RAND_cleanup.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/RAND_egd.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/RAND_load_file.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/RAND_set_rand_method.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/RSA_blinding_on.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/RSA_check_key.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/RSA_generate_key.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/RSA_get_ex_new_index.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/RSA_new.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/RSA_print.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/RSA_private_encrypt.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/RSA_public_encrypt.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/RSA_set_method.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/RSA_sign.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/RSA_size.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/SMIME_read_PKCS7.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/SMIME_write_PKCS7.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/X509_NAME_print_ex.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/X509_new.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/bio.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/blowfish.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/bn.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/bn_internal.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/buffer.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/crypto.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/d2i_DHparams.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/d2i_DSAPublicKey.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/d2i_RSAPublicKey.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/d2i_X509.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/d2i_X509_ALGOR.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/d2i_X509_CRL.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/d2i_X509_NAME.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/d2i_X509_REQ.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/d2i_X509_SIG.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/des.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/dh.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/dsa.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/ecdsa.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/engine.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/err.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/evp.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/hmac.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/lh_stats.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/lhash.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/md5.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/mdc2.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/pem.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/rand.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/rc4.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/ripemd.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/rsa.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/sha.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/threads.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/ui.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/ui_compat.3#3 integrate .. //depot/projects/mjexp/secure/lib/libcrypto/man/x509.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/Makefile.man#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CIPHER_get_name.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_COMP_add_compression_method.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_add_session.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_ctrl.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_flush_sessions.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_free.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_new.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_sess_number.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_sessions.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_cert_store.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_info_callback.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_mode.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_options.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_timeout.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_set_verify.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_CTX_use_certificate.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_SESSION_free.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_SESSION_get_time.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_accept.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_alert_type_string.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_clear.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_connect.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_do_handshake.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_free.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_get_SSL_CTX.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_get_ciphers.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_get_client_CA_list.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_get_current_cipher.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_get_default_timeout.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_get_error.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_get_ex_new_index.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_get_fd.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_get_peer_cert_chain.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_get_peer_certificate.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_get_rbio.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_get_session.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_get_verify_result.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_get_version.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_library_init.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_load_client_CA_file.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_new.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_pending.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_read.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_rstate_string.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_session_reused.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_set_bio.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_set_connect_state.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_set_fd.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_set_session.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_set_shutdown.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_set_verify_result.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_shutdown.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_state_string.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_want.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/SSL_write.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/d2i_SSL_SESSION.3#3 integrate .. //depot/projects/mjexp/secure/lib/libssl/man/ssl.3#3 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/Makefile.man#3 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/CA.pl.1#3 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/asn1parse.1#3 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/ca.1#3 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/ciphers.1#3 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/crl.1#3 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/crl2pkcs7.1#3 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/dgst.1#3 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/dhparam.1#3 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/dsa.1#3 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/dsaparam.1#3 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/ec.1#3 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/ecparam.1#3 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/enc.1#3 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/errstr.1#3 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/gendsa.1#3 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/genrsa.1#3 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/nseq.1#3 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/ocsp.1#3 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/openssl.1#3 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/passwd.1#3 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/pkcs12.1#3 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/pkcs7.1#3 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/pkcs8.1#3 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/rand.1#3 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/req.1#3 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/rsa.1#3 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/rsautl.1#3 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/s_client.1#3 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/s_server.1#3 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/s_time.1#3 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/sess_id.1#3 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/smime.1#3 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/speed.1#3 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/spkac.1#3 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/verify.1#3 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/version.1#3 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/x509.1#3 integrate .. //depot/projects/mjexp/secure/usr.bin/openssl/man/x509v3_config.1#3 integrate .. //depot/projects/mjexp/share/man/man4/Makefile#9 integrate .. //depot/projects/mjexp/share/man/man4/acpi_thermal.4#2 integrate .. //depot/projects/mjexp/share/man/man4/ata.4#5 integrate .. //depot/projects/mjexp/share/man/man4/cxgb.4#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Mar 30 05:25:38 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5FC2C16A404; Fri, 30 Mar 2007 05:25:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1EB0C16A402 for ; Fri, 30 Mar 2007 05:25:38 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0D7DF13C457 for ; Fri, 30 Mar 2007 05:25:38 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2U5Pb4E086878 for ; Fri, 30 Mar 2007 05:25:37 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2U5PaPT086875 for perforce@freebsd.org; Fri, 30 Mar 2007 05:25:36 GMT (envelope-from mjacob@freebsd.org) Date: Fri, 30 Mar 2007 05:25:36 GMT Message-Id: <200703300525.l2U5PaPT086875@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 116905 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Mar 2007 05:25:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=116905 Change 116905 by mjacob@mjexp on 2007/03/30 05:25:31 IFC Affected files ... .. //depot/projects/mjexp/ObsoleteFiles.inc#11 integrate .. //depot/projects/mjexp/contrib/bzip2/CHANGES#2 integrate .. //depot/projects/mjexp/contrib/bzip2/FREEBSD-upgrade#2 integrate .. //depot/projects/mjexp/contrib/bzip2/LICENSE#2 integrate .. //depot/projects/mjexp/contrib/bzip2/Makefile#2 integrate .. //depot/projects/mjexp/contrib/bzip2/Makefile-libbz2_so#2 integrate .. //depot/projects/mjexp/contrib/bzip2/README#2 integrate .. //depot/projects/mjexp/contrib/bzip2/README.COMPILATION.PROBLEMS#2 integrate .. //depot/projects/mjexp/contrib/bzip2/Y2K_INFO#2 delete .. //depot/projects/mjexp/contrib/bzip2/blocksort.c#2 integrate .. //depot/projects/mjexp/contrib/bzip2/bzip2.1#2 integrate .. //depot/projects/mjexp/contrib/bzip2/bzip2.c#2 integrate .. //depot/projects/mjexp/contrib/bzip2/bzip2recover.c#2 integrate .. //depot/projects/mjexp/contrib/bzip2/bzlib.c#2 integrate .. //depot/projects/mjexp/contrib/bzip2/bzlib.h#2 integrate .. //depot/projects/mjexp/contrib/bzip2/bzlib_private.h#2 integrate .. //depot/projects/mjexp/contrib/bzip2/compress.c#2 integrate .. //depot/projects/mjexp/contrib/bzip2/crctable.c#2 integrate .. //depot/projects/mjexp/contrib/bzip2/decompress.c#2 integrate .. //depot/projects/mjexp/contrib/bzip2/dlltest.c#2 integrate .. //depot/projects/mjexp/contrib/bzip2/huffman.c#2 integrate .. //depot/projects/mjexp/contrib/bzip2/manual.texi#2 delete .. //depot/projects/mjexp/contrib/bzip2/randtable.c#2 integrate .. //depot/projects/mjexp/contrib/bzip2/sample1.bz2.uu#2 integrate .. //depot/projects/mjexp/contrib/bzip2/sample1.ref.gz.uu#2 integrate .. //depot/projects/mjexp/contrib/bzip2/sample2.bz2.uu#2 integrate .. //depot/projects/mjexp/contrib/bzip2/sample2.ref.gz.uu#2 integrate .. //depot/projects/mjexp/contrib/bzip2/sample3.bz2.uu#2 integrate .. //depot/projects/mjexp/contrib/bzip2/sample3.ref.gz.uu#2 integrate .. //depot/projects/mjexp/contrib/bzip2/spewG.c#2 integrate .. //depot/projects/mjexp/contrib/bzip2/unzcrash.c#2 integrate .. //depot/projects/mjexp/contrib/bzip2/words0#2 integrate .. //depot/projects/mjexp/contrib/bzip2/words2#2 integrate .. //depot/projects/mjexp/contrib/bzip2/words3#2 integrate .. //depot/projects/mjexp/contrib/netcat/nc.1#2 integrate .. //depot/projects/mjexp/contrib/netcat/netcat.c#2 integrate .. //depot/projects/mjexp/contrib/netcat/socks.c#2 integrate .. //depot/projects/mjexp/etc/defaults/rc.conf#8 integrate .. //depot/projects/mjexp/etc/network.subr#5 integrate .. //depot/projects/mjexp/games/fortune/datfiles/fortunes#11 integrate .. //depot/projects/mjexp/games/fortune/datfiles/fortunes-o.real#3 integrate .. //depot/projects/mjexp/lib/libc/gen/valloc.3#3 integrate .. //depot/projects/mjexp/lib/libc/stdlib/malloc.3#2 integrate .. //depot/projects/mjexp/lib/libc/stdlib/malloc.c#6 integrate .. //depot/projects/mjexp/lib/libc/stdlib/posix_memalign.3#2 integrate .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/article.sgml#9 integrate .. //depot/projects/mjexp/sbin/ifconfig/ifconfig.8#8 integrate .. //depot/projects/mjexp/share/man/man3/pthread_cond_timedwait.3#2 integrate .. //depot/projects/mjexp/share/man/man3/pthread_cond_wait.3#2 integrate .. //depot/projects/mjexp/share/man/man4/watchdog.4#3 integrate .. //depot/projects/mjexp/share/man/man9/Makefile#13 integrate .. //depot/projects/mjexp/share/man/man9/watchdog.9#3 integrate .. //depot/projects/mjexp/sys/amd64/amd64/cpu_switch.S#3 integrate .. //depot/projects/mjexp/sys/amd64/amd64/genassym.c#5 integrate .. //depot/projects/mjexp/sys/amd64/amd64/machdep.c#9 integrate .. //depot/projects/mjexp/sys/amd64/amd64/support.S#3 integrate .. //depot/projects/mjexp/sys/amd64/include/pcb.h#2 integrate .. //depot/projects/mjexp/sys/amd64/include/segments.h#2 integrate .. //depot/projects/mjexp/sys/amd64/linux32/linux32_locore.s#2 integrate .. //depot/projects/mjexp/sys/amd64/linux32/linux32_machdep.c#11 integrate .. //depot/projects/mjexp/sys/amd64/linux32/linux32_proto.h#9 integrate .. //depot/projects/mjexp/sys/amd64/linux32/linux32_syscall.h#9 integrate .. //depot/projects/mjexp/sys/amd64/linux32/linux32_sysent.c#9 integrate .. //depot/projects/mjexp/sys/amd64/linux32/linux32_sysvec.c#4 integrate .. //depot/projects/mjexp/sys/amd64/linux32/syscalls.master#8 integrate .. //depot/projects/mjexp/sys/compat/linux/linux_futex.c#3 integrate .. //depot/projects/mjexp/sys/dev/isp/isp.c#19 integrate .. //depot/projects/mjexp/sys/i386/i386/support.s#3 integrate .. //depot/projects/mjexp/sys/netinet/in.c#5 integrate .. //depot/projects/mjexp/usr.bin/bzip2/Makefile#2 integrate .. //depot/projects/mjexp/usr.bin/bzip2/doc/Makefile#2 delete .. //depot/projects/mjexp/usr.sbin/acpi/acpidump/acpi.c#2 integrate .. //depot/projects/mjexp/usr.sbin/acpi/acpidump/acpidump.h#2 integrate .. //depot/projects/mjexp/usr.sbin/arp/arp.4#2 integrate .. //depot/projects/mjexp/usr.sbin/gstat/gstat.c#2 integrate .. //depot/projects/mjexp/usr.sbin/ngctl/Makefile#3 integrate .. //depot/projects/mjexp/usr.sbin/pkg_install/lib/exec.c#2 integrate .. //depot/projects/mjexp/usr.sbin/pkg_install/lib/lib.h#2 integrate .. //depot/projects/mjexp/usr.sbin/pkg_install/lib/plist.c#2 integrate .. //depot/projects/mjexp/usr.sbin/pkg_install/lib/url.c#3 integrate Differences ... ==== //depot/projects/mjexp/ObsoleteFiles.inc#11 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.76 2007/03/19 11:15:53 delphij Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.77 2007/03/28 07:49:57 delphij Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070328: bzip2 1.0.4 +OLD_FILES+=usr/share/info/bzip2.info.gz # 20070303: libarchive 2.0 OLD_LIBS+=usr/lib/libarchive.so.3 # 20070301: remove addr2ascii and ascii2addr ==== //depot/projects/mjexp/contrib/bzip2/CHANGES#2 (text+ko) ==== @@ -1,5 +1,18 @@ + ------------------------------------------------------------------ + This file is part of bzip2/libbzip2, a program and library for + lossless, block-sorting data compression. + bzip2/libbzip2 version 1.0.4 of 20 December 2006 + Copyright (C) 1996-2006 Julian Seward + Please read the WARNING, DISCLAIMER and PATENTS sections in the + README file. + + This program is released under the terms of the license contained + in the file LICENSE. + ------------------------------------------------------------------ + + 0.9.0 ~~~~~ First version. @@ -261,7 +274,7 @@ decompressor to crash, loop or access memory which does not belong to it. If you are using bzip2 or the library to decompress bitstreams from untrusted sources, an upgrade - to 1.0.3 is recommended. + to 1.0.3 is recommended. This fixes CAN-2005-1260. * The documentation has been converted to XML, from which html and pdf can be derived. @@ -273,3 +286,29 @@ * The BZ_NO_STDIO cpp symbol was not properly observed in 1.0.2. This has been fixed. + + +1.0.4 (20 Dec 06) +~~~~~~~~~~~~~~~~~ +Fixes some minor bugs since the last version, 1.0.3. + +* Fix file permissions race problem (CAN-2005-0953). + +* Avoid possible segfault in BZ2_bzclose. From Coverity's NetBSD + scan. + +* 'const'/prototype cleanups in the C code. + +* Change default install location to /usr/local, and handle multiple + 'make install's without error. + +* Sanitise file names more carefully in bzgrep. Fixes CAN-2005-0758 + to the extent that applies to bzgrep. + +* Use 'mktemp' rather than 'tempfile' in bzdiff. + +* Tighten up a couple of assertions in blocksort.c following automated + analysis. + +* Fix minor doc/comment bugs. + ==== //depot/projects/mjexp/contrib/bzip2/FREEBSD-upgrade#2 (text+ko) ==== @@ -1,18 +1,18 @@ -$FreeBSD: src/contrib/bzip2/FREEBSD-upgrade,v 1.2 2005/05/16 18:56:30 obrien Exp $ +$FreeBSD: src/contrib/bzip2/FREEBSD-upgrade,v 1.3 2007/03/28 07:56:14 delphij Exp $ Julian Seward's bzip2 originals can be found at: http://sources.redhat.com/bzip2/ Imported by: - cvs import -m "Virgin import (trimmed) of Bzip2 version 1.0.3." \ - src/contrib/bzip2 BZIP2 v1_0_3 + cvs import -m "Virgin import (trimmed) of Bzip2 version 1.0.4." \ + src/contrib/bzip2 BZIP2 v1_0_4 Notes: The following log shows details of trimming: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - tar xvfz bzip2-1.0.3.tar.gz -X FREEBSD-Xlist - cd bzip2-1.0.3 + tar xvfz bzip2-1.0.4.tar.gz -X FREEBSD-Xlist + cd bzip2-1.0.4 uuencode sample1.bz2 sample1.bz2 > sample1.bz2.uu uuencode sample2.bz2 sample2.bz2 > sample2.bz2.uu uuencode sample3.bz2 sample3.bz2 > sample3.bz2.uu ==== //depot/projects/mjexp/contrib/bzip2/LICENSE#2 (text+ko) ==== @@ -1,6 +1,8 @@ +-------------------------------------------------------------------------- + This program, "bzip2", the associated library "libbzip2", and all -documentation, are copyright (C) 1996-2005 Julian R Seward. All +documentation, are copyright (C) 1996-2006 Julian R Seward. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -35,6 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Julian Seward, Cambridge, UK. -jseward@acm.org -bzip2/libbzip2 version 1.0.3 of 15 February 2005 +jseward@bzip.org +bzip2/libbzip2 version 1.0.4 of 20 December 2006 +-------------------------------------------------------------------------- ==== //depot/projects/mjexp/contrib/bzip2/Makefile#2 (text+ko) ==== @@ -1,3 +1,16 @@ +# ------------------------------------------------------------------ +# This file is part of bzip2/libbzip2, a program and library for +# lossless, block-sorting data compression. +# +# bzip2/libbzip2 version 1.0.4 of 20 December 2006 +# Copyright (C) 1996-2006 Julian Seward +# +# Please read the WARNING, DISCLAIMER and PATENTS sections in the +# README file. +# +# This program is released under the terms of the license contained +# in the file LICENSE. +# ------------------------------------------------------------------ SHELL=/bin/sh @@ -8,10 +21,10 @@ LDFLAGS= BIGFILES=-D_FILE_OFFSET_BITS=64 -CFLAGS=-Wall -Winline -O -g $(BIGFILES) +CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) # Where you want it installed when you do 'make install' -PREFIX=/usr +PREFIX=/usr/local OBJS= blocksort.o \ @@ -77,14 +90,14 @@ cp -f libbz2.a $(PREFIX)/lib chmod a+r $(PREFIX)/lib/libbz2.a cp -f bzgrep $(PREFIX)/bin/bzgrep - ln $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep - ln $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep + ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep + ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep chmod a+x $(PREFIX)/bin/bzgrep cp -f bzmore $(PREFIX)/bin/bzmore - ln $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless + ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless chmod a+x $(PREFIX)/bin/bzmore cp -f bzdiff $(PREFIX)/bin/bzdiff - ln $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp + ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp chmod a+x $(PREFIX)/bin/bzdiff cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1 chmod a+r $(PREFIX)/man/man1/bzgrep.1 @@ -124,10 +137,10 @@ distclean: clean rm -f manual.ps manual.html manual.pdf -DISTNAME=bzip2-1.0.3 +DISTNAME=bzip2-1.0.4 dist: check manual rm -f $(DISTNAME) - ln -sf . $(DISTNAME) + ln -s -f . $(DISTNAME) tar cvf $(DISTNAME).tar \ $(DISTNAME)/blocksort.c \ $(DISTNAME)/huffman.c \ @@ -167,7 +180,6 @@ $(DISTNAME)/libbz2.dsp \ $(DISTNAME)/dlltest.dsp \ $(DISTNAME)/makefile.msc \ - $(DISTNAME)/Y2K_INFO \ $(DISTNAME)/unzcrash.c \ $(DISTNAME)/spewG.c \ $(DISTNAME)/mk251.c \ ==== //depot/projects/mjexp/contrib/bzip2/Makefile-libbz2_so#2 (text+ko) ==== @@ -1,15 +1,30 @@ # This Makefile builds a shared version of the library, -# libbz2.so.1.0.3, with soname libbz2.so.1.0, +# libbz2.so.1.0.4, with soname libbz2.so.1.0, # at least on x86-Linux (RedHat 7.2), # with gcc-2.96 20000731 (Red Hat Linux 7.1 2.96-98). -# Please see the README file for some -# important info about building the library like this. +# Please see the README file for some important info +# about building the library like this. + +# ------------------------------------------------------------------ +# This file is part of bzip2/libbzip2, a program and library for +# lossless, block-sorting data compression. +# +# bzip2/libbzip2 version 1.0.4 of 20 December 2006 +# Copyright (C) 1996-2006 Julian Seward +# +# Please read the WARNING, DISCLAIMER and PATENTS sections in the +# README file. +# +# This program is released under the terms of the license contained +# in the file LICENSE. +# ------------------------------------------------------------------ + SHELL=/bin/sh CC=gcc BIGFILES=-D_FILE_OFFSET_BITS=64 -CFLAGS=-fpic -fPIC -Wall -Winline -O -g +CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) OBJS= blocksort.o \ huffman.o \ @@ -20,13 +35,13 @@ bzlib.o all: $(OBJS) - $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.3 $(OBJS) - $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.3 + $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.4 $(OBJS) + $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.4 rm -f libbz2.so.1.0 - ln -s libbz2.so.1.0.3 libbz2.so.1.0 + ln -s libbz2.so.1.0.4 libbz2.so.1.0 clean: - rm -f $(OBJS) bzip2.o libbz2.so.1.0.3 libbz2.so.1.0 bzip2-shared + rm -f $(OBJS) bzip2.o libbz2.so.1.0.4 libbz2.so.1.0 bzip2-shared blocksort.o: blocksort.c $(CC) $(CFLAGS) -c blocksort.c ==== //depot/projects/mjexp/contrib/bzip2/README#2 (text+ko) ==== @@ -1,33 +1,48 @@ -This is the README for bzip2, a block-sorting file compressor, version -1.0.3. This version is fully compatible with the previous public -releases, versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1 and 1.0.2. +This is the README for bzip2/libzip2. +This version is fully compatible with the previous public releases. + +------------------------------------------------------------------ +This file is part of bzip2/libbzip2, a program and library for +lossless, block-sorting data compression. + +bzip2/libbzip2 version 1.0.4 of 20 December 2006 +Copyright (C) 1996-2006 Julian Seward + +Please read the WARNING, DISCLAIMER and PATENTS sections in this file. -bzip2-1.0.3 is distributed under a BSD-style license. For details, -see the file LICENSE. +This program is released under the terms of the license contained +in the file LICENSE. +------------------------------------------------------------------ Complete documentation is available in Postscript form (manual.ps), PDF (manual.pdf) or html (manual.html). A plain-text version of the -manual page is available as bzip2.txt. A statement about Y2K issues -is now included in the file Y2K_INFO. +manual page is available as bzip2.txt. HOW TO BUILD -- UNIX -Type `make'. This builds the library libbz2.a and then the -programs bzip2 and bzip2recover. Six self-tests are run. -If the self-tests complete ok, carry on to installation: +Type 'make'. This builds the library libbz2.a and then the programs +bzip2 and bzip2recover. Six self-tests are run. If the self-tests +complete ok, carry on to installation: + +To install in /usr/local/bin, /usr/local/lib, /usr/local/man and +/usr/local/include, type -To install in /usr/bin, /usr/lib, /usr/man and /usr/include, type make install -To install somewhere else, eg, /xxx/yyy/{bin,lib,man,include}, type + +To install somewhere else, eg, /xxx/yyy/{bin,lib,man,include}, type + make install PREFIX=/xxx/yyy + If you are (justifiably) paranoid and want to see what 'make install' is going to do, you can first do + make -n install or make -n install PREFIX=/xxx/yyy respectively. -The -n instructs make to show the commands it would execute, but -not actually execute them. + +The -n instructs make to show the commands it would execute, but not +actually execute them. HOW TO BUILD -- UNIX, shared library libbz2.so. @@ -49,23 +64,25 @@ bzCompress to BZ2_bzCompress, to avoid namespace pollution. Unfortunately this means that the libbz2.so created by Makefile-libbz2_so will not work with any program which used an older -version of the library. Sorry. I do encourage library clients to -make the effort to upgrade to use version 1.0, since it is both faster -and more robust than previous versions. +version of the library. I do encourage library clients to make the +effort to upgrade to use version 1.0, since it is both faster and more +robust than previous versions. HOW TO BUILD -- Windows 95, NT, DOS, Mac, etc. It's difficult for me to support compilation on all these platforms. My approach is to collect binaries for these platforms, and put them -on the master web page (http://sources.redhat.com/bzip2). Look there. -However (FWIW), bzip2-1.0.X is very standard ANSI C and should compile +on the master web site (http://www.bzip.org). Look there. However +(FWIW), bzip2-1.0.X is very standard ANSI C and should compile unmodified with MS Visual C. If you have difficulties building, you might want to read README.COMPILATION.PROBLEMS. At least using MS Visual C++ 6, you can build from the unmodified sources by issuing, in a command shell: + nmake -f makefile.msc + (you may need to first run the MSVC-provided script VCVARS32.BAT so as to set up paths to the MSVC tools correctly). @@ -86,18 +103,19 @@ WARNING: - This program (attempts to) compress data by performing several - non-trivial transformations on it. Unless you are 100% familiar - with *all* the algorithms contained herein, and with the - consequences of modifying them, you should NOT meddle with the - compression or decompression machinery. Incorrect changes can and - very likely *will* lead to disastrous loss of data. + This program and library (attempts to) compress data by + performing several non-trivial transformations on it. + Unless you are 100% familiar with *all* the algorithms + contained herein, and with the consequences of modifying them, + you should NOT meddle with the compression or decompression + machinery. Incorrect changes can and very likely *will* + lead to disastrous loss of data. DISCLAIMER: I TAKE NO RESPONSIBILITY FOR ANY LOSS OF DATA ARISING FROM THE - USE OF THIS PROGRAM, HOWSOEVER CAUSED. + USE OF THIS PROGRAM/LIBRARY, HOWSOEVER CAUSED. Every compression of a file implies an assumption that the compressed file can be decompressed to reproduce the original. @@ -110,19 +128,18 @@ PROGRAM UNLESS YOU ARE PREPARED TO ACCEPT THE POSSIBILITY, HOWEVER SMALL, THAT THE DATA WILL NOT BE RECOVERABLE. - That is not to say this program is inherently unreliable. Indeed, - I very much hope the opposite is true. bzip2 has been carefully - constructed and extensively tested. + That is not to say this program is inherently unreliable. + Indeed, I very much hope the opposite is true. bzip2/libbzip2 + has been carefully constructed and extensively tested. PATENTS: - To the best of my knowledge, bzip2 does not use any patented - algorithms. However, I do not have the resources to carry out - a patent search. Therefore I cannot give any guarantee of the - above statement. + To the best of my knowledge, bzip2/libbzip2 does not use any + patented algorithms. However, I do not have the resources + to carry out a patent search. Therefore I cannot give any + guarantee of the above statement. -End of legalities. WHAT'S NEW IN 0.9.0 (as compared to 0.1pl2) ? @@ -156,21 +173,23 @@ See the CHANGES file. +WHAT'S NEW IN 1.0.4 ? + + See the CHANGES file. + I hope you find bzip2 useful. Feel free to contact me at jseward@bzip.org if you have any suggestions or queries. Many people mailed me with comments, suggestions and patches after the releases of bzip-0.15, -bzip-0.21, and bzip2 versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1 and -1.0.2, and the changes in bzip2 are largely a result of this feedback. -I thank you for your comments. +bzip-0.21, and bzip2 versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1, +1.0.2 and 1.0.3, and the changes in bzip2 are largely a result of this +feedback. I thank you for your comments. -At least for the time being, bzip2's "home" is (or can be reached via) -http://www.bzip.org +bzip2's "home" is http://www.bzip.org/ Julian Seward jseward@bzip.org - Cambridge, UK. 18 July 1996 (version 0.15) @@ -183,3 +202,4 @@ 5 May 2000 (bzip2, version 1.0pre8) 30 December 2001 (bzip2, version 1.0.2pre1) 15 February 2005 (bzip2, version 1.0.3) +20 December 2006 (bzip2, version 1.0.4) ==== //depot/projects/mjexp/contrib/bzip2/README.COMPILATION.PROBLEMS#2 (text+ko) ==== @@ -1,32 +1,47 @@ +------------------------------------------------------------------ +This file is part of bzip2/libbzip2, a program and library for +lossless, block-sorting data compression. + +bzip2/libbzip2 version 1.0.4 of 20 December 2006 +Copyright (C) 1996-2006 Julian Seward -bzip2-1.0.3 should compile without problems on the vast majority of +Please read the WARNING, DISCLAIMER and PATENTS sections in the +README file. + +This program is released under the terms of the license contained +in the file LICENSE. +------------------------------------------------------------------ + +bzip2-1.0.4 should compile without problems on the vast majority of platforms. Using the supplied Makefile, I've built and tested it -myself for x86-linux and x86_64-linux. With makefile.msc, Visual C++ +myself for x86-linux and amd64-linux. With makefile.msc, Visual C++ 6.0 and nmake, you can build a native Win32 version too. Large file -support seems to work correctly on at least alpha-tru64unix and -x86-cygwin32 (on Windows 2000). +support seems to work correctly on at least on amd64-linux. When I say "large file" I mean a file of size 2,147,483,648 (2^31) bytes or above. Many older OSs can't handle files above this size, but many newer ones can. Large files are pretty huge -- most files you'll encounter are not Large Files. -Earlier versions of bzip2 (0.1, 0.9.0, 0.9.5) compiled on a wide -variety of platforms without difficulty, and I hope this version will -continue in that tradition. However, in order to support large files, -I've had to include the define -D_FILE_OFFSET_BITS=64 in the Makefile. -This can cause problems. +Early versions of bzip2 (0.1, 0.9.0, 0.9.5) compiled on a wide variety +of platforms without difficulty, and I hope this version will continue +in that tradition. However, in order to support large files, I've had +to include the define -D_FILE_OFFSET_BITS=64 in the Makefile. This +can cause problems. The technique of adding -D_FILE_OFFSET_BITS=64 to get large file support is, as far as I know, the Recommended Way to get correct large file support. For more details, see the Large File Support Specification, published by the Large File Summit, at + http://ftp.sas.com/standards/large.file As a general comment, if you get compilation errors which you think are related to large file support, try removing the above define from the Makefile, ie, delete the line + BIGFILES=-D_FILE_OFFSET_BITS=64 + from the Makefile, and do 'make clean ; make'. This will give you a version of bzip2 without large file support, which, for most applications, is probably not a problem. @@ -37,3 +52,7 @@ large file support, if you are feeling paranoid. Be aware though that any compilation problems which affect bzip2 will also affect spewG.c, alas. + +AIX: I have reports that for large file support, you need to specify +-D_LARGE_FILES rather than -D_FILE_OFFSET_BITS=64. I have not tested +this myself. ==== //depot/projects/mjexp/contrib/bzip2/blocksort.c#2 (text+ko) ==== @@ -4,68 +4,21 @@ /*--- blocksort.c ---*/ /*-------------------------------------------------------------*/ -/*-- - This file is a part of bzip2 and/or libbzip2, a program and - library for lossless, block-sorting data compression. +/* ------------------------------------------------------------------ + This file is part of bzip2/libbzip2, a program and library for + lossless, block-sorting data compression. - Copyright (C) 1996-2005 Julian R Seward. All rights reserved. + bzip2/libbzip2 version 1.0.4 of 20 December 2006 + Copyright (C) 1996-2006 Julian Seward - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: + Please read the WARNING, DISCLAIMER and PATENTS sections in the + README file. - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - 2. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product - documentation would be appreciated but is not required. - - 3. Altered source versions must be plainly marked as such, and must - not be misrepresented as being the original software. + This program is released under the terms of the license contained + in the file LICENSE. + ------------------------------------------------------------------ */ - 4. The name of the author may not be used to endorse or promote - products derived from this software without specific prior written - permission. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS - OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY - DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE - GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY 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. - - Julian Seward, Cambridge, UK. - jseward@bzip.org - bzip2/libbzip2 version 1.0 of 21 March 2000 - - This program is based on (at least) the work of: - Mike Burrows - David Wheeler - Peter Fenwick - Alistair Moffat - Radford Neal - Ian H. Witten - Robert Sedgewick - Jon L. Bentley - - For more information on these sources, see the manual. - - To get some idea how the block sorting algorithms in this file - work, read my paper - On the Performance of BWT Sorting Algorithms - in Proceedings of the IEEE Data Compression Conference 2000, - Snowbird, Utah, USA, 27-30 March 2000. The main sort in this - file implements the algorithm called cache in the paper. ---*/ - - #include "bzlib_private.h" /*---------------------------------------------*/ @@ -155,7 +108,7 @@ while (sp > 0) { - AssertH ( sp < FALLBACK_QSORT_STACK_SIZE, 1004 ); + AssertH ( sp < FALLBACK_QSORT_STACK_SIZE - 1, 1004 ); fpop ( lo, hi ); if (hi - lo < FALLBACK_QSORT_SMALL_THRESH) { @@ -690,7 +643,7 @@ while (sp > 0) { - AssertH ( sp < MAIN_QSORT_STACK_SIZE, 1001 ); + AssertH ( sp < MAIN_QSORT_STACK_SIZE - 2, 1001 ); mpop ( lo, hi, d ); if (hi - lo < MAIN_QSORT_SMALL_THRESH || ==== //depot/projects/mjexp/contrib/bzip2/bzip2.1#2 (text+ko) ==== @@ -1,7 +1,7 @@ .PU .TH bzip2 1 .SH NAME -bzip2, bunzip2 \- a block-sorting file compressor, v1.0.3 +bzip2, bunzip2 \- a block-sorting file compressor, v1.0.4 .br bzcat \- decompresses files to stdout .br @@ -405,11 +405,11 @@ tries hard to detect I/O errors and exit cleanly, but the details of what the problem is sometimes seem rather misleading. -This manual page pertains to version 1.0.3 of +This manual page pertains to version 1.0.4 of .I bzip2. Compressed data created by this version is entirely forwards and backwards compatible with the previous public releases, versions -0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1 and 1.0.2, but with the following +0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1, 1.0.2 and 1.0.3, but with the following exception: 0.9.0 and above can correctly decompress multiple concatenated compressed files. 0.1pl2 cannot do this; it will stop after decompressing just the first file in the stream. ==== //depot/projects/mjexp/contrib/bzip2/bzip2.c#2 (text+ko) ==== @@ -3,119 +3,26 @@ /*--- A block-sorting, lossless compressor bzip2.c ---*/ /*-----------------------------------------------------------*/ -/*-- - This file is a part of bzip2 and/or libbzip2, a program and - library for lossless, block-sorting data compression. +/* ------------------------------------------------------------------ + This file is part of bzip2/libbzip2, a program and library for + lossless, block-sorting data compression. - Copyright (C) 1996-2005 Julian R Seward. All rights reserved. + bzip2/libbzip2 version 1.0.4 of 20 December 2006 + Copyright (C) 1996-2006 Julian Seward - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: + Please read the WARNING, DISCLAIMER and PATENTS sections in the + README file. - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. + This program is released under the terms of the license contained + in the file LICENSE. + ------------------------------------------------------------------ */ - 2. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product - documentation would be appreciated but is not required. - 3. Altered source versions must be plainly marked as such, and must - not be misrepresented as being the original software. - - 4. The name of the author may not be used to endorse or promote - products derived from this software without specific prior written - permission. - - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS - OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY - DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE - GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY 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. - - Julian Seward, Cambridge, UK. - jseward@bzip.org - bzip2/libbzip2 version 1.0 of 21 March 2000 - - This program is based on (at least) the work of: - Mike Burrows - David Wheeler - Peter Fenwick - Alistair Moffat - Radford Neal - Ian H. Witten - Robert Sedgewick - Jon L. Bentley - - For more information on these sources, see the manual. ---*/ - - -/*----------------------------------------------------*/ -/*--- IMPORTANT ---*/ -/*----------------------------------------------------*/ - -/*-- - WARNING: - This program and library (attempts to) compress data by - performing several non-trivial transformations on it. - Unless you are 100% familiar with *all* the algorithms - contained herein, and with the consequences of modifying them, - you should NOT meddle with the compression or decompression - machinery. Incorrect changes can and very likely *will* - lead to disasterous loss of data. - - DISCLAIMER: - I TAKE NO RESPONSIBILITY FOR ANY LOSS OF DATA ARISING FROM THE - USE OF THIS PROGRAM, HOWSOEVER CAUSED. - - Every compression of a file implies an assumption that the - compressed file can be decompressed to reproduce the original. - Great efforts in design, coding and testing have been made to - ensure that this program works correctly. However, the - complexity of the algorithms, and, in particular, the presence - of various special cases in the code which occur with very low - but non-zero probability make it impossible to rule out the - possibility of bugs remaining in the program. DO NOT COMPRESS - ANY DATA WITH THIS PROGRAM AND/OR LIBRARY UNLESS YOU ARE PREPARED - TO ACCEPT THE POSSIBILITY, HOWEVER SMALL, THAT THE DATA WILL - NOT BE RECOVERABLE. - - That is not to say this program is inherently unreliable. - Indeed, I very much hope the opposite is true. bzip2/libbzip2 - has been carefully constructed and extensively tested. - - PATENTS: - To the best of my knowledge, bzip2/libbzip2 does not use any - patented algorithms. However, I do not have the resources - available to carry out a full patent search. Therefore I cannot - give any guarantee of the above statement. ---*/ - -/* $FreeBSD: src/contrib/bzip2/bzip2.c,v 1.2 2005/06/29 21:36:49 simon Exp $ */ - - -/*----------------------------------------------------*/ -/*--- and now for something much more pleasant :-) ---*/ -/*----------------------------------------------------*/ - -/*---------------------------------------------*/ -/*-- - Place a 1 beside your platform, and 0 elsewhere. ---*/ - -/*-- - Generic 32-bit Unix. - Also works on 64-bit Unix boxes. - This is the default. ---*/ +/* Place a 1 beside your platform, and 0 elsewhere. + Generic 32-bit Unix. + Also works on 64-bit Unix boxes. + This is the default. +*/ #define BZ_UNIX 1 /*-- @@ -303,17 +210,17 @@ FILE *outputHandleJustInCase; Int32 workFactor; -static void panic ( Char* ) NORETURN; -static void ioError ( void ) NORETURN; -static void outOfMemory ( void ) NORETURN; -static void configError ( void ) NORETURN; -static void crcError ( void ) NORETURN; -static void cleanUpAndFail ( Int32 ) NORETURN; -static void compressedStreamEOF ( void ) NORETURN; +static void panic ( const Char* ) NORETURN; +static void ioError ( void ) NORETURN; +static void outOfMemory ( void ) NORETURN; +static void configError ( void ) NORETURN; +static void crcError ( void ) NORETURN; +static void cleanUpAndFail ( Int32 ) NORETURN; +static void compressedStreamEOF ( void ) NORETURN; static void copyFileName ( Char*, Char* ); static void* myMalloc ( Int32 ); -static int applySavedFileAttrToOutputFile ( int fd ); +static void applySavedFileAttrToOutputFile ( IntNative fd ); @@ -459,10 +366,9 @@ ret = fflush ( zStream ); if (ret == EOF) goto errhandler_io; if (zStream != stdout) { - int fd = fileno ( zStream ); + Int32 fd = fileno ( zStream ); if (fd < 0) goto errhandler_io; - ret = applySavedFileAttrToOutputFile ( fd ); - if (ret != 0) goto errhandler_io; + applySavedFileAttrToOutputFile ( fd ); ret = fclose ( zStream ); outputHandleJustInCase = NULL; if (ret == EOF) goto errhandler_io; @@ -575,11 +481,10 @@ closeok: if (ferror(zStream)) goto errhandler_io; - if ( stream != stdout) { - int fd = fileno ( stream ); + if (stream != stdout) { + Int32 fd = fileno ( stream ); if (fd < 0) goto errhandler_io; - ret = applySavedFileAttrToOutputFile ( fd ); - if (ret != 0) goto errhandler_io; + applySavedFileAttrToOutputFile ( fd ); } ret = fclose ( zStream ); if (ret == EOF) goto errhandler_io; @@ -838,7 +743,7 @@ /*---------------------------------------------*/ static -void panic ( Char* s ) +void panic ( const Char* s ) { fprintf ( stderr, "\n%s: PANIC -- internal consistency error:\n" @@ -1051,6 +956,7 @@ For non-Unix platforms, if we are not worrying about security issues, simple this simply behaves like fopen. */ +static FILE* fopen_output_safely ( Char* name, const char* mode ) { # if BZ_UNIX @@ -1156,20 +1062,18 @@ } static -int applySavedFileAttrToOutputFile ( int fd ) +void applySavedFileAttrToOutputFile ( IntNative fd ) { # if BZ_UNIX - IntNative retVal; + IntNative retVal; retVal = fchmod ( fd, fileMetaInfo.st_mode ); - if (retVal != 0) - return retVal; + ERROR_IF_NOT_ZERO ( retVal ); (void) fchown ( fd, fileMetaInfo.st_uid, fileMetaInfo.st_gid ); /* chown() will in many cases return with EPERM, which can be safely ignored. */ - return 0; # endif } @@ -1197,13 +1101,13 @@ /*---------------------------------------------*/ #define BZ_N_SUFFIX_PAIRS 4 -Char* zSuffix[BZ_N_SUFFIX_PAIRS] +const Char* zSuffix[BZ_N_SUFFIX_PAIRS] = { ".bz2", ".bz", ".tbz2", ".tbz" }; -Char* unzSuffix[BZ_N_SUFFIX_PAIRS] +const Char* unzSuffix[BZ_N_SUFFIX_PAIRS] = { "", "", ".tar", ".tar" }; static -Bool hasSuffix ( Char* s, Char* suffix ) +Bool hasSuffix ( Char* s, const Char* suffix ) { Int32 ns = strlen(s); Int32 nx = strlen(suffix); @@ -1214,7 +1118,8 @@ static Bool mapSuffix ( Char* name, - Char* oldSuffix, Char* newSuffix ) + const Char* oldSuffix, + const Char* newSuffix ) { if (!hasSuffix(name,oldSuffix)) return False; name[strlen(name)-strlen(oldSuffix)] = 0; @@ -1239,8 +1144,8 @@ switch (srcMode) { case SM_I2O: - copyFileName ( inName, "(stdin)" ); - copyFileName ( outName, "(stdout)" ); + copyFileName ( inName, (Char*)"(stdin)" ); + copyFileName ( outName, (Char*)"(stdout)" ); break; case SM_F2F: copyFileName ( inName, name ); @@ -1249,7 +1154,7 @@ break; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Mar 30 07:50:37 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E45B16A403; Fri, 30 Mar 2007 07:50:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C723F16A401 for ; Fri, 30 Mar 2007 07:50:36 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B6B2113C487 for ; Fri, 30 Mar 2007 07:50:36 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2U7oah1014494 for ; Fri, 30 Mar 2007 07:50:36 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2U7oaup014490 for perforce@freebsd.org; Fri, 30 Mar 2007 07:50:36 GMT (envelope-from scottl@freebsd.org) Date: Fri, 30 Mar 2007 07:50:36 GMT Message-Id: <200703300750.l2U7oaup014490@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 116907 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Mar 2007 07:50:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=116907 Change 116907 by scottl@scottl-x64 on 2007/03/30 07:50:04 Keep from breaking the userland ABI by not including a callout struct in the ccb_hdr. MPSAFE SIMs are now required to provide storage for and initialize their own callouts. Non-MPSAFE SIMs can continue to use the callout_handle that is already in the ccb_hdr. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#14 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#54 edit .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx.c#7 edit .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx.h#6 edit .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.c#14 edit .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx.c#7 edit .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx.h#4 edit .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.c#12 edit .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic_osm_lib.c#6 edit .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic_osm_lib.h#7 edit .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt.h#18 edit .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_cam.c#21 edit .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_raid.c#12 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#14 (text+ko) ==== @@ -275,13 +275,10 @@ u_int32_t timeout; /* Timeout value */ /* - * CAM does not manage CCB timeouts itself, but provides convenient - * storage for drivers to use for their own management of timeouts. - * Drivers that are not yet MPSAFE should use the timeout_ch. - * Drivers that are MPSAFE should use the callout. + * Deprecated, only for use by non-MPSAFE SIMs. All others must + * allocate and initialize their own callout storage. */ struct callout_handle timeout_ch; - struct callout callout; }; /* Get Device Information CCB */ ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#54 (text+ko) ==== @@ -5032,10 +5032,8 @@ union ccb *new_ccb; new_ccb = malloc(sizeof(*new_ccb), M_CAMXPT, M_WAITOK); - if (sim != NULL) { + if ((sim != NULL) && ((sim->flags & CAM_SIM_MPSAFE) == 0)) { callout_handle_init(&new_ccb->ccb_h.timeout_ch); - callout_init(&new_ccb->ccb_h.callout, - (sim->flags & CAM_SIM_MPSAFE) ? 1 : 0); } return (new_ccb); } @@ -5046,9 +5044,9 @@ union ccb *new_ccb; new_ccb = malloc(sizeof(*new_ccb), M_CAMXPT, M_NOWAIT); - callout_handle_init(&new_ccb->ccb_h.timeout_ch); - callout_init(&new_ccb->ccb_h.callout, - (sim->flags & CAM_SIM_MPSAFE) ? 1 : 0); + if ((sim != NULL) && ((sim->flags & CAM_SIM_MPSAFE) == 0)) { + callout_handle_init(&new_ccb->ccb_h.timeout_ch); + } return (new_ccb); } ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx.c#7 (text+ko) ==== @@ -6215,6 +6215,7 @@ next_scb->col_scb = ahd_find_scb_by_tag(ahd, col_tag); if (next_scb->col_scb != NULL) next_scb->col_scb->col_scb = next_scb; + aic_timer_init(&next_scb->io_timer); ahd_free_scb(ahd, next_scb); hscb++; hscb_busaddr += sizeof(*hscb); ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx.h#6 (text+ko) ==== @@ -639,6 +639,7 @@ u_int sg_count;/* How full ahd_dma_seg is */ #define AHD_MAX_LQ_CRC_ERRORS 5 u_int crc_retry_count; + aic_timer_t io_timer; }; TAILQ_HEAD(scb_tailq, scb); ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.c#14 (text+ko) ==== @@ -222,7 +222,7 @@ if ((scb->flags & SCB_TIMEDOUT) != 0) LIST_REMOVE(scb, timedout_links); - callout_stop(&ccb->ccb_h.callout); + callout_stop(&scb->io_timer); if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) { bus_dmasync_op_t op; ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx.c#7 (text+ko) ==== @@ -4606,6 +4606,7 @@ #endif next_scb->hscb = &scb_data->hscbs[scb_data->numscbs]; next_scb->hscb->tag = ahc->scb_data->numscbs; + aic_timer_init(&next_scb->io_timer); SLIST_INSERT_HEAD(&ahc->scb_data->free_scbs, next_scb, links.sle); segs += AHC_NSEG; ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx.h#4 (text+ko) ==== @@ -597,6 +597,7 @@ struct ahc_dma_seg *sg_list; bus_addr_t sg_list_phys; u_int sg_count;/* How full ahc_dma_seg is */ + aic_timer_t io_timer; }; struct scb_data { ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.c#12 (text+ko) ==== @@ -339,7 +339,7 @@ ahc_run_untagged_queue(ahc, untagged_q); } - callout_stop(&ccb->ccb_h.callout); + callout_stop(&scb->io_timer); if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) { bus_dmasync_op_t op; ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic_osm_lib.c#6 (text+ko) ==== @@ -57,7 +57,7 @@ union ccb *ccb; ccb = list_scb->io_ctx; - callout_stop(&ccb->ccb_h.callout); + callout_stop(&scb->io_timer); } } } ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic_osm_lib.h#7 (text+ko) ==== @@ -223,8 +223,7 @@ time = msec; time *= hz; time /= 1000; - callout_reset(&scb->io_ctx->ccb_h.callout, time, aic_platform_timeout, - scb); + callout_reset(&scb->io_timer, time, aic_platform_timeout, scb); } static __inline void ==== //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt.h#18 (text+ko) ==== @@ -280,7 +280,7 @@ /****************************** Timer Facilities ******************************/ #if __FreeBSD_version > 500000 -#define mpt_callout_init(c) callout_init(c, /*mpsafe*/0); +#define mpt_callout_init(c) callout_init(c, /*mpsafe*/1); #else #define mpt_callout_init(c) callout_init(c); #endif @@ -337,6 +337,7 @@ bus_addr_t sense_pbuf; /* Physical Address of sense data */ bus_dmamap_t dmap; /* DMA map for data buffers */ struct req_entry *chain; /* for SGE overallocations */ + struct callout callout; /* Timeout for the request */ }; /**************************** MPI Target State Info ***************************/ @@ -814,12 +815,12 @@ #define CAMLOCK_2_MPTLOCK(mpt) #define mpt_sleep(mpt, ident, priority, wmesg, timo) \ msleep(ident, &(mpt)->mpt_lock, priority, wmesg, timo) -#define mpt_ccb_timeout(ccb, ticks, func, arg) \ - callout_reset(&(ccb)->ccb_h.callout, (ticks), (func), (arg)); -#define mpt_ccb_untimeout(ccb, func, arg) \ - callout_stop(&(ccb)->ccb_h.callout) -#define mpt_ccb_timeout_init(ccb) \ - callout_init(&(ccb)->ccb_h.callout, 1) +#define mpt_req_timeout(req, ticks, func, arg) \ + callout_reset(&(req)->callout, (ticks), (func), (arg)); +#define mpt_req_untimeout(req, func, arg) \ + callout_stop(&(req)->callout) +#define mpt_req_timeout_init(req) \ + callout_init(&(req)->callout, 1) #else ==== //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_cam.c#21 (text+ko) ==== @@ -1325,10 +1325,10 @@ ccb->ccb_h.status |= CAM_SIM_QUEUED; if (ccb->ccb_h.timeout != CAM_TIME_INFINITY) { - mpt_ccb_timeout(ccb, (ccb->ccb_h.timeout * hz) / 1000, + mpt_req_timeout(req, (ccb->ccb_h.timeout * hz) / 1000, mpt_timeout, ccb); } else { - mpt_ccb_timeout_init(ccb); + mpt_req_timeout_init(req); } if (mpt->verbose > MPT_PRT_DEBUG) { int nc = 0; @@ -1726,10 +1726,10 @@ ccb->ccb_h.status |= CAM_SIM_QUEUED; if (ccb->ccb_h.timeout != CAM_TIME_INFINITY) { - mpt_ccb_timeout(ccb, (ccb->ccb_h.timeout * hz) / 1000, + mpt_req_timeout(req, (ccb->ccb_h.timeout * hz) / 1000, mpt_timeout, ccb); } else { - mpt_ccb_timeout_init(ccb); + mpt_req_timeout_init(req); } if (mpt->verbose > MPT_PRT_DEBUG) { int nc = 0; @@ -2103,6 +2103,7 @@ { union ccb *ccb; uint32_t pathid; + struct cam_sim *sim; /* * In general this means a device has been added to the loop. */ @@ -2111,16 +2112,17 @@ break; } if (mpt->phydisk_sim) { - pathid = cam_sim_path(mpt->phydisk_sim);; + sim = mpt->phydisk_sim; } else { - pathid = cam_sim_path(mpt->sim); + sim = mpt->sim; } + pathid = cam_sim_path(sim); MPTLOCK_2_CAMLOCK(mpt); /* * Allocate a CCB, create a wildcard path for this bus, * and schedule a rescan. */ - ccb = xpt_alloc_ccb_nowait(); + ccb = xpt_alloc_ccb_nowait(sim); if (ccb == NULL) { mpt_prt(mpt, "unable to alloc CCB for rescan\n"); CAMLOCK_2_MPTLOCK(mpt); @@ -2297,7 +2299,7 @@ } tgt = scsi_req->TargetID; - mpt_ccb_untimeout(ccb, mpt_timeout, ccb); + mpt_req_untimeout(req, mpt_timeout, ccb); ccb->ccb_h.status &= ~CAM_SIM_QUEUED; if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) { @@ -4618,7 +4620,7 @@ req->serno, tgt->resid); if (ccb) { ccb->ccb_h.status = CAM_SIM_QUEUED | CAM_REQ_INPROG; - mpt_ccb_timeout(ccb, 60 * hz, mpt_timeout, ccb); + mpt_req_timeout(req, 60 * hz, mpt_timeout, ccb); } mpt_send_cmd(mpt, req); } @@ -5033,7 +5035,7 @@ } tgt->ccb = NULL; tgt->nxfers++; - mpt_ccb_untimeout(ccb, mpt_timeout, ccb); + mpt_req_untimeout(req, mpt_timeout, ccb); mpt_lprt(mpt, MPT_PRT_DEBUG, "TARGET_ASSIST %p (req %p:%u) done tag 0x%x\n", ccb, tgt->req, tgt->req->serno, ccb->csio.tag_id); @@ -5098,7 +5100,7 @@ TGT_STATE_MOVING_DATA_AND_STATUS) { tgt->nxfers++; } - mpt_ccb_untimeout(ccb, mpt_timeout, ccb); + mpt_req_untimeout(req, mpt_timeout, ccb); if (ccb->ccb_h.flags & CAM_SEND_SENSE) { ccb->ccb_h.status |= CAM_SENT_SENSE; } ==== //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_raid.c#12 (text+ko) ==== @@ -756,7 +756,7 @@ if (rv != 0) return (CAM_REQ_CMP_ERR); - mpt_ccb_timeout(ccb, mpt_raid_quiesce_timeout, ccb, 5 * hz); + mpt_req_timeout(req, mpt_raid_quiesce_timeout, ccb, 5 * hz); #if 0 if (rv == ETIMEDOUT) { mpt_disk_prt(mpt, mpt_disk, "mpt_raid_quiesce_disk: " From owner-p4-projects@FreeBSD.ORG Fri Mar 30 07:59:49 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E01E616A404; Fri, 30 Mar 2007 07:59:48 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 98F7216A400 for ; Fri, 30 Mar 2007 07:59:48 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8960A13C46E for ; Fri, 30 Mar 2007 07:59:48 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2U7xmxX016208 for ; Fri, 30 Mar 2007 07:59:48 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2U7xmHf016205 for perforce@freebsd.org; Fri, 30 Mar 2007 07:59:48 GMT (envelope-from rdivacky@FreeBSD.org) Date: Fri, 30 Mar 2007 07:59:48 GMT Message-Id: <200703300759.l2U7xmHf016205@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 116908 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Mar 2007 07:59:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=116908 Change 116908 by rdivacky@rdivacky_witten on 2007/03/30 07:59:17 Remove fchmodat and faccessat from linux32_dummy.c and add stubs for those two functions to linux_file.c. Its beyond my imagination how it is possible that it compiles/links without it on my PC. Also some whitespace fixes Submitted by: Scot Hetzel Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_dummy.c#12 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#19 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_dummy.c#12 (text+ko) ==== @@ -96,8 +96,6 @@ DUMMY(inotify_add_watch); DUMMY(inotify_rm_watch); DUMMY(migrate_pages); -DUMMY(fchmodat); -DUMMY(faccessat); DUMMY(pselect6); DUMMY(ppoll); DUMMY(unshare); ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#19 (text+ko) ==== @@ -83,7 +83,7 @@ int linux_at(struct thread *td, int dirfd, char *filename, char **newpath, char **freebuf) { - struct file *fp; + struct file *fp; int error = 0; struct vnode *dvp; struct filedesc *fdp = td->td_proc->p_fd; @@ -92,23 +92,23 @@ /* don't do anything if the pathname is absolute */ if (*filename == '/') { - *newpath= filename; - return (0); + *newpath= filename; + return (0); } /* check for AT_FDWCD */ if (dirfd == LINUX_AT_FDCWD) { - FILEDESC_LOCK(fdp); + FILEDESC_LOCK(fdp); dvp = fdp->fd_cdir; - FILEDESC_UNLOCK(fdp); + FILEDESC_UNLOCK(fdp); } else { - error = fget(td, dirfd, &fp); + error = fget(td, dirfd, &fp); if (error) - return (error); + return (error); dvp = fp->f_vnode; /* only a dir can be dfd */ if (dvp->v_type != VDIR) { - fdrop(fp, td); + fdrop(fp, td); return (ENOTDIR); } fdrop(fp, td); @@ -116,7 +116,8 @@ error = vn_fullpath(td, dvp, &fullpath, &freepath); if (!error) { - *newpath = malloc(strlen(fullpath) + strlen(filename) + 2, M_TEMP, M_WAITOK | M_ZERO); + *newpath = malloc(strlen(fullpath) + strlen(filename) + 2, + M_TEMP, M_WAITOK | M_ZERO); *freebuf = freepath; sprintf(*newpath, "%s/%s", fullpath, filename); } @@ -124,7 +125,6 @@ return (error); } - int linux_creat(struct thread *td, struct linux_creat_args *args) { @@ -237,7 +237,7 @@ int linux_openat(struct thread *td, struct linux_openat_args *args) { - char *newpath, *oldpath, *freebuf = NULL, *path; + char *newpath, *oldpath, *freebuf = NULL, *path; int error; oldpath = malloc(MAXPATHLEN, M_TEMP, M_WAITOK); @@ -251,18 +251,18 @@ error = linux_at(td, args->dfd, oldpath, &newpath, &freebuf); if (error) - return (error); + return (error); #ifdef DEBUG printf(LMSG("newpath: %s"), newpath); #endif - if (args->flags & LINUX_O_CREAT) + if (args->flags & LINUX_O_CREAT) LCONVPATH_SEG(td, newpath, &path, 1, UIO_SYSSPACE); - else + else LCONVPATH_SEG(td, newpath, &path, 0, UIO_SYSSPACE); if (freebuf) - free(freebuf, M_TEMP); + free(freebuf, M_TEMP); if (*oldpath != '/') - free(newpath, M_TEMP); + free(newpath, M_TEMP); error = linux_common_open(td, path, args->flags, args->mode, 1); free(oldpath, M_TEMP); @@ -272,12 +272,12 @@ int linux_open(struct thread *td, struct linux_open_args *args) { - char *path; + char *path; - if (args->flags & LINUX_O_CREAT) - LCONVPATHCREAT(td, args->path, &path); - else - LCONVPATHEXIST(td, args->path, &path); + if (args->flags & LINUX_O_CREAT) + LCONVPATHCREAT(td, args->path, &path); + else + LCONVPATHEXIST(td, args->path, &path); #ifdef DEBUG if (ldebug(open)) @@ -285,7 +285,7 @@ path, args->flags, args->mode); #endif - return linux_common_open(td, path, args->flags, args->mode, 0); + return linux_common_open(td, path, args->flags, args->mode, 0); } int @@ -635,6 +635,12 @@ } int +linux_faccessat(struct thread *td, struct linux_faccessat_args *args) +{ + return (ENOSYS); +} + +int linux_unlink(struct thread *td, struct linux_unlink_args *args) { char *path; @@ -699,6 +705,12 @@ } int +linux_fchmodat(struct thread *td, struct linux_fchmodat_args *args) +{ + return (ENOSYS); +} + +int linux_mkdir(struct thread *td, struct linux_mkdir_args *args) { char *path; From owner-p4-projects@FreeBSD.ORG Fri Mar 30 14:24:53 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F8FB16A403; Fri, 30 Mar 2007 14:24:53 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2487F16A401 for ; Fri, 30 Mar 2007 14:24:53 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id F15A413C465 for ; Fri, 30 Mar 2007 14:24:52 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2UEOqxJ094207 for ; Fri, 30 Mar 2007 14:24:52 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2UEOqQV094203 for perforce@freebsd.org; Fri, 30 Mar 2007 14:24:52 GMT (envelope-from gonzo@FreeBSD.org) Date: Fri, 30 Mar 2007 14:24:52 GMT Message-Id: <200703301424.l2UEOqQV094203@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 116918 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Mar 2007 14:24:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=116918 Change 116918 by gonzo@gonzo_jeeves on 2007/03/30 14:24:37 o Set curthread before calling pmap_activate. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/swtch.S#11 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/swtch.S#11 (text+ko) ==== @@ -40,6 +40,8 @@ ENTRY(cpu_throw) subu sp, 8 sw a1, 0(sp) + lw t2, pcpup + sw a1, PC_CURTHREAD(t2) # curthread = new move a0, a1 jal pmap_activate nop @@ -110,7 +112,6 @@ .set at lw t2, pcpup .set noat - sw t3, PC_CURTHREAD(t2) lw t0, TD_PCB(t3) sw t0, PC_CURPCB(t2) lw s0, PCB_REG_S0(t0) From owner-p4-projects@FreeBSD.ORG Fri Mar 30 15:23:09 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6268716A402; Fri, 30 Mar 2007 15:23:09 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 108F416A400 for ; Fri, 30 Mar 2007 15:23:09 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E8F4D13C46C for ; Fri, 30 Mar 2007 15:23:08 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2UFN8X2006207 for ; Fri, 30 Mar 2007 15:23:08 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2UFN8CO006204 for perforce@freebsd.org; Fri, 30 Mar 2007 15:23:08 GMT (envelope-from gonzo@FreeBSD.org) Date: Fri, 30 Mar 2007 15:23:08 GMT Message-Id: <200703301523.l2UFN8CO006204@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 116925 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Mar 2007 15:23:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=116925 Change 116925 by gonzo@gonzo_jeeves on 2007/03/30 15:22:20 o ASID generation logic reworked. o PTE for kernel virtual address space should have global bit set. With EntryHi set in pmap_active some undesirable effects appeared, i.e.: "splitting" KVA among processes. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/pmap.c#25 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/pmap.c#25 (text+ko) ==== @@ -169,7 +169,7 @@ /* * Active segtab. */ -struct segtab * segtab_active; +struct segtab * segtab_active = 0; /* * Data for the ASID allocator @@ -207,6 +207,7 @@ static int pte_prot(pmap_t pmap, vm_prot_t prot) { + if(prot & VM_PROT_WRITE) return PG_D; @@ -342,7 +343,7 @@ kernel_pmap->pm_private.pm_direct_map = kptmap; kernel_pmap->pm_active = ~0; kernel_pmap->pm_asid = PMAP_ASID_RESERVED; - kernel_pmap->pm_asid_generation = 1; + kernel_pmap->pm_asid_generation = 0; PMAP_LOCK_INIT(kernel_pmap); TAILQ_INIT(&kernel_pmap->pm_pvlist); @@ -509,8 +510,10 @@ * Invalidate all per-process mappings and I-cache */ PCPU_SET(next_asid, 1); - PCPU_SET(current_asid_generation, (PCPU_GET(current_asid_generation) + 1) & - ASIDGEN_MASK); + + /* It's OK to turn to 0 */ + PCPU_SET(current_asid_generation, + (PCPU_GET(current_asid_generation) + 1)); if (PCPU_GET(current_asid_generation) == 0) { /* @@ -679,7 +682,7 @@ pmap_kenter(vm_offset_t va, vm_offset_t pa) { - tlb_enter(kernel_pmap, va, pa, PG_V | PG_W | PG_D); + tlb_enter(kernel_pmap, va, pa, PG_V | PG_W | PG_D | PG_G); } /* @@ -730,12 +733,13 @@ pmap->pm_active = 0; pmap->pm_asid = PMAP_ASID_RESERVED; - pmap->pm_asid_generation = 1; + pmap->pm_asid_generation = 0; TAILQ_INIT(&pmap->pm_pvlist); bzero(&pmap->pm_stats, sizeof pmap->pm_stats); mtx_init(&allpmaps_lock, "allpmaps", NULL, MTX_SPIN | MTX_QUIET); LIST_INSERT_HEAD(&allpmaps, pmap, pm_list); + PCPU_SET(current_asid_generation, 1); } /* @@ -771,9 +775,8 @@ pmap->pm_ptphint = NULL; pmap->pm_active = 0; - /* XXXMIPS: put proper asid generation here */ - pmap->pm_asid = 1; - pmap->pm_asid_generation = 1; + pmap->pm_asid = PMAP_ASID_RESERVED; + pmap->pm_asid_generation = 0; PMAP_LOCK_INIT(pmap); TAILQ_INIT(&pmap->pm_pvlist); bzero(&pmap->pm_stats, sizeof pmap->pm_stats); @@ -974,7 +977,9 @@ int retval; oldpte = *ptq; - *ptq = 0; + /* Preserve global bit */ + *ptq &= PG_G; + if (oldpte & PG_W) pmap->pm_stats.wired_count -= 1; @@ -1029,6 +1034,7 @@ { pmap_remove_pte(pmap, pte, va); tlb_remove(pmap, va); + } va += PAGE_SIZE; } @@ -1185,7 +1191,7 @@ pt_entry_t *pte; vm_offset_t opa; vm_page_t mpte, mem; - int p, has_mapping = 0; + int p, has_mapping = 0, global; if (pmap == NULL) return; @@ -1298,8 +1304,9 @@ pmap->pm_stats.wired_count++; wired = wired ? PG_W : 0; + global = pmap == kernel_pmap ? PG_G : 0; p = pte_prot(pmap, prot); - tlb_enter(pmap, va, pa, PG_V | wired | p); + tlb_enter(pmap, va, pa, PG_V | wired | global | p); } /* @@ -1843,30 +1850,34 @@ pmap = vmspace_pmap(td->td_proc->p_vmspace); critical_enter(); - if (pmap_active && pmap != pmap_active) { - atomic_clear_int(&pmap_active->pm_active, - PCPU_GET(cpumask)); - pmap_active = 0; - segtab_active = 0; - } - if (pmap->pm_asid_generation != PCPU_GET(current_asid_generation)) + /* + * Kernel pmap has ASID equal zero and generation zero as well + * Just don't mess with it's ASID on generation turnover. + */ + if ((pmap != kernel_pmap) && + (pmap->pm_asid_generation != PCPU_GET(current_asid_generation))) pmap_get_asid(pmap); - mips_wr_entryhi(pmap->pm_asid); + if (td == curthread) + { + if (pmap_active && pmap != pmap_active) + { + atomic_clear_int(&pmap_active->pm_active, + PCPU_GET(cpumask)); + pmap_active = 0; + segtab_active = 0; + } + + mips_wr_entryhi(pmap->pm_asid); - pmap_active = pmap; - segtab_active = pmap->pm_private.pm_segtab; - atomic_set_int(&pmap->pm_active, PCPU_GET(cpumask)); + pmap_active = pmap; + segtab_active = pmap->pm_private.pm_segtab; + atomic_set_int(&pmap->pm_active, PCPU_GET(cpumask)); + mips_dcache_wbinv_all(); + } critical_exit(); - - if (td == curthread) { - /* XXX swap context? - alpha_pal_swpctx((u_long)td->td_md.md_pcbpaddr); - */ - } - mips_dcache_wbinv_all(); } void From owner-p4-projects@FreeBSD.ORG Fri Mar 30 17:41:50 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 304B316A408; Fri, 30 Mar 2007 17:41:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7AAD816A407 for ; Fri, 30 Mar 2007 17:41:49 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 68D3413C46E for ; Fri, 30 Mar 2007 17:41:49 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2UHfnP9054376 for ; Fri, 30 Mar 2007 17:41:49 GMT (envelope-from jkim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2UHfnuc054373 for perforce@freebsd.org; Fri, 30 Mar 2007 17:41:49 GMT (envelope-from jkim@freebsd.org) Date: Fri, 30 Mar 2007 17:41:49 GMT Message-Id: <200703301741.l2UHfnuc054373@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jkim@freebsd.org using -f From: Jung-uk Kim To: Perforce Change Reviews Cc: Subject: PERFORCE change 116938 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Mar 2007 17:41:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=116938 Change 116938 by jkim@jkim_hammer on 2007/03/30 17:40:59 IFC @116937 Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#48 integrate .. //depot/projects/linuxolator/src/sys/dev/firewire/firewire.c#3 integrate .. //depot/projects/linuxolator/src/sys/geom/geom_ctl.c#2 integrate .. //depot/projects/linuxolator/src/sys/netgraph/ng_base.c#5 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#48 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.37 2007/03/30 00:06:21 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.39 2007/03/30 17:27:13 jkim Exp $"); #include #include ==== //depot/projects/linuxolator/src/sys/dev/firewire/firewire.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.84 2007/03/16 05:39:33 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.86 2007/03/30 15:43:56 simokawa Exp $ * */ @@ -355,7 +355,6 @@ "split transaction timeout dst=0x%x tl=0x%x state=%d\n", xfer->send.hdr.mode.hdr.dst, i, xfer->state); xfer->resp = ETIMEDOUT; - STAILQ_REMOVE_HEAD(&fc->tlabels[i], link); fw_xfer_done(xfer); } } @@ -420,7 +419,6 @@ bus_generic_attach(dev); /* bus_reset */ - fw_busreset(fc); fc->ibr(fc); return 0; @@ -1013,6 +1011,7 @@ if (xfer->fc == NULL) panic("fw_xfer_done: why xfer->fc is NULL?"); + fw_tl_free(xfer->fc, xfer); xfer->hand(xfer); } @@ -1039,7 +1038,6 @@ */ printf("fw_xfer_free FWXF_START\n"); #endif - fw_tl_free(xfer->fc, xfer); } xfer->state = FWXF_INIT; xfer->resp = 0; ==== //depot/projects/linuxolator/src/sys/geom/geom_ctl.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/geom_ctl.c,v 1.38 2006/04/07 16:19:48 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/geom_ctl.c,v 1.39 2007/03/30 16:32:08 delphij Exp $"); #include "opt_geom.h" @@ -398,17 +398,17 @@ struct g_geom *gp; p = gctl_get_asciiparam(req, arg); - if (p != NULL) { - LIST_FOREACH(mp, &g_classes, class) { - if (mpr != NULL && mpr != mp) - continue; - LIST_FOREACH(gp, &mp->geom, geom) { - if (!strcmp(p, gp->name)) - return (gp); - } + if (p == NULL) + return (NULL); + LIST_FOREACH(mp, &g_classes, class) { + if (mpr != NULL && mpr != mp) + continue; + LIST_FOREACH(gp, &mp->geom, geom) { + if (!strcmp(p, gp->name)) + return (gp); } } - gctl_error(req, "Geom not found"); + gctl_error(req, "Geom not found: \"%s\"", p); return (NULL); } @@ -424,7 +424,7 @@ pp = g_provider_by_name(p); if (pp != NULL) return (pp); - gctl_error(req, "Provider not found"); + gctl_error(req, "Provider not found: \"%s\"", p); return (NULL); } ==== //depot/projects/linuxolator/src/sys/netgraph/ng_base.c#5 (text+ko) ==== @@ -38,7 +38,7 @@ * Authors: Julian Elischer * Archie Cobbs * - * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.129 2007/03/18 16:49:50 rwatson Exp $ + * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.130 2007/03/30 14:34:34 wkoszek Exp $ * $Whistle: ng_base.c,v 1.39 1999/01/28 23:54:53 julian Exp $ */ @@ -228,6 +228,19 @@ #define _NG_ALLOC_NODE(node) \ MALLOC(node, node_p, sizeof(*node), M_NETGRAPH_NODE, M_NOWAIT | M_ZERO) +#define NG_QUEUE_LOCK_INIT(n) \ + mtx_init(&(n)->q_mtx, "ng_node", NULL, MTX_SPIN) +#define NG_QUEUE_LOCK(n) \ + mtx_lock_spin(&(n)->q_mtx) +#define NG_QUEUE_UNLOCK(n) \ + mtx_unlock_spin(&(n)->q_mtx) +#define NG_WORKLIST_LOCK_INIT() \ + mtx_init(&ng_worklist_mtx, "ng_worklist", NULL, MTX_SPIN) +#define NG_WORKLIST_LOCK() \ + mtx_lock_spin(&ng_worklist_mtx) +#define NG_WORKLIST_UNLOCK() \ + mtx_unlock_spin(&ng_worklist_mtx) + #ifdef NETGRAPH_DEBUG /*----------------------------------------------*/ /* * In debug mode: @@ -605,7 +618,7 @@ NG_NODE_REF(node); /* note reference */ type->refs++; - mtx_init(&node->nd_input_queue.q_mtx, "ng_node", NULL, MTX_SPIN); + NG_QUEUE_LOCK_INIT(&node->nd_input_queue); node->nd_input_queue.queue = NULL; node->nd_input_queue.last = &node->nd_input_queue.queue; node->nd_input_queue.q_flags = 0; @@ -2039,7 +2052,7 @@ atomic_subtract_long(&ngq->q_flags, READER_INCREMENT); /* ######### End Hack alert ######### */ - mtx_lock_spin((&ngq->q_mtx)); + NG_QUEUE_LOCK(ngq); /* * Try again. Another processor (or interrupt for that matter) may * have removed the last queued item that was stopping us from @@ -2050,7 +2063,7 @@ */ if ((ngq->q_flags & NGQ_RMASK) == 0) { atomic_add_long(&ngq->q_flags, READER_INCREMENT); - mtx_unlock_spin((&ngq->q_mtx)); + NG_QUEUE_UNLOCK(ngq); CTR4(KTR_NET, "%20s: node [%x] (%p) slow acquired item %p", __func__, ngq->q_node->nd_ID, ngq->q_node, item); return (item); @@ -2060,7 +2073,7 @@ * and queue the request for later. */ ng_queue_rw(ngq, item, NGQRW_R); - mtx_unlock_spin(&(ngq->q_mtx)); + NG_QUEUE_UNLOCK(ngq); return (NULL); } @@ -2072,7 +2085,7 @@ ("%s: working on deadnode", __func__)); restart: - mtx_lock_spin(&(ngq->q_mtx)); + NG_QUEUE_LOCK(ngq); /* * If there are no readers, no writer, and no pending packets, then * we can just go ahead. In all other situations we need to queue the @@ -2081,7 +2094,7 @@ if ((ngq->q_flags & NGQ_WMASK) == 0) { /* collision could happen *HERE* */ atomic_add_long(&ngq->q_flags, WRITER_ACTIVE); - mtx_unlock_spin((&ngq->q_mtx)); + NG_QUEUE_UNLOCK(ngq); if (ngq->q_flags & READER_MASK) { /* Collision with fast-track reader */ atomic_subtract_long(&ngq->q_flags, WRITER_ACTIVE); @@ -2096,7 +2109,7 @@ * and queue the request for later. */ ng_queue_rw(ngq, item, NGQRW_W); - mtx_unlock_spin(&(ngq->q_mtx)); + NG_QUEUE_UNLOCK(ngq); return (NULL); } @@ -2192,7 +2205,7 @@ { item_p item; - mtx_lock_spin(&ngq->q_mtx); + NG_QUEUE_LOCK(ngq); while (ngq->queue) { item = ngq->queue; ngq->queue = item->el_next; @@ -2200,7 +2213,7 @@ ngq->last = &(ngq->queue); atomic_add_long(&ngq->q_flags, -OP_PENDING); } - mtx_unlock_spin(&ngq->q_mtx); + NG_QUEUE_UNLOCK(ngq); /* If the item is supplying a callback, call it with an error */ if (item->apply != NULL) { @@ -2208,14 +2221,14 @@ item->apply = NULL; } NG_FREE_ITEM(item); - mtx_lock_spin(&ngq->q_mtx); + NG_QUEUE_LOCK(ngq); } /* * Take us off the work queue if we are there. * We definately have no work to be done. */ ng_worklist_remove(ngq->q_node); - mtx_unlock_spin(&ngq->q_mtx); + NG_QUEUE_UNLOCK(ngq); } /*********************************************************************** @@ -2339,9 +2352,9 @@ #ifdef NETGRAPH_DEBUG _ngi_check(item, __FILE__, __LINE__); #endif - mtx_lock_spin(&(ngq->q_mtx)); + NG_QUEUE_LOCK(ngq); ng_queue_rw(ngq, item, rw); - mtx_unlock_spin(&(ngq->q_mtx)); + NG_QUEUE_UNLOCK(ngq); if (flags & NG_PROGRESS) return (EINPROGRESS); @@ -2384,10 +2397,10 @@ return (error); } - mtx_lock_spin(&(ngq->q_mtx)); + NG_QUEUE_LOCK(ngq); if (NEXT_QUEUED_ITEM_CAN_PROCEED(ngq)) ng_setisr(ngq->q_node); - mtx_unlock_spin(&(ngq->q_mtx)); + NG_QUEUE_UNLOCK(ngq); return (error); } @@ -3140,7 +3153,7 @@ switch (event) { case MOD_LOAD: /* Initialize everything. */ - mtx_init(&ng_worklist_mtx, "ng_worklist", NULL, MTX_SPIN); + NG_WORKLIST_LOCK_INIT(); mtx_init(&ng_typelist_mtx, "netgraph types mutex", NULL, MTX_DEF); mtx_init(&ng_nodelist_mtx, "netgraph nodelist mutex", NULL, @@ -3318,15 +3331,15 @@ node_p node = NULL; for (;;) { - mtx_lock_spin(&ng_worklist_mtx); + NG_WORKLIST_LOCK(); node = TAILQ_FIRST(&ng_worklist); if (!node) { - mtx_unlock_spin(&ng_worklist_mtx); + NG_WORKLIST_UNLOCK(); break; } node->nd_flags &= ~NGF_WORKQ; TAILQ_REMOVE(&ng_worklist, node, nd_work); - mtx_unlock_spin(&ng_worklist_mtx); + NG_WORKLIST_UNLOCK(); CTR3(KTR_NET, "%20s: node [%x] (%p) taken off worklist", __func__, node->nd_ID, node); /* @@ -3345,13 +3358,13 @@ for (;;) { int rw; - mtx_lock_spin(&node->nd_input_queue.q_mtx); + NG_QUEUE_LOCK(&node->nd_input_queue); item = ng_dequeue(&node->nd_input_queue, &rw); if (item == NULL) { - mtx_unlock_spin(&node->nd_input_queue.q_mtx); + NG_QUEUE_UNLOCK(&node->nd_input_queue); break; /* go look for another node */ } else { - mtx_unlock_spin(&node->nd_input_queue.q_mtx); + NG_QUEUE_UNLOCK(&node->nd_input_queue); NGI_GET_NODE(item, node); /* zaps stored node */ ng_apply_item(node, item, rw); NG_NODE_UNREF(node); @@ -3366,16 +3379,16 @@ { mtx_assert(&node->nd_input_queue.q_mtx, MA_OWNED); - mtx_lock_spin(&ng_worklist_mtx); + NG_WORKLIST_LOCK(); if (node->nd_flags & NGF_WORKQ) { node->nd_flags &= ~NGF_WORKQ; TAILQ_REMOVE(&ng_worklist, node, nd_work); - mtx_unlock_spin(&ng_worklist_mtx); + NG_WORKLIST_UNLOCK(); NG_NODE_UNREF(node); CTR3(KTR_NET, "%20s: node [%x] (%p) removed from worklist", __func__, node->nd_ID, node); } else { - mtx_unlock_spin(&ng_worklist_mtx); + NG_WORKLIST_UNLOCK(); } } @@ -3396,9 +3409,9 @@ * then put us on. */ node->nd_flags |= NGF_WORKQ; - mtx_lock_spin(&ng_worklist_mtx); + NG_WORKLIST_LOCK(); TAILQ_INSERT_TAIL(&ng_worklist, node, nd_work); - mtx_unlock_spin(&ng_worklist_mtx); + NG_WORKLIST_UNLOCK(); NG_NODE_REF(node); /* XXX fafe in mutex? */ CTR3(KTR_NET, "%20s: node [%x] (%p) put on worklist", __func__, node->nd_ID, node); From owner-p4-projects@FreeBSD.ORG Fri Mar 30 18:06:30 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8DE6516A403; Fri, 30 Mar 2007 18:06:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 508FD16A401 for ; Fri, 30 Mar 2007 18:06:30 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4051513C459 for ; Fri, 30 Mar 2007 18:06:30 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2UI6UxB059978 for ; Fri, 30 Mar 2007 18:06:30 GMT (envelope-from jkim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2UI6TkE059975 for perforce@freebsd.org; Fri, 30 Mar 2007 18:06:29 GMT (envelope-from jkim@freebsd.org) Date: Fri, 30 Mar 2007 18:06:29 GMT Message-Id: <200703301806.l2UI6TkE059975@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jkim@freebsd.org using -f From: Jung-uk Kim To: Perforce Change Reviews Cc: Subject: PERFORCE change 116943 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Mar 2007 18:06:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=116943 Change 116943 by jkim@jkim_hammer on 2007/03/30 18:05:35 IFC @116942 Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linprocfs/linprocfs.c#14 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linprocfs/linprocfs.c#14 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.107 2007/03/12 12:16:52 des Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.108 2007/03/30 17:56:44 jkim Exp $"); #include #include @@ -54,11 +54,13 @@ #include #include #include +#include #include #include #include #include #include +#include #include #include #include @@ -1031,14 +1033,8 @@ static int linprocfs_domsgmni(PFS_FILL_ARGS) { - int msgmni; - size_t size; - size = sizeof(msgmni); - if (kernel_sysctlbyname(td, "kern.ipc.msgmni", &msgmni, &size, - 0, 0, 0, 0) != 0) - msgmni = 0; - sbuf_printf(sb, "%i\n", msgmni); + sbuf_printf(sb, "%d\n", msginfo.msgmni); return (0); } @@ -1061,34 +1057,9 @@ static int linprocfs_dosem(PFS_FILL_ARGS) { - int semmsl, semmns, semopm, semmni; - size_t size; - /* Field 1: SEMMSL */ - size = sizeof(semmsl); - if (kernel_sysctlbyname(td, "kern.ipc.semmsl", &semmsl, &size, - 0, 0, 0, 0) != 0) - semmsl = 0; - - /* Field 2: SEMMNS */ - size = sizeof(semmns); - if (kernel_sysctlbyname(td, "kern.ipc.semmns", &semmns, &size, - 0, 0, 0, 0) != 0) - semmns = 0; - - /* Field 3: SEMOPM */ - size = sizeof(semopm); - if (kernel_sysctlbyname(td, "kern.ipc.semopm", &semopm, &size, - 0, 0, 0, 0) != 0) - semopm = 0; - - /* Field 4: SEMMNI */ - size = sizeof(semmni); - if (kernel_sysctlbyname(td, "kern.ipc.semmni", &semmni, &size, - 0, 0, 0, 0) != 0) - semmni = 0; - - sbuf_printf(sb, "%i %i %i %i\n", semmsl, semmns, semopm, semmni); + sbuf_printf(sb, "%d %d %d %d\n", seminfo.semmsl, seminfo.semmns, + seminfo.semopm, seminfo.semmni); return (0); } From owner-p4-projects@FreeBSD.ORG Fri Mar 30 18:26:00 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 604A916A404; Fri, 30 Mar 2007 18:26:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 13C3016A402 for ; Fri, 30 Mar 2007 18:26:00 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 025D613C45D for ; Fri, 30 Mar 2007 18:26:00 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2UIPxdQ063966 for ; Fri, 30 Mar 2007 18:25:59 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2UIPvIU063960 for perforce@freebsd.org; Fri, 30 Mar 2007 18:25:57 GMT (envelope-from marcel@freebsd.org) Date: Fri, 30 Mar 2007 18:25:57 GMT Message-Id: <200703301825.l2UIPvIU063960@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 Cc: Subject: PERFORCE change 116949 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Mar 2007 18:26:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=116949 Change 116949 by marcel@marcel_xcllnt on 2007/03/30 18:25:41 IFC @116947 Affected files ... .. //depot/projects/uart/amd64/amd64/cpu_switch.S#5 integrate .. //depot/projects/uart/amd64/amd64/genassym.c#10 integrate .. //depot/projects/uart/amd64/amd64/machdep.c#26 integrate .. //depot/projects/uart/amd64/amd64/support.S#9 integrate .. //depot/projects/uart/amd64/include/pcb.h#4 integrate .. //depot/projects/uart/amd64/include/segments.h#4 integrate .. //depot/projects/uart/amd64/linux32/linux.h#6 integrate .. //depot/projects/uart/amd64/linux32/linux32_dummy.c#7 integrate .. //depot/projects/uart/amd64/linux32/linux32_locore.s#2 integrate .. //depot/projects/uart/amd64/linux32/linux32_machdep.c#10 integrate .. //depot/projects/uart/amd64/linux32/linux32_proto.h#13 integrate .. //depot/projects/uart/amd64/linux32/linux32_syscall.h#13 integrate .. //depot/projects/uart/amd64/linux32/linux32_sysent.c#13 integrate .. //depot/projects/uart/amd64/linux32/linux32_sysvec.c#14 integrate .. //depot/projects/uart/amd64/linux32/syscalls.master#13 integrate .. //depot/projects/uart/boot/arm/at91/libat91/at91rm9200_lowlevel.c#4 integrate .. //depot/projects/uart/boot/arm/at91/libat91/at91rm9200_lowlevel.h#5 integrate .. //depot/projects/uart/boot/arm/at91/libat91/emac.c#5 integrate .. //depot/projects/uart/boot/arm/at91/libat91/getc.c#3 integrate .. //depot/projects/uart/boot/arm/at91/libat91/sd-card.c#3 integrate .. //depot/projects/uart/boot/arm/at91/libat91/spi_flash.c#4 integrate .. //depot/projects/uart/compat/linprocfs/linprocfs.c#23 integrate .. //depot/projects/uart/compat/linux/linux_file.c#12 integrate .. //depot/projects/uart/compat/linux/linux_futex.c#3 integrate .. //depot/projects/uart/compat/linux/linux_util.h#8 integrate .. //depot/projects/uart/dev/acpica/acpi_hpet.c#4 integrate .. //depot/projects/uart/dev/firewire/firewire.c#13 integrate .. //depot/projects/uart/dev/isp/isp.c#20 integrate .. //depot/projects/uart/dev/sio/sio_pci.c#8 integrate .. //depot/projects/uart/geom/geom_ctl.c#10 integrate .. //depot/projects/uart/i386/i386/support.s#9 integrate .. //depot/projects/uart/i386/linux/linux.h#8 integrate .. //depot/projects/uart/i386/linux/linux_dummy.c#9 integrate .. //depot/projects/uart/i386/linux/linux_proto.h#15 integrate .. //depot/projects/uart/i386/linux/linux_syscall.h#15 integrate .. //depot/projects/uart/i386/linux/linux_sysent.c#15 integrate .. //depot/projects/uart/i386/linux/syscalls.master#15 integrate .. //depot/projects/uart/kern/kern_lock.c#17 integrate .. //depot/projects/uart/kern/kern_rwlock.c#10 integrate .. //depot/projects/uart/kern/vfs_bio.c#29 integrate .. //depot/projects/uart/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c#6 integrate .. //depot/projects/uart/netgraph/ng_base.c#16 integrate .. //depot/projects/uart/netinet/in.c#14 integrate .. //depot/projects/uart/sys/lockmgr.h#10 integrate .. //depot/projects/uart/sys/mount.h#21 integrate .. //depot/projects/uart/sys/mutex.h#17 integrate .. //depot/projects/uart/ufs/ffs/ffs_softdep.c#24 integrate Differences ... ==== //depot/projects/uart/amd64/amd64/cpu_switch.S#5 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.155 2006/12/20 04:40:38 davidxu Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.156 2007/03/30 00:06:20 jkim Exp $ */ #include @@ -104,11 +104,12 @@ testl $PCB_32BIT,PCB_FLAGS(%r8) jz 1f /* no, skip over */ - /* Save segment selector numbers */ - movl %ds,PCB_DS(%r8) - movl %es,PCB_ES(%r8) - movl %fs,PCB_FS(%r8) + /* Save userland %gs */ movl %gs,PCB_GS(%r8) + movq PCB_GS32P(%r8),%rax + movq (%rax),%rax + movq %rax,PCB_GS32SD(%r8) + 1: /* Test if debug registers should be saved. */ testl $PCB_DBREGS,PCB_FLAGS(%r8) @@ -170,22 +171,6 @@ */ movq TD_PCB(%rsi),%r8 - testl $PCB_32BIT,PCB_FLAGS(%r8) - jz 1f /* no, skip over */ - - /* Restore segment selector numbers */ - movl PCB_DS(%r8),%ds - movl PCB_ES(%r8),%es - movl PCB_FS(%r8),%fs - - /* Restore userland %gs while preserving kernel gsbase */ - movl $MSR_GSBASE,%ecx - rdmsr - movl PCB_GS(%r8),%gs - wrmsr - jmp 2f -1: - /* Restore userland %fs */ movl $MSR_FSBASE,%ecx movl PCB_FSBASE(%r8),%eax @@ -197,7 +182,6 @@ movl PCB_GSBASE(%r8),%eax movl PCB_GSBASE+4(%r8),%edx wrmsr -2: /* Update the TSS_RSP0 pointer for the next interrupt */ movq PCPU(TSSP), %rax @@ -211,6 +195,19 @@ movl %eax, PCPU(CURTID) movq %rsi, PCPU(CURTHREAD) /* into next thread */ + testl $PCB_32BIT,PCB_FLAGS(%r8) + jz 1f /* no, skip over */ + + /* Restore userland %gs while preserving kernel gsbase */ + movq PCB_GS32P(%r8),%rax + movq PCB_GS32SD(%r8),%rbx + movq %rbx,(%rax) + movl $MSR_GSBASE,%ecx + rdmsr + movl PCB_GS(%r8),%gs + wrmsr + +1: /* Restore context. */ movq PCB_RBX(%r8),%rbx movq PCB_RSP(%r8),%rsp ==== //depot/projects/uart/amd64/amd64/genassym.c#10 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.160 2006/12/20 04:40:38 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.161 2007/03/30 00:06:20 jkim Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -136,12 +136,14 @@ ASSYM(PCB_DR7, offsetof(struct pcb, pcb_dr7)); ASSYM(PCB_DBREGS, PCB_DBREGS); ASSYM(PCB_32BIT, PCB_32BIT); +ASSYM(PCB_FULLCTX, PCB_FULLCTX); ASSYM(PCB_FLAGS, offsetof(struct pcb, pcb_flags)); -ASSYM(PCB_FULLCTX, PCB_FULLCTX); ASSYM(PCB_SAVEFPU, offsetof(struct pcb, pcb_save)); ASSYM(PCB_SAVEFPU_SIZE, sizeof(struct savefpu)); ASSYM(PCB_ONFAULT, offsetof(struct pcb, pcb_onfault)); +ASSYM(PCB_GS32P, offsetof(struct pcb, pcb_gs32p)); +ASSYM(PCB_GS32SD, offsetof(struct pcb, pcb_gs32sd)); ASSYM(PCB_SIZE, sizeof(struct pcb)); ==== //depot/projects/uart/amd64/amd64/machdep.c#26 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.669 2007/01/27 18:13:24 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.670 2007/03/30 00:06:20 jkim Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -725,6 +725,15 @@ 0, /* long */ 0, /* default 32 vs 16 bit size */ 0 /* limit granularity (byte/page units)*/ }, +/* GUGS32_SEL 8 32 bit GS Descriptor for user */ +{ 0x0, /* segment base address */ + 0xfffff, /* length - all address space */ + SDT_MEMRWA, /* segment type */ + SEL_UPL, /* segment descriptor priority level */ + 1, /* segment descriptor present */ + 0, /* long */ + 1, /* default 32 vs 16 bit size */ + 1 /* limit granularity (byte/page units)*/ }, }; void ==== //depot/projects/uart/amd64/amd64/support.S#9 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.121 2006/10/17 02:24:45 davidxu Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.122 2007/03/30 01:07:27 jkim Exp $ */ #include "opt_ddb.h" @@ -689,3 +689,47 @@ movq %rax,32(%rdi) movq %rdi,bbhead NON_GPROF_RET + +#if defined(SMP) || !defined(_KERNEL) +#define MPLOCKED lock ; +#else +#define MPLOCKED +#endif + + .text + +futex_fault: + movq PCPU(CURPCB), %rdx + movq $0, PCB_ONFAULT(%rdx) + movq $-EFAULT, %rax + ret + +/* int futex_xchgl(int oparg, caddr_t uaddr, int *oldval); */ +ENTRY(futex_xchgl) + movq PCPU(CURPCB), %r11 + movq $futex_fault, PCB_ONFAULT(%r11) + + movq $VM_MAXUSER_ADDRESS-4, %rax + cmpq %rax, %rsi + ja futex_fault + + MPLOCKED xchgl %edi, (%rsi) + movl %edi, (%rdx) + xorl %eax, %eax + movq %rax, PCB_ONFAULT(%r11) + ret + +/* int futex_addl(int oparg, caddr_t uaddr, int *oldval); */ +ENTRY(futex_addl) + movq PCPU(CURPCB), %r11 + movq $futex_fault, PCB_ONFAULT(%r11) + + movq $VM_MAXUSER_ADDRESS-4, %rax + cmpq %rax, %rsi + ja futex_fault + + MPLOCKED xaddl %edi, (%rsi) + movl %edi, (%rdx) + xorl %eax, %eax + movq %rax, PCB_ONFAULT(%r11) + ret ==== //depot/projects/uart/amd64/include/pcb.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)pcb.h 5.10 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pcb.h,v 1.62 2005/09/27 21:11:35 peter Exp $ + * $FreeBSD: src/sys/amd64/include/pcb.h,v 1.63 2007/03/30 00:06:21 jkim Exp $ */ #ifndef _AMD64_PCB_H_ @@ -41,6 +41,7 @@ * AMD64 process control block */ #include +#include struct pcb { register_t pcb_cr3; @@ -73,6 +74,10 @@ #define PCB_FULLCTX 0x80 /* full context restore on sysret */ caddr_t pcb_onfault; /* copyin/out fault recovery */ + + /* 32-bit segment descriptor */ + struct user_segment_descriptor *pcb_gs32p; + struct user_segment_descriptor pcb_gs32sd; }; #ifdef _KERNEL ==== //depot/projects/uart/amd64/include/segments.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)segments.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/segments.h,v 1.38 2004/04/05 21:25:51 imp Exp $ + * $FreeBSD: src/sys/amd64/include/segments.h,v 1.39 2007/03/30 00:06:21 jkim Exp $ */ #ifndef _MACHINE_SEGMENTS_H_ @@ -200,9 +200,10 @@ #define GUCODE32_SEL 3 /* User 32 bit code Descriptor */ #define GUDATA_SEL 4 /* User 32/64 bit Data Descriptor */ #define GUCODE_SEL 5 /* User 64 bit Code Descriptor */ -#define GPROC0_SEL 6 /* TSS for entering kernel etc */ +#define GPROC0_SEL 6 /* TSS for entering kernel etc */ /* slot 6 is second half of GPROC0_SEL */ -#define NGDT 8 +#define GUGS32_SEL 8 /* User 32 bit GS Descriptor */ +#define NGDT 9 #ifdef _KERNEL extern struct user_segment_descriptor gdt[]; ==== //depot/projects/uart/amd64/linux32/linux.h#6 (text+ko) ==== @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.14 2007/03/02 00:08:47 jkim Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.15 2007/03/29 02:11:46 julian Exp $ */ #ifndef _AMD64_LINUX_H_ @@ -531,6 +531,7 @@ #define LINUX_O_RDONLY 00000000 #define LINUX_O_WRONLY 00000001 #define LINUX_O_RDWR 00000002 +#define LINUX_O_ACCMODE 00000003 #define LINUX_O_CREAT 00000100 #define LINUX_O_EXCL 00000200 #define LINUX_O_NOCTTY 00000400 @@ -565,6 +566,8 @@ #define LINUX_F_WRLCK 1 #define LINUX_F_UNLCK 2 +#define LINUX_AT_FDCWD -100 + /* * mount flags */ ==== //depot/projects/uart/amd64/linux32/linux32_dummy.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.7 2006/12/31 13:16:00 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.8 2007/03/29 02:11:46 julian Exp $"); #include #include @@ -97,7 +97,6 @@ DUMMY(inotify_add_watch); DUMMY(inotify_rm_watch); DUMMY(migrate_pages); -DUMMY(openat); DUMMY(mkdirat); DUMMY(mknodat); DUMMY(fchownat); ==== //depot/projects/uart/amd64/linux32/linux32_locore.s#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/amd64/linux32/linux32_locore.s,v 1.1 2004/08/16 07:55:06 tjr Exp $ */ +/* $FreeBSD: src/sys/amd64/linux32/linux32_locore.s,v 1.2 2007/03/30 00:06:21 jkim Exp $ */ #include "linux32_assym.h" /* system definitions */ #include /* miscellaneous asm macros */ @@ -11,8 +11,6 @@ NON_GPROF_ENTRY(linux_sigcode) call *LINUX_SIGF_HANDLER(%esp) leal LINUX_SIGF_SC(%esp),%ebx /* linux scp */ - movl LINUX_SC_GS(%ebx),%gs - movl LINUX_SC_FS(%ebx),%fs movl LINUX_SC_ES(%ebx),%es movl LINUX_SC_DS(%ebx),%ds movl %esp, %ebx /* pass sigframe */ @@ -25,8 +23,6 @@ linux_rt_sigcode: call *LINUX_RT_SIGF_HANDLER(%esp) leal LINUX_RT_SIGF_UC(%esp),%ebx /* linux ucp */ - movl LINUX_SC_GS(%ebx),%gs - movl LINUX_SC_FS(%ebx),%fs movl LINUX_SC_ES(%ebx),%es movl LINUX_SC_DS(%ebx),%ds push %eax /* fake ret addr */ ==== //depot/projects/uart/amd64/linux32/linux32_machdep.c#10 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.36 2007/03/02 00:08:47 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.39 2007/03/30 17:27:13 jkim Exp $"); #include #include @@ -53,7 +53,10 @@ #include #include +#include #include +#include +#include #include #include @@ -121,7 +124,7 @@ * Allocate temporary demand zeroed space for argument and * environment strings */ - args->buf = (char *) kmem_alloc_wait(exec_map, + args->buf = (char *)kmem_alloc_wait(exec_map, PATH_MAX + ARG_MAX + MAXSHELLCMDLEN); if (args->buf == NULL) return (ENOMEM); @@ -155,14 +158,14 @@ if (error) { if (error == ENAMETOOLONG) error = E2BIG; - + goto err_exit; } args->stringspace -= length; args->endp += length; args->argc++; } - + args->begin_envv = args->endp; /* @@ -219,13 +222,13 @@ if (error == 0) error = kern_execve(td, &eargs, NULL); if (error == 0) - /* linux process can exec fbsd one, dont attempt + /* Linux process can execute FreeBSD one, do not attempt * to create emuldata for such process using * linux_proc_init, this leads to a panic on KASSERT - * because such process has p->p_emuldata == NULL + * because such process has p->p_emuldata == NULL. */ if (td->td_proc->p_sysent == &elf_linux_sysvec) - error = linux_proc_init(td, 0, 0); + error = linux_proc_init(td, 0, 0); return (error); } @@ -466,7 +469,7 @@ if ((error = fork1(td, RFFDG | RFPROC | RFSTOPPED, 0, &p2)) != 0) return (error); - + if (error == 0) { td->td_retval[0] = p2->p_pid; td->td_retval[1] = 0; @@ -480,7 +483,9 @@ td2 = FIRST_THREAD_IN_PROC(p2); - /* make it run */ + /* + * Make this runnable after we are finished with it. + */ mtx_lock_spin(&sched_lock); TD_SET_CAN_RUN(td2); sched_add(td2, SRQ_BORING); @@ -501,7 +506,7 @@ printf(ARGS(vfork, "")); #endif - /* exclude RFPPWAIT */ + /* Exclude RFPPWAIT */ if ((error = fork1(td, RFFDG | RFPROC | RFMEM | RFSTOPPED, 0, &p2)) != 0) return (error); if (error == 0) { @@ -520,7 +525,7 @@ PROC_UNLOCK(p2); td2 = FIRST_THREAD_IN_PROC(p2); - + /* make it run */ mtx_lock_spin(&sched_lock); TD_SET_CAN_RUN(td2); @@ -532,7 +537,7 @@ while (p2->p_flag & P_PPWAIT) msleep(td->td_proc, &p2->p_mtx, PWAIT, "ppwait", 0); PROC_UNLOCK(p2); - + return (0); } @@ -547,10 +552,9 @@ #ifdef DEBUG if (ldebug(clone)) { - printf(ARGS(clone, "flags %x, stack %x, parent tid: %x, child tid: %x"), - (unsigned int)args->flags, (unsigned int)(uintptr_t)args->stack, - (unsigned int)(uintptr_t)args->parent_tidptr, - (unsigned int)(uintptr_t)args->child_tidptr); + printf(ARGS(clone, "flags %x, stack %p, parent tid: %p, " + "child tid: %p"), (unsigned)args->flags, + args->stack, args->parent_tidptr, args->child_tidptr); } #endif @@ -565,11 +569,11 @@ ff |= RFMEM; if (args->flags & LINUX_CLONE_SIGHAND) ff |= RFSIGSHARE; - /* - * XXX: in linux sharing of fs info (chroot/cwd/umask) - * and open files is independant. in fbsd its in one - * structure but in reality it doesn't cause any problems - * because both of these flags are usually set together. + /* + * XXX: In Linux, sharing of fs info (chroot/cwd/umask) + * and open files is independant. In FreeBSD, its in one + * structure but in reality it does not make any problems + * because both of these flags are set at once usually. */ if (!(args->flags & (LINUX_CLONE_FILES | LINUX_CLONE_FS))) ff |= RFFDG; @@ -590,6 +594,10 @@ if ((args->flags & 0xffffff00) == LINUX_THREADING_FLAGS) ff |= RFTHREAD; + if (args->flags & LINUX_CLONE_PARENT_SETTID) + if (args->parent_tidptr == NULL) + return (EINVAL); + error = fork1(td, ff, 0, &p2); if (error) return (error); @@ -601,35 +609,21 @@ PROC_UNLOCK(p2); sx_xunlock(&proctree_lock); } - + /* create the emuldata */ error = linux_proc_init(td, p2->p_pid, args->flags); /* reference it - no need to check this */ em = em_find(p2, EMUL_DOLOCK); KASSERT(em != NULL, ("clone: emuldata not found.\n")); /* and adjust it */ - if (args->flags & LINUX_CLONE_PARENT_SETTID) { - if (args->parent_tidptr == NULL) { - EMUL_UNLOCK(&emul_lock); - return (EINVAL); - } - error = copyout(&p2->p_pid, args->parent_tidptr, sizeof(p2->p_pid)); - if (error) { - EMUL_UNLOCK(&emul_lock); - return (error); - } - } if (args->flags & LINUX_CLONE_THREAD) { - /* XXX: linux mangles pgrp and pptr somehow - * I think it might be this but I am not sure. - */ #ifdef notyet PROC_LOCK(p2); p2->p_pgrp = td->td_proc->p_pgrp; PROC_UNLOCK(p2); #endif - exit_signal = 0; + exit_signal = 0; } if (args->flags & LINUX_CLONE_CHILD_SETTID) @@ -644,25 +638,70 @@ EMUL_UNLOCK(&emul_lock); + if (args->flags & LINUX_CLONE_PARENT_SETTID) { + error = copyout(&p2->p_pid, args->parent_tidptr, + sizeof(p2->p_pid)); + if (error) + printf(LMSG("copyout failed!")); + } + PROC_LOCK(p2); p2->p_sigparent = exit_signal; PROC_UNLOCK(p2); td2 = FIRST_THREAD_IN_PROC(p2); - /* - * in a case of stack = NULL we are supposed to COW calling process stack - * this is what normal fork() does so we just keep the tf_rsp arg intact + /* + * In a case of stack = NULL, we are supposed to COW calling process + * stack. This is what normal fork() does, so we just keep tf_rsp arg + * intact. */ if (args->stack) - td2->td_frame->tf_rsp = PTROUT(args->stack); + td2->td_frame->tf_rsp = PTROUT(args->stack); if (args->flags & LINUX_CLONE_SETTLS) { - /* XXX: todo */ + struct user_segment_descriptor sd; + struct l_user_desc info; + int a[2]; + + error = copyin((void *)td->td_frame->tf_rsi, &info, + sizeof(struct l_user_desc)); + if (error) { + printf(LMSG("copyin failed!")); + } else { + /* We might copy out the entry_number as GUGS32_SEL. */ + info.entry_number = GUGS32_SEL; + error = copyout(&info, (void *)td->td_frame->tf_rsi, + sizeof(struct l_user_desc)); + if (error) + printf(LMSG("copyout failed!")); + + a[0] = LINUX_LDT_entry_a(&info); + a[1] = LINUX_LDT_entry_b(&info); + + memcpy(&sd, &a, sizeof(a)); +#ifdef DEBUG + if (ldebug(clone)) + printf("Segment created in clone with " + "CLONE_SETTLS: lobase: %x, hibase: %x, " + "lolimit: %x, hilimit: %x, type: %i, " + "dpl: %i, p: %i, xx: %i, long: %i, " + "def32: %i, gran: %i\n", sd.sd_lobase, + sd.sd_hibase, sd.sd_lolimit, sd.sd_hilimit, + sd.sd_type, sd.sd_dpl, sd.sd_p, sd.sd_xx, + sd.sd_long, sd.sd_def32, sd.sd_gran); +#endif + td2->td_pcb->pcb_gsbase = (register_t)info.base_addr; + td2->td_pcb->pcb_gs32sd = sd; + td2->td_pcb->pcb_gs32p = &gdt[GUGS32_SEL]; + td2->td_pcb->pcb_gs = GSEL(GUGS32_SEL, SEL_UPL); + td2->td_pcb->pcb_flags |= PCB_32BIT; + } } #ifdef DEBUG if (ldebug(clone)) - printf(LMSG("clone: successful rfork to %ld, stack %p sig = %d"), - (long)p2->p_pid, args->stack, exit_signal); + printf(LMSG("clone: successful rfork to %d, " + "stack %p sig = %d"), (int)p2->p_pid, args->stack, + exit_signal); #endif if (args->flags & LINUX_CLONE_VFORK) { PROC_LOCK(p2); @@ -680,12 +719,12 @@ td->td_retval[0] = p2->p_pid; td->td_retval[1] = 0; - + if (args->flags & LINUX_CLONE_VFORK) { - /* wait for the children to exit, ie. emulate vfork */ - PROC_LOCK(p2); + /* wait for the children to exit, ie. emulate vfork */ + PROC_LOCK(p2); while (p2->p_flag & P_PPWAIT) - msleep(td->td_proc, &p2->p_mtx, PWAIT, "ppwait", 0); + msleep(td->td_proc, &p2->p_mtx, PWAIT, "ppwait", 0); PROC_UNLOCK(p2); } @@ -704,8 +743,8 @@ #ifdef DEBUG if (ldebug(mmap2)) - printf(ARGS(mmap2, "%p, %d, %d, 0x%08x, %d, %d"), - (void *)(intptr_t)args->addr, args->len, args->prot, + printf(ARGS(mmap2, "0x%08x, %d, %d, 0x%08x, %d, %d"), + args->addr, args->len, args->prot, args->flags, args->fd, args->pgoff); #endif @@ -731,10 +770,9 @@ #ifdef DEBUG if (ldebug(mmap)) - printf(ARGS(mmap, "%p, %d, %d, 0x%08x, %d, %d"), - (void *)(intptr_t)linux_args.addr, linux_args.len, - linux_args.prot, linux_args.flags, linux_args.fd, - linux_args.pgoff); + printf(ARGS(mmap, "0x%08x, %d, %d, 0x%08x, %d, %d"), + linux_args.addr, linux_args.len, linux_args.prot, + linux_args.flags, linux_args.fd, linux_args.pgoff); #endif if ((linux_args.pgoff % PAGE_SIZE) != 0) return (EINVAL); @@ -820,14 +858,14 @@ } if (linux_args->flags & LINUX_MAP_GROWSDOWN) { - /* - * The linux MAP_GROWSDOWN option does not limit auto + /* + * The Linux MAP_GROWSDOWN option does not limit auto * growth of the region. Linux mmap with this option * takes as addr the inital BOS, and as len, the initial * region size. It can then grow down from addr without - * limit. However, linux threads has an implicit internal + * limit. However, Linux threads has an implicit internal * limit to stack size of STACK_SIZE. Its just not - * enforced explicitly in linux. But, here we impose + * enforced explicitly in Linux. But, here we impose * a limit of (STACK_SIZE - GUARD_SIZE) on the stack * region, since we can do this with our mmap. * @@ -844,8 +882,8 @@ if ((caddr_t)PTRIN(linux_args->addr) + linux_args->len > p->p_vmspace->vm_maxsaddr) { - /* - * Some linux apps will attempt to mmap + /* + * Some Linux apps will attempt to mmap * thread stacks near the top of their * address space. If their TOS is greater * than vm_maxsaddr, vm_map_growstack() @@ -872,7 +910,7 @@ else bsd_args.len = STACK_SIZE - GUARD_SIZE; - /* + /* * This gives us a new BOS. If we're using VM_STACK, then * mmap will just map the top SGROWSIZ bytes, and let * the stack grow down to the limit at BOS. If we're @@ -905,6 +943,19 @@ } int +linux_mprotect(struct thread *td, struct linux_mprotect_args *uap) +{ + struct mprotect_args bsd_args; + + bsd_args.addr = uap->addr; + bsd_args.len = uap->len; + bsd_args.prot = uap->prot; + if (bsd_args.prot & (PROT_READ | PROT_WRITE | PROT_EXEC)) + bsd_args.prot |= PROT_READ | PROT_EXEC; + return (mprotect(td, &bsd_args)); +} + +int linux_iopl(struct thread *td, struct linux_iopl_args *args) { int error; @@ -992,7 +1043,7 @@ } /* - * Linux has two extra args, restart and oldmask. We dont use these, + * Linux has two extra args, restart and oldmask. We don't use these, * but it seems that "restart" is actually a context pointer that * enables the signal to happen with a different register set. */ @@ -1177,14 +1228,104 @@ } int -linux_mprotect(struct thread *td, struct linux_mprotect_args *uap) +linux_set_thread_area(struct thread *td, + struct linux_set_thread_area_args *args) { - struct mprotect_args bsd_args; + struct l_user_desc info; + struct user_segment_descriptor sd; + int a[2]; + int error; + + error = copyin(args->desc, &info, sizeof(struct l_user_desc)); + if (error) + return (error); + +#ifdef DEBUG + if (ldebug(set_thread_area)) + printf(ARGS(set_thread_area, "%i, %x, %x, %i, %i, %i, " + "%i, %i, %i"), info.entry_number, info.base_addr, + info.limit, info.seg_32bit, info.contents, + info.read_exec_only, info.limit_in_pages, + info.seg_not_present, info.useable); +#endif + + /* + * Semantics of Linux version: every thread in the system has array + * of three TLS descriptors. 1st is GLIBC TLS, 2nd is WINE, 3rd unknown. + * This syscall loads one of the selected TLS decriptors with a value + * and also loads GDT descriptors 6, 7 and 8 with the content of + * the per-thread descriptors. + * + * Semantics of FreeBSD version: I think we can ignore that Linux has + * three per-thread descriptors and use just the first one. + * The tls_array[] is used only in [gs]et_thread_area() syscalls and + * for loading the GDT descriptors. We use just one GDT descriptor + * for TLS, so we will load just one. + * XXX: This doesnt work when user-space process tries to use more + * than one TLS segment. Comment in the Linux source says wine might + * do that. + */ + + /* + * GLIBC reads current %gs and call set_thread_area() with it. + * We should let GUDATA_SEL and GUGS32_SEL proceed as well because + * we use these segments. + */ + switch (info.entry_number) { + case GUGS32_SEL: + case GUDATA_SEL: + case 6: + case -1: + info.entry_number = GUGS32_SEL; + break; + default: + return (EINVAL); + } + + /* + * We have to copy out the GDT entry we use. + * XXX: What if userspace program does not check return value and + * tries to use 6, 7 or 8? + */ + error = copyout(&info, args->desc, sizeof(struct l_user_desc)); + if (error) + return (error); + + if (LINUX_LDT_empty(&info)) { + a[0] = 0; + a[1] = 0; + } else { + a[0] = LINUX_LDT_entry_a(&info); + a[1] = LINUX_LDT_entry_b(&info); + } + + memcpy(&sd, &a, sizeof(a)); +#ifdef DEBUG + if (ldebug(set_thread_area)) + printf("Segment created in set_thread_area: " + "lobase: %x, hibase: %x, lolimit: %x, hilimit: %x, " + "type: %i, dpl: %i, p: %i, xx: %i, long: %i, " + "def32: %i, gran: %i\n", + sd.sd_lobase, + sd.sd_hibase, + sd.sd_lolimit, + sd.sd_hilimit, + sd.sd_type, + sd.sd_dpl, + sd.sd_p, + sd.sd_xx, + sd.sd_long, + sd.sd_def32, + sd.sd_gran); +#endif + + critical_enter(); + td->td_pcb->pcb_gsbase = (register_t)info.base_addr; + td->td_pcb->pcb_gs32sd = gdt[GUGS32_SEL] = sd; + td->td_pcb->pcb_gs32p = &gdt[GUGS32_SEL]; + td->td_pcb->pcb_flags |= PCB_32BIT; + wrmsr(MSR_KGSBASE, td->td_pcb->pcb_gsbase); + critical_exit(); - bsd_args.addr = uap->addr; - bsd_args.len = uap->len; - bsd_args.prot = uap->prot; - if (bsd_args.prot & (PROT_READ | PROT_WRITE | PROT_EXEC)) - bsd_args.prot |= PROT_READ | PROT_EXEC; - return (mprotect(td, &bsd_args)); + return (0); } ==== //depot/projects/uart/amd64/linux32/linux32_proto.h#13 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.29 2007/02/15 01:15:31 jkim Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.26 2007/02/15 01:13:36 jkim Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.31 2007/03/30 00:08:21 jkim Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.28 2007/03/30 00:06:21 jkim Exp */ #ifndef _LINUX_SYSPROTO_H_ @@ -734,6 +734,9 @@ char uaddr2_l_[PADL_(void *)]; void * uaddr2; char uaddr2_r_[PADR_(void *)]; char val3_l_[PADL_(int)]; int val3; char val3_r_[PADR_(int)]; }; +struct linux_set_thread_area_args { + char desc_l_[PADL_(struct l_user_desc *)]; struct l_user_desc * desc; char desc_r_[PADR_(struct l_user_desc *)]; +}; struct linux_fadvise64_args { register_t dummy; }; @@ -871,7 +874,10 @@ register_t dummy; }; struct linux_openat_args { - register_t dummy; + char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; + char filename_l_[PADL_(char *)]; char * filename; char filename_r_[PADR_(char *)]; + char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; + char mode_l_[PADL_(l_int)]; l_int mode; char mode_r_[PADR_(l_int)]; }; struct linux_mkdirat_args { register_t dummy; @@ -1093,6 +1099,7 @@ int linux_fremovexattr(struct thread *, struct linux_fremovexattr_args *); int linux_tkill(struct thread *, struct linux_tkill_args *); int linux_sys_futex(struct thread *, struct linux_sys_futex_args *); +int linux_set_thread_area(struct thread *, struct linux_set_thread_area_args *); int linux_fadvise64(struct thread *, struct linux_fadvise64_args *); int linux_exit_group(struct thread *, struct linux_exit_group_args *); int linux_lookup_dcookie(struct thread *, struct linux_lookup_dcookie_args *); @@ -1339,6 +1346,7 @@ #define LINUX_SYS_AUE_linux_fremovexattr AUE_NULL #define LINUX_SYS_AUE_linux_tkill AUE_NULL #define LINUX_SYS_AUE_linux_sys_futex AUE_NULL +#define LINUX_SYS_AUE_linux_set_thread_area AUE_NULL #define LINUX_SYS_AUE_linux_fadvise64 AUE_NULL #define LINUX_SYS_AUE_linux_exit_group AUE_EXIT #define LINUX_SYS_AUE_linux_lookup_dcookie AUE_NULL @@ -1381,7 +1389,7 @@ #define LINUX_SYS_AUE_linux_inotify_add_watch AUE_NULL #define LINUX_SYS_AUE_linux_inotify_rm_watch AUE_NULL #define LINUX_SYS_AUE_linux_migrate_pages AUE_NULL -#define LINUX_SYS_AUE_linux_openat AUE_NULL +#define LINUX_SYS_AUE_linux_openat AUE_OPEN_RWTC #define LINUX_SYS_AUE_linux_mkdirat AUE_NULL #define LINUX_SYS_AUE_linux_mknodat AUE_NULL #define LINUX_SYS_AUE_linux_fchownat AUE_NULL ==== //depot/projects/uart/amd64/linux32/linux32_syscall.h#13 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.29 2007/02/15 01:15:31 jkim Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.26 2007/02/15 01:13:36 jkim Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.31 2007/03/30 00:08:21 jkim Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.28 2007/03/30 00:06:21 jkim Exp */ #define LINUX_SYS_exit 1 @@ -222,6 +222,7 @@ #define LINUX_SYS_linux_fremovexattr 237 #define LINUX_SYS_linux_tkill 238 #define LINUX_SYS_linux_sys_futex 240 +#define LINUX_SYS_linux_set_thread_area 243 #define LINUX_SYS_linux_fadvise64 250 #define LINUX_SYS_linux_exit_group 252 #define LINUX_SYS_linux_lookup_dcookie 253 ==== //depot/projects/uart/amd64/linux32/linux32_sysent.c#13 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.29 2007/02/15 01:15:31 jkim Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.26 2007/02/15 01:13:36 jkim Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.31 2007/03/30 00:08:21 jkim Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.28 2007/03/30 00:06:21 jkim Exp */ #include @@ -263,7 +263,7 @@ { AS(linux_sys_futex_args), (sy_call_t *)linux_sys_futex, AUE_NULL, NULL, 0, 0 }, /* 240 = linux_sys_futex */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 241 = linux_sched_setaffinity */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 242 = linux_sched_getaffinity */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 243 = linux_set_thread_area */ + { AS(linux_set_thread_area_args), (sy_call_t *)linux_set_thread_area, AUE_NULL, NULL, 0, 0 }, /* 243 = linux_set_thread_area */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 244 = linux_get_thread_area */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 245 = linux_io_setup */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 246 = linux_io_destroy */ @@ -315,7 +315,7 @@ { 0, (sy_call_t *)linux_inotify_add_watch, AUE_NULL, NULL, 0, 0 }, /* 292 = linux_inotify_add_watch */ { 0, (sy_call_t *)linux_inotify_rm_watch, AUE_NULL, NULL, 0, 0 }, /* 293 = linux_inotify_rm_watch */ { 0, (sy_call_t *)linux_migrate_pages, AUE_NULL, NULL, 0, 0 }, /* 294 = linux_migrate_pages */ - { 0, (sy_call_t *)linux_openat, AUE_NULL, NULL, 0, 0 }, /* 295 = linux_openat */ + { AS(linux_openat_args), (sy_call_t *)linux_openat, AUE_OPEN_RWTC, NULL, 0, 0 }, /* 295 = linux_openat */ { 0, (sy_call_t *)linux_mkdirat, AUE_NULL, NULL, 0, 0 }, /* 296 = linux_mkdirat */ { 0, (sy_call_t *)linux_mknodat, AUE_NULL, NULL, 0, 0 }, /* 297 = linux_mknodat */ { 0, (sy_call_t *)linux_fchownat, AUE_NULL, NULL, 0, 0 }, /* 298 = linux_fchownat */ ==== //depot/projects/uart/amd64/linux32/linux32_sysvec.c#14 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.26 2006/12/03 21:06:07 netchild Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Mar 30 19:54:13 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 71A0416A402; Fri, 30 Mar 2007 19:54:13 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2806816A400 for ; Fri, 30 Mar 2007 19:54:13 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 175E413C46C for ; Fri, 30 Mar 2007 19:54:13 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2UJsD7g080078 for ; Fri, 30 Mar 2007 19:54:13 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2UJsCR1080075 for perforce@freebsd.org; Fri, 30 Mar 2007 19:54:12 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 30 Mar 2007 19:54:12 GMT Message-Id: <200703301954.l2UJsCR1080075@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 116960 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Mar 2007 19:54:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=116960 Change 116960 by hselasky@hselasky_mini_itx on 2007/03/30 19:54:03 This is a bigger cleanup in the UCOM layer. The goal is to create a context for all the callbacks so that they can call sleeping functions. This is achieved using the USB config thread system. The reason for this is that the code becomes simpler when synchronous operation is applied versus asynchronous. But asynchronous behaviour is the most secure, hence then all USB resources are preallocated for each transfer. After the changes, only data transfers are done asynchronously. All configuration is now done synchronously. This makes the USB device drivers look more like in the old USB stack. Else some cleanup and bugfixes have been made. Please test! Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ubsa.c#14 edit .. //depot/projects/usb/src/sys/dev/usb/ubser.c#9 edit .. //depot/projects/usb/src/sys/dev/usb/ucom.c#14 edit .. //depot/projects/usb/src/sys/dev/usb/ucomvar.h#10 edit .. //depot/projects/usb/src/sys/dev/usb/ucycom.c#9 edit .. //depot/projects/usb/src/sys/dev/usb/ufoma.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/uftdi.c#13 edit .. //depot/projects/usb/src/sys/dev/usb/umct.c#11 edit .. //depot/projects/usb/src/sys/dev/usb/umodem.c#15 edit .. //depot/projects/usb/src/sys/dev/usb/uplcom.c#16 edit .. //depot/projects/usb/src/sys/dev/usb/uvisor.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/uvscom.c#16 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ubsa.c#14 (text+ko) ==== @@ -26,6 +26,7 @@ #include __FBSDID("$FreeBSD: src/sys/dev/usb/ubsa.c,v 1.20 2006/10/31 02:27:24 kevlo Exp $"); + /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. * All rights reserved. @@ -67,7 +68,6 @@ #include #include #include -#include #include #include @@ -92,25 +92,20 @@ #define DPRINTF(...) #endif -#define UBSA_MODVER 1 /* module version */ +#define UBSA_N_TRANSFER 6 /* units */ +#define UBSA_BSIZE 256 /* bytes */ -#define UBSA_N_TRANSFER 14 /* units */ -#define UBSA_BSIZE 64 /* bytes */ - #define UBSA_CONFIG_INDEX 1 #define UBSA_IFACE_INDEX 0 -enum { - UBSA_REG_BAUDRATE, - UBSA_REG_STOP_BITS, - UBSA_REG_DATA_BITS, - UBSA_REG_PARITY, - UBSA_REG_DTR, - UBSA_REG_RTS, - UBSA_REG_BREAK, - UBSA_REG_FLOW_CTRL, - USBA_N_REG -}; +#define UBSA_REG_BAUDRATE 0x00 +#define UBSA_REG_STOP_BITS 0x01 +#define UBSA_REG_DATA_BITS 0x02 +#define UBSA_REG_PARITY 0x03 +#define UBSA_REG_DTR 0x0A +#define UBSA_REG_RTS 0x0B +#define UBSA_REG_BREAK 0x0C +#define UBSA_REG_FLOW_CTRL 0x10 #define UBSA_PARITY_NONE 0x00 #define UBSA_PARITY_EVEN 0x01 @@ -151,22 +146,19 @@ #define UBSA_MSR_DCTS 0x01 /* CTS has changed state */ struct ubsa_softc { + struct ucom_super_softc sc_super_ucom; struct ucom_softc sc_ucom; struct usbd_xfer * sc_xfer[UBSA_N_TRANSFER]; + struct usbd_device *sc_udev; u_int16_t sc_flag; #define UBSA_FLAG_WRITE_STALL 0x0001 #define UBSA_FLAG_READ_STALL 0x0002 #define UBSA_FLAG_INTR_STALL 0x0004 - u_int16_t sc_reg_flag; - u_int16_t sc_reg[USBA_N_REG]; - u_int8_t sc_iface_no; /* interface number */ u_int8_t sc_iface_index; /* interface index */ - u_int8_t sc_dtr; /* current DTR state */ - u_int8_t sc_rts; /* current RTS state */ u_int8_t sc_lsr; /* local status register */ u_int8_t sc_msr; /* UBSA status register */ }; @@ -175,101 +167,23 @@ static device_attach_t ubsa_attach; static device_detach_t ubsa_detach; -static void -ubsa_request(struct ubsa_softc *sc, u_int8_t index, u_int16_t value); - -static void -ubsa_set_dtr(struct ucom_softc *ucom, u_int8_t onoff); - -static void -ubsa_set_rts(struct ucom_softc *ucom, u_int8_t onoff); - -static void -ubsa_set_break(struct ucom_softc *ucom, u_int8_t onoff); - -static u_int8_t -ubsa_baudrate(struct ubsa_softc *sc, speed_t speed); - -static void -ubsa_parity(struct ubsa_softc *sc, tcflag_t cflag); - -static void -ubsa_databits(struct ubsa_softc *sc, tcflag_t cflag); - -static void -ubsa_stopbits(struct ubsa_softc *sc, tcflag_t cflag); - -static void -ubsa_flow(struct ubsa_softc *sc, tcflag_t cflag, tcflag_t iflag); - -static int -ubsa_param(struct ucom_softc *ucom, struct termios *ti); - -static int -ubsa_open(struct ucom_softc *ucom); - -static void -ubsa_close(struct ucom_softc *ucom); - -static void -ubsa_start_read(struct ucom_softc *ucom); - -static void -ubsa_stop_read(struct ucom_softc *ucom); - -static void -ubsa_start_write(struct ucom_softc *ucom); - -static void -ubsa_stop_write(struct ucom_softc *ucom); - -static void -ubsa_get_status(struct ucom_softc *ucom, u_int8_t *lsr, u_int8_t *msr); - -static void -ubsa_write_callback(struct usbd_xfer *xfer); - -static void -ubsa_write_clear_stall_callback(struct usbd_xfer *xfer); - -static void -ubsa_read_callback(struct usbd_xfer *xfer); - -static void -ubsa_read_clear_stall_callback(struct usbd_xfer *xfer); - -static void -ubsa_intr_callback(struct usbd_xfer *xfer); - -static void -ubsa_intr_clear_stall_callback(struct usbd_xfer *xfer); - -static void -ubsa_request_callback(struct usbd_xfer *xfer, u_int8_t index); - -static void -ubsa_set_baudrate_callback(struct usbd_xfer *xfer); - -static void -ubsa_set_stop_bits_callback(struct usbd_xfer *xfer); - -static void -ubsa_set_data_bits_callback(struct usbd_xfer *xfer); - -static void -ubsa_set_parity_callback(struct usbd_xfer *xfer); - -static void -ubsa_set_dtr_callback(struct usbd_xfer *xfer); - -static void -ubsa_set_rts_callback(struct usbd_xfer *xfer); - -static void -ubsa_set_break_callback(struct usbd_xfer *xfer); - -static void -ubsa_set_flow_ctrl_callback(struct usbd_xfer *xfer); +static void ubsa_cfg_request(struct ubsa_softc *sc, u_int8_t index, u_int16_t value); +static void ubsa_cfg_set_dtr(struct ucom_softc *ucom, u_int8_t onoff); +static void ubsa_cfg_set_rts(struct ucom_softc *ucom, u_int8_t onoff); +static void ubsa_cfg_set_break(struct ucom_softc *ucom, u_int8_t onoff); +static int ubsa_pre_param(struct ucom_softc *ucom, struct termios *t); +static void ubsa_cfg_param(struct ucom_softc *ucom, struct termios *t); +static void ubsa_start_read(struct ucom_softc *ucom); +static void ubsa_stop_read(struct ucom_softc *ucom); +static void ubsa_start_write(struct ucom_softc *ucom); +static void ubsa_stop_write(struct ucom_softc *ucom); +static void ubsa_cfg_get_status(struct ucom_softc *ucom, u_int8_t *lsr, u_int8_t *msr); +static void ubsa_write_callback(struct usbd_xfer *xfer); +static void ubsa_write_clear_stall_callback(struct usbd_xfer *xfer); +static void ubsa_read_callback(struct usbd_xfer *xfer); +static void ubsa_read_clear_stall_callback(struct usbd_xfer *xfer); +static void ubsa_intr_callback(struct usbd_xfer *xfer); +static void ubsa_intr_clear_stall_callback(struct usbd_xfer *xfer); static const struct usbd_config ubsa_config[UBSA_N_TRANSFER] = { @@ -326,92 +240,19 @@ .callback = &ubsa_intr_clear_stall_callback, .timeout = 1000, /* 1 second */ }, - - [6+UBSA_REG_BAUDRATE] = { - .type = UE_CONTROL, - .endpoint = 0x00, /* Control pipe */ - .direction = -1, - .bufsize = sizeof(usb_device_request_t), - .callback = &ubsa_set_baudrate_callback, - .timeout = 1000, /* 1 second */ - }, - - [6+UBSA_REG_STOP_BITS] = { - .type = UE_CONTROL, - .endpoint = 0x00, /* Control pipe */ - .direction = -1, - .bufsize = sizeof(usb_device_request_t), - .callback = &ubsa_set_stop_bits_callback, - .timeout = 1000, /* 1 second */ - }, - - [6+UBSA_REG_DATA_BITS] = { - .type = UE_CONTROL, - .endpoint = 0x00, /* Control pipe */ - .direction = -1, - .bufsize = sizeof(usb_device_request_t), - .callback = &ubsa_set_data_bits_callback, - .timeout = 1000, /* 1 second */ - }, - - [6+UBSA_REG_PARITY] = { - .type = UE_CONTROL, - .endpoint = 0x00, /* Control pipe */ - .direction = -1, - .bufsize = sizeof(usb_device_request_t), - .callback = &ubsa_set_parity_callback, - .timeout = 1000, /* 1 second */ - }, - - [6+UBSA_REG_DTR] = { - .type = UE_CONTROL, - .endpoint = 0x00, /* Control pipe */ - .direction = -1, - .bufsize = sizeof(usb_device_request_t), - .callback = &ubsa_set_dtr_callback, - .timeout = 1000, /* 1 second */ - }, - - [6+UBSA_REG_RTS] = { - .type = UE_CONTROL, - .endpoint = 0x00, /* Control pipe */ - .direction = -1, - .bufsize = sizeof(usb_device_request_t), - .callback = &ubsa_set_rts_callback, - .timeout = 1000, /* 1 second */ - }, - - [6+UBSA_REG_BREAK] = { - .type = UE_CONTROL, - .endpoint = 0x00, /* Control pipe */ - .direction = -1, - .bufsize = sizeof(usb_device_request_t), - .callback = &ubsa_set_break_callback, - .timeout = 1000, /* 1 second */ - }, - - [6+UBSA_REG_FLOW_CTRL] = { - .type = UE_CONTROL, - .endpoint = 0x00, /* Control pipe */ - .direction = -1, - .bufsize = sizeof(usb_device_request_t), - .callback = &ubsa_set_flow_ctrl_callback, - .timeout = 1000, /* 1 second */ - }, }; static const struct ucom_callback ubsa_callback = { - .ucom_get_status = &ubsa_get_status, - .ucom_set_dtr = &ubsa_set_dtr, - .ucom_set_rts = &ubsa_set_rts, - .ucom_set_break = &ubsa_set_break, - .ucom_param = &ubsa_param, - .ucom_open = &ubsa_open, - .ucom_close = &ubsa_close, - .ucom_start_read = &ubsa_start_read, - .ucom_stop_read = &ubsa_stop_read, - .ucom_start_write = &ubsa_start_write, - .ucom_stop_write = &ubsa_stop_write, + .ucom_cfg_get_status = &ubsa_cfg_get_status, + .ucom_cfg_set_dtr = &ubsa_cfg_set_dtr, + .ucom_cfg_set_rts = &ubsa_cfg_set_rts, + .ucom_cfg_set_break = &ubsa_cfg_set_break, + .ucom_cfg_param = &ubsa_cfg_param, + .ucom_pre_param = &ubsa_pre_param, + .ucom_start_read = &ubsa_start_read, + .ucom_stop_read = &ubsa_stop_read, + .ucom_start_write = &ubsa_start_write, + .ucom_stop_write = &ubsa_stop_write, }; static const struct ubsa_product { @@ -455,7 +296,6 @@ DRIVER_MODULE(ubsa, uhub, ubsa_driver, ubsa_devclass, usbd_driver_load, 0); MODULE_DEPEND(ubsa, usb, 1, 1, 1); MODULE_DEPEND(ubsa, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); -MODULE_VERSION(ubsa, UBSA_MODVER); static int ubsa_probe(device_t dev) @@ -494,6 +334,8 @@ usbd_set_desc(dev, uaa->device); + sc->sc_udev = uaa->device; + /* configure the device */ error = usbd_set_config_index(uaa->device, UBSA_CONFIG_INDEX, 1); @@ -529,10 +371,11 @@ goto detach; } - sc->sc_dtr = -1; - sc->sc_rts = -1; + /* clear stall at first run */ + sc->sc_flag |= (UBSA_FLAG_WRITE_STALL| + UBSA_FLAG_READ_STALL); - error = ucom_attach(&(sc->sc_ucom), 1, sc, + error = ucom_attach(&(sc->sc_super_ucom), &(sc->sc_ucom), 1, sc, &ubsa_callback, &Giant); if (error) { DPRINTF(0, "ucom_attach failed\n"); @@ -553,7 +396,7 @@ DPRINTF(0, "sc=%p\n", sc); - ucom_detach(&(sc->sc_ucom), 1); + ucom_detach(&(sc->sc_super_ucom), &(sc->sc_ucom), 1); usbd_transfer_unsetup(sc->sc_xfer, UBSA_N_TRANSFER); @@ -561,66 +404,73 @@ } static void -ubsa_request(struct ubsa_softc *sc, u_int8_t index, u_int16_t value) +ubsa_cfg_request(struct ubsa_softc *sc, u_int8_t index, u_int16_t value) { - if (index >= USBA_N_REG) { - panic("invalid register index!"); + usb_device_request_t req; + usbd_status err; + + if (ucom_cfg_is_gone(&(sc->sc_ucom))) { + return; + } + + req.bmRequestType = UT_WRITE_VENDOR_DEVICE; + req.bRequest = index; + USETW(req.wValue, value); + req.wIndex[0] = sc->sc_iface_no; + req.wIndex[1] = 0; + USETW(req.wLength, 0); + + err = usbd_do_request_flags_mtx(sc->sc_udev, &Giant, &req, + NULL, 0, NULL, 1000); + if (err) { + DPRINTF(-1, "device request failed, err=%s " + "(ignored)\n", usbd_errstr(err)); } - sc->sc_reg_flag |= (1 << index); - sc->sc_reg[index] = value; - usbd_transfer_start(sc->sc_xfer[6+index]); return; } static void -ubsa_set_dtr(struct ucom_softc *ucom, u_int8_t onoff) +ubsa_cfg_set_dtr(struct ucom_softc *ucom, u_int8_t onoff) { struct ubsa_softc *sc = ucom->sc_parent; DPRINTF(0, "onoff = %d\n", onoff); - if (sc->sc_dtr != onoff) { - sc->sc_dtr = onoff; - ubsa_request(sc, UBSA_REG_DTR, onoff ? 1 : 0); - } + ubsa_cfg_request(sc, UBSA_REG_DTR, onoff ? 1 : 0); return; } static void -ubsa_set_rts(struct ucom_softc *ucom, u_int8_t onoff) +ubsa_cfg_set_rts(struct ucom_softc *ucom, u_int8_t onoff) { struct ubsa_softc *sc = ucom->sc_parent; DPRINTF(0, "onoff = %d\n", onoff); - if (sc->sc_rts != onoff) { - sc->sc_rts = onoff; - ubsa_request(sc, UBSA_REG_RTS, onoff ? 1 : 0); - } + ubsa_cfg_request(sc, UBSA_REG_RTS, onoff ? 1 : 0); return; } static void -ubsa_set_break(struct ucom_softc *ucom, u_int8_t onoff) +ubsa_cfg_set_break(struct ucom_softc *ucom, u_int8_t onoff) { struct ubsa_softc *sc = ucom->sc_parent; DPRINTF(0, "onoff = %d\n", onoff); - ubsa_request(sc, UBSA_REG_BREAK, onoff ? 1 : 0); + ubsa_cfg_request(sc, UBSA_REG_BREAK, onoff ? 1 : 0); return; } -static u_int8_t -ubsa_baudrate(struct ubsa_softc *sc, speed_t speed) +static int +ubsa_pre_param(struct ucom_softc *ucom, struct termios *t) { - u_int16_t value = 0; + struct ubsa_softc *sc = ucom->sc_parent; - DPRINTF(0, "speed = %d\n", speed); + DPRINTF(0, "sc = %p\n", sc); - switch(speed) { + switch(t->c_ospeed) { case B0: - break; case B300: case B600: case B1200: @@ -632,136 +482,86 @@ case B57600: case B115200: case B230400: - value = B230400 / speed; break; - default: - DPRINTF(0, "unsupported baudrate\n"); - return 1; - }; - - if (speed == B0) { - ubsa_flow(sc, 0, 0); - ubsa_set_dtr(&(sc->sc_ucom), 0); - ubsa_set_rts(&(sc->sc_ucom), 0); - } else { - ubsa_request(sc, UBSA_REG_BAUDRATE, value); + return EINVAL; } return 0; } static void -ubsa_parity(struct ubsa_softc *sc, tcflag_t cflag) +ubsa_cfg_param(struct ucom_softc *ucom, struct termios *t) { - u_int16_t value; + struct ubsa_softc *sc = ucom->sc_parent; + u_int16_t value = 0; + + DPRINTF(0, "sc = %p\n", sc); - DPRINTF(0, "flag = 0x%x\n", cflag); + switch(t->c_ospeed) { + case B0: + ubsa_cfg_request(sc, UBSA_REG_FLOW_CTRL, 0); + ubsa_cfg_set_dtr(&(sc->sc_ucom), 0); + ubsa_cfg_set_rts(&(sc->sc_ucom), 0); + break; + case B300: + case B600: + case B1200: + case B2400: + case B4800: + case B9600: + case B19200: + case B38400: + case B57600: + case B115200: + case B230400: + value = B230400 / t->c_ospeed; + ubsa_cfg_request(sc, UBSA_REG_BAUDRATE, value); + break; + default: + return; + } - if (cflag & PARENB) - value = (cflag & PARODD) ? UBSA_PARITY_ODD : UBSA_PARITY_EVEN; + if (t->c_cflag & PARENB) + value = (t->c_cflag & PARODD) ? UBSA_PARITY_ODD : UBSA_PARITY_EVEN; else value = UBSA_PARITY_NONE; - ubsa_request(sc, UBSA_REG_PARITY, value); - return; -} + ubsa_cfg_request(sc, UBSA_REG_PARITY, value); -static void -ubsa_databits(struct ubsa_softc *sc, tcflag_t cflag) -{ - u_int16_t value; - - DPRINTF(0, "cflag = 0x%x\n", cflag); - - switch (cflag & CSIZE) { + switch (t->c_cflag & CSIZE) { case CS5: value = 0; break; case CS6: value = 1; break; case CS7: value = 2; break; + default: case CS8: value = 3; break; - default: - DPRINTF(0, "unsupported databits requested, " - "forcing default of 8\n"); - value = 3; } - ubsa_request(sc, UBSA_REG_DATA_BITS, value); - return; -} + ubsa_cfg_request(sc, UBSA_REG_DATA_BITS, value); + + value = (t->c_cflag & CSTOPB) ? 1 : 0; -static void -ubsa_stopbits(struct ubsa_softc *sc, tcflag_t cflag) -{ - u_int16_t value; + ubsa_cfg_request(sc, UBSA_REG_STOP_BITS, value); - DPRINTF(0, "cflag = 0x%x\n", cflag); + value = 0; + if (t->c_cflag & CRTSCTS) + value |= UBSA_FLOW_OCTS | UBSA_FLOW_IRTS; - value = (cflag & CSTOPB) ? 1 : 0; + if (t->c_iflag & (IXON|IXOFF)) + value |= UBSA_FLOW_OXON | UBSA_FLOW_IXON; - ubsa_request(sc, UBSA_REG_STOP_BITS, value); + ubsa_cfg_request(sc, UBSA_REG_FLOW_CTRL, value); return; } static void -ubsa_flow(struct ubsa_softc *sc, tcflag_t cflag, tcflag_t iflag) +ubsa_start_read(struct ucom_softc *ucom) { - u_int16_t value; - - DPRINTF(0, "cflag = 0x%x, iflag = 0x%x\n", cflag, iflag); - - value = 0; - if (cflag & CRTSCTS) - value |= UBSA_FLOW_OCTS | UBSA_FLOW_IRTS; - if (iflag & (IXON|IXOFF)) - value |= UBSA_FLOW_OXON | UBSA_FLOW_IXON; - - ubsa_request(sc, UBSA_REG_FLOW_CTRL, value); - return; -} - -static int -ubsa_param(struct ucom_softc *ucom, struct termios *ti) -{ struct ubsa_softc *sc = ucom->sc_parent; - DPRINTF(0, "sc = %p\n", sc); - - if (ubsa_baudrate(sc, ti->c_ospeed)) { - return EIO; - } - ubsa_parity(sc, ti->c_cflag); - ubsa_databits(sc, ti->c_cflag); - ubsa_stopbits(sc, ti->c_cflag); - ubsa_flow(sc, ti->c_cflag, ti->c_iflag); - - return (0); -} - -static int -ubsa_open(struct ucom_softc *ucom) -{ - struct ubsa_softc *sc = ucom->sc_parent; - - /* clear stall first: */ - sc->sc_flag |= (UBSA_FLAG_WRITE_STALL| - UBSA_FLAG_READ_STALL); - + /* start interrupt endpoint */ usbd_transfer_start(sc->sc_xfer[4]); - return 0; -} -static void -ubsa_close(struct ucom_softc *ucom) -{ - struct ubsa_softc *sc = ucom->sc_parent; - usbd_transfer_stop(sc->sc_xfer[5]); - usbd_transfer_stop(sc->sc_xfer[4]); - return; -} - -static void -ubsa_start_read(struct ucom_softc *ucom) -{ - struct ubsa_softc *sc = ucom->sc_parent; + /* start read endpoint */ usbd_transfer_start(sc->sc_xfer[1]); return; } @@ -770,6 +570,11 @@ ubsa_stop_read(struct ucom_softc *ucom) { struct ubsa_softc *sc = ucom->sc_parent; + /* stop interrupt endpoint */ + usbd_transfer_stop(sc->sc_xfer[5]); + usbd_transfer_stop(sc->sc_xfer[4]); + + /* stop read endpoint */ usbd_transfer_stop(sc->sc_xfer[3]); usbd_transfer_stop(sc->sc_xfer[1]); return; @@ -793,19 +598,14 @@ } static void -ubsa_get_status(struct ucom_softc *ucom, u_int8_t *lsr, u_int8_t *msr) +ubsa_cfg_get_status(struct ucom_softc *ucom, u_int8_t *lsr, u_int8_t *msr) { struct ubsa_softc *sc = ucom->sc_parent; DPRINTF(0, "\n"); - if (lsr) { - *lsr = sc->sc_lsr; - } - - if (msr) { - *msr = sc->sc_msr; - } + *lsr = sc->sc_lsr; + *msr = sc->sc_msr; return; } @@ -816,6 +616,7 @@ u_int32_t actlen; USBD_CHECK_STATUS(xfer); + tr_error: if (xfer->error != USBD_CANCELLED) { sc->sc_flag |= UBSA_FLAG_WRITE_STALL; @@ -980,100 +781,3 @@ usbd_errstr(xfer->error)); return; } - -static void -ubsa_request_callback(struct usbd_xfer *xfer, u_int8_t index) -{ - static const u_int8_t mapping[USBA_N_REG] = { - [UBSA_REG_BAUDRATE] = 0x00, - [UBSA_REG_STOP_BITS] = 0x01, - [UBSA_REG_DATA_BITS] = 0x02, - [UBSA_REG_PARITY] = 0x03, - [UBSA_REG_DTR] = 0x0A, - [UBSA_REG_RTS] = 0x0B, - [UBSA_REG_BREAK] = 0x0C, - [UBSA_REG_FLOW_CTRL] = 0x10, - }; - - usb_device_request_t *req = xfer->buffer; - struct ubsa_softc *sc = xfer->priv_sc; - u_int8_t request = mapping[index]; - u_int16_t value = sc->sc_reg[index]; - u_int16_t bitmask = (1 << index); - - USBD_CHECK_STATUS(xfer); - - tr_error: - DPRINTF(0, "transfer failed, " - "error=%s\n", usbd_errstr(xfer->error)); - tr_setup: - tr_transferred: - if (sc->sc_reg_flag & bitmask) { - sc->sc_reg_flag &= ~bitmask; - - req->bmRequestType = UT_WRITE_VENDOR_DEVICE; - req->bRequest = request; - USETW(req->wValue, value); - USETW(req->wIndex, sc->sc_iface_no); - USETW(req->wLength, 0); - - usbd_start_hardware(xfer); - } - return; -} - -static void -ubsa_set_baudrate_callback(struct usbd_xfer *xfer) -{ - ubsa_request_callback(xfer, UBSA_REG_BAUDRATE); - return; -} - -static void -ubsa_set_stop_bits_callback(struct usbd_xfer *xfer) -{ - ubsa_request_callback(xfer, UBSA_REG_STOP_BITS); - return; -} - -static void -ubsa_set_data_bits_callback(struct usbd_xfer *xfer) -{ - ubsa_request_callback(xfer, UBSA_REG_DATA_BITS); - return; -} - -static void -ubsa_set_parity_callback(struct usbd_xfer *xfer) -{ - ubsa_request_callback(xfer, UBSA_REG_PARITY); - return; -} - -static void -ubsa_set_dtr_callback(struct usbd_xfer *xfer) -{ - ubsa_request_callback(xfer, UBSA_REG_DTR); - return; -} - -static void -ubsa_set_rts_callback(struct usbd_xfer *xfer) -{ - ubsa_request_callback(xfer, UBSA_REG_RTS); - return; -} - -static void -ubsa_set_break_callback(struct usbd_xfer *xfer) -{ - ubsa_request_callback(xfer, UBSA_REG_BREAK); - return; -} - -static void -ubsa_set_flow_ctrl_callback(struct usbd_xfer *xfer) -{ - ubsa_request_callback(xfer, UBSA_REG_FLOW_CTRL); - return; -} ==== //depot/projects/usb/src/sys/dev/usb/ubser.c#9 (text+ko) ==== @@ -81,7 +81,6 @@ #include #include #include -#include #include #include @@ -115,18 +114,18 @@ #define UBSER_TR_DT_READ 1 #define UBSER_TR_CS_WRITE 2 #define UBSER_TR_CS_READ 3 -#define UBSER_TR_DT_BREAK 4 -#define UBSER_TR_MAX 5 +#define UBSER_TR_MAX 4 struct ubser_softc { + struct ucom_super_softc sc_super_ucom; struct ucom_softc sc_ucom[UBSER_UNIT_MAX]; struct usbd_xfer *sc_xfer[UBSER_TR_MAX]; + struct usbd_device *sc_udev; uint16_t sc_tx_size; uint8_t sc_numser; - uint8_t sc_send_break[(UBSER_UNIT_MAX+7)/8]; uint8_t sc_flags; #define UBSER_FLAG_READ_STALL 0x01 #define UBSER_FLAG_WRITE_STALL 0x02 @@ -134,7 +133,6 @@ uint8_t sc_iface_no; uint8_t sc_iface_index; uint8_t sc_curr_tx_unit; - uint8_t sc_curr_break_unit; uint8_t sc_name[16]; }; @@ -142,15 +140,17 @@ static device_attach_t ubser_attach; static device_detach_t ubser_detach; -static int ubser_param(struct ucom_softc *ucom, struct termios *t); +static int ubser_pre_param(struct ucom_softc *ucom, struct termios *t); static void ubser_write_clear_stall_callback(struct usbd_xfer *xfer); static void ubser_write_callback(struct usbd_xfer *xfer); static void ubser_read_clear_stall_callback(struct usbd_xfer *xfer); static void ubser_read_callback(struct usbd_xfer *xfer); -static void ubser_set_break(struct ucom_softc *ucom, u_int8_t onoff); -static void ubser_send_break_callback(struct usbd_xfer *xfer); -static int ubser_open(struct ucom_softc *ucom); +static void ubser_cfg_set_break(struct ucom_softc *ucom, u_int8_t onoff); +static void ubser_cfg_get_status(struct ucom_softc *ucom, u_int8_t *lsr, u_int8_t *msr); +static void ubser_start_read(struct ucom_softc *ucom); +static void ubser_stop_read(struct ucom_softc *ucom); static void ubser_start_write(struct ucom_softc *ucom); +static void ubser_stop_write(struct ucom_softc *ucom); static const struct usbd_config ubser_config[UBSER_TR_MAX] = { @@ -191,23 +191,16 @@ .callback = &ubser_read_clear_stall_callback, .timeout = 1000, /* 1 second */ }, - - [UBSER_TR_DT_BREAK] = { - .type = UE_CONTROL, - .endpoint = 0x00, /* Control pipe */ - .direction = -1, - .bufsize = sizeof(usb_device_request_t), - .flags = 0, - .callback = &ubser_send_break_callback, - .timeout = 1000, /* 1 second */ - }, }; static const struct ucom_callback ubser_callback = { - .ucom_open = &ubser_open, - .ucom_set_break = &ubser_set_break, - .ucom_param = &ubser_param, - .ucom_start_write = &ubser_start_write, + .ucom_cfg_set_break = &ubser_cfg_set_break, + .ucom_cfg_get_status = &ubser_cfg_get_status, + .ucom_pre_param = &ubser_pre_param, + .ucom_start_read = &ubser_start_read, + .ucom_stop_read = &ubser_stop_read, + .ucom_start_write = &ubser_start_write, + .ucom_stop_write = &ubser_stop_write, }; static device_method_t ubser_methods[] = { @@ -288,12 +281,14 @@ sc->sc_iface_no = id->bInterfaceNumber; sc->sc_iface_index = uaa->iface_index; + sc->sc_udev = uaa->device; /* get number of serials */ req.bmRequestType = UT_READ_VENDOR_INTERFACE; req.bRequest = VENDOR_GET_NUMSER; USETW(req.wValue, 0); - USETW(req.wIndex, sc->sc_iface_no); + req.wIndex[0] = sc->sc_iface_no; + req.wIndex[1] = 0; USETW(req.wLength, 1); error = usbd_do_request_flags(uaa->device, &req, &sc->sc_numser, 0, NULL, USBD_DEFAULT_TIMEOUT); @@ -329,7 +324,7 @@ sc->sc_ucom[n].sc_portno = n; } - error = ucom_attach(sc->sc_ucom, sc->sc_numser, sc, + error = ucom_attach(&(sc->sc_super_ucom), sc->sc_ucom, sc->sc_numser, sc, &ubser_callback, &Giant); if (error) { goto detach; @@ -359,7 +354,7 @@ DPRINTF(sc, 0, "\n"); - ucom_detach(sc->sc_ucom, sc->sc_numser); + ucom_detach(&(sc->sc_super_ucom), sc->sc_ucom, sc->sc_numser); /* need to stop all transfers atomically, * hence when clear stall completes, it @@ -379,7 +374,7 @@ } static int -ubser_param(struct ucom_softc *ucom, struct termios *t) +ubser_pre_param(struct ucom_softc *ucom, struct termios *t) { struct ubser_softc *sc = ucom->sc_parent; @@ -391,7 +386,7 @@ * We refuse to accept other configurations. */ - /* enshure 9600bps */ + /* ensure 9600bps */ switch (t->c_ospeed) { case 9600: break; @@ -576,76 +571,57 @@ } static void -ubser_set_break(struct ucom_softc *ucom, u_int8_t onoff) +ubser_cfg_set_break(struct ucom_softc *ucom, u_int8_t onoff) { struct ubser_softc *sc = ucom->sc_parent; uint8_t x = ucom->sc_portno; + usb_device_request_t req; + usbd_status err; if (onoff) { - sc->sc_send_break[x/8] |= (1<<(x%8)); - usbd_transfer_start(sc->sc_xfer[UBSER_TR_DT_BREAK]); + + req.bmRequestType = UT_READ_VENDOR_INTERFACE; + req.bRequest = VENDOR_SET_BREAK; + req.wValue[0] = x; + req.wValue[1] = 0; + req.wIndex[0] = sc->sc_iface_no; + req.wIndex[1] = 0; + USETW(req.wLength, 0); + + err = usbd_do_request_flags_mtx(sc->sc_udev, &Giant, &req, + NULL, 0, NULL, 1000); + if (err) { + DPRINTF(sc, -1, "send break failed, error=%s\n", + usbd_errstr(err)); + } } return; } -static __inline void -ubser_inc_break_unit(struct ubser_softc *sc) +static void +ubser_cfg_get_status(struct ucom_softc *ucom, u_int8_t *lsr, u_int8_t *msr) { - sc->sc_curr_break_unit ++; - if (sc->sc_curr_break_unit >= sc->sc_numser) { - sc->sc_curr_break_unit = 0; - } + /* fake status bits */ + *lsr = 0; + *msr = SER_DCD; return; } static void -ubser_send_break_callback(struct usbd_xfer *xfer) +ubser_start_read(struct ucom_softc *ucom) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Mar 30 20:12:28 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 86CE016A406; Fri, 30 Mar 2007 20:12:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1D76D16A400 for ; Fri, 30 Mar 2007 20:12:28 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0CF7213C4C4 for ; Fri, 30 Mar 2007 20:12:28 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2UKCRJD083117 for ; Fri, 30 Mar 2007 20:12:27 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2UKCR5R083107 for perforce@freebsd.org; Fri, 30 Mar 2007 20:12:27 GMT (envelope-from jhb@freebsd.org) Date: Fri, 30 Mar 2007 20:12:27 GMT Message-Id: <200703302012.l2UKCR5R083107@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 Cc: Subject: PERFORCE change 116967 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Mar 2007 20:12:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=116967 Change 116967 by jhb@jhb_mutex on 2007/03/30 20:11:26 IFC @116957. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/support.S#18 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_machdep.c#22 integrate .. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#56 integrate .. //depot/projects/smpng/sys/compat/linux/linux_futex.c#4 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.c#40 integrate .. //depot/projects/smpng/sys/geom/geom_ctl.c#26 integrate .. //depot/projects/smpng/sys/i386/i386/support.s#23 integrate .. //depot/projects/smpng/sys/kern/kern_lock.c#62 integrate .. //depot/projects/smpng/sys/kern/kern_rwlock.c#15 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#48 integrate .. //depot/projects/smpng/sys/sys/lockmgr.h#20 integrate .. //depot/projects/smpng/sys/sys/mutex.h#72 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/support.S#18 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.121 2006/10/17 02:24:45 davidxu Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.124 2007/03/30 19:33:52 jkim Exp $ */ #include "opt_ddb.h" @@ -242,7 +242,7 @@ cmpq %rcx,%rax ja copyout_fault - xchgq %rdi, %rsi + xchgq %rdi,%rsi /* bcopy(%rsi, %rdi, %rdx) */ movq %rdx,%rcx @@ -288,8 +288,8 @@ cmpq %rcx,%rax ja copyin_fault - xchgq %rdi, %rsi - movq %rdx, %rcx + xchgq %rdi,%rsi + movq %rdx,%rcx movb %cl,%al shrq $3,%rcx /* copy longword-wise */ cld @@ -353,11 +353,11 @@ cmpq %rax,%rdi /* verify address is valid */ ja fusufault - movq %rsi, %rax /* old */ + movq %rsi,%rax /* old */ #ifdef SMP lock #endif - cmpxchgq %rdx, (%rdi) /* new = %rdx */ + cmpxchgq %rdx,(%rdi) /* new = %rdx */ /* * The old value is in %eax. If the store succeeded it will be the @@ -501,7 +501,7 @@ cmpq %rax,%rdi /* verify address validity */ ja fusufault - movl %esi, %eax + movl %esi,%eax movb %al,(%rdi) xorl %eax,%eax movq PCPU(CURPCB),%rcx /* restore trashed register */ @@ -518,9 +518,9 @@ * return the actual length in *lencopied. */ ENTRY(copyinstr) - movq %rdx, %r8 /* %r8 = maxlen */ - movq %rcx, %r9 /* %r9 = *len */ - xchgq %rdi, %rsi /* %rdi = from, %rsi = to */ + movq %rdx,%r8 /* %r8 = maxlen */ + movq %rcx,%r9 /* %r9 = *len */ + xchgq %rdi,%rsi /* %rdi = from, %rsi = to */ movq PCPU(CURPCB),%rcx movq $cpystrflt,PCB_ONFAULT(%rcx) @@ -582,9 +582,9 @@ * %rdi, %rsi, %rdx, %rcx */ ENTRY(copystr) - movq %rdx, %r8 /* %r8 = maxlen */ + movq %rdx,%r8 /* %r8 = maxlen */ - xchgq %rdi, %rsi + xchgq %rdi,%rsi incq %rdx cld 1: @@ -605,11 +605,11 @@ 6: - testq %rcx, %rcx + testq %rcx,%rcx jz 7f /* set *lencopied and return %rax */ - subq %rdx, %r8 - movq %r8, (%rcx) + subq %rdx,%r8 + movq %r8,(%rcx) 7: ret @@ -626,7 +626,7 @@ jmp 1f nop 1: - movl $KDSEL, %eax + movl $KDSEL,%eax movl %eax,%ds movl %eax,%es movl %eax,%fs /* Beware, use wrmsr to set 64 bit base */ @@ -689,3 +689,47 @@ movq %rax,32(%rdi) movq %rdi,bbhead NON_GPROF_RET + + .text + +futex_fault: + movq PCPU(CURPCB),%rdx + movq $0,PCB_ONFAULT(%rdx) + movq $-EFAULT,%rax + ret + +/* int futex_xchgl(int oparg, caddr_t uaddr, int *oldval); */ +ENTRY(futex_xchgl) + movq PCPU(CURPCB),%r11 + movq $futex_fault,PCB_ONFAULT(%r11) + + movq $VM_MAXUSER_ADDRESS-4,%rax + cmpq %rax,%rsi + ja futex_fault + +#ifdef SMP + lock +#endif + xchgl %edi,(%rsi) + movl %edi,(%rdx) + xorl %eax,%eax + movq %rax,PCB_ONFAULT(%r11) + ret + +/* int futex_addl(int oparg, caddr_t uaddr, int *oldval); */ +ENTRY(futex_addl) + movq PCPU(CURPCB),%r11 + movq $futex_fault,PCB_ONFAULT(%r11) + + movq $VM_MAXUSER_ADDRESS-4,%rax + cmpq %rax,%rsi + ja futex_fault + +#ifdef SMP + lock +#endif + xaddl %edi,(%rsi) + movl %edi,(%rdx) + xorl %eax,%eax + movq %rax,PCB_ONFAULT(%r11) + ret ==== //depot/projects/smpng/sys/amd64/linux32/linux32_machdep.c#22 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.37 2007/03/30 00:06:21 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.39 2007/03/30 17:27:13 jkim Exp $"); #include #include @@ -124,7 +124,7 @@ * Allocate temporary demand zeroed space for argument and * environment strings */ - args->buf = (char *) kmem_alloc_wait(exec_map, + args->buf = (char *)kmem_alloc_wait(exec_map, PATH_MAX + ARG_MAX + MAXSHELLCMDLEN); if (args->buf == NULL) return (ENOMEM); @@ -158,14 +158,14 @@ if (error) { if (error == ENAMETOOLONG) error = E2BIG; - + goto err_exit; } args->stringspace -= length; args->endp += length; args->argc++; } - + args->begin_envv = args->endp; /* @@ -222,13 +222,13 @@ if (error == 0) error = kern_execve(td, &eargs, NULL); if (error == 0) - /* linux process can exec fbsd one, dont attempt + /* Linux process can execute FreeBSD one, do not attempt * to create emuldata for such process using * linux_proc_init, this leads to a panic on KASSERT - * because such process has p->p_emuldata == NULL + * because such process has p->p_emuldata == NULL. */ if (td->td_proc->p_sysent == &elf_linux_sysvec) - error = linux_proc_init(td, 0, 0); + error = linux_proc_init(td, 0, 0); return (error); } @@ -469,7 +469,7 @@ if ((error = fork1(td, RFFDG | RFPROC | RFSTOPPED, 0, &p2)) != 0) return (error); - + if (error == 0) { td->td_retval[0] = p2->p_pid; td->td_retval[1] = 0; @@ -483,7 +483,9 @@ td2 = FIRST_THREAD_IN_PROC(p2); - /* make it run */ + /* + * Make this runnable after we are finished with it. + */ mtx_lock_spin(&sched_lock); TD_SET_CAN_RUN(td2); sched_add(td2, SRQ_BORING); @@ -504,7 +506,7 @@ printf(ARGS(vfork, "")); #endif - /* exclude RFPPWAIT */ + /* Exclude RFPPWAIT */ if ((error = fork1(td, RFFDG | RFPROC | RFMEM | RFSTOPPED, 0, &p2)) != 0) return (error); if (error == 0) { @@ -523,7 +525,7 @@ PROC_UNLOCK(p2); td2 = FIRST_THREAD_IN_PROC(p2); - + /* make it run */ mtx_lock_spin(&sched_lock); TD_SET_CAN_RUN(td2); @@ -535,7 +537,7 @@ while (p2->p_flag & P_PPWAIT) msleep(td->td_proc, &p2->p_mtx, PWAIT, "ppwait", 0); PROC_UNLOCK(p2); - + return (0); } @@ -550,10 +552,9 @@ #ifdef DEBUG if (ldebug(clone)) { - printf(ARGS(clone, "flags %x, stack %x, parent tid: %x, child tid: %x"), - (unsigned int)args->flags, (unsigned int)(uintptr_t)args->stack, - (unsigned int)(uintptr_t)args->parent_tidptr, - (unsigned int)(uintptr_t)args->child_tidptr); + printf(ARGS(clone, "flags %x, stack %p, parent tid: %p, " + "child tid: %p"), (unsigned)args->flags, + args->stack, args->parent_tidptr, args->child_tidptr); } #endif @@ -568,11 +569,11 @@ ff |= RFMEM; if (args->flags & LINUX_CLONE_SIGHAND) ff |= RFSIGSHARE; - /* - * XXX: in linux sharing of fs info (chroot/cwd/umask) - * and open files is independant. in fbsd its in one - * structure but in reality it doesn't cause any problems - * because both of these flags are usually set together. + /* + * XXX: In Linux, sharing of fs info (chroot/cwd/umask) + * and open files is independant. In FreeBSD, its in one + * structure but in reality it does not make any problems + * because both of these flags are set at once usually. */ if (!(args->flags & (LINUX_CLONE_FILES | LINUX_CLONE_FS))) ff |= RFFDG; @@ -593,6 +594,10 @@ if ((args->flags & 0xffffff00) == LINUX_THREADING_FLAGS) ff |= RFTHREAD; + if (args->flags & LINUX_CLONE_PARENT_SETTID) + if (args->parent_tidptr == NULL) + return (EINVAL); + error = fork1(td, ff, 0, &p2); if (error) return (error); @@ -604,35 +609,21 @@ PROC_UNLOCK(p2); sx_xunlock(&proctree_lock); } - + /* create the emuldata */ error = linux_proc_init(td, p2->p_pid, args->flags); /* reference it - no need to check this */ em = em_find(p2, EMUL_DOLOCK); KASSERT(em != NULL, ("clone: emuldata not found.\n")); /* and adjust it */ - if (args->flags & LINUX_CLONE_PARENT_SETTID) { - if (args->parent_tidptr == NULL) { - EMUL_UNLOCK(&emul_lock); - return (EINVAL); - } - error = copyout(&p2->p_pid, args->parent_tidptr, sizeof(p2->p_pid)); - if (error) { - EMUL_UNLOCK(&emul_lock); - return (error); - } - } if (args->flags & LINUX_CLONE_THREAD) { - /* XXX: linux mangles pgrp and pptr somehow - * I think it might be this but I am not sure. - */ #ifdef notyet PROC_LOCK(p2); p2->p_pgrp = td->td_proc->p_pgrp; PROC_UNLOCK(p2); #endif - exit_signal = 0; + exit_signal = 0; } if (args->flags & LINUX_CLONE_CHILD_SETTID) @@ -647,16 +638,24 @@ EMUL_UNLOCK(&emul_lock); + if (args->flags & LINUX_CLONE_PARENT_SETTID) { + error = copyout(&p2->p_pid, args->parent_tidptr, + sizeof(p2->p_pid)); + if (error) + printf(LMSG("copyout failed!")); + } + PROC_LOCK(p2); p2->p_sigparent = exit_signal; PROC_UNLOCK(p2); td2 = FIRST_THREAD_IN_PROC(p2); - /* - * in a case of stack = NULL we are supposed to COW calling process stack - * this is what normal fork() does so we just keep the tf_rsp arg intact + /* + * In a case of stack = NULL, we are supposed to COW calling process + * stack. This is what normal fork() does, so we just keep tf_rsp arg + * intact. */ if (args->stack) - td2->td_frame->tf_rsp = PTROUT(args->stack); + td2->td_frame->tf_rsp = PTROUT(args->stack); if (args->flags & LINUX_CLONE_SETTLS) { struct user_segment_descriptor sd; @@ -700,8 +699,9 @@ #ifdef DEBUG if (ldebug(clone)) - printf(LMSG("clone: successful rfork to %ld, stack %p sig = %d"), - (long)p2->p_pid, args->stack, exit_signal); + printf(LMSG("clone: successful rfork to %d, " + "stack %p sig = %d"), (int)p2->p_pid, args->stack, + exit_signal); #endif if (args->flags & LINUX_CLONE_VFORK) { PROC_LOCK(p2); @@ -719,12 +719,12 @@ td->td_retval[0] = p2->p_pid; td->td_retval[1] = 0; - + if (args->flags & LINUX_CLONE_VFORK) { - /* wait for the children to exit, ie. emulate vfork */ - PROC_LOCK(p2); + /* wait for the children to exit, ie. emulate vfork */ + PROC_LOCK(p2); while (p2->p_flag & P_PPWAIT) - msleep(td->td_proc, &p2->p_mtx, PWAIT, "ppwait", 0); + msleep(td->td_proc, &p2->p_mtx, PWAIT, "ppwait", 0); PROC_UNLOCK(p2); } @@ -743,8 +743,8 @@ #ifdef DEBUG if (ldebug(mmap2)) - printf(ARGS(mmap2, "%p, %d, %d, 0x%08x, %d, %d"), - (void *)(intptr_t)args->addr, args->len, args->prot, + printf(ARGS(mmap2, "0x%08x, %d, %d, 0x%08x, %d, %d"), + args->addr, args->len, args->prot, args->flags, args->fd, args->pgoff); #endif @@ -770,10 +770,9 @@ #ifdef DEBUG if (ldebug(mmap)) - printf(ARGS(mmap, "%p, %d, %d, 0x%08x, %d, %d"), - (void *)(intptr_t)linux_args.addr, linux_args.len, - linux_args.prot, linux_args.flags, linux_args.fd, - linux_args.pgoff); + printf(ARGS(mmap, "0x%08x, %d, %d, 0x%08x, %d, %d"), + linux_args.addr, linux_args.len, linux_args.prot, + linux_args.flags, linux_args.fd, linux_args.pgoff); #endif if ((linux_args.pgoff % PAGE_SIZE) != 0) return (EINVAL); @@ -859,14 +858,14 @@ } if (linux_args->flags & LINUX_MAP_GROWSDOWN) { - /* - * The linux MAP_GROWSDOWN option does not limit auto + /* + * The Linux MAP_GROWSDOWN option does not limit auto * growth of the region. Linux mmap with this option * takes as addr the inital BOS, and as len, the initial * region size. It can then grow down from addr without - * limit. However, linux threads has an implicit internal + * limit. However, Linux threads has an implicit internal * limit to stack size of STACK_SIZE. Its just not - * enforced explicitly in linux. But, here we impose + * enforced explicitly in Linux. But, here we impose * a limit of (STACK_SIZE - GUARD_SIZE) on the stack * region, since we can do this with our mmap. * @@ -883,8 +882,8 @@ if ((caddr_t)PTRIN(linux_args->addr) + linux_args->len > p->p_vmspace->vm_maxsaddr) { - /* - * Some linux apps will attempt to mmap + /* + * Some Linux apps will attempt to mmap * thread stacks near the top of their * address space. If their TOS is greater * than vm_maxsaddr, vm_map_growstack() @@ -911,7 +910,7 @@ else bsd_args.len = STACK_SIZE - GUARD_SIZE; - /* + /* * This gives us a new BOS. If we're using VM_STACK, then * mmap will just map the top SGROWSIZ bytes, and let * the stack grow down to the limit at BOS. If we're @@ -1044,7 +1043,7 @@ } /* - * Linux has two extra args, restart and oldmask. We dont use these, + * Linux has two extra args, restart and oldmask. We don't use these, * but it seems that "restart" is actually a context pointer that * enables the signal to happen with a different register set. */ ==== //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#56 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.107 2007/03/12 12:16:52 des Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.108 2007/03/30 17:56:44 jkim Exp $"); #include #include @@ -54,11 +54,13 @@ #include #include #include +#include #include #include #include #include #include +#include #include #include #include @@ -1031,14 +1033,8 @@ static int linprocfs_domsgmni(PFS_FILL_ARGS) { - int msgmni; - size_t size; - size = sizeof(msgmni); - if (kernel_sysctlbyname(td, "kern.ipc.msgmni", &msgmni, &size, - 0, 0, 0, 0) != 0) - msgmni = 0; - sbuf_printf(sb, "%i\n", msgmni); + sbuf_printf(sb, "%d\n", msginfo.msgmni); return (0); } @@ -1061,34 +1057,9 @@ static int linprocfs_dosem(PFS_FILL_ARGS) { - int semmsl, semmns, semopm, semmni; - size_t size; - /* Field 1: SEMMSL */ - size = sizeof(semmsl); - if (kernel_sysctlbyname(td, "kern.ipc.semmsl", &semmsl, &size, - 0, 0, 0, 0) != 0) - semmsl = 0; - - /* Field 2: SEMMNS */ - size = sizeof(semmns); - if (kernel_sysctlbyname(td, "kern.ipc.semmns", &semmns, &size, - 0, 0, 0, 0) != 0) - semmns = 0; - - /* Field 3: SEMOPM */ - size = sizeof(semopm); - if (kernel_sysctlbyname(td, "kern.ipc.semopm", &semopm, &size, - 0, 0, 0, 0) != 0) - semopm = 0; - - /* Field 4: SEMMNI */ - size = sizeof(semmni); - if (kernel_sysctlbyname(td, "kern.ipc.semmni", &semmni, &size, - 0, 0, 0, 0) != 0) - semmni = 0; - - sbuf_printf(sb, "%i %i %i %i\n", semmsl, semmns, semopm, semmni); + sbuf_printf(sb, "%d %d %d %d\n", seminfo.semmsl, seminfo.semmns, + seminfo.semopm, seminfo.semmni); return (0); } ==== //depot/projects/smpng/sys/compat/linux/linux_futex.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_futex.c,v 1.8 2007/02/25 12:43:07 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_futex.c,v 1.9 2007/03/30 01:07:28 jkim Exp $"); #if 0 __KERNEL_RCSID(1, "$NetBSD: linux_futex.c,v 1.7 2006/07/24 19:01:49 manu Exp $"); #endif @@ -88,17 +88,15 @@ static struct futex *futex_get(void *, int); static void futex_put(struct futex *); static int futex_sleep(struct futex *, struct thread *, unsigned long); -static int futex_wake(struct futex *, int, struct futex *); -#ifdef __i386__ +static int futex_wake(struct futex *, int, struct futex *, int); static int futex_atomic_op(struct thread *td, int encoded_op, caddr_t uaddr); -#endif +static int futex_orl(int oparg, caddr_t uaddr, int *oldval); +static int futex_andl(int oparg, caddr_t uaddr, int *oldval); +static int futex_xorl(int oparg, caddr_t uaddr, int *oldval); /* support.s */ int futex_xchgl(int oparg, caddr_t uaddr, int *oldval); int futex_addl(int oparg, caddr_t uaddr, int *oldval); -int futex_orl(int oparg, caddr_t uaddr, int *oldval); -int futex_andnl(int oparg, caddr_t uaddr, int *oldval); -int futex_xorl(int oparg, caddr_t uaddr, int *oldval); int linux_sys_futex(struct thread *td, struct linux_sys_futex_args *args) @@ -111,10 +109,8 @@ struct futex *newf; int timeout_hz; struct timeval tv = {0, 0}; -#ifdef __i386__ struct futex *f2; int op_ret; -#endif #ifdef DEBUG if (ldebug(sys_futex)) @@ -192,7 +188,8 @@ case 0: /* FUTEX_WAKE received */ #ifdef DEBUG if (ldebug(sys_futex)) - printf("FUTEX_WAIT %d: uaddr = %p, got FUTEX_WAKE\n", + printf("FUTEX_WAIT %d: uaddr = %p, " + "got FUTEX_WAKE\n", td->td_proc->p_pid, args->uaddr); #endif return 0; @@ -200,7 +197,8 @@ default: #ifdef DEBUG if (ldebug(sys_futex)) - printf("FUTEX_WAIT: unexpected ret = %d\n", ret); + printf("FUTEX_WAIT: unexpected ret = %d\n", + ret); #endif break; } @@ -212,9 +210,9 @@ FUTEX_SYSTEM_LOCK; /* - * XXX: Linux is able cope with different addresses + * XXX: Linux is able to cope with different addresses * corresponding to the same mapped memory in the sleeping - * and the waker process. + * and waker process(es). */ #ifdef DEBUG if (ldebug(sys_futex)) @@ -222,7 +220,7 @@ td->td_proc->p_pid, args->uaddr, args->val); #endif f = futex_get(args->uaddr, FUTEX_UNLOCKED); - td->td_retval[0] = futex_wake(f, args->val, NULL); + td->td_retval[0] = futex_wake(f, args->val, NULL, 0); futex_put(f); FUTEX_SYSTEM_UNLOCK; @@ -244,7 +242,8 @@ f = futex_get(args->uaddr, FUTEX_UNLOCKED); newf = futex_get(args->uaddr2, FUTEX_UNLOCKED); - td->td_retval[0] = futex_wake(f, args->val, newf); + td->td_retval[0] = futex_wake(f, args->val, newf, + (int)(unsigned long)args->timeout); futex_put(f); futex_put(newf); @@ -253,29 +252,31 @@ case LINUX_FUTEX_REQUEUE: FUTEX_SYSTEM_LOCK; - + f = futex_get(args->uaddr, FUTEX_UNLOCKED); newf = futex_get(args->uaddr2, FUTEX_UNLOCKED); - td->td_retval[0] = futex_wake(f, args->val, newf); + td->td_retval[0] = futex_wake(f, args->val, newf, + (int)(unsigned long)args->timeout); futex_put(f); futex_put(newf); - + FUTEX_SYSTEM_UNLOCK; break; case LINUX_FUTEX_FD: - printf("linux_sys_futex: unimplemented op %d\n", + /* XXX: Linux plans to remove this operation */ + printf("linux_sys_futex: unimplemented op %d\n", args->op); break; case LINUX_FUTEX_WAKE_OP: -#ifdef __i386__ FUTEX_SYSTEM_LOCK; #ifdef DEBUG if (ldebug(sys_futex)) - printf("FUTEX_WAKE_OP: %d: uaddr = %p, op = %d, val = %d, uaddr2 = %p, val3 = %d\n", - td->td_proc->p_pid, args->uaddr, args->op, args->val, - args->uaddr2, args->val3); + printf("FUTEX_WAKE_OP: %d: uaddr = %p, op = %d, " + "val = %d, uaddr2 = %p, val3 = %d\n", + td->td_proc->p_pid, args->uaddr, args->op, + args->val, args->uaddr2, args->val3); #endif f = futex_get(args->uaddr, FUTEX_UNLOCKED); f2 = futex_get(args->uaddr2, FUTEX_UNLOCKED); @@ -287,7 +288,7 @@ op_ret = futex_atomic_op(td, args->val3, args->uaddr2); if (op_ret < 0) { - /* XXX: we dont handle the EFAULT yet */ + /* XXX: We don't handle the EFAULT yet. */ if (op_ret != -EFAULT) { futex_put(f); futex_put(f2); @@ -303,29 +304,26 @@ } - ret = futex_wake(f, args->val, NULL); + ret = futex_wake(f, args->val, NULL, 0); futex_put(f); if (op_ret > 0) { - op_ret = 0; - /* - * Linux uses the address of the timespec parameter - * as the number of retries, so any large number will - * be ok. + op_ret = 0; + /* + * Linux abuses the address of the timespec parameter + * as the number of retries. */ - op_ret += futex_wake(f2, 0x7fffffff, NULL); + op_ret += futex_wake(f2, + (int)(unsigned long)args->timeout, NULL, 0); ret += op_ret; } futex_put(f2); td->td_retval[0] = ret; FUTEX_SYSTEM_UNLOCK; -#else - printf("linux_sys_futex: wake_op not implemented"); -#endif - break; + break; default: - printf("linux_sys_futex: unknown op %d\n", + printf("linux_sys_futex: unknown op %d\n", args->op); break; } @@ -389,8 +387,8 @@ #ifdef DEBUG if (ldebug(sys_futex)) - printf("FUTEX --> %d tlseep timeout = %ld\n", td->td_proc->p_pid, - timeout); + printf("FUTEX --> %d tlseep timeout = %ld\n", + td->td_proc->p_pid, timeout); #endif ret = tsleep(wp, PCATCH | PZERO, "linuxfutex", timeout); #ifdef DEBUG @@ -414,10 +412,17 @@ } static int -futex_wake(struct futex *f, int n, struct futex *newf) +futex_wake(struct futex *f, int n, struct futex *newf, int n2) { struct waiting_proc *wp; - int count = 0; + int count; + + /* + * Linux is very strange it wakes up N threads for + * all operations BUT requeue ones where its N+1 + * mimic this. + */ + count = newf ? 0 : 1; FUTEX_LOCK; TAILQ_FOREACH(wp, &f->f_waiting_proc, wp_list) { @@ -427,8 +432,11 @@ } else { if (newf != NULL) { /* futex_put called after tsleep */ - wp->wp_new_futex = futex_get(newf->f_uaddr, FUTEX_LOCKED); + wp->wp_new_futex = futex_get(newf->f_uaddr, + FUTEX_LOCKED); wakeup_one(wp); + if (count - n >= n2) + break; } } } @@ -437,72 +445,106 @@ return count; } -#ifdef __i386__ static int futex_atomic_op(struct thread *td, int encoded_op, caddr_t uaddr) { - int op = (encoded_op >> 28) & 7; - int cmp = (encoded_op >> 24) & 15; - int oparg = (encoded_op << 8) >> 20; - int cmparg = (encoded_op << 20) >> 20; - int oldval = 0, ret; + int op = (encoded_op >> 28) & 7; + int cmp = (encoded_op >> 24) & 15; + int oparg = (encoded_op << 8) >> 20; + int cmparg = (encoded_op << 20) >> 20; + int oldval = 0, ret; if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28)) - oparg = 1 << oparg; + oparg = 1 << oparg; -#ifdef DEBUG - printf("futex_atomic_op: op = %d, cmp = %d, oparg = %d, cmparg = %d, uaddr = %p\n", - op, cmp, oparg, cmparg, uaddr); +#ifdef DEBUG + printf("futex_atomic_op: op = %d, cmp = %d, oparg = %d, cmparg = %d, " + "uaddr = %p\n", op, cmp, oparg, cmparg, uaddr); #endif /* XXX: linux verifies access here and returns EFAULT */ - critical_enter(); + switch (op) { + case FUTEX_OP_SET: + ret = futex_xchgl(oparg, uaddr, &oldval); + break; + case FUTEX_OP_ADD: + ret = futex_addl(oparg, uaddr, &oldval); + break; + case FUTEX_OP_OR: + ret = futex_orl(oparg, uaddr, &oldval); + break; + case FUTEX_OP_ANDN: + ret = futex_andl(~oparg, uaddr, &oldval); + break; + case FUTEX_OP_XOR: + ret = futex_xorl(oparg, uaddr, &oldval); + break; + default: + ret = -ENOSYS; + } - switch (op) { - case FUTEX_OP_SET: - ret = futex_xchgl(oparg, uaddr, &oldval); + if (!ret) + switch (cmp) { + case FUTEX_OP_CMP_EQ: + ret = (oldval == cmparg); + break; + case FUTEX_OP_CMP_NE: + ret = (oldval != cmparg); break; - case FUTEX_OP_ADD: - ret = futex_addl(oparg, uaddr, &oldval); + case FUTEX_OP_CMP_LT: + ret = (oldval < cmparg); break; - case FUTEX_OP_OR: - ret = futex_orl(oparg, uaddr, &oldval); + case FUTEX_OP_CMP_GE: + ret = (oldval >= cmparg); break; - case FUTEX_OP_ANDN: - ret = futex_andnl(oparg, uaddr, &oldval); + case FUTEX_OP_CMP_LE: + ret = (oldval <= cmparg); break; - case FUTEX_OP_XOR: - ret = futex_xorl(oparg, uaddr, &oldval); + case FUTEX_OP_CMP_GT: + ret = (oldval > cmparg); break; default: ret = -ENOSYS; + } + + return (ret); +} + +static int +futex_orl(int oparg, caddr_t uaddr, int *oldval) +{ + uint32_t ua, ua_old; + + for (;;) { + ua = ua_old = fuword32(uaddr); + ua |= oparg; + if (casuword32((void *)uaddr, ua_old, ua) == ua_old) + return ua_old; } +} - critical_exit(); +static int +futex_andl(int oparg, caddr_t uaddr, int *oldval) +{ + uint32_t ua, ua_old; + + for (;;) { + ua = ua_old = fuword32(uaddr); + ua &= oparg; + if (casuword32((void *)uaddr, ua_old, ua) == ua_old) + return ua_old; + } +} - if (!ret) - switch (cmp) { - case FUTEX_OP_CMP_EQ: - ret = (oldval == cmparg); - break; - case FUTEX_OP_CMP_NE: - ret = (oldval != cmparg); - break; - case FUTEX_OP_CMP_LT: - ret = (oldval < cmparg); - break; - case FUTEX_OP_CMP_GE: - ret = (oldval >= cmparg); - break; - case FUTEX_OP_CMP_LE: - ret = (oldval <= cmparg); - break; - case FUTEX_OP_CMP_GT: - ret = (oldval > cmparg); - break; - default: ret = -ENOSYS; - } +static int +futex_xorl(int oparg, caddr_t uaddr, int *oldval) +{ + uint32_t ua, ua_old; - return (ret); + for (;;) { + ua = ua_old = fuword32(uaddr); + ua ^= oparg; + if (casuword32((void *)uaddr, ua_old, ua) == ua_old) + return ua_old; + } } -#endif ==== //depot/projects/smpng/sys/dev/firewire/firewire.c#40 (text+ko) ==== @@ -31,7 +31,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.84 2007/03/16 05:39:33 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.86 2007/03/30 15:43:56 simokawa Exp $ * */ @@ -355,7 +355,6 @@ "split transaction timeout dst=0x%x tl=0x%x state=%d\n", xfer->send.hdr.mode.hdr.dst, i, xfer->state); xfer->resp = ETIMEDOUT; - STAILQ_REMOVE_HEAD(&fc->tlabels[i], link); fw_xfer_done(xfer); } } @@ -420,7 +419,6 @@ bus_generic_attach(dev); /* bus_reset */ - fw_busreset(fc); fc->ibr(fc); return 0; @@ -1013,6 +1011,7 @@ if (xfer->fc == NULL) panic("fw_xfer_done: why xfer->fc is NULL?"); + fw_tl_free(xfer->fc, xfer); xfer->hand(xfer); } @@ -1039,7 +1038,6 @@ */ printf("fw_xfer_free FWXF_START\n"); #endif - fw_tl_free(xfer->fc, xfer); } xfer->state = FWXF_INIT; xfer->resp = 0; ==== //depot/projects/smpng/sys/geom/geom_ctl.c#26 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/geom_ctl.c,v 1.38 2006/04/07 16:19:48 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/geom_ctl.c,v 1.39 2007/03/30 16:32:08 delphij Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Mar 30 20:32:54 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3CE5B16A404; Fri, 30 Mar 2007 20:32:54 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 050CA16A401 for ; Fri, 30 Mar 2007 20:32:54 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id EA1EC13C44B for ; Fri, 30 Mar 2007 20:32:53 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2UKWri6087587 for ; Fri, 30 Mar 2007 20:32:53 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2UKWrFx087584 for perforce@freebsd.org; Fri, 30 Mar 2007 20:32:53 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 30 Mar 2007 20:32:53 GMT Message-Id: <200703302032.l2UKWrFx087584@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 116970 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Mar 2007 20:32:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=116970 Change 116970 by hselasky@hselasky_mini_itx on 2007/03/30 20:32:16 Imported moscom.c from OpenBSD. Made some improvements. The driver has been tested and verified to work. Affected files ... .. //depot/projects/usb/src/sys/conf/NOTES#4 edit .. //depot/projects/usb/src/sys/conf/files#12 edit .. //depot/projects/usb/src/sys/dev/usb/umoscom.c#1 add .. //depot/projects/usb/src/sys/dev/usb/usbdevs#5 edit .. //depot/projects/usb/src/sys/modules/umoscom/Makefile#1 add Differences ... ==== //depot/projects/usb/src/sys/conf/NOTES#4 (text+ko) ==== @@ -2426,6 +2426,8 @@ device uftdi # USB support for some Windows CE based serial communication. device uipaq +# USB support for MOSCHIP serial port adapters +device umoscom # USB support for Prolific PL-2303 serial adapters device uplcom # USB Visor and Palm devices ==== //depot/projects/usb/src/sys/conf/files#12 (text+ko) ==== @@ -1060,6 +1060,7 @@ dev/usb/umass.c optional umass dev/usb/umct.c optional umct dev/usb/umodem.c optional umodem +dev/usb/umoscom.c optional umoscom dev/usb/ums.c optional ums dev/usb/uplcom.c optional uplcom dev/usb/urio.c optional urio ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#5 (text+ko) ==== @@ -568,6 +568,7 @@ vendor ARKMICRO 0x6547 Arkmicro Technologies vendor 3COM2 0x6891 3Com vendor INTEL 0x8086 Intel +vendor MOSCHIP 0x9710 MosChip vendor HP2 0xf003 Hewlett Packard /* @@ -1366,6 +1367,10 @@ product MITSUMI CDRRW 0x0000 CD-R/RW Drive product MITSUMI BT_DONGLE 0x641f Bluetooth USB dongle +/* MosChip products */ +product MOSCHIP MCS7703 0x7703 MCS7703 Serial Port Adapter +product MOSCHIP MCS7830 0x7830 MCS7830 Ethernet + /* Motorola products */ product MOTOROLA MC141555 0x1555 MC141555 hub controller product MOTOROLA SB4100 0x4100 SB4100 USB Cable Modem From owner-p4-projects@FreeBSD.ORG Fri Mar 30 20:36:59 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C008D16A408; Fri, 30 Mar 2007 20:36:59 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 991F416A403 for ; Fri, 30 Mar 2007 20:36:59 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 71AFC13C46A for ; Fri, 30 Mar 2007 20:36:59 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2UKax8c088472 for ; Fri, 30 Mar 2007 20:36:59 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2UKaxW0088469 for perforce@freebsd.org; Fri, 30 Mar 2007 20:36:59 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 30 Mar 2007 20:36:59 GMT Message-Id: <200703302036.l2UKaxW0088469@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 116971 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Mar 2007 20:37:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=116971 Change 116971 by hselasky@hselasky_mini_itx on 2007/03/30 20:36:17 Remove unused structure. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ufoma.c#13 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ufoma.c#13 (text+ko) ==== @@ -178,15 +178,6 @@ u_int8_t sc_name[16]; }; -struct ufoma_config_copy { - - usb_cdc_line_state_t line_state; - - u_int8_t break_onoff; - u_int8_t dtr_onoff; - u_int8_t rts_onoff; -}; - /* prototypes */ static device_probe_t ufoma_probe; From owner-p4-projects@FreeBSD.ORG Fri Mar 30 21:23:08 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 47C9116A40E; Fri, 30 Mar 2007 21:23:08 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EBEF116A406 for ; Fri, 30 Mar 2007 21:23:07 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C34A113C4EE for ; Fri, 30 Mar 2007 21:23:07 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2ULN7CL005693 for ; Fri, 30 Mar 2007 21:23:07 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2ULN7H8005689 for perforce@freebsd.org; Fri, 30 Mar 2007 21:23:07 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 30 Mar 2007 21:23:07 GMT Message-Id: <200703302123.l2ULN7H8005689@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 116974 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Mar 2007 21:23:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=116974 Change 116974 by hselasky@hselasky_mini_itx on 2007/03/30 21:22:41 Imported ugensa.c from NetBSD. Affected files ... .. //depot/projects/usb/src/sys/conf/NOTES#5 edit .. //depot/projects/usb/src/sys/conf/files#13 edit .. //depot/projects/usb/src/sys/dev/usb/ugensa.c#1 add .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#35 edit .. //depot/projects/usb/src/sys/dev/usb/usbdevs#6 edit .. //depot/projects/usb/src/sys/modules/ugensa/Makefile#1 add Differences ... ==== //depot/projects/usb/src/sys/conf/NOTES#5 (text+ko) ==== @@ -2395,6 +2395,8 @@ device ufm # Generic USB device driver device ugen +# Generic USB serial driver +device ugensa # Human Interface Device (anything with buttons and dials) device uhid # USB keyboard ==== //depot/projects/usb/src/sys/conf/files#13 (text+ko) ==== @@ -1050,6 +1050,7 @@ dev/usb/ufoma.c optional ufoma dev/usb/uftdi.c optional uftdi dev/usb/ugen.c optional ugen +dev/usb/ugensa.c optional ugensa dev/usb/uhci.c optional uhci dev/usb/uhci_pci.c optional uhci pci dev/usb/uhid.c optional uhid ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#35 (text+ko) ==== @@ -86,7 +86,7 @@ typedef uint8_t usbd_status; -typedef void (*usbd_callback_t)(struct usbd_xfer *); +typedef void (usbd_callback_t)(struct usbd_xfer *); struct usbd_bus_methods { void (*pipe_init)(struct usbd_device *udev, usb_endpoint_descriptor_t *edesc, struct usbd_pipe *pipe); @@ -266,7 +266,7 @@ }; struct usbd_config { - usbd_callback_t callback; + usbd_callback_t *callback; uint32_t flags; /* flags */ #define USBD_SYNCHRONOUS 0x0001 /* wait for completion */ @@ -349,7 +349,7 @@ void *buffer; uint16_t *frlengths; uint16_t *frlengths_old; - usbd_callback_t callback; + usbd_callback_t *callback; uint32_t length; /* bytes */ uint32_t actlen; /* bytes */ ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#6 (text+ko) ==== @@ -443,6 +443,7 @@ vendor ARRIS 0x09c1 Arris Interactive vendor ACTIVCARD 0x09c3 ACTIVCARD vendor ACTISYS 0x09c4 ACTiSYS +vendor NOVATEL 0x09d7 NovAtel vendor AFOURTECH 0x09da A-FOUR TECH vendor AIMEX 0x09dc AIMEX vendor ADDONICS 0x09df Addonics @@ -481,6 +482,7 @@ vendor CHICONY2 0x0c45 Chicony vendor SEALEVEL 0x0c52 Sealevel vendor LUWEN 0x0c76 Luwen +vendor QUALCOMM_K 0x0c88 Qualcomm Kyocera vendor ZCOM 0x0cde Z-Com vendor ATHEROS2 0x0cf3 Atheros Communications vendor TANGTOP 0x0d3d Tangtop @@ -497,6 +499,7 @@ vendor PILOTECH 0x0eaf Pilotech vendor NOVATECH 0x0eb0 NovaTech vendor EGALAX 0x0eef eGalax +vendor AIRPRIME 0x0f3d AirPrime, Incorporated vendor MICROTUNE 0x0f4d Microtune vendor VTECH 0x0f88 VTech vendor QUALCOMM2 0x1004 Qualcomm @@ -524,6 +527,7 @@ vendor RADIOSHACK 0x1453 Radio Shack vendor LINKSYS4 0x13b1 Linksys vendor SHARK 0x13d2 Shark +vendor NOVATEL2 0x1410 Novatel vendor SILICOM 0x1485 Silicom vendor RALINK 0x148f Ralink Technology vendor IMAGINATION 0x149a Imagination Technologies @@ -663,6 +667,9 @@ /* Ain Communication Technology products */ product AINCOMM AWU2000B 0x1001 AWU2000B Wireless adapter +/* AirPrime products */ +product AIRPRIME PC5220 0x0112 CDMA Wireless PC Card + /* AKS products */ product AKS USBHASP 0x0001 USB-HASP 0.06 @@ -1430,6 +1437,10 @@ /* NovaTech Products */ product NOVATECH NV902 0x9020 NovaTech NV-902W +/* NovAtel products */ +product NOVATEL FLEXPACKGPS 0x0100 NovAtel FlexPack GPS receiver +product NOVATEL2 CDMA_MODEM 0x1110 Novatel Wireless Merlin CDMA + /* Olympus products */ product OLYMPUS C1 0x0102 C-1 Digital Camera product OLYMPUS C700 0x0105 C-700 Ultra Zoom @@ -1532,6 +1543,7 @@ /* Qualcomm products */ product QUALCOMM CDMA_MSM 0x3196 CDMA Technologies MSM modem product QUALCOMM2 CDMA_MSM 0x6000 CDMA Technologies MSM phone +product QUALCOMM_K CDMA_MSM_K 0x17da Qualcomm Kyocera CDMA Technologies MSM /* Qtronix products */ product QTRONIX 980N 0x2011 Scorpion-980N keyboard @@ -1612,6 +1624,7 @@ product SIEMENS SPEEDSTREAM 0x1001 SpeedStream USB /* Sierra Wireless products */ +product SIERRA AIRCARD580 0x0112 Sierra Wireless AirCard 580 product SIERRA MC5720 0x0218 MC5720 Wireless Modem /* Sigmatel products */ From owner-p4-projects@FreeBSD.ORG Fri Mar 30 21:33:21 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B84216A407; Fri, 30 Mar 2007 21:33:21 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BF65516A404 for ; Fri, 30 Mar 2007 21:33:20 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9794C13C448 for ; Fri, 30 Mar 2007 21:33:20 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2ULXKQP008268 for ; Fri, 30 Mar 2007 21:33:20 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2ULXKZ1008265 for perforce@freebsd.org; Fri, 30 Mar 2007 21:33:20 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 30 Mar 2007 21:33:20 GMT Message-Id: <200703302133.l2ULXKZ1008265@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 116975 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Mar 2007 21:33:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=116975 Change 116975 by hselasky@hselasky_mini_itx on 2007/03/30 21:32:49 Remove unused includes. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ugensa.c#2 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ugensa.c#2 (text+ko) ==== @@ -51,8 +51,6 @@ #include #include #include -#include -#include #include From owner-p4-projects@FreeBSD.ORG Fri Mar 30 21:57:52 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 840B116A406; Fri, 30 Mar 2007 21:57:52 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3ECF516A404 for ; Fri, 30 Mar 2007 21:57:52 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2E9EB13C4AE for ; Fri, 30 Mar 2007 21:57:52 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2ULvqHZ014148 for ; Fri, 30 Mar 2007 21:57:52 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2ULvpYn014145 for perforce@freebsd.org; Fri, 30 Mar 2007 21:57:51 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 30 Mar 2007 21:57:51 GMT Message-Id: <200703302157.l2ULvpYn014145@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 116977 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Mar 2007 21:57:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=116977 Change 116977 by hselasky@hselasky_mini_itx on 2007/03/30 21:57:38 Finished converting uark to the new USB stack. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uark.c#2 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uark.c#2 (text+ko) ==== @@ -17,43 +17,34 @@ * * $FreeBSD: src/sys/dev/usb/uark.c,v 1.1 2006/11/15 09:13:24 maxim Exp $ */ + +/* + * NOTE: all function names beginning like "uark_cfg_" can only + * be called from within the config thread function ! + */ + #include #include #include +#include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include -#include -#include +#include + +#include + #include "usbdevs.h" -#include +#define DPRINTF(...) { } -#ifdef UARK_DEBUG -#define DPRINTFN(n, x) do { \ - if (uarkdebug > (n)) \ - logprintf x; \ -} while (0) -int uarkebug = 0; -#else -#define DPRINTFN(n, x) -#endif -#define DPRINTF(x) DPRINTFN(0, x) +#define UARK_BUF_SIZE 512 -#define UARKBUFSZ 256 -#define UARK_CONFIG_NO 0 -#define UARK_IFACE_NO 0 +#define UARK_N_TRANSFER 4 /* units */ -#define UARK_SET_DATA_BITS(x) (x - 5) +#define UARK_SET_DATA_BITS(x) ((x) - 5) #define UARK_PARITY_NONE 0x00 #define UARK_PARITY_ODD 0x08 @@ -73,177 +64,367 @@ #define UARK_IFACE_INDEX 0 struct uark_softc { + struct ucom_super_softc sc_super_ucom; struct ucom_softc sc_ucom; - usbd_interface_handle sc_iface; + + struct usbd_xfer *sc_xfer[UARK_N_TRANSFER]; + struct usbd_device *sc_udev; + + uint8_t sc_flags; +#define UARK_FLAG_BULK_READ_STALL 0x01 +#define UARK_FLAG_BULK_WRITE_STALL 0x02 + uint8_t sc_msr; + uint8_t sc_lsr; +}; + +/* prototypes */ + +static device_probe_t uark_probe; +static device_attach_t uark_attach; +static device_detach_t uark_detach; + +static usbd_callback_t uark_bulk_write_callback; +static usbd_callback_t uark_bulk_write_clear_stall_callback; +static usbd_callback_t uark_bulk_read_callback; +static usbd_callback_t uark_bulk_read_clear_stall_callback; + +static void uark_start_read(struct ucom_softc *ucom); +static void uark_stop_read(struct ucom_softc *ucom); +static void uark_start_write(struct ucom_softc *ucom); +static void uark_stop_write(struct ucom_softc *ucom); + +static int uark_pre_param(struct ucom_softc *ucom, struct termios *t); +static void uark_cfg_param(struct ucom_softc *ucom, struct termios *t); +static void uark_cfg_get_status(struct ucom_softc *ucom, uint8_t *lsr, uint8_t *msr); +static void uark_cfg_set_break(struct ucom_softc *ucom, uint8_t onoff); +static void uark_cfg_write(struct uark_softc *sc, uint16_t index, uint16_t value); + +static const struct usbd_config +uark_xfer_config[UARK_N_TRANSFER] = { + + [0] = { + .type = UE_BULK, + .endpoint = -1, /* any */ + .direction = UE_DIR_OUT, + .bufsize = UARK_BUF_SIZE, + .flags = 0, + .callback = &uark_bulk_write_callback, + }, + + [1] = { + .type = UE_BULK, + .endpoint = -1, /* any */ + .direction = UE_DIR_IN, + .bufsize = UARK_BUF_SIZE, + .flags = USBD_SHORT_XFER_OK, + .callback = &uark_bulk_read_callback, + }, + + [2] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .flags = (USBD_USE_DMA), + .callback = &uark_bulk_write_clear_stall_callback, + .timeout = 1000, /* 1 second */ + }, + + [3] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .flags = (USBD_USE_DMA), + .callback = &uark_bulk_read_clear_stall_callback, + .timeout = 1000, /* 1 second */ + }, +}; + +static const struct ucom_callback uark_callback = { + .ucom_cfg_get_status = &uark_cfg_get_status, + .ucom_cfg_set_break = &uark_cfg_set_break, + .ucom_cfg_param = &uark_cfg_param, + .ucom_pre_param = &uark_pre_param, + .ucom_start_read = &uark_start_read, + .ucom_stop_read = &uark_stop_read, + .ucom_start_write = &uark_start_write, + .ucom_stop_write = &uark_stop_write, +}; - u_char sc_msr; - u_char sc_lsr; +static device_method_t uark_methods[] = { + /* Device methods */ + DEVMETHOD(device_probe, uark_probe), + DEVMETHOD(device_attach, uark_attach), + DEVMETHOD(device_detach, uark_detach), + { 0, 0 } }; -static void uark_get_status(void *, int portno, u_char *lsr, u_char *msr); -static void uark_set(void *, int, int, int); -static int uark_param(void *, int, struct termios *); -static void uark_break(void *, int, int); -static int uark_cmd(struct uark_softc *, uint16_t, uint16_t); +static devclass_t uark_devclass; -struct ucom_callback uark_callback = { - uark_get_status, - uark_set, - uark_param, - NULL, - NULL, - NULL, - NULL, - NULL, +static driver_t uark_driver = { + .name = "uark", + .methods = uark_methods, + .size = sizeof(struct uark_softc), }; -static const struct uark_product { - uint16_t vendor; - uint16_t product; -} uark_products[] = { +DRIVER_MODULE(uark, uhub, uark_driver, uark_devclass, usbd_driver_load, 0); +MODULE_DEPEND(uark, usb, 1, 1, 1); +MODULE_DEPEND(uark, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); + +static const struct usb_devno uark_devs[] = { { USB_VENDOR_ARKMICRO, USB_PRODUCT_ARKMICRO_ARK3116 }, - { 0, 0 } }; -USB_MATCH(uark) +#define uark_lookup(v, p) usb_lookup(uark_devs, v, p) + +static int +uark_probe(device_t dev) +{ + struct usb_attach_arg *uaa = device_get_ivars(dev); + + if (uaa->iface) { + return UMATCH_NONE; + } + + return (uark_lookup(uaa->vendor, uaa->product) ? + UMATCH_VENDOR_PRODUCT : UMATCH_NONE); +} + +static int +uark_attach(device_t dev) +{ + struct usb_attach_arg *uaa = device_get_ivars(dev); + struct uark_softc *sc = device_get_softc(dev); + int32_t error; + + if (sc == NULL) { + return ENOMEM; + } + + usbd_set_desc(dev, uaa->device); + + sc->sc_udev = uaa->device; + + /* Move the device into the configured state */ + error = usbd_set_config_index(uaa->device, UARK_CONFIG_INDEX, 1); + if (error) { + device_printf(dev, "failed to set configuration, err=%s\n", + usbd_errstr(error)); + goto detach; + } + + error = usbd_transfer_setup + (uaa->device, UARK_IFACE_INDEX, + sc->sc_xfer, uark_xfer_config, UARK_N_TRANSFER, + sc, &Giant); + + if (error) { + device_printf(dev, "allocating control USB " + "transfers failed!\n"); + goto detach; + } + + /* clear stall at first run */ + sc->sc_flags |= (UARK_FLAG_BULK_WRITE_STALL| + UARK_FLAG_BULK_READ_STALL); + + error = ucom_attach(&(sc->sc_super_ucom), &(sc->sc_ucom), 1, sc, + &uark_callback, &Giant); + if (error) { + DPRINTF(0, "ucom_attach failed\n"); + goto detach; + } + + return 0; /* success */ + + detach: + uark_detach(dev); + return ENXIO; /* failure */ +} + +static int +uark_detach(device_t dev) +{ + struct uark_softc *sc = device_get_softc(dev); + + ucom_detach(&(sc->sc_super_ucom), &(sc->sc_ucom), 1); + + usbd_transfer_unsetup(sc->sc_xfer, UARK_N_TRANSFER); + + return 0; +} + +static void +uark_bulk_write_callback(struct usbd_xfer *xfer) { - USB_MATCH_START(uark, uaa); - int i; + struct uark_softc *sc = xfer->priv_sc; + uint32_t actlen; + + USBD_CHECK_STATUS(xfer); - if (uaa->iface != NULL) - return (UMATCH_NONE); +tr_error: + if (xfer->error != USBD_CANCELLED) { + sc->sc_flags |= UARK_FLAG_BULK_WRITE_STALL; + usbd_transfer_start(sc->sc_xfer[2]); + } + return; - for (i = 0; uark_products[i].vendor != 0; i++) { - if (uark_products[i].vendor == uaa->vendor && - uark_products[i].product == uaa->product) { - return (UMATCH_VENDOR_PRODUCT); - } +tr_setup: +tr_transferred: + if (sc->sc_flags & UARK_FLAG_BULK_WRITE_STALL) { + usbd_transfer_start(sc->sc_xfer[2]); + return; } - return (UMATCH_NONE); + if (ucom_get_data(&(sc->sc_ucom), xfer->buffer, + UARK_BUF_SIZE, &actlen)) { + xfer->length = actlen; + usbd_start_hardware(xfer); + } + return; } -USB_ATTACH(uark) +static void +uark_bulk_write_clear_stall_callback(struct usbd_xfer *xfer) { - USB_ATTACH_START(uark, sc, uaa); - usbd_device_handle dev = uaa->device; - usbd_interface_handle iface; - usb_interface_descriptor_t *id; - usb_endpoint_descriptor_t *ed; - usbd_status error; - char *devinfo; - const char *devname; - int i; - struct ucom_softc *ucom = &sc->sc_ucom; + struct uark_softc *sc = xfer->priv_sc; + struct usbd_xfer *xfer_other = sc->sc_xfer[0]; - devinfo = malloc(1024, M_USBDEV, M_WAITOK); + USBD_CHECK_STATUS(xfer); - bzero(ucom, sizeof(struct ucom_softc)); - ucom->sc_dev = self; - ucom->sc_udev = dev; + tr_setup: + /* start clear stall */ + usbd_clear_stall_tr_setup(xfer, xfer_other); + return; - devname = device_get_nameunit(ucom->sc_dev); + tr_transferred: + usbd_clear_stall_tr_transferred(xfer, xfer_other); + sc->sc_flags &= ~UARK_FLAG_BULK_WRITE_STALL; + usbd_transfer_start(xfer_other); + return; - if (uaa->iface == NULL) { - /* Move the device into the configured state. */ - error = usbd_set_config_index(dev, UARK_CONFIG_INDEX, 1); - if (error) { - printf("\n%s: failed to set configuration, err=%s\n", - devname, usbd_errstr(error)); - goto bad; - } - error = - usbd_device2interface_handle(dev, UARK_IFACE_INDEX, &iface); - if (error) { - printf("\n%s: failed to get interface, err=%s\n", - devname, usbd_errstr(error)); - goto bad; - } - } else - iface = uaa->iface; + tr_error: + sc->sc_flags &= ~UARK_FLAG_BULK_WRITE_STALL; + DPRINTF(sc, 0, "clear stall failed, error=%s\n", + usbd_errstr(xfer->error)); + return; +} - usbd_devinfo(dev, 0, devinfo); - printf("%s: %s\n", devname, devinfo); +static void +uark_bulk_read_callback(struct usbd_xfer *xfer) +{ + struct uark_softc *sc = xfer->priv_sc; - id = usbd_get_interface_descriptor(iface); - ucom->sc_iface = iface; + USBD_CHECK_STATUS(xfer); - ucom->sc_bulkin_no = ucom->sc_bulkout_no = -1; - for (i = 0; i < id->bNumEndpoints; i++) { - ed = usbd_interface2endpoint_descriptor(iface, i); - if (ed == NULL) { - printf("%s: could not read endpoint descriptor\n", - devname); - goto bad; - } - if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN && - UE_GET_XFERTYPE(ed->bmAttributes) == UE_BULK) - ucom->sc_bulkin_no = ed->bEndpointAddress; - else if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_OUT && - UE_GET_XFERTYPE(ed->bmAttributes) == UE_BULK) - ucom->sc_bulkout_no = ed->bEndpointAddress; + tr_error: + if (xfer->error != USBD_CANCELLED) { + sc->sc_flags |= UARK_FLAG_BULK_READ_STALL; + usbd_transfer_start(sc->sc_xfer[3]); } - if (ucom->sc_bulkin_no == -1 || ucom->sc_bulkout_no == -1) { - printf("%s: missing endpoint\n", devname); - goto bad; + return; + + tr_transferred: + ucom_put_data(&(sc->sc_ucom), xfer->buffer, + xfer->actlen); + + tr_setup: + if (sc->sc_flags & UARK_FLAG_BULK_READ_STALL) { + usbd_transfer_start(sc->sc_xfer[3]); + } else { + usbd_start_hardware(xfer); } - ucom->sc_parent = sc; - ucom->sc_ibufsize = UARKBUFSZ; - ucom->sc_obufsize = UARKBUFSZ; - ucom->sc_ibufsizepad = UARKBUFSZ; - ucom->sc_opkthdrlen = 0; + return; +} - ucom->sc_callback = &uark_callback; +static void +uark_bulk_read_clear_stall_callback(struct usbd_xfer *xfer) +{ + struct uark_softc *sc = xfer->priv_sc; + struct usbd_xfer *xfer_other = sc->sc_xfer[1]; - DPRINTF(("uark: in=0x%x out=0x%x\n", ucom->sc_bulkin_no, ucom->sc_bulkout_no)); - ucom_attach(&sc->sc_ucom); - free(devinfo, M_USBDEV); + USBD_CHECK_STATUS(xfer); - USB_ATTACH_SUCCESS_RETURN; + tr_setup: + /* start clear stall */ + usbd_clear_stall_tr_setup(xfer, xfer_other); + return; -bad: - DPRINTF(("uftdi_attach: ATTACH ERROR\n")); - ucom->sc_dying = 1; - free(devinfo, M_USBDEV); + tr_transferred: + usbd_clear_stall_tr_transferred(xfer, xfer_other); + sc->sc_flags &= ~UARK_FLAG_BULK_READ_STALL; + usbd_transfer_start(xfer_other); + return; - USB_ATTACH_ERROR_RETURN; + tr_error: + sc->sc_flags &= ~UARK_FLAG_BULK_READ_STALL; + DPRINTF(sc, 0, "clear stall failed, error=%s\n", + usbd_errstr(xfer->error)); + return; } -USB_DETACH(uark) +static void +uark_start_read(struct ucom_softc *ucom) { - USB_DETACH_START(uark, sc); - int rv = 0; + struct uark_softc *sc = ucom->sc_parent; + usbd_transfer_start(sc->sc_xfer[1]); + return; +} - DPRINTF(("uark_detach: sc=%p\n", sc)); - sc->sc_ucom.sc_dying = 1; - rv = ucom_detach(&sc->sc_ucom); +static void +uark_stop_read(struct ucom_softc *ucom) +{ + struct uark_softc *sc = ucom->sc_parent; + usbd_transfer_stop(sc->sc_xfer[3]); + usbd_transfer_stop(sc->sc_xfer[1]); + return; +} - return (rv); +static void +uark_start_write(struct ucom_softc *ucom) +{ + struct uark_softc *sc = ucom->sc_parent; + usbd_transfer_start(sc->sc_xfer[0]); + return; } static void -uark_set(void *vsc, int portno, int reg, int onoff) +uark_stop_write(struct ucom_softc *ucom) { - struct uark_softc *sc = vsc; + struct uark_softc *sc = ucom->sc_parent; + usbd_transfer_stop(sc->sc_xfer[2]); + usbd_transfer_stop(sc->sc_xfer[0]); + return; +} - switch (reg) { - case UCOM_SET_BREAK: - uark_break(sc, portno, onoff); - return; - /* NOTREACHED */ - case UCOM_SET_DTR: - case UCOM_SET_RTS: +static int +uark_pre_param(struct ucom_softc *ucom, struct termios *t) +{ + switch (t->c_ospeed) { + case 300: + case 600: + case 1200: + case 1800: + case 2400: + case 4800: + case 9600: + case 19200: + case 38400: + case 57600: + case 115200: + break; default: - return; - /* NOTREACHED */ + return EINVAL; } + return 0; } -static int -uark_param(void *vsc, int portno, struct termios *t) +static void +uark_cfg_param(struct ucom_softc *ucom, struct termios *t) { - struct uark_softc *sc = (struct uark_softc *)vsc; - int data; + struct uark_softc *sc = ucom->sc_parent; + uint16_t data; switch (t->c_ospeed) { case 300: @@ -257,29 +438,30 @@ case 38400: case 57600: case 115200: - uark_cmd(sc, 3, 0x83); - uark_cmd(sc, 0, (UARK_BAUD_REF / t->c_ospeed) & 0xFF); - uark_cmd(sc, 1, (UARK_BAUD_REF / t->c_ospeed) >> 8); - uark_cmd(sc, 3, 0x03); + data = (UARK_BAUD_REF / t->c_ospeed); + uark_cfg_write(sc, 3, 0x83); + uark_cfg_write(sc, 0, data & 0xFF); + uark_cfg_write(sc, 1, data >> 8); + uark_cfg_write(sc, 3, 0x03); break; default: - return (EINVAL); - /* NOTREACHED */ + return; } - if (ISSET(t->c_cflag, CSTOPB)) + + if (t->c_cflag & CSTOPB) data = UARK_STOP_BITS_2; else data = UARK_STOP_BITS_1; - if (ISSET(t->c_cflag, PARENB)) { - if (ISSET(t->c_cflag, PARODD)) + if (t->c_cflag & PARENB) { + if (t->c_cflag & PARODD) data |= UARK_PARITY_ODD; else data |= UARK_PARITY_EVEN; } else data |= UARK_PARITY_NONE; - switch (ISSET(t->c_cflag, CSIZE)) { + switch (t->c_cflag & CSIZE) { case CS5: data |= UARK_SET_DATA_BITS(5); break; @@ -289,79 +471,58 @@ case CS7: data |= UARK_SET_DATA_BITS(7); break; + default: case CS8: data |= UARK_SET_DATA_BITS(8); break; } - uark_cmd(sc, 3, 0x00); - uark_cmd(sc, 3, data); - - return (0); + uark_cfg_write(sc, 3, 0x00); + uark_cfg_write(sc, 3, data); + return; } -void -uark_get_status(void *vsc, int portno, u_char *lsr, u_char *msr) +static void +uark_cfg_get_status(struct ucom_softc *ucom, uint8_t *lsr, uint8_t *msr) { - struct uark_softc *sc = vsc; + struct uark_softc *sc = ucom->sc_parent; - if (msr != NULL) - *msr = sc->sc_msr; - if (lsr != NULL) - *lsr = sc->sc_lsr; + *lsr = sc->sc_lsr; + *msr = sc->sc_msr; + return; } -void -uark_break(void *vsc, int portno, int onoff) +static void +uark_cfg_set_break(struct ucom_softc *ucom, uint8_t onoff) { -#ifdef UARK_DEBUG - struct uark_softc *sc = vsc; + struct uark_softc *sc = ucom->sc_parent; - printf("%s: break %s!\n", device_get_nameunit(sc->sc_dev), - onoff ? "on" : "off"); + DPRINTF(sc, 0, "onoff=%d\n", onoff); - if (onoff) - /* break on */ - uark_cmd(sc, 4, 0x01); - else - uark_cmd(sc, 4, 0x00); -#endif + uark_cfg_write(sc, 4, onoff ? 0x01 : 0x00); + return; } -int -uark_cmd(struct uark_softc *sc, uint16_t index, uint16_t value) +static void +uark_cfg_write(struct uark_softc *sc, uint16_t index, uint16_t value) { usb_device_request_t req; usbd_status err; - struct ucom_softc *ucom = &sc->sc_ucom; + + if (ucom_cfg_is_gone(&(sc->sc_ucom))) { + return; + } req.bmRequestType = UARK_WRITE; req.bRequest = UARK_REQUEST; USETW(req.wValue, value); USETW(req.wIndex, index); USETW(req.wLength, 0); - err = usbd_do_request(ucom->sc_udev, &req, NULL); - if (err) - return (EIO); - - return (0); + err = usbd_do_request_flags_mtx(sc->sc_udev, &Giant, &req, + NULL, 0, NULL, 1000); + if (err) { + DPRINTF(sc, -1, "device request failed, err=%s " + "(ignored)\n", usbd_errstr(err)); + } + return; } - -static device_method_t uark_methods[] = { - /* Device interface */ - DEVMETHOD(device_probe, uark_match), - DEVMETHOD(device_attach, uark_attach), - DEVMETHOD(device_detach, uark_detach), - - { 0, 0 } -}; - -static driver_t uark_driver = { - "ucom", - uark_methods, - sizeof (struct uark_softc) -}; - -DRIVER_MODULE(uark, uhub, uark_driver, ucom_devclass, usbd_driver_load, 0); -MODULE_DEPEND(uark, usb, 1, 1, 1); -MODULE_DEPEND(uark, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); From owner-p4-projects@FreeBSD.ORG Sat Mar 31 02:40:02 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C50C16A40B; Sat, 31 Mar 2007 02:40:02 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id ECA6816A407 for ; Sat, 31 Mar 2007 02:40:01 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DB71013C45A for ; Sat, 31 Mar 2007 02:40:01 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2V2e16K081391 for ; Sat, 31 Mar 2007 02:40:01 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2V2dqEJ081373 for perforce@freebsd.org; Sat, 31 Mar 2007 02:39:52 GMT (envelope-from imp@freebsd.org) Date: Sat, 31 Mar 2007 02:39:52 GMT Message-Id: <200703310239.l2V2dqEJ081373@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 116992 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Mar 2007 02:40:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=116992 Change 116992 by imp@imp_paco-paco on 2007/03/31 02:39:37 IFC @116988 Affected files ... .. //depot/projects/arm/src/ObsoleteFiles.inc#17 integrate .. //depot/projects/arm/src/contrib/bzip2/CHANGES#2 integrate .. //depot/projects/arm/src/contrib/bzip2/FREEBSD-upgrade#2 integrate .. //depot/projects/arm/src/contrib/bzip2/LICENSE#2 integrate .. //depot/projects/arm/src/contrib/bzip2/Makefile#2 integrate .. //depot/projects/arm/src/contrib/bzip2/Makefile-libbz2_so#2 integrate .. //depot/projects/arm/src/contrib/bzip2/README#2 integrate .. //depot/projects/arm/src/contrib/bzip2/README.COMPILATION.PROBLEMS#2 integrate .. //depot/projects/arm/src/contrib/bzip2/Y2K_INFO#2 delete .. //depot/projects/arm/src/contrib/bzip2/blocksort.c#2 integrate .. //depot/projects/arm/src/contrib/bzip2/bzip2.1#2 integrate .. //depot/projects/arm/src/contrib/bzip2/bzip2.c#2 integrate .. //depot/projects/arm/src/contrib/bzip2/bzip2recover.c#2 integrate .. //depot/projects/arm/src/contrib/bzip2/bzlib.c#2 integrate .. //depot/projects/arm/src/contrib/bzip2/bzlib.h#2 integrate .. //depot/projects/arm/src/contrib/bzip2/bzlib_private.h#2 integrate .. //depot/projects/arm/src/contrib/bzip2/compress.c#2 integrate .. //depot/projects/arm/src/contrib/bzip2/crctable.c#2 integrate .. //depot/projects/arm/src/contrib/bzip2/decompress.c#2 integrate .. //depot/projects/arm/src/contrib/bzip2/dlltest.c#2 integrate .. //depot/projects/arm/src/contrib/bzip2/huffman.c#2 integrate .. //depot/projects/arm/src/contrib/bzip2/manual.texi#2 delete .. //depot/projects/arm/src/contrib/bzip2/randtable.c#2 integrate .. //depot/projects/arm/src/contrib/bzip2/sample1.bz2.uu#2 integrate .. //depot/projects/arm/src/contrib/bzip2/sample1.ref.gz.uu#2 integrate .. //depot/projects/arm/src/contrib/bzip2/sample2.bz2.uu#2 integrate .. //depot/projects/arm/src/contrib/bzip2/sample2.ref.gz.uu#2 integrate .. //depot/projects/arm/src/contrib/bzip2/sample3.bz2.uu#2 integrate .. //depot/projects/arm/src/contrib/bzip2/sample3.ref.gz.uu#2 integrate .. //depot/projects/arm/src/contrib/bzip2/spewG.c#2 integrate .. //depot/projects/arm/src/contrib/bzip2/unzcrash.c#2 integrate .. //depot/projects/arm/src/contrib/bzip2/words0#2 integrate .. //depot/projects/arm/src/contrib/bzip2/words2#2 integrate .. //depot/projects/arm/src/contrib/bzip2/words3#2 integrate .. //depot/projects/arm/src/contrib/netcat/nc.1#2 integrate .. //depot/projects/arm/src/contrib/netcat/netcat.c#2 integrate .. //depot/projects/arm/src/contrib/netcat/socks.c#2 integrate .. //depot/projects/arm/src/etc/defaults/rc.conf#12 integrate .. //depot/projects/arm/src/etc/network.subr#7 integrate .. //depot/projects/arm/src/etc/rc.d/dhclient#5 integrate .. //depot/projects/arm/src/etc/rc.d/isdnd#2 integrate .. //depot/projects/arm/src/etc/rc.d/nfslocking#2 integrate .. //depot/projects/arm/src/etc/rc.d/syscons#4 integrate .. //depot/projects/arm/src/games/fortune/datfiles/fortunes#11 integrate .. //depot/projects/arm/src/games/fortune/datfiles/fortunes-o.real#3 integrate .. //depot/projects/arm/src/lib/libarchive/Makefile#9 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_support_compression_bzip2.c#7 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_disk.c#3 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_write_disk_perms.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/valloc.3#3 integrate .. //depot/projects/arm/src/lib/libc/net/inet.3#5 integrate .. //depot/projects/arm/src/lib/libc/stdlib/malloc.3#3 integrate .. //depot/projects/arm/src/lib/libc/stdlib/malloc.c#11 integrate .. //depot/projects/arm/src/lib/libc/stdlib/posix_memalign.3#3 integrate .. //depot/projects/arm/src/lib/libelf/elf_getarhdr.3#2 integrate .. //depot/projects/arm/src/lib/libelf/elf_rand.3#2 integrate .. //depot/projects/arm/src/lib/libelf/libelf_ar.c#3 integrate .. //depot/projects/arm/src/lib/libpam/modules/pam_unix/pam_unix.8#3 integrate .. //depot/projects/arm/src/lib/libpam/modules/pam_unix/pam_unix.c#2 integrate .. //depot/projects/arm/src/lib/libpmc/pmc.3#2 integrate .. //depot/projects/arm/src/lib/libypclnt/Makefile#3 integrate .. //depot/projects/arm/src/lib/libypclnt/ypclnt.3#2 delete .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#6 integrate .. //depot/projects/arm/src/sbin/geom/core/geom.c#3 integrate .. //depot/projects/arm/src/sbin/ifconfig/ifconfig.8#12 integrate .. //depot/projects/arm/src/sbin/ifconfig/ifconfig.c#8 integrate .. //depot/projects/arm/src/sbin/ifconfig/ifieee80211.c#8 integrate .. //depot/projects/arm/src/share/man/man3/pthread_cond_timedwait.3#3 integrate .. //depot/projects/arm/src/share/man/man3/pthread_cond_wait.3#3 integrate .. //depot/projects/arm/src/share/man/man4/Makefile#9 integrate .. //depot/projects/arm/src/share/man/man4/edsc.4#1 branch .. //depot/projects/arm/src/share/man/man4/ng_fec.4#2 integrate .. //depot/projects/arm/src/share/man/man4/tap.4#3 integrate .. //depot/projects/arm/src/share/man/man4/watchdog.4#3 integrate .. //depot/projects/arm/src/share/man/man9/Makefile#10 integrate .. //depot/projects/arm/src/share/man/man9/condvar.9#3 integrate .. //depot/projects/arm/src/share/man/man9/lock.9#4 integrate .. //depot/projects/arm/src/share/man/man9/locking.9#2 integrate .. //depot/projects/arm/src/share/man/man9/mtx_pool.9#3 integrate .. //depot/projects/arm/src/share/man/man9/mutex.9#5 integrate .. //depot/projects/arm/src/share/man/man9/rwlock.9#5 integrate .. //depot/projects/arm/src/share/man/man9/sema.9#2 integrate .. //depot/projects/arm/src/share/man/man9/sleep.9#5 integrate .. //depot/projects/arm/src/share/man/man9/sx.9#3 integrate .. //depot/projects/arm/src/share/man/man9/watchdog.9#3 integrate .. //depot/projects/arm/src/share/misc/Makefile#2 integrate .. //depot/projects/arm/src/share/misc/committers-doc.dot#1 branch .. //depot/projects/arm/src/share/misc/committers-ports.dot#1 branch .. //depot/projects/arm/src/share/misc/committers-src.dot#1 branch .. //depot/projects/arm/src/sys/Makefile#11 integrate .. //depot/projects/arm/src/sys/amd64/acpica/OsdEnvironment.c#3 integrate .. //depot/projects/arm/src/sys/amd64/acpica/madt.c#7 integrate .. //depot/projects/arm/src/sys/amd64/amd64/cpu_switch.S#4 integrate .. //depot/projects/arm/src/sys/amd64/amd64/genassym.c#6 integrate .. //depot/projects/arm/src/sys/amd64/amd64/identcpu.c#11 integrate .. //depot/projects/arm/src/sys/amd64/amd64/io_apic.c#11 integrate .. //depot/projects/arm/src/sys/amd64/amd64/legacy.c#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/local_apic.c#18 integrate .. //depot/projects/arm/src/sys/amd64/amd64/machdep.c#22 integrate .. //depot/projects/arm/src/sys/amd64/amd64/nexus.c#9 integrate .. //depot/projects/arm/src/sys/amd64/amd64/prof_machdep.c#5 integrate .. //depot/projects/arm/src/sys/amd64/amd64/support.S#7 integrate .. //depot/projects/arm/src/sys/amd64/amd64/trap.c#17 integrate .. //depot/projects/arm/src/sys/amd64/amd64/tsc.c#3 integrate .. //depot/projects/arm/src/sys/amd64/conf/NOTES#14 integrate .. //depot/projects/arm/src/sys/amd64/include/acpica_machdep.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/apicvar.h#12 integrate .. //depot/projects/arm/src/sys/amd64/include/pcb.h#3 integrate .. //depot/projects/arm/src/sys/amd64/include/segments.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/specialreg.h#7 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux.h#11 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_dummy.c#8 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_locore.s#2 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_machdep.c#14 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_proto.h#19 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_syscall.h#19 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_sysent.c#19 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_sysvec.c#13 integrate .. //depot/projects/arm/src/sys/amd64/linux32/syscalls.master#18 integrate .. //depot/projects/arm/src/sys/arm/arm/cpufunc_asm_arm9.S#4 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_st.c#18 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_twi.c#42 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_twireg.h#8 integrate .. //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#42 integrate .. //depot/projects/arm/src/sys/arm/conf/KB920X#43 integrate .. //depot/projects/arm/src/sys/arm/include/bootconfig.h#2 integrate .. //depot/projects/arm/src/sys/arm/include/cpufunc.h#8 integrate .. //depot/projects/arm/src/sys/arm/include/undefined.h#2 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/i80321_wdog.c#3 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_wdog.c#5 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/boot2.c#32 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#15 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#12 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#42 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/getc.c#7 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/memcmp.c#4 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/sd-card.c#17 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/spi_flash.c#21 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/strlen.c#4 integrate .. //depot/projects/arm/src/sys/boot/ficl/ficl.h#2 integrate .. //depot/projects/arm/src/sys/boot/ficl/float.c#2 integrate .. //depot/projects/arm/src/sys/boot/ficl/softwords/fileaccess.fr#2 integrate .. //depot/projects/arm/src/sys/boot/ficl/softwords/jhlocal.fr#2 integrate .. //depot/projects/arm/src/sys/boot/ficl/softwords/oo.fr#2 integrate .. //depot/projects/arm/src/sys/boot/ficl/softwords/prefix.fr#2 integrate .. //depot/projects/arm/src/sys/boot/ficl/softwords/softcore.awk#2 integrate .. //depot/projects/arm/src/sys/boot/ficl/tools.c#2 integrate .. //depot/projects/arm/src/sys/boot/ficl/unix.c#2 integrate .. //depot/projects/arm/src/sys/boot/ficl/vm.c#2 integrate .. //depot/projects/arm/src/sys/boot/ficl/words.c#2 integrate .. //depot/projects/arm/src/sys/boot/i386/boot0/boot0.S#3 integrate .. //depot/projects/arm/src/sys/boot/i386/libi386/biosacpi.c#4 integrate .. //depot/projects/arm/src/sys/boot/ia64/ski/acpi_stub.c#3 integrate .. //depot/projects/arm/src/sys/compat/linprocfs/linprocfs.c#16 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_file.c#10 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_futex.c#6 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_util.h#6 integrate .. //depot/projects/arm/src/sys/conf/NOTES#44 integrate .. //depot/projects/arm/src/sys/conf/files#65 integrate .. //depot/projects/arm/src/sys/conf/kern.post.mk#15 integrate .. //depot/projects/arm/src/sys/conf/kmod.mk#16 integrate .. //depot/projects/arm/src/sys/conf/options#41 integrate .. //depot/projects/arm/src/sys/contrib/altq/altq/altq_subr.c#4 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/CHANGES.txt#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acapps.h#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acconfig.h#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acdebug.h#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acdisasm.h#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acdispat.h#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acefi.h#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acenv.h#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acevents.h#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acexcep.h#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acfreebsd.h#4 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acgcc.h#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acglobal.h#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/achware.h#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acinterp.h#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/aclocal.h#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acmacros.h#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acnames.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acnamesp.h#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acobject.h#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acopcode.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acoutput.h#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acparser.h#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acpi.h#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acpica_prep.sh#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acpiosxf.h#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acpixf.h#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acresrc.h#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acstruct.h#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/actables.h#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/actbl.h#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/actbl1.h#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/actbl2.h#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/actypes.h#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acutils.h#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/aecommon.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/aeexec.c#2 delete .. //depot/projects/arm/src/sys/contrib/dev/acpica/amlcode.h#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/amlresrc.h#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/common/adfile.c#1 branch .. //depot/projects/arm/src/sys/contrib/dev/acpica/common/adisasm.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/common/adwalk.c#1 branch .. //depot/projects/arm/src/sys/contrib/dev/acpica/common/dmrestag.c#1 branch .. //depot/projects/arm/src/sys/contrib/dev/acpica/common/dmtable.c#1 branch .. //depot/projects/arm/src/sys/contrib/dev/acpica/common/dmtbdump.c#1 branch .. //depot/projects/arm/src/sys/contrib/dev/acpica/common/dmtbinfo.c#1 branch .. //depot/projects/arm/src/sys/contrib/dev/acpica/common/getopt.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslanalyze.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslcodegen.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslcompile.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslcompiler.l#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/asldefine.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslerror.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslfiles.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslfold.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslglobal.h#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/asllength.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/asllisting.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslload.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/asllookup.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslmain.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslmap.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslopcodes.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/asloperands.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslopt.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslresource.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslrestype1.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslrestype2.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslstubs.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/asltransform.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/asltree.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/asltypes.h#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslutils.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dbcmds.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dbdisply.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dbexec.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dbfileio.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dbhistry.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dbinput.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dbstats.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dbutils.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dbxface.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dmbuffer.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dmnames.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dmobject.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dmopcode.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dmresrc.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dmresrcl.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dmresrcs.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dmutils.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dmwalk.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dsfield.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dsinit.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dsmethod.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dsmthdat.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dsobject.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dsopcode.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dsutils.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dswexec.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dswload.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dswscope.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dswstate.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/evevent.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/evgpe.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/evgpeblk.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/evmisc.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/evregion.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/evrgnini.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/evsci.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/evxface.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/evxfevnt.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/evxfregn.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exconfig.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exconvrt.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/excreate.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exdump.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exfield.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exfldio.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exmisc.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exmutex.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exnames.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exoparg1.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exoparg2.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exoparg3.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exoparg6.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exprep.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exregion.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exresnte.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exresolv.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exresop.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exstore.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exstoren.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exstorob.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exsystem.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exutils.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/hwacpi.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/hwgpe.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/hwregs.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/hwsleep.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/hwtimer.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/nsaccess.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/nsalloc.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/nsdump.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/nsdumpdv.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/nseval.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/nsinit.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/nsload.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/nsnames.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/nsobject.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/nsparse.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/nssearch.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/nsutils.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/nswalk.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/nsxfeval.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/nsxfname.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/nsxfobj.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/osunixxf.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/psargs.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/psloop.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/psopcode.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/psparse.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/psscope.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/pstree.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/psutils.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/pswalk.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/psxface.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/rsaddr.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/rscalc.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/rscreate.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/rsdump.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/rsinfo.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/rsio.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/rsirq.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/rslist.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/rsmemory.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/rsmisc.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/rsutils.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/rsxface.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/tbconvrt.c#3 delete .. //depot/projects/arm/src/sys/contrib/dev/acpica/tbfadt.c#1 branch .. //depot/projects/arm/src/sys/contrib/dev/acpica/tbfind.c#1 branch .. //depot/projects/arm/src/sys/contrib/dev/acpica/tbget.c#3 delete .. //depot/projects/arm/src/sys/contrib/dev/acpica/tbgetall.c#3 delete .. //depot/projects/arm/src/sys/contrib/dev/acpica/tbinstal.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/tbrsdt.c#3 delete .. //depot/projects/arm/src/sys/contrib/dev/acpica/tbutils.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/tbxface.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/tbxfroot.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/utalloc.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/utcache.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/utclib.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/utcopy.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/utdebug.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/utdelete.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/uteval.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/utglobal.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/utinit.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/utmath.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/utmisc.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/utmutex.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/utobject.c#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/utresrc.c#1 branch .. //depot/projects/arm/src/sys/contrib/dev/acpica/utstate.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/uttrack.c#1 branch .. //depot/projects/arm/src/sys/contrib/dev/acpica/utxface.c#3 integrate .. //depot/projects/arm/src/sys/crypto/via/padlock.c#9 integrate .. //depot/projects/arm/src/sys/dev/acpi_support/acpi_asus.c#5 integrate .. //depot/projects/arm/src/sys/dev/acpi_support/acpi_fujitsu.c#3 integrate .. //depot/projects/arm/src/sys/dev/acpi_support/acpi_ibm.c#6 integrate .. //depot/projects/arm/src/sys/dev/acpica/Osd/OsdDebug.c#4 integrate .. //depot/projects/arm/src/sys/dev/acpica/Osd/OsdMemory.c#4 integrate .. //depot/projects/arm/src/sys/dev/acpica/Osd/OsdSchedule.c#7 integrate .. //depot/projects/arm/src/sys/dev/acpica/Osd/OsdSynch.c#4 integrate .. //depot/projects/arm/src/sys/dev/acpica/Osd/OsdTable.c#3 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi.c#17 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_acad.c#3 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_button.c#4 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_cmbat.c#6 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_cpu.c#5 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_dock.c#5 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_ec.c#7 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_hpet.c#4 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_lid.c#3 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_pci_link.c#9 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_perf.c#8 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_quirk.c#3 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_resource.c#4 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_throttle.c#7 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_timer.c#4 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpivar.h#9 integrate .. //depot/projects/arm/src/sys/dev/ar/if_ar.c#5 integrate .. //depot/projects/arm/src/sys/dev/ce/if_ce.c#7 integrate .. //depot/projects/arm/src/sys/dev/cm/smc90cx6.c#4 integrate .. //depot/projects/arm/src/sys/dev/cp/if_cp.c#8 integrate .. //depot/projects/arm/src/sys/dev/ctau/if_ct.c#8 integrate .. //depot/projects/arm/src/sys/dev/cx/if_cx.c#7 integrate .. //depot/projects/arm/src/sys/dev/cxgb/common/cxgb_common.h#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/common/cxgb_regs.h#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/common/cxgb_t3_hw.c#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/common/cxgb_version.h#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/common/cxgb_xgmac.c#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_config.h#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_ioctl.h#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_main.c#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_osdep.h#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/arm/src/sys/dev/ed/if_ed.c#6 integrate .. //depot/projects/arm/src/sys/dev/exca/exca.c#6 integrate .. //depot/projects/arm/src/sys/dev/firewire/firewire.c#4 integrate .. //depot/projects/arm/src/sys/dev/firewire/fwohci_pci.c#8 integrate .. //depot/projects/arm/src/sys/dev/fxp/if_fxp.c#17 integrate .. //depot/projects/arm/src/sys/dev/hifn/hifn7751.c#8 integrate .. //depot/projects/arm/src/sys/dev/hifn/hifn7751reg.h#2 integrate .. //depot/projects/arm/src/sys/dev/hifn/hifn7751var.h#3 integrate .. //depot/projects/arm/src/sys/dev/ichwd/ichwd.c#5 integrate .. //depot/projects/arm/src/sys/dev/iicbus/iic.c#12 integrate .. //depot/projects/arm/src/sys/dev/iicbus/iicbb.c#8 integrate .. //depot/projects/arm/src/sys/dev/iicbus/iicbus.c#11 integrate .. //depot/projects/arm/src/sys/dev/iicbus/iicbus.h#6 integrate .. //depot/projects/arm/src/sys/dev/iicbus/iiconf.c#7 integrate .. //depot/projects/arm/src/sys/dev/ipmi/ipmi.c#9 integrate .. //depot/projects/arm/src/sys/dev/ipw/if_ipw.c#9 integrate .. //depot/projects/arm/src/sys/dev/isp/isp.c#20 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_library.c#10 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_library.h#7 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_pci.c#23 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_sbus.c#15 integrate .. //depot/projects/arm/src/sys/dev/isp/ispvar.h#17 integrate .. //depot/projects/arm/src/sys/dev/iwi/if_iwi.c#16 integrate .. //depot/projects/arm/src/sys/dev/mii/brgphy.c#16 integrate .. //depot/projects/arm/src/sys/dev/mk48txx/mk48txx.c#5 integrate .. //depot/projects/arm/src/sys/dev/mxge/if_mxge.c#12 integrate .. //depot/projects/arm/src/sys/dev/pcf/envctrl.c#5 integrate .. //depot/projects/arm/src/sys/dev/pcf/pcf_ebus.c#5 integrate .. //depot/projects/arm/src/sys/dev/pcf/pcf_isa.c#5 integrate .. //depot/projects/arm/src/sys/dev/pci/pci.c#23 integrate .. //depot/projects/arm/src/sys/dev/pci/pcivar.h#11 integrate .. //depot/projects/arm/src/sys/dev/ppc/ppc.c#9 integrate .. //depot/projects/arm/src/sys/dev/re/if_re.c#23 integrate .. //depot/projects/arm/src/sys/dev/safe/safe.c#8 integrate .. //depot/projects/arm/src/sys/dev/scc/scc_bfe.h#3 integrate .. //depot/projects/arm/src/sys/dev/scc/scc_bfe_ebus.c#2 integrate .. //depot/projects/arm/src/sys/dev/scc/scc_bfe_macio.c#2 integrate .. //depot/projects/arm/src/sys/dev/scc/scc_bfe_sbus.c#2 integrate .. //depot/projects/arm/src/sys/dev/scc/scc_core.c#5 integrate .. //depot/projects/arm/src/sys/dev/scc/scc_if.m#2 integrate .. //depot/projects/arm/src/sys/dev/sio/sio_pci.c#4 integrate .. //depot/projects/arm/src/sys/dev/snp/snp.c#4 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/atiixp.c#11 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/hda/hdac.c#10 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/hda/hdac_private.h#5 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/ich.c#17 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/via8233.c#10 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/via82c686.c#6 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/buffer.c#8 integrate .. //depot/projects/arm/src/sys/dev/sr/if_sr.c#5 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_core.c#11 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_dev_ns8250.c#7 integrate .. //depot/projects/arm/src/sys/dev/ubsec/ubsec.c#11 integrate .. //depot/projects/arm/src/sys/dev/usb/uhci.c#9 integrate .. //depot/projects/arm/src/sys/dev/usb/uplcom.c#11 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_quirks.c#13 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdevs#27 integrate .. //depot/projects/arm/src/sys/dev/watchdog/watchdog.c#4 integrate .. //depot/projects/arm/src/sys/dev/wl/if_wl.c#6 integrate .. //depot/projects/arm/src/sys/fs/devfs/devfs_vnops.c#14 integrate .. //depot/projects/arm/src/sys/fs/udf/udf_vnops.c#10 integrate .. //depot/projects/arm/src/sys/geom/eli/g_eli.c#17 integrate .. //depot/projects/arm/src/sys/geom/eli/g_eli_crypto.c#4 integrate .. //depot/projects/arm/src/sys/geom/geom_ctl.c#4 integrate .. //depot/projects/arm/src/sys/geom/geom_dev.c#6 integrate .. //depot/projects/arm/src/sys/geom/journal/g_journal.c#3 integrate .. //depot/projects/arm/src/sys/i386/acpica/OsdEnvironment.c#3 integrate .. //depot/projects/arm/src/sys/i386/acpica/acpi_machdep.c#6 integrate .. //depot/projects/arm/src/sys/i386/acpica/madt.c#7 integrate .. //depot/projects/arm/src/sys/i386/bios/smapi.c#2 integrate .. //depot/projects/arm/src/sys/i386/bios/smbios.c#3 integrate .. //depot/projects/arm/src/sys/i386/bios/vpd.c#2 integrate .. //depot/projects/arm/src/sys/i386/conf/NOTES#22 integrate .. //depot/projects/arm/src/sys/i386/i386/elan-mmcr.c#4 integrate .. //depot/projects/arm/src/sys/i386/i386/geode.c#5 integrate .. //depot/projects/arm/src/sys/i386/i386/identcpu.c#20 integrate .. //depot/projects/arm/src/sys/i386/i386/io_apic.c#10 integrate .. //depot/projects/arm/src/sys/i386/i386/legacy.c#2 integrate .. //depot/projects/arm/src/sys/i386/i386/local_apic.c#17 integrate .. //depot/projects/arm/src/sys/i386/i386/locore.s#4 integrate .. //depot/projects/arm/src/sys/i386/i386/nexus.c#9 integrate .. //depot/projects/arm/src/sys/i386/i386/pmap.c#29 integrate .. //depot/projects/arm/src/sys/i386/i386/support.s#6 integrate .. //depot/projects/arm/src/sys/i386/i386/trap.c#13 integrate .. //depot/projects/arm/src/sys/i386/i386/tsc.c#4 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_misc.c#7 integrate .. //depot/projects/arm/src/sys/i386/include/acpica_machdep.h#2 integrate .. //depot/projects/arm/src/sys/i386/include/apicvar.h#11 integrate .. //depot/projects/arm/src/sys/i386/include/specialreg.h#8 integrate .. //depot/projects/arm/src/sys/i386/isa/prof_machdep.c#5 integrate .. //depot/projects/arm/src/sys/i386/linux/linux.h#11 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_dummy.c#9 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_proto.h#22 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_syscall.h#21 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_sysent.c#21 integrate .. //depot/projects/arm/src/sys/i386/linux/syscalls.master#21 integrate .. //depot/projects/arm/src/sys/ia64/acpica/OsdEnvironment.c#3 integrate .. //depot/projects/arm/src/sys/ia64/acpica/madt.c#3 integrate .. //depot/projects/arm/src/sys/ia64/ia64/nexus.c#7 integrate .. //depot/projects/arm/src/sys/ia64/include/acpica_machdep.h#2 integrate .. //depot/projects/arm/src/sys/kern/init_main.c#14 integrate .. //depot/projects/arm/src/sys/kern/kern_condvar.c#7 integrate .. //depot/projects/arm/src/sys/kern/kern_cpu.c#5 integrate .. //depot/projects/arm/src/sys/kern/kern_exec.c#16 integrate .. //depot/projects/arm/src/sys/kern/kern_exit.c#21 integrate .. //depot/projects/arm/src/sys/kern/kern_kse.c#12 integrate .. //depot/projects/arm/src/sys/kern/kern_lock.c#11 integrate .. //depot/projects/arm/src/sys/kern/kern_mutex.c#14 integrate .. //depot/projects/arm/src/sys/kern/kern_proc.c#11 integrate .. //depot/projects/arm/src/sys/kern/kern_rwlock.c#9 integrate .. //depot/projects/arm/src/sys/kern/kern_sig.c#21 integrate .. //depot/projects/arm/src/sys/kern/kern_sx.c#9 integrate .. //depot/projects/arm/src/sys/kern/kern_synch.c#19 integrate .. //depot/projects/arm/src/sys/kern/kern_thread.c#16 integrate .. //depot/projects/arm/src/sys/kern/subr_witness.c#16 integrate .. //depot/projects/arm/src/sys/kern/sysv_sem.c#9 integrate .. //depot/projects/arm/src/sys/kern/uipc_sockbuf.c#6 integrate .. //depot/projects/arm/src/sys/kern/uipc_socket.c#34 integrate .. //depot/projects/arm/src/sys/kern/uipc_socket2.c#15 delete .. //depot/projects/arm/src/sys/kern/vfs_bio.c#18 integrate .. //depot/projects/arm/src/sys/kern/vfs_subr.c#31 integrate .. //depot/projects/arm/src/sys/kern/vfs_syscalls.c#26 integrate .. //depot/projects/arm/src/sys/modules/Makefile#38 integrate .. //depot/projects/arm/src/sys/modules/acpi/Makefile#8 integrate .. //depot/projects/arm/src/sys/modules/acpi/acpi/Makefile#6 integrate .. //depot/projects/arm/src/sys/modules/crypto/Makefile#4 integrate .. //depot/projects/arm/src/sys/modules/cxgb/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/hifn/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/if_edsc/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/padlock/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/safe/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/ubsec/Makefile#3 integrate .. //depot/projects/arm/src/sys/net/if.c#19 integrate .. //depot/projects/arm/src/sys/net/if_disc.c#6 integrate .. //depot/projects/arm/src/sys/net/if_edsc.c#1 branch .. //depot/projects/arm/src/sys/net/if_ethersubr.c#21 integrate .. //depot/projects/arm/src/sys/net/if_var.h#8 integrate .. //depot/projects/arm/src/sys/net/rtsock.c#10 integrate .. //depot/projects/arm/src/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c#3 integrate .. //depot/projects/arm/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#7 integrate .. //depot/projects/arm/src/sys/netgraph/netflow/ng_netflow.c#6 integrate .. //depot/projects/arm/src/sys/netgraph/netflow/ng_netflow.h#5 integrate .. //depot/projects/arm/src/sys/netgraph/ng_base.c#9 integrate .. //depot/projects/arm/src/sys/netgraph/ng_ether.c#7 integrate .. //depot/projects/arm/src/sys/netinet/if_ether.c#16 integrate .. //depot/projects/arm/src/sys/netinet/in.c#8 integrate .. //depot/projects/arm/src/sys/netinet/in_pcb.h#8 integrate .. //depot/projects/arm/src/sys/netinet/in_var.h#5 integrate .. //depot/projects/arm/src/sys/netinet/ip_input.c#17 integrate .. //depot/projects/arm/src/sys/netinet/ip_output.c#21 integrate .. //depot/projects/arm/src/sys/netinet/raw_ip.c#12 integrate .. //depot/projects/arm/src/sys/netinet/sctp_indata.c#8 integrate .. //depot/projects/arm/src/sys/netinet/sctp_input.c#8 integrate .. //depot/projects/arm/src/sys/netinet/sctp_os_bsd.h#6 integrate .. //depot/projects/arm/src/sys/netinet/sctp_output.c#8 integrate .. //depot/projects/arm/src/sys/netinet/sctp_pcb.c#8 integrate .. //depot/projects/arm/src/sys/netinet/sctp_structs.h#8 integrate .. //depot/projects/arm/src/sys/netinet/sctp_timer.c#6 integrate .. //depot/projects/arm/src/sys/netinet/sctp_usrreq.c#8 integrate .. //depot/projects/arm/src/sys/netinet/sctputil.c#8 integrate .. //depot/projects/arm/src/sys/netinet/tcp.h#6 integrate .. //depot/projects/arm/src/sys/netinet/tcp_debug.h#2 integrate .. //depot/projects/arm/src/sys/netinet/tcp_hostcache.c#3 integrate .. //depot/projects/arm/src/sys/netinet/tcp_input.c#24 integrate .. //depot/projects/arm/src/sys/netinet/tcp_output.c#12 integrate .. //depot/projects/arm/src/sys/netinet/tcp_sack.c#10 integrate .. //depot/projects/arm/src/sys/netinet/tcp_subr.c#19 integrate .. //depot/projects/arm/src/sys/netinet/tcp_timer.c#11 integrate .. //depot/projects/arm/src/sys/netinet/tcp_usrreq.c#15 integrate .. //depot/projects/arm/src/sys/netinet/tcp_var.h#14 integrate .. //depot/projects/arm/src/sys/netinet6/mld6.c#6 integrate .. //depot/projects/arm/src/sys/netipsec/ipsec.c#9 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_vfsops.c#13 integrate .. //depot/projects/arm/src/sys/nfsserver/nfs_serv.c#14 integrate .. //depot/projects/arm/src/sys/opencrypto/crypto.c#7 integrate .. //depot/projects/arm/src/sys/opencrypto/crypto_if.m#2 delete .. //depot/projects/arm/src/sys/opencrypto/cryptodev.c#7 integrate .. //depot/projects/arm/src/sys/opencrypto/cryptodev.h#5 integrate .. //depot/projects/arm/src/sys/opencrypto/cryptodev_if.m#1 branch .. //depot/projects/arm/src/sys/opencrypto/cryptosoft.c#7 integrate .. //depot/projects/arm/src/sys/opencrypto/cryptosoft.h#3 integrate .. //depot/projects/arm/src/sys/pc98/cbus/fdc.c#8 integrate .. //depot/projects/arm/src/sys/rpc/rpcclnt.c#5 integrate .. //depot/projects/arm/src/sys/sys/_mutex.h#3 integrate .. //depot/projects/arm/src/sys/sys/_rwlock.h#3 integrate .. //depot/projects/arm/src/sys/sys/condvar.h#3 integrate .. //depot/projects/arm/src/sys/sys/cpu.h#3 integrate .. //depot/projects/arm/src/sys/sys/eventhandler.h#4 integrate .. //depot/projects/arm/src/sys/sys/lock.h#12 integrate .. //depot/projects/arm/src/sys/sys/lockmgr.h#7 integrate .. //depot/projects/arm/src/sys/sys/mbuf.h#19 integrate .. //depot/projects/arm/src/sys/sys/mount.h#17 integrate .. //depot/projects/arm/src/sys/sys/mutex.h#11 integrate .. //depot/projects/arm/src/sys/sys/param.h#26 integrate .. //depot/projects/arm/src/sys/sys/proc.h#22 integrate .. //depot/projects/arm/src/sys/sys/rwlock.h#7 integrate .. //depot/projects/arm/src/sys/sys/sx.h#8 integrate .. //depot/projects/arm/src/sys/sys/systm.h#21 integrate .. //depot/projects/arm/src/sys/tools/acpi_quirks2h.awk#2 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_softdep.c#15 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_vfsops.c#23 integrate .. //depot/projects/arm/src/sys/vm/vm_fault.c#17 integrate .. //depot/projects/arm/src/sys/vm/vm_map.c#13 integrate .. //depot/projects/arm/src/sys/vm/vm_object.c#19 integrate .. //depot/projects/arm/src/tools/regression/ipsec/ipsec.t#2 integrate .. //depot/projects/arm/src/tools/regression/ipsec/ipsec6.t#1 branch .. //depot/projects/arm/src/tools/tools/crypto/cryptokeytest.c#2 integrate .. //depot/projects/arm/src/tools/tools/crypto/cryptotest.c#2 integrate .. //depot/projects/arm/src/usr.bin/bzip2/Makefile#2 integrate .. //depot/projects/arm/src/usr.bin/bzip2/doc/Makefile#2 delete .. //depot/projects/arm/src/usr.bin/file2c/file2c.1#2 integrate .. //depot/projects/arm/src/usr.bin/file2c/file2c.c#2 integrate .. //depot/projects/arm/src/usr.bin/mail/mail.1#2 integrate .. //depot/projects/arm/src/usr.bin/nl/nl.1#2 integrate .. //depot/projects/arm/src/usr.bin/sockstat/sockstat.c#3 integrate .. //depot/projects/arm/src/usr.bin/tar/Makefile#3 integrate .. //depot/projects/arm/src/usr.bin/tar/bsdtar.c#5 integrate .. //depot/projects/arm/src/usr.sbin/acpi/acpidb/Makefile#2 integrate .. //depot/projects/arm/src/usr.sbin/acpi/acpidb/acpidb.c#2 integrate .. //depot/projects/arm/src/usr.sbin/acpi/acpidump/acpi.c#2 integrate .. //depot/projects/arm/src/usr.sbin/acpi/acpidump/acpi_user.c#2 integrate .. //depot/projects/arm/src/usr.sbin/acpi/acpidump/acpidump.h#2 integrate .. //depot/projects/arm/src/usr.sbin/acpi/iasl/Makefile#2 integrate .. //depot/projects/arm/src/usr.sbin/adduser/adduser.sh#2 integrate .. //depot/projects/arm/src/usr.sbin/arp/arp.4#3 integrate .. //depot/projects/arm/src/usr.sbin/daemon/daemon.8#3 integrate .. //depot/projects/arm/src/usr.sbin/daemon/daemon.c#3 integrate .. //depot/projects/arm/src/usr.sbin/gstat/gstat.c#2 integrate .. //depot/projects/arm/src/usr.sbin/ifmcstat/Makefile#2 integrate .. //depot/projects/arm/src/usr.sbin/ifmcstat/ifmcstat.8#2 integrate .. //depot/projects/arm/src/usr.sbin/ifmcstat/ifmcstat.c#2 integrate .. //depot/projects/arm/src/usr.sbin/ngctl/Makefile#4 integrate .. //depot/projects/arm/src/usr.sbin/pkg_install/lib/exec.c#2 integrate .. //depot/projects/arm/src/usr.sbin/pkg_install/lib/lib.h#2 integrate .. //depot/projects/arm/src/usr.sbin/pkg_install/lib/plist.c#2 integrate .. //depot/projects/arm/src/usr.sbin/pkg_install/lib/url.c#4 integrate .. //depot/projects/arm/src/usr.sbin/pw/cpdir.c#2 integrate .. //depot/projects/arm/src/usr.sbin/pw/pw.8#3 integrate .. //depot/projects/arm/src/usr.sbin/pw/pw.c#3 integrate .. //depot/projects/arm/src/usr.sbin/pw/pw.conf.5#2 integrate .. //depot/projects/arm/src/usr.sbin/pw/pw.h#2 integrate .. //depot/projects/arm/src/usr.sbin/pw/pw_conf.c#2 integrate .. //depot/projects/arm/src/usr.sbin/pw/pw_user.c#2 integrate .. //depot/projects/arm/src/usr.sbin/sysinstall/Makefile#2 integrate .. //depot/projects/arm/src/usr.sbin/sysinstall/biosmptable.c#2 integrate .. //depot/projects/arm/src/usr.sbin/sysinstall/devices.c#6 integrate .. //depot/projects/arm/src/usr.sbin/sysinstall/dist.c#4 integrate Differences ... ==== //depot/projects/arm/src/ObsoleteFiles.inc#17 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.75 2007/03/01 10:53:55 bms Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.77 2007/03/28 07:49:57 delphij Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,10 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070328: bzip2 1.0.4 +OLD_FILES+=usr/share/info/bzip2.info.gz +# 20070303: libarchive 2.0 +OLD_LIBS+=usr/lib/libarchive.so.3 # 20070301: remove addr2ascii and ascii2addr OLD_FILES+=usr/share/man/man3/addr2ascii.3.gz # 20070225: vm_page_unmanage() removed ==== //depot/projects/arm/src/contrib/bzip2/CHANGES#2 (text+ko) ==== @@ -1,5 +1,18 @@ + ------------------------------------------------------------------ + This file is part of bzip2/libbzip2, a program and library for + lossless, block-sorting data compression. + bzip2/libbzip2 version 1.0.4 of 20 December 2006 + Copyright (C) 1996-2006 Julian Seward + Please read the WARNING, DISCLAIMER and PATENTS sections in the + README file. + + This program is released under the terms of the license contained + in the file LICENSE. + ------------------------------------------------------------------ + + 0.9.0 ~~~~~ First version. @@ -261,7 +274,7 @@ decompressor to crash, loop or access memory which does not belong to it. If you are using bzip2 or the library to decompress bitstreams from untrusted sources, an upgrade - to 1.0.3 is recommended. + to 1.0.3 is recommended. This fixes CAN-2005-1260. * The documentation has been converted to XML, from which html and pdf can be derived. @@ -273,3 +286,29 @@ * The BZ_NO_STDIO cpp symbol was not properly observed in 1.0.2. This has been fixed. + + +1.0.4 (20 Dec 06) +~~~~~~~~~~~~~~~~~ +Fixes some minor bugs since the last version, 1.0.3. + +* Fix file permissions race problem (CAN-2005-0953). + +* Avoid possible segfault in BZ2_bzclose. From Coverity's NetBSD + scan. + +* 'const'/prototype cleanups in the C code. + +* Change default install location to /usr/local, and handle multiple + 'make install's without error. + +* Sanitise file names more carefully in bzgrep. Fixes CAN-2005-0758 + to the extent that applies to bzgrep. + +* Use 'mktemp' rather than 'tempfile' in bzdiff. + +* Tighten up a couple of assertions in blocksort.c following automated + analysis. + +* Fix minor doc/comment bugs. + ==== //depot/projects/arm/src/contrib/bzip2/FREEBSD-upgrade#2 (text+ko) ==== @@ -1,18 +1,18 @@ -$FreeBSD: src/contrib/bzip2/FREEBSD-upgrade,v 1.2 2005/05/16 18:56:30 obrien Exp $ +$FreeBSD: src/contrib/bzip2/FREEBSD-upgrade,v 1.4 2007/03/30 16:33:05 delphij Exp $ Julian Seward's bzip2 - originals can be found at: http://sources.redhat.com/bzip2/ + originals can be found at: http://www.bzip.org/downloads.html Imported by: - cvs import -m "Virgin import (trimmed) of Bzip2 version 1.0.3." \ - src/contrib/bzip2 BZIP2 v1_0_3 + cvs import -m "Virgin import (trimmed) of Bzip2 version 1.0.4." \ + src/contrib/bzip2 BZIP2 v1_0_4 Notes: The following log shows details of trimming: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - tar xvfz bzip2-1.0.3.tar.gz -X FREEBSD-Xlist - cd bzip2-1.0.3 + tar xvfz bzip2-1.0.4.tar.gz -X FREEBSD-Xlist + cd bzip2-1.0.4 uuencode sample1.bz2 sample1.bz2 > sample1.bz2.uu uuencode sample2.bz2 sample2.bz2 > sample2.bz2.uu uuencode sample3.bz2 sample3.bz2 > sample3.bz2.uu ==== //depot/projects/arm/src/contrib/bzip2/LICENSE#2 (text+ko) ==== @@ -1,6 +1,8 @@ +-------------------------------------------------------------------------- + This program, "bzip2", the associated library "libbzip2", and all -documentation, are copyright (C) 1996-2005 Julian R Seward. All +documentation, are copyright (C) 1996-2006 Julian R Seward. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -35,6 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Julian Seward, Cambridge, UK. -jseward@acm.org -bzip2/libbzip2 version 1.0.3 of 15 February 2005 +jseward@bzip.org +bzip2/libbzip2 version 1.0.4 of 20 December 2006 +-------------------------------------------------------------------------- ==== //depot/projects/arm/src/contrib/bzip2/Makefile#2 (text+ko) ==== @@ -1,3 +1,16 @@ +# ------------------------------------------------------------------ +# This file is part of bzip2/libbzip2, a program and library for +# lossless, block-sorting data compression. +# +# bzip2/libbzip2 version 1.0.4 of 20 December 2006 +# Copyright (C) 1996-2006 Julian Seward +# +# Please read the WARNING, DISCLAIMER and PATENTS sections in the +# README file. +# +# This program is released under the terms of the license contained +# in the file LICENSE. +# ------------------------------------------------------------------ SHELL=/bin/sh @@ -8,10 +21,10 @@ LDFLAGS= BIGFILES=-D_FILE_OFFSET_BITS=64 -CFLAGS=-Wall -Winline -O -g $(BIGFILES) +CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) # Where you want it installed when you do 'make install' -PREFIX=/usr +PREFIX=/usr/local OBJS= blocksort.o \ @@ -77,14 +90,14 @@ cp -f libbz2.a $(PREFIX)/lib chmod a+r $(PREFIX)/lib/libbz2.a cp -f bzgrep $(PREFIX)/bin/bzgrep - ln $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep - ln $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep + ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep + ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep chmod a+x $(PREFIX)/bin/bzgrep cp -f bzmore $(PREFIX)/bin/bzmore - ln $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless + ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless chmod a+x $(PREFIX)/bin/bzmore cp -f bzdiff $(PREFIX)/bin/bzdiff - ln $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp + ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp chmod a+x $(PREFIX)/bin/bzdiff cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1 chmod a+r $(PREFIX)/man/man1/bzgrep.1 @@ -124,10 +137,10 @@ distclean: clean rm -f manual.ps manual.html manual.pdf -DISTNAME=bzip2-1.0.3 +DISTNAME=bzip2-1.0.4 dist: check manual rm -f $(DISTNAME) - ln -sf . $(DISTNAME) + ln -s -f . $(DISTNAME) tar cvf $(DISTNAME).tar \ $(DISTNAME)/blocksort.c \ $(DISTNAME)/huffman.c \ @@ -167,7 +180,6 @@ $(DISTNAME)/libbz2.dsp \ $(DISTNAME)/dlltest.dsp \ $(DISTNAME)/makefile.msc \ - $(DISTNAME)/Y2K_INFO \ $(DISTNAME)/unzcrash.c \ $(DISTNAME)/spewG.c \ $(DISTNAME)/mk251.c \ ==== //depot/projects/arm/src/contrib/bzip2/Makefile-libbz2_so#2 (text+ko) ==== @@ -1,15 +1,30 @@ # This Makefile builds a shared version of the library, -# libbz2.so.1.0.3, with soname libbz2.so.1.0, +# libbz2.so.1.0.4, with soname libbz2.so.1.0, # at least on x86-Linux (RedHat 7.2), # with gcc-2.96 20000731 (Red Hat Linux 7.1 2.96-98). -# Please see the README file for some -# important info about building the library like this. +# Please see the README file for some important info +# about building the library like this. + +# ------------------------------------------------------------------ +# This file is part of bzip2/libbzip2, a program and library for +# lossless, block-sorting data compression. +# +# bzip2/libbzip2 version 1.0.4 of 20 December 2006 +# Copyright (C) 1996-2006 Julian Seward +# +# Please read the WARNING, DISCLAIMER and PATENTS sections in the +# README file. +# +# This program is released under the terms of the license contained +# in the file LICENSE. +# ------------------------------------------------------------------ + SHELL=/bin/sh CC=gcc BIGFILES=-D_FILE_OFFSET_BITS=64 -CFLAGS=-fpic -fPIC -Wall -Winline -O -g +CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) OBJS= blocksort.o \ huffman.o \ @@ -20,13 +35,13 @@ bzlib.o all: $(OBJS) - $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.3 $(OBJS) - $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.3 + $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.4 $(OBJS) + $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.4 rm -f libbz2.so.1.0 - ln -s libbz2.so.1.0.3 libbz2.so.1.0 + ln -s libbz2.so.1.0.4 libbz2.so.1.0 clean: - rm -f $(OBJS) bzip2.o libbz2.so.1.0.3 libbz2.so.1.0 bzip2-shared + rm -f $(OBJS) bzip2.o libbz2.so.1.0.4 libbz2.so.1.0 bzip2-shared blocksort.o: blocksort.c $(CC) $(CFLAGS) -c blocksort.c ==== //depot/projects/arm/src/contrib/bzip2/README#2 (text+ko) ==== @@ -1,33 +1,48 @@ -This is the README for bzip2, a block-sorting file compressor, version -1.0.3. This version is fully compatible with the previous public -releases, versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1 and 1.0.2. +This is the README for bzip2/libzip2. +This version is fully compatible with the previous public releases. + +------------------------------------------------------------------ +This file is part of bzip2/libbzip2, a program and library for +lossless, block-sorting data compression. + +bzip2/libbzip2 version 1.0.4 of 20 December 2006 +Copyright (C) 1996-2006 Julian Seward + +Please read the WARNING, DISCLAIMER and PATENTS sections in this file. -bzip2-1.0.3 is distributed under a BSD-style license. For details, -see the file LICENSE. +This program is released under the terms of the license contained +in the file LICENSE. +------------------------------------------------------------------ Complete documentation is available in Postscript form (manual.ps), PDF (manual.pdf) or html (manual.html). A plain-text version of the -manual page is available as bzip2.txt. A statement about Y2K issues -is now included in the file Y2K_INFO. +manual page is available as bzip2.txt. HOW TO BUILD -- UNIX -Type `make'. This builds the library libbz2.a and then the -programs bzip2 and bzip2recover. Six self-tests are run. -If the self-tests complete ok, carry on to installation: +Type 'make'. This builds the library libbz2.a and then the programs +bzip2 and bzip2recover. Six self-tests are run. If the self-tests +complete ok, carry on to installation: + +To install in /usr/local/bin, /usr/local/lib, /usr/local/man and +/usr/local/include, type -To install in /usr/bin, /usr/lib, /usr/man and /usr/include, type make install -To install somewhere else, eg, /xxx/yyy/{bin,lib,man,include}, type + +To install somewhere else, eg, /xxx/yyy/{bin,lib,man,include}, type + make install PREFIX=/xxx/yyy + If you are (justifiably) paranoid and want to see what 'make install' is going to do, you can first do + make -n install or make -n install PREFIX=/xxx/yyy respectively. -The -n instructs make to show the commands it would execute, but -not actually execute them. + +The -n instructs make to show the commands it would execute, but not +actually execute them. HOW TO BUILD -- UNIX, shared library libbz2.so. @@ -49,23 +64,25 @@ bzCompress to BZ2_bzCompress, to avoid namespace pollution. Unfortunately this means that the libbz2.so created by Makefile-libbz2_so will not work with any program which used an older -version of the library. Sorry. I do encourage library clients to >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Mar 31 02:46:10 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C639616A403; Sat, 31 Mar 2007 02:46:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9A5C816A401 for ; Sat, 31 Mar 2007 02:46:10 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8C60813C44C for ; Sat, 31 Mar 2007 02:46:10 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2V2kA2s082842 for ; Sat, 31 Mar 2007 02:46:10 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2V2kA9H082839 for perforce@freebsd.org; Sat, 31 Mar 2007 02:46:10 GMT (envelope-from imp@freebsd.org) Date: Sat, 31 Mar 2007 02:46:10 GMT Message-Id: <200703310246.l2V2kA9H082839@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 116994 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Mar 2007 02:46:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=116994 Change 116994 by imp@imp_paco-paco on 2007/03/31 02:45:43 IFC @116992 Affected files ... .. //depot/projects/arm/src/sys/amd64/amd64/support.S#8 integrate .. //depot/projects/arm/src/sys/i386/i386/support.s#7 integrate Differences ... ==== //depot/projects/arm/src/sys/amd64/amd64/support.S#8 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.125 2007/03/30 23:19:08 jkim Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.126 2007/03/31 01:47:37 jkim Exp $ */ #include "opt_ddb.h" @@ -671,33 +671,15 @@ incl %eax ret -/* - * Support for BB-profiling (gcc -a). The kernbb program will extract - * the data from the kernel. - */ - - .data - ALIGN_DATA - .globl bbhead -bbhead: - .quad 0 - - .text -NON_GPROF_ENTRY(__bb_init_func) - movq $1,(%rdi) - movq bbhead,%rax - movq %rax,32(%rdi) - movq %rdi,bbhead - NON_GPROF_RET +/*****************************************************************************/ +/* linux_futex support */ +/*****************************************************************************/ - .text - futex_fault: movq $0,PCB_ONFAULT(%rcx) movq $-EFAULT,%rax ret -/* int futex_xchgl(int oparg, caddr_t uaddr, int *oldval); */ ENTRY(futex_xchgl) movq PCPU(CURPCB),%rcx movq $futex_fault,PCB_ONFAULT(%rcx) @@ -715,7 +697,6 @@ movq %rax,PCB_ONFAULT(%rcx) ret -/* int futex_addl(int oparg, caddr_t uaddr, int *oldval); */ ENTRY(futex_addl) movq PCPU(CURPCB),%rcx movq $futex_fault,PCB_ONFAULT(%rcx) @@ -732,3 +713,22 @@ xorl %eax,%eax movq %rax,PCB_ONFAULT(%rcx) ret + +/* + * Support for BB-profiling (gcc -a). The kernbb program will extract + * the data from the kernel. + */ + + .data + ALIGN_DATA + .globl bbhead +bbhead: + .quad 0 + + .text +NON_GPROF_ENTRY(__bb_init_func) + movq $1,(%rdi) + movq bbhead,%rax + movq %rax,32(%rdi) + movq %rdi,bbhead + NON_GPROF_RET ==== //depot/projects/arm/src/sys/i386/i386/support.s#7 (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/i386/i386/support.s,v 1.116 2007/03/30 23:19:08 jkim Exp $ + * $FreeBSD: src/sys/i386/i386/support.s,v 1.117 2007/03/31 01:47:37 jkim Exp $ */ #include "opt_npx.h" @@ -1513,35 +1513,15 @@ incl %eax ret -/* - * Support for BB-profiling (gcc -a). The kernbb program will extract - * the data from the kernel. - */ +/*****************************************************************************/ +/* linux_futex support */ +/*****************************************************************************/ - .data - ALIGN_DATA - .globl bbhead -bbhead: - .long 0 - - .text -NON_GPROF_ENTRY(__bb_init_func) - movl 4(%esp),%eax - movl $1,(%eax) - movl bbhead,%edx - movl %edx,16(%eax) - movl %eax,bbhead - NON_GPROF_RET - -/* necessary for linux_futex support */ - .text - futex_fault: movl $0,PCB_ONFAULT(%ecx) movl $-EFAULT,%eax ret -/* int futex_xchgl(int oparg, caddr_t uaddr, int *oldval); */ ENTRY(futex_xchgl) movl PCPU(CURPCB),%ecx movl $futex_fault,PCB_ONFAULT(%ecx) @@ -1560,7 +1540,6 @@ movl $0,PCB_ONFAULT(%ecx) ret -/* int futex_addl(int oparg, caddr_t uaddr, int *oldval); */ ENTRY(futex_addl) movl PCPU(CURPCB),%ecx movl $futex_fault,PCB_ONFAULT(%ecx) @@ -1578,3 +1557,23 @@ xorl %eax,%eax movl $0,PCB_ONFAULT(%ecx) ret + +/* + * Support for BB-profiling (gcc -a). The kernbb program will extract + * the data from the kernel. + */ + + .data + ALIGN_DATA + .globl bbhead +bbhead: + .long 0 + + .text +NON_GPROF_ENTRY(__bb_init_func) + movl 4(%esp),%eax + movl $1,(%eax) + movl bbhead,%edx + movl %edx,16(%eax) + movl %eax,bbhead + NON_GPROF_RET From owner-p4-projects@FreeBSD.ORG Sat Mar 31 06:09:05 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EBB6916A405; Sat, 31 Mar 2007 06:09:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A781616A402 for ; Sat, 31 Mar 2007 06:09:04 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 956D913C455 for ; Sat, 31 Mar 2007 06:09:04 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2V694xs032534 for ; Sat, 31 Mar 2007 06:09:04 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2V67jVR032466 for perforce@freebsd.org; Sat, 31 Mar 2007 06:07:45 GMT (envelope-from marcel@freebsd.org) Date: Sat, 31 Mar 2007 06:07:45 GMT Message-Id: <200703310607.l2V67jVR032466@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 Cc: Subject: PERFORCE change 116998 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Mar 2007 06:09:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=116998 Change 116998 by marcel@marcel_cluster on 2007/03/31 06:06:41 IFC @116997 Affected files ... .. //depot/projects/powerpc/Makefile.inc1#3 integrate .. //depot/projects/powerpc/ObsoleteFiles.inc#4 integrate .. //depot/projects/powerpc/UPDATING#5 integrate .. //depot/projects/powerpc/bin/csh/config.h#2 integrate .. //depot/projects/powerpc/bin/csh/config_p.h#2 integrate .. //depot/projects/powerpc/bin/df/df.1#2 integrate .. //depot/projects/powerpc/bin/df/df.c#2 integrate .. //depot/projects/powerpc/bin/expr/expr.1#2 integrate .. //depot/projects/powerpc/bin/kill/kill.1#2 integrate .. //depot/projects/powerpc/bin/rcp/rcp.1#2 integrate .. //depot/projects/powerpc/bin/setfacl/setfacl.c#2 integrate .. //depot/projects/powerpc/contrib/bzip2/CHANGES#2 integrate .. //depot/projects/powerpc/contrib/bzip2/FREEBSD-upgrade#2 integrate .. //depot/projects/powerpc/contrib/bzip2/LICENSE#2 integrate .. //depot/projects/powerpc/contrib/bzip2/Makefile#2 integrate .. //depot/projects/powerpc/contrib/bzip2/Makefile-libbz2_so#2 integrate .. //depot/projects/powerpc/contrib/bzip2/README#2 integrate .. //depot/projects/powerpc/contrib/bzip2/README.COMPILATION.PROBLEMS#2 integrate .. //depot/projects/powerpc/contrib/bzip2/Y2K_INFO#2 delete .. //depot/projects/powerpc/contrib/bzip2/blocksort.c#2 integrate .. //depot/projects/powerpc/contrib/bzip2/bzip2.1#2 integrate .. //depot/projects/powerpc/contrib/bzip2/bzip2.c#2 integrate .. //depot/projects/powerpc/contrib/bzip2/bzip2recover.c#2 integrate .. //depot/projects/powerpc/contrib/bzip2/bzlib.c#2 integrate .. //depot/projects/powerpc/contrib/bzip2/bzlib.h#2 integrate .. //depot/projects/powerpc/contrib/bzip2/bzlib_private.h#2 integrate .. //depot/projects/powerpc/contrib/bzip2/compress.c#2 integrate .. //depot/projects/powerpc/contrib/bzip2/crctable.c#2 integrate .. //depot/projects/powerpc/contrib/bzip2/decompress.c#2 integrate .. //depot/projects/powerpc/contrib/bzip2/dlltest.c#2 integrate .. //depot/projects/powerpc/contrib/bzip2/huffman.c#2 integrate .. //depot/projects/powerpc/contrib/bzip2/manual.texi#2 delete .. //depot/projects/powerpc/contrib/bzip2/randtable.c#2 integrate .. //depot/projects/powerpc/contrib/bzip2/sample1.bz2.uu#2 integrate .. //depot/projects/powerpc/contrib/bzip2/sample1.ref.gz.uu#2 integrate .. //depot/projects/powerpc/contrib/bzip2/sample2.bz2.uu#2 integrate .. //depot/projects/powerpc/contrib/bzip2/sample2.ref.gz.uu#2 integrate .. //depot/projects/powerpc/contrib/bzip2/sample3.bz2.uu#2 integrate .. //depot/projects/powerpc/contrib/bzip2/sample3.ref.gz.uu#2 integrate .. //depot/projects/powerpc/contrib/bzip2/spewG.c#2 integrate .. //depot/projects/powerpc/contrib/bzip2/unzcrash.c#2 integrate .. //depot/projects/powerpc/contrib/bzip2/words0#2 integrate .. //depot/projects/powerpc/contrib/bzip2/words2#2 integrate .. //depot/projects/powerpc/contrib/bzip2/words3#2 integrate .. //depot/projects/powerpc/contrib/libpcap/pcap-bpf.c#2 integrate .. //depot/projects/powerpc/contrib/netcat/nc.1#2 integrate .. //depot/projects/powerpc/contrib/netcat/netcat.c#2 integrate .. //depot/projects/powerpc/contrib/netcat/socks.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/FREEBSD-Xlist#2 integrate .. //depot/projects/powerpc/contrib/tcsh/FREEBSD-upgrade#2 integrate .. //depot/projects/powerpc/contrib/tcsh/Fixes#2 integrate .. //depot/projects/powerpc/contrib/tcsh/Imakefile#2 integrate .. //depot/projects/powerpc/contrib/tcsh/MAKEDIFFS#2 integrate .. //depot/projects/powerpc/contrib/tcsh/MAKESHAR#2 integrate .. //depot/projects/powerpc/contrib/tcsh/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/tcsh/Makefile.std#2 integrate .. //depot/projects/powerpc/contrib/tcsh/Makefile.vms#2 integrate .. //depot/projects/powerpc/contrib/tcsh/README#2 integrate .. //depot/projects/powerpc/contrib/tcsh/complete.tcsh#2 integrate .. //depot/projects/powerpc/contrib/tcsh/config.h.in#2 integrate .. //depot/projects/powerpc/contrib/tcsh/config/bsd4.4#2 integrate .. //depot/projects/powerpc/contrib/tcsh/config_f.h#2 integrate .. //depot/projects/powerpc/contrib/tcsh/configure#2 integrate .. //depot/projects/powerpc/contrib/tcsh/configure.in#2 integrate .. //depot/projects/powerpc/contrib/tcsh/ed.chared.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/ed.decls.h#2 integrate .. //depot/projects/powerpc/contrib/tcsh/ed.defns.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/ed.h#2 integrate .. //depot/projects/powerpc/contrib/tcsh/ed.init.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/ed.inputl.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/ed.refresh.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/ed.screen.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/ed.term.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/ed.term.h#2 integrate .. //depot/projects/powerpc/contrib/tcsh/ed.xmap.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/eight-bit.me#2 integrate .. //depot/projects/powerpc/contrib/tcsh/gethost.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/glob.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/glob.h#2 integrate .. //depot/projects/powerpc/contrib/tcsh/host.defs#2 integrate .. //depot/projects/powerpc/contrib/tcsh/imake.config#2 integrate .. //depot/projects/powerpc/contrib/tcsh/ma.setp.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/mi.termios.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/mi.varargs.h#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/C/set1#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/C/set10#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/C/set11#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/C/set12#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/C/set13#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/C/set14#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/C/set15#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/C/set16#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/C/set17#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/C/set18#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/C/set19#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/C/set2#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/C/set20#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/C/set21#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/C/set22#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/C/set23#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/C/set24#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/C/set25#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/C/set26#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/C/set27#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/C/set29#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/C/set3#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/C/set30#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/C/set31#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/C/set4#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/C/set5#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/C/set6#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/C/set7#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/C/set8#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/C/set9#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/Makefile#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/et/set1#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/et/set10#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/et/set11#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/et/set12#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/et/set13#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/et/set14#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/et/set15#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/et/set16#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/et/set17#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/et/set18#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/et/set19#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/et/set2#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/et/set20#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/et/set21#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/et/set22#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/et/set23#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/et/set24#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/et/set25#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/et/set26#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/et/set27#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/et/set29#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/et/set3#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/et/set30#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/et/set31#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/et/set4#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/et/set5#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/et/set6#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/et/set7#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/et/set8#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/et/set9#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/finnish/set1#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/finnish/set10#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/finnish/set11#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/finnish/set12#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/finnish/set13#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/finnish/set14#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/finnish/set15#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/finnish/set16#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/finnish/set17#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/finnish/set18#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/finnish/set19#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/finnish/set2#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/finnish/set20#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/finnish/set21#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/finnish/set22#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/finnish/set23#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/finnish/set24#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/finnish/set25#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/finnish/set26#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/finnish/set27#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/finnish/set29#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/finnish/set3#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/finnish/set30#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/finnish/set31#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/finnish/set4#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/finnish/set5#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/finnish/set6#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/finnish/set7#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/finnish/set8#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/finnish/set9#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/french/set1#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/french/set10#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/french/set11#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/french/set12#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/french/set13#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/french/set14#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/french/set15#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/french/set16#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/french/set17#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/french/set18#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/french/set19#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/french/set2#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/french/set20#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/french/set21#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/french/set22#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/french/set23#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/french/set24#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/french/set25#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/french/set26#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/french/set27#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/french/set29#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/french/set3#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/french/set30#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/french/set31#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/french/set4#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/french/set5#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/french/set6#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/french/set7#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/french/set8#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/french/set9#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/german/set1#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/german/set10#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/german/set11#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/german/set12#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/german/set13#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/german/set14#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/german/set15#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/german/set16#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/german/set17#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/german/set18#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/german/set19#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/german/set2#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/german/set20#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/german/set21#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/german/set22#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/german/set23#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/german/set24#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/german/set25#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/german/set26#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/german/set27#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/german/set29#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/german/set3#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/german/set30#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/german/set31#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/german/set4#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/german/set5#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/german/set6#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/german/set7#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/german/set8#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/german/set9#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/greek/set1#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/greek/set10#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/greek/set11#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/greek/set12#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/greek/set13#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/greek/set14#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/greek/set15#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/greek/set16#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/greek/set17#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/greek/set18#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/greek/set19#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/greek/set2#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/greek/set20#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/greek/set21#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/greek/set22#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/greek/set23#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/greek/set24#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/greek/set25#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/greek/set26#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/greek/set27#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/greek/set29#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/greek/set3#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/greek/set30#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/greek/set31#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/greek/set4#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/greek/set5#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/greek/set6#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/greek/set7#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/greek/set8#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/greek/set9#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/italian/set1#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/italian/set10#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/italian/set11#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/italian/set12#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/italian/set13#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/italian/set14#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/italian/set15#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/italian/set16#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/italian/set17#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/italian/set18#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/italian/set19#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/italian/set2#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/italian/set20#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/italian/set21#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/italian/set22#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/italian/set23#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/italian/set24#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/italian/set25#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/italian/set26#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/italian/set27#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/italian/set29#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/italian/set3#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/italian/set30#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/italian/set31#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/italian/set4#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/italian/set5#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/italian/set6#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/italian/set7#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/italian/set8#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/italian/set9#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ja/set1#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ja/set10#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ja/set11#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ja/set12#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ja/set13#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ja/set15#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ja/set16#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ja/set17#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ja/set18#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ja/set2#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ja/set21#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ja/set24#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ja/set29#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ja/set3#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ja/set30#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ja/set4#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ja/set5#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ja/set6#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ja/set7#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ja/set8#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/pl/set1#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/pl/set10#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/pl/set11#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/pl/set12#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/pl/set13#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/pl/set14#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/pl/set15#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/pl/set16#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/pl/set17#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/pl/set18#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/pl/set19#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/pl/set2#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/pl/set20#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/pl/set21#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/pl/set22#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/pl/set23#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/pl/set24#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/pl/set25#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/pl/set26#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/pl/set27#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/pl/set29#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/pl/set3#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/pl/set30#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/pl/set31#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/pl/set4#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/pl/set5#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/pl/set6#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/pl/set7#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/pl/set8#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/pl/set9#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/russian/set1#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/russian/set10#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/russian/set11#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/russian/set12#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/russian/set13#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/russian/set14#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/russian/set15#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/russian/set16#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/russian/set17#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/russian/set18#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/russian/set19#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/russian/set2#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/russian/set20#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/russian/set21#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/russian/set22#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/russian/set23#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/russian/set24#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/russian/set25#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/russian/set26#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/russian/set27#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/russian/set29#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/russian/set3#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/russian/set30#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/russian/set31#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/russian/set4#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/russian/set5#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/russian/set6#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/russian/set7#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/russian/set8#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/russian/set9#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/spanish/set1#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/spanish/set10#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/spanish/set11#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/spanish/set12#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/spanish/set13#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/spanish/set14#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/spanish/set15#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/spanish/set16#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/spanish/set17#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/spanish/set18#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/spanish/set19#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/spanish/set2#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/spanish/set20#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/spanish/set21#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/spanish/set22#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/spanish/set23#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/spanish/set24#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/spanish/set25#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/spanish/set26#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/spanish/set27#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/spanish/set29#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/spanish/set3#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/spanish/set30#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/spanish/set31#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/spanish/set4#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/spanish/set5#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/spanish/set6#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/spanish/set7#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/spanish/set8#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/spanish/set9#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ukrainian/set1#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ukrainian/set10#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ukrainian/set11#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ukrainian/set12#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ukrainian/set13#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ukrainian/set14#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ukrainian/set15#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ukrainian/set16#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ukrainian/set17#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ukrainian/set18#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ukrainian/set19#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ukrainian/set2#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ukrainian/set20#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ukrainian/set21#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ukrainian/set22#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ukrainian/set23#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ukrainian/set24#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ukrainian/set25#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ukrainian/set26#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ukrainian/set27#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ukrainian/set29#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ukrainian/set3#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ukrainian/set30#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ukrainian/set31#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ukrainian/set4#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ukrainian/set5#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ukrainian/set6#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ukrainian/set7#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ukrainian/set8#2 integrate .. //depot/projects/powerpc/contrib/tcsh/nls/ukrainian/set9#2 integrate .. //depot/projects/powerpc/contrib/tcsh/patchlevel.h#2 integrate .. //depot/projects/powerpc/contrib/tcsh/pathnames.h#2 integrate .. //depot/projects/powerpc/contrib/tcsh/sh.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/sh.char.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/sh.char.h#2 integrate .. //depot/projects/powerpc/contrib/tcsh/sh.decls.h#2 integrate .. //depot/projects/powerpc/contrib/tcsh/sh.dir.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/sh.dir.h#2 integrate .. //depot/projects/powerpc/contrib/tcsh/sh.dol.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/sh.err.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/sh.exec.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/sh.exp.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/sh.file.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/sh.func.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/sh.glob.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/sh.h#2 integrate .. //depot/projects/powerpc/contrib/tcsh/sh.hist.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/sh.init.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/sh.lex.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/sh.misc.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/sh.parse.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/sh.print.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/sh.proc.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/sh.proc.h#2 integrate .. //depot/projects/powerpc/contrib/tcsh/sh.sem.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/sh.set.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/sh.time.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/sh.types.h#2 integrate .. //depot/projects/powerpc/contrib/tcsh/snames.h#2 integrate .. //depot/projects/powerpc/contrib/tcsh/tc.alloc.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/tc.bind.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/tc.const.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/tc.decls.h#2 integrate .. //depot/projects/powerpc/contrib/tcsh/tc.disc.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/tc.func.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/tc.h#2 integrate .. //depot/projects/powerpc/contrib/tcsh/tc.nls.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/tc.nls.h#2 integrate .. //depot/projects/powerpc/contrib/tcsh/tc.os.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/tc.os.h#2 integrate .. //depot/projects/powerpc/contrib/tcsh/tc.printf.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/tc.prompt.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/tc.sched.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/tc.sig.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/tc.sig.h#2 integrate .. //depot/projects/powerpc/contrib/tcsh/tc.str.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/tc.vers.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/tc.wait.h#2 integrate .. //depot/projects/powerpc/contrib/tcsh/tc.who.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/tcsh.man#2 integrate .. //depot/projects/powerpc/contrib/tcsh/tcsh.man2html#2 integrate .. //depot/projects/powerpc/contrib/tcsh/termcap.vms#2 integrate .. //depot/projects/powerpc/contrib/tcsh/tw.color.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/tw.comp.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/tw.decls.h#2 integrate .. //depot/projects/powerpc/contrib/tcsh/tw.h#2 integrate .. //depot/projects/powerpc/contrib/tcsh/tw.help.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/tw.init.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/tw.parse.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/tw.spell.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/vms.termcap.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/CHANGES#2 integrate .. //depot/projects/powerpc/crypto/openssl/Configure#2 integrate .. //depot/projects/powerpc/crypto/openssl/FAQ#2 integrate .. //depot/projects/powerpc/crypto/openssl/FREEBSD-upgrade#2 integrate .. //depot/projects/powerpc/crypto/openssl/INSTALL#2 integrate .. //depot/projects/powerpc/crypto/openssl/LICENSE#2 integrate .. //depot/projects/powerpc/crypto/openssl/Makefile#2 integrate .. //depot/projects/powerpc/crypto/openssl/NEWS#2 integrate .. //depot/projects/powerpc/crypto/openssl/README#2 integrate .. //depot/projects/powerpc/crypto/openssl/apps/CA.pl#2 integrate .. //depot/projects/powerpc/crypto/openssl/apps/Makefile#2 integrate .. //depot/projects/powerpc/crypto/openssl/apps/ca.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/apps/dgst.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/apps/ec.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/apps/enc.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/apps/ocsp.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/apps/pkcs12.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/apps/s_client.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/apps/s_server.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/certs/aol1.pem#1 branch .. //depot/projects/powerpc/crypto/openssl/certs/aol2.pem#1 branch .. //depot/projects/powerpc/crypto/openssl/certs/aoltw1.pem#1 branch .. //depot/projects/powerpc/crypto/openssl/certs/aoltw2.pem#1 branch .. //depot/projects/powerpc/crypto/openssl/config#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/aes/Makefile#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/aes/aes_misc.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/asn1/a_strex.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/asn1/asn1_err.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/asn1/asn1_lib.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/asn1/asn1t.h#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/asn1/t_x509.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/asn1/tasn_dec.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/asn1/x_x509.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/bf/bf_ecb.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/bio/bio.h#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/bio/bio_err.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/bio/bio_lib.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/bn/bn_err.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/bn/bn_lib.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/bn/bn_print.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/buffer/buf_err.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/camellia/Makefile#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/camellia/camellia.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/camellia/cmll_cbc.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/camellia/cmll_locl.h#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/camellia/cmll_misc.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/cast/c_ecb.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/comp/c_zlib.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/comp/comp_err.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/conf/conf_def.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/conf/conf_err.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/conf/conf_lib.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/cpt_err.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/cryptlib.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/des/INSTALL#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/des/des_ver.h#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/des/ecb_enc.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/dh/dh_err.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/dh/dh_lib.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/dsa/dsa_err.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/dsa/dsa_lib.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/dso/dso_err.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/ec/ec_asn1.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/ec/ec_err.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/ecdh/ech_err.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/ecdh/ech_lib.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/ecdsa/ecdsa.h#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/ecdsa/ecs_err.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/ecdsa/ecs_lib.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/ecdsa/ecs_ossl.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/engine/eng_all.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/engine/eng_err.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/engine/eng_padlock.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/engine/tb_ecdh.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/engine/tb_ecdsa.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/err/err_all.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/evp/bio_md.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/evp/evp.h#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/evp/evp_enc.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/evp/evp_err.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/evp/evp_lib.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/evp/evp_locl.h#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/idea/i_ecb.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/idea/idea_lcl.h#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/lhash/lhash.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/md2/md2.h#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/md2/md2_dgst.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/md4/md4.h#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/md4/md4_dgst.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/md5/md5.h#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/md5/md5_dgst.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/objects/obj_dat.h#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/objects/obj_err.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/objects/obj_mac.h#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/objects/obj_mac.num#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/objects/objects.txt#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/ocsp/ocsp_asn.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/ocsp/ocsp_err.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/ocsp/ocsp_vfy.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/opensslconf.h#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/opensslv.h#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/pem/pem.h#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/pem/pem_err.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/pem/pem_lib.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/pem/pem_pkey.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/pkcs12/pk12err.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/pkcs7/pk7_doit.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/pkcs7/pk7_lib.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/pkcs7/pk7_smime.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/pkcs7/pkcs7err.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/rand/md_rand.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/rand/rand_err.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/rc2/rc2_ecb.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/rc4/rc4_skey.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/ripemd/ripemd.h#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/ripemd/rmd_dgst.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/rsa/rsa_err.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/rsa/rsa_lib.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/sha/sha.h#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/sha/sha1dgst.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/sha/sha256.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/sha/sha512.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/sha/sha_dgst.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/stack/safestack.h#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/stack/stack.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/store/str_err.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/txt_db/txt_db.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/ui/ui_err.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/x509/by_dir.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/x509/x509.h#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/x509/x509_err.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/x509/x509_req.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/x509/x509_txt.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/x509/x509_vfy.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/x509/x509_vfy.h#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/x509v3/Makefile#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/x509v3/ext_dat.h#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/x509v3/pcy_tree.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/x509v3/v3_addr.c#1 branch .. //depot/projects/powerpc/crypto/openssl/crypto/x509v3/v3_akey.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/x509v3/v3_alt.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/x509v3/v3_asid.c#1 branch .. //depot/projects/powerpc/crypto/openssl/crypto/x509v3/v3_bcons.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/x509v3/v3_bitst.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/x509v3/v3_cpols.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/x509v3/v3_crld.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/x509v3/v3_enum.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/x509v3/v3_extku.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/x509v3/v3_ia5.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/x509v3/v3_info.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/x509v3/v3_int.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/x509v3/v3_ncons.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/x509v3/v3_ocsp.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/x509v3/v3_pci.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/x509v3/v3_pcons.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/x509v3/v3_pku.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/x509v3/v3_pmaps.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/x509v3/v3_purp.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/x509v3/v3_skey.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/x509v3/v3_sxnet.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/x509v3/v3_utl.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/x509v3/v3err.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/crypto/x509v3/x509v3.h#2 integrate .. //depot/projects/powerpc/crypto/openssl/doc/apps/ciphers.pod#2 integrate .. //depot/projects/powerpc/crypto/openssl/doc/apps/s_client.pod#2 integrate .. //depot/projects/powerpc/crypto/openssl/doc/apps/x509.pod#2 integrate .. //depot/projects/powerpc/crypto/openssl/doc/crypto/ASN1_STRING_print_ex.pod#2 integrate .. //depot/projects/powerpc/crypto/openssl/doc/crypto/BIO_set_callback.pod#2 integrate .. //depot/projects/powerpc/crypto/openssl/doc/crypto/CONF_modules_free.pod#2 integrate .. //depot/projects/powerpc/crypto/openssl/doc/crypto/RAND_egd.pod#2 integrate .. //depot/projects/powerpc/crypto/openssl/doc/crypto/RSA_get_ex_new_index.pod#2 integrate .. //depot/projects/powerpc/crypto/openssl/doc/crypto/md5.pod#2 integrate .. //depot/projects/powerpc/crypto/openssl/doc/crypto/mdc2.pod#2 integrate .. //depot/projects/powerpc/crypto/openssl/doc/crypto/ripemd.pod#2 integrate .. //depot/projects/powerpc/crypto/openssl/doc/crypto/sha.pod#2 integrate .. //depot/projects/powerpc/crypto/openssl/doc/ssl/SSL_CTX_set_tmp_rsa_callback.pod#2 integrate .. //depot/projects/powerpc/crypto/openssl/doc/ssl/SSL_SESSION_get_time.pod#2 integrate .. //depot/projects/powerpc/crypto/openssl/openssl.spec#2 integrate .. //depot/projects/powerpc/crypto/openssl/ssl/d1_lib.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/ssl/d1_pkt.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/ssl/kssl.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/ssl/s23_clnt.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/ssl/s23_srvr.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/ssl/s2_enc.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/ssl/s2_lib.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/ssl/s3_clnt.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/ssl/s3_enc.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/ssl/s3_lib.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/ssl/s3_pkt.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/ssl/s3_srvr.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/ssl/ssl.h#2 integrate .. //depot/projects/powerpc/crypto/openssl/ssl/ssl_ciph.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/ssl/ssl_err.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/ssl/ssl_lib.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/ssl/ssl_sess.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/ssl/t1_enc.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/ssl/t1_lib.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/test/Makefile#2 integrate .. //depot/projects/powerpc/crypto/openssl/tools/c_rehash#2 integrate .. //depot/projects/powerpc/crypto/openssl/util/libeay.num#2 integrate .. //depot/projects/powerpc/crypto/openssl/util/mk1mf.pl#2 integrate .. //depot/projects/powerpc/crypto/openssl/util/mkdef.pl#2 integrate .. //depot/projects/powerpc/crypto/openssl/util/mkerr.pl#2 integrate .. //depot/projects/powerpc/crypto/openssl/util/ssleay.num#2 integrate .. //depot/projects/powerpc/etc/defaults/rc.conf#4 integrate .. //depot/projects/powerpc/etc/mtree/BSD.include.dist#2 integrate .. //depot/projects/powerpc/etc/mtree/BSD.usr.dist#2 integrate .. //depot/projects/powerpc/etc/network.subr#3 integrate .. //depot/projects/powerpc/etc/periodic/security/800.loginfail#3 integrate .. //depot/projects/powerpc/etc/periodic/weekly/310.locate#2 integrate .. //depot/projects/powerpc/etc/rc.d/bgfsck#2 integrate .. //depot/projects/powerpc/etc/rc.d/dhclient#3 integrate .. //depot/projects/powerpc/etc/rc.d/isdnd#2 integrate .. //depot/projects/powerpc/etc/rc.d/nfslocking#2 integrate .. //depot/projects/powerpc/etc/rc.d/random#2 integrate .. //depot/projects/powerpc/etc/rc.d/syscons#3 integrate .. //depot/projects/powerpc/etc/rc.subr#3 integrate .. //depot/projects/powerpc/games/fortune/datfiles/fortunes#4 integrate .. //depot/projects/powerpc/games/fortune/datfiles/fortunes-o.real#3 integrate .. //depot/projects/powerpc/gnu/usr.bin/cc/Makefile.fe#2 integrate .. //depot/projects/powerpc/gnu/usr.bin/cc/Makefile.inc#2 integrate .. //depot/projects/powerpc/gnu/usr.bin/cc/c++filt/Makefile#2 integrate .. //depot/projects/powerpc/gnu/usr.bin/cc/cc_int/Makefile#2 integrate .. //depot/projects/powerpc/gnu/usr.bin/cc/f77/Makefile#2 integrate .. //depot/projects/powerpc/gnu/usr.bin/gdb/kgdb/kgdb.h#2 integrate .. //depot/projects/powerpc/gnu/usr.bin/gdb/kgdb/kthr.c#3 integrate .. //depot/projects/powerpc/gnu/usr.bin/gdb/kgdb/trgt_i386.c#2 integrate .. //depot/projects/powerpc/include/protocols/dumprestore.h#2 integrate .. //depot/projects/powerpc/lib/libarchive/Makefile#3 integrate .. //depot/projects/powerpc/lib/libarchive/README#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive.h.in#4 integrate .. //depot/projects/powerpc/lib/libarchive/archive_entry.3#3 integrate .. //depot/projects/powerpc/lib/libarchive/archive_entry.c#3 integrate .. //depot/projects/powerpc/lib/libarchive/archive_entry.h#3 integrate .. //depot/projects/powerpc/lib/libarchive/archive_private.h#3 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read.3#4 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read.c#4 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_data_into_fd.c#3 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_extract.c#3 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_private.h#1 branch .. //depot/projects/powerpc/lib/libarchive/archive_read_support_compression_bzip2.c#3 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_compression_compress.c#3 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_compression_gzip.c#3 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_compression_none.c#4 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_format_cpio.c#3 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_format_empty.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_format_iso9660.c#3 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_format_tar.c#3 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_format_zip.c#3 integrate .. //depot/projects/powerpc/lib/libarchive/archive_util.3#3 integrate .. //depot/projects/powerpc/lib/libarchive/archive_util.c#3 integrate .. //depot/projects/powerpc/lib/libarchive/archive_virtual.c#1 branch .. //depot/projects/powerpc/lib/libarchive/archive_write.3#3 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write.c#3 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write_disk.3#1 branch .. //depot/projects/powerpc/lib/libarchive/archive_write_disk.c#1 branch .. //depot/projects/powerpc/lib/libarchive/archive_write_disk_private.h#1 branch .. //depot/projects/powerpc/lib/libarchive/archive_write_disk_set_standard_lookup.c#1 branch .. //depot/projects/powerpc/lib/libarchive/archive_write_private.h#1 branch .. //depot/projects/powerpc/lib/libarchive/archive_write_set_compression_bzip2.c#3 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write_set_compression_gzip.c#3 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write_set_compression_none.c#3 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write_set_format_cpio.c#3 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write_set_format_pax.c#3 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write_set_format_shar.c#3 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write_set_format_ustar.c#3 integrate .. //depot/projects/powerpc/lib/libarchive/test/Makefile#1 branch .. //depot/projects/powerpc/lib/libarchive/test/README#1 branch .. //depot/projects/powerpc/lib/libarchive/test/main.c#1 branch .. //depot/projects/powerpc/lib/libarchive/test/test.h#1 branch .. //depot/projects/powerpc/lib/libarchive/test/test_acl_basic.c#1 branch .. //depot/projects/powerpc/lib/libarchive/test/test_acl_pax.c#1 branch .. //depot/projects/powerpc/lib/libarchive/test/test_archive_api_feature.c#1 branch .. //depot/projects/powerpc/lib/libarchive/test/test_bad_fd.c#1 branch .. //depot/projects/powerpc/lib/libarchive/test/test_read_data_large.c#1 branch .. //depot/projects/powerpc/lib/libarchive/test/test_read_extract.c#1 branch .. //depot/projects/powerpc/lib/libarchive/test/test_read_format_cpio_bin.c#1 branch .. //depot/projects/powerpc/lib/libarchive/test/test_read_format_cpio_bin_Z.c#1 branch .. //depot/projects/powerpc/lib/libarchive/test/test_read_format_cpio_bin_bz2.c#1 branch .. //depot/projects/powerpc/lib/libarchive/test/test_read_format_cpio_bin_gz.c#1 branch .. //depot/projects/powerpc/lib/libarchive/test/test_read_format_cpio_odc.c#1 branch .. //depot/projects/powerpc/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c#1 branch .. //depot/projects/powerpc/lib/libarchive/test/test_read_format_cpio_svr4c_Z.c#1 branch .. //depot/projects/powerpc/lib/libarchive/test/test_read_format_empty.c#1 branch .. //depot/projects/powerpc/lib/libarchive/test/test_read_format_gtar_gz.c#1 branch .. //depot/projects/powerpc/lib/libarchive/test/test_read_format_iso_gz.c#1 branch .. //depot/projects/powerpc/lib/libarchive/test/test_read_format_isorr_bz2.c#1 branch .. //depot/projects/powerpc/lib/libarchive/test/test_read_format_pax_bz2.c#1 branch .. //depot/projects/powerpc/lib/libarchive/test/test_read_format_tar.c#1 branch .. //depot/projects/powerpc/lib/libarchive/test/test_read_format_tbz.c#1 branch .. //depot/projects/powerpc/lib/libarchive/test/test_read_format_tgz.c#1 branch .. //depot/projects/powerpc/lib/libarchive/test/test_read_format_tz.c#1 branch .. //depot/projects/powerpc/lib/libarchive/test/test_read_format_zip.c#1 branch .. //depot/projects/powerpc/lib/libarchive/test/test_read_large.c#1 branch .. //depot/projects/powerpc/lib/libarchive/test/test_read_position.c#1 branch .. //depot/projects/powerpc/lib/libarchive/test/test_read_truncated.c#1 branch .. //depot/projects/powerpc/lib/libarchive/test/test_write_disk.c#1 branch .. //depot/projects/powerpc/lib/libarchive/test/test_write_disk_perms.c#1 branch .. //depot/projects/powerpc/lib/libarchive/test/test_write_disk_secure.c#1 branch .. //depot/projects/powerpc/lib/libarchive/test/test_write_format_cpio_empty.c#1 branch .. //depot/projects/powerpc/lib/libarchive/test/test_write_format_shar_empty.c#1 branch .. //depot/projects/powerpc/lib/libarchive/test/test_write_format_tar.c#1 branch .. //depot/projects/powerpc/lib/libarchive/test/test_write_format_tar_empty.c#1 branch .. //depot/projects/powerpc/lib/libarchive/test/test_write_open_memory.c#1 branch .. //depot/projects/powerpc/lib/libc/Makefile#2 integrate .. //depot/projects/powerpc/lib/libc/gen/tls.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/valloc.3#3 integrate .. //depot/projects/powerpc/lib/libc/net/Makefile.inc#4 integrate .. //depot/projects/powerpc/lib/libc/net/Symbol.map#2 integrate .. //depot/projects/powerpc/lib/libc/net/addr2ascii.3#2 delete .. //depot/projects/powerpc/lib/libc/net/addr2ascii.c#2 delete .. //depot/projects/powerpc/lib/libc/net/ascii2addr.c#2 delete .. //depot/projects/powerpc/lib/libc/net/getnameinfo.3#2 integrate .. //depot/projects/powerpc/lib/libc/net/getnameinfo.c#2 integrate .. //depot/projects/powerpc/lib/libc/net/inet.3#3 integrate .. //depot/projects/powerpc/lib/libc/net/linkaddr.3#3 integrate .. //depot/projects/powerpc/lib/libc/net/sctp_bindx.3#2 integrate .. //depot/projects/powerpc/lib/libc/net/sctp_connectx.3#2 integrate .. //depot/projects/powerpc/lib/libc/net/sctp_freepaddrs.3#2 integrate .. //depot/projects/powerpc/lib/libc/net/sctp_getaddrlen.3#2 integrate .. //depot/projects/powerpc/lib/libc/net/sctp_getassocid.3#2 integrate .. //depot/projects/powerpc/lib/libc/net/sctp_getpaddrs.3#2 integrate .. //depot/projects/powerpc/lib/libc/net/sctp_opt_info.3#2 integrate .. //depot/projects/powerpc/lib/libc/net/sctp_recvmsg.3#2 integrate .. //depot/projects/powerpc/lib/libc/net/sctp_send.3#2 integrate .. //depot/projects/powerpc/lib/libc/net/sctp_sendmsg.3#2 integrate .. //depot/projects/powerpc/lib/libc/net/sctp_sys_calls.c#3 integrate .. //depot/projects/powerpc/lib/libc/posix1e/acl_from_text.c#2 integrate .. //depot/projects/powerpc/lib/libc/posix1e/acl_support.c#2 integrate .. //depot/projects/powerpc/lib/libc/posix1e/acl_support.h#2 integrate .. //depot/projects/powerpc/lib/libc/regex/engine.c#3 integrate .. //depot/projects/powerpc/lib/libc/regex/grot/tests#2 integrate .. //depot/projects/powerpc/lib/libc/resolv/res_send.c#4 integrate .. //depot/projects/powerpc/lib/libc/rpc/clnt_dg.c#2 integrate .. //depot/projects/powerpc/lib/libc/stdio/tmpnam.3#3 integrate .. //depot/projects/powerpc/lib/libc/stdlib/malloc.3#2 integrate .. //depot/projects/powerpc/lib/libc/stdlib/malloc.c#4 integrate .. //depot/projects/powerpc/lib/libc/stdlib/posix_memalign.3#2 integrate .. //depot/projects/powerpc/lib/libc/sys/getsockopt.2#3 integrate .. //depot/projects/powerpc/lib/libc/sys/sctp_generic_recvmsg.2#2 integrate .. //depot/projects/powerpc/lib/libc/sys/sctp_generic_sendmsg.2#2 integrate .. //depot/projects/powerpc/lib/libc/sys/sctp_peeloff.2#2 integrate .. //depot/projects/powerpc/lib/libc/sys/shutdown.2#3 integrate .. //depot/projects/powerpc/lib/libc/yp/yplib.c#2 integrate .. //depot/projects/powerpc/lib/libedit/chared.h#2 integrate .. //depot/projects/powerpc/lib/libedit/common.c#2 integrate .. //depot/projects/powerpc/lib/libedit/editline.3#2 integrate .. //depot/projects/powerpc/lib/libedit/editrc.5#2 integrate .. //depot/projects/powerpc/lib/libedit/emacs.c#2 integrate .. //depot/projects/powerpc/lib/libedit/history.c#2 integrate .. //depot/projects/powerpc/lib/libedit/key.c#2 integrate .. //depot/projects/powerpc/lib/libedit/key.h#2 integrate .. //depot/projects/powerpc/lib/libedit/map.c#2 integrate .. //depot/projects/powerpc/lib/libedit/read.c#2 integrate .. //depot/projects/powerpc/lib/libedit/read.h#2 integrate .. //depot/projects/powerpc/lib/libedit/term.c#2 integrate .. //depot/projects/powerpc/lib/libedit/term.h#2 integrate .. //depot/projects/powerpc/lib/libedit/tty.c#2 integrate .. //depot/projects/powerpc/lib/libedit/vi.c#2 integrate .. //depot/projects/powerpc/lib/libelf/elf_data.c#2 integrate .. //depot/projects/powerpc/lib/libelf/elf_getarhdr.3#2 integrate .. //depot/projects/powerpc/lib/libelf/elf_rand.3#2 integrate .. //depot/projects/powerpc/lib/libelf/gelf.h#3 integrate .. //depot/projects/powerpc/lib/libelf/gelf_getehdr.3#3 integrate .. //depot/projects/powerpc/lib/libelf/libelf_ar.c#3 integrate .. //depot/projects/powerpc/lib/libmemstat/memstat.h#2 integrate .. //depot/projects/powerpc/lib/libncp/ipxsap.h#3 integrate .. //depot/projects/powerpc/lib/libpam/modules/pam_unix/pam_unix.8#2 integrate .. //depot/projects/powerpc/lib/libpam/modules/pam_unix/pam_unix.c#2 integrate .. //depot/projects/powerpc/lib/libpmc/pmc.3#2 integrate .. //depot/projects/powerpc/lib/libpthread/thread/thr_kern.c#3 integrate .. //depot/projects/powerpc/lib/libufs/type.c#2 integrate .. //depot/projects/powerpc/lib/libwrap/Makefile#3 integrate .. //depot/projects/powerpc/lib/libypclnt/Makefile#3 integrate .. //depot/projects/powerpc/lib/libypclnt/ypclnt.3#2 delete .. //depot/projects/powerpc/lib/ncurses/Makefile#2 integrate .. //depot/projects/powerpc/lib/ncurses/Makefile.inc#2 integrate .. //depot/projects/powerpc/lib/ncurses/config.mk#2 integrate .. //depot/projects/powerpc/lib/ncurses/form/Makefile#2 integrate .. //depot/projects/powerpc/lib/ncurses/formw/Makefile#1 branch .. //depot/projects/powerpc/lib/ncurses/menu/Makefile#2 integrate .. //depot/projects/powerpc/lib/ncurses/menuw/Makefile#1 branch .. //depot/projects/powerpc/lib/ncurses/ncurses/Makefile#3 integrate .. //depot/projects/powerpc/lib/ncurses/ncurses/ncurses_cfg.h#2 integrate .. //depot/projects/powerpc/lib/ncurses/ncursesw/Makefile#1 branch .. //depot/projects/powerpc/lib/ncurses/panel/Makefile#2 integrate .. //depot/projects/powerpc/lib/ncurses/panelw/Makefile#1 branch .. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#4 integrate .. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/relnotes/article.sgml#5 integrate .. //depot/projects/powerpc/release/doc/share/misc/dev.archlist.txt#4 integrate .. //depot/projects/powerpc/sbin/dump/dump.h#2 integrate .. //depot/projects/powerpc/sbin/dump/traverse.c#2 integrate .. //depot/projects/powerpc/sbin/geom/class/Makefile#2 integrate .. //depot/projects/powerpc/sbin/geom/class/eli/geli.8#2 integrate .. //depot/projects/powerpc/sbin/geom/class/eli/geom_eli.c#3 integrate .. //depot/projects/powerpc/sbin/geom/class/multipath/Makefile#1 branch .. //depot/projects/powerpc/sbin/geom/class/multipath/geom_multipath.c#1 branch .. //depot/projects/powerpc/sbin/geom/class/multipath/gmultipath.8#1 branch .. //depot/projects/powerpc/sbin/geom/core/geom.c#2 integrate .. //depot/projects/powerpc/sbin/ifconfig/af_atalk.c#2 integrate .. //depot/projects/powerpc/sbin/ifconfig/af_inet.c#2 integrate .. //depot/projects/powerpc/sbin/ifconfig/af_inet6.c#3 integrate .. //depot/projects/powerpc/sbin/ifconfig/af_ipx.c#2 integrate .. //depot/projects/powerpc/sbin/ifconfig/af_link.c#2 integrate .. //depot/projects/powerpc/sbin/ifconfig/ifconfig.8#5 integrate .. //depot/projects/powerpc/sbin/ifconfig/ifconfig.c#3 integrate .. //depot/projects/powerpc/sbin/ifconfig/ifconfig.h#2 integrate .. //depot/projects/powerpc/sbin/ifconfig/ifieee80211.c#4 integrate .. //depot/projects/powerpc/sbin/mdmfs/mdmfs.c#3 integrate .. //depot/projects/powerpc/sbin/mount_nfs/mount_nfs.8#3 integrate .. //depot/projects/powerpc/sbin/mount_nfs/mount_nfs.c#3 integrate .. //depot/projects/powerpc/sbin/newfs/newfs.c#2 integrate .. //depot/projects/powerpc/sbin/restore/dirs.c#2 integrate .. //depot/projects/powerpc/sbin/restore/extern.h#2 integrate .. //depot/projects/powerpc/sbin/restore/restore.h#2 integrate .. //depot/projects/powerpc/sbin/restore/tape.c#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/Makefile#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/Makefile.inc#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/Makefile.man#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/ASN1_OBJECT_new.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/ASN1_STRING_length.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/ASN1_STRING_new.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/ASN1_generate_nconf.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/BIO_ctrl.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/BIO_f_base64.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/BIO_f_buffer.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/BIO_f_cipher.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/BIO_f_md.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/BIO_f_null.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/BIO_f_ssl.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/BIO_find_type.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/BIO_new.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/BIO_push.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/BIO_read.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/BIO_s_accept.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/BIO_s_bio.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/BIO_s_connect.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/BIO_s_fd.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/BIO_s_file.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/BIO_s_mem.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/BIO_s_null.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/BIO_s_socket.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/BIO_set_callback.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/BIO_should_retry.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/BN_BLINDING_new.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/BN_CTX_new.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/BN_CTX_start.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/BN_add.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/BN_add_word.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/BN_bn2bin.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/BN_cmp.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/BN_copy.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/BN_generate_prime.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/BN_mod_inverse.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/BN_new.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/BN_num_bytes.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/BN_rand.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/BN_set_bit.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/BN_swap.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/BN_zero.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/CONF_modules_free.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/CONF_modules_load_file.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/DH_generate_key.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/DH_generate_parameters.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/DH_get_ex_new_index.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/DH_new.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/DH_set_method.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/DH_size.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/DSA_SIG_new.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/DSA_do_sign.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/DSA_dup_DH.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/DSA_generate_key.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/DSA_generate_parameters.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/DSA_get_ex_new_index.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/DSA_new.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/DSA_set_method.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/DSA_sign.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/DSA_size.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/ERR_GET_LIB.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/ERR_clear_error.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/ERR_error_string.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/ERR_get_error.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/ERR_load_crypto_strings.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/ERR_load_strings.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/ERR_print_errors.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/ERR_put_error.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/ERR_remove_state.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/ERR_set_mark.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/EVP_BytesToKey.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/EVP_DigestInit.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/EVP_EncryptInit.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/EVP_OpenInit.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/EVP_PKEY_new.3#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Mar 31 07:08:20 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 91C2516A408; Sat, 31 Mar 2007 07:08:20 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 564FC16A402 for ; Sat, 31 Mar 2007 07:08:20 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4646F13C457 for ; Sat, 31 Mar 2007 07:08:20 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2V78Kct043140 for ; Sat, 31 Mar 2007 07:08:20 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2V78KlW043137 for perforce@freebsd.org; Sat, 31 Mar 2007 07:08:20 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 31 Mar 2007 07:08:20 GMT Message-Id: <200703310708.l2V78KlW043137@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 116999 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Mar 2007 07:08:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=116999 Change 116999 by hselasky@hselasky_mini_itx on 2007/03/31 07:08:06 Add support for "CDMA Technologies USB modem" to "ugensa.c" Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ugensa.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/usb_quirks.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/usbdevs#7 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ugensa.c#3 (text+ko) ==== @@ -67,7 +67,7 @@ struct ucom_super_softc sc_super_ucom; struct ucom_softc sc_ucom; - struct usbd_xfer * sc_xfer[UGENSA_N_TRANSFER]; + struct usbd_xfer *sc_xfer[UGENSA_N_TRANSFER]; uint8_t sc_flags; #define UGENSA_FLAG_BULK_READ_STALL 0x01 @@ -165,6 +165,7 @@ { USB_VENDOR_QUALCOMM_K, USB_PRODUCT_QUALCOMM_K_CDMA_MSM_K }, { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AIRCARD580 }, { USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_CDMA_MODEM }, + { USB_VENDOR_CMOTECH, USB_PRODUCT_CMOTECH_CDMA_MODEM1 }, }; #define ugensa_lookup(v, p) usb_lookup(ugensa_devs, v, p) ==== //depot/projects/usb/src/sys/dev/usb/usb_quirks.c#7 (text+ko) ==== @@ -76,7 +76,7 @@ { USB_VENDOR_SILICONPORTALS, USB_PRODUCT_SILICONPORTALS_YAPPHONE, 0x100, { UQ_AU_INP_ASYNC }}, { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_UN53B, ANY, { UQ_NO_STRINGS }}, - { USB_VENDOR_CMOTECH, USB_PRODUCT_CMOTECH_CDMAMODEM, ANY, { UQ_ASSUME_CM_OVER_DATA }}, + { USB_VENDOR_CMOTECH, USB_PRODUCT_CMOTECH_CDMA_MODEM0, ANY, { UQ_ASSUME_CM_OVER_DATA }}, /* XXX These should have a revision number, but I don't know what they are. */ { USB_VENDOR_HP, USB_PRODUCT_HP_895C, ANY, { UQ_BROKEN_BIDIR }}, { USB_VENDOR_HP, USB_PRODUCT_HP_880C, ANY, { UQ_BROKEN_BIDIR }}, ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#7 (text+ko) ==== @@ -813,7 +813,8 @@ product CHICONY KB8933 0x0001 KB-8933 keyboard /* CMOTECH products */ -product CMOTECH CDMAMODEM 0x5141 CMOTECH CDMA Technologies USB modem +product CMOTECH CDMA_MODEM0 0x5141 CMOTECH CDMA Technologies USB modem +product CMOTECH CDMA_MODEM1 0x6280 CMOTECH CDMA Technologies USB modem /* Compaq products */ product COMPAQ IPAQPOCKETPC 0x0003 iPAQ PocketPC From owner-p4-projects@FreeBSD.ORG Sat Mar 31 08:00:27 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F17CA16A403; Sat, 31 Mar 2007 08:00:26 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 903C916A401 for ; Sat, 31 Mar 2007 08:00:26 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7F2D213C448 for ; Sat, 31 Mar 2007 08:00:26 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2V80Q1Z053119 for ; Sat, 31 Mar 2007 08:00:26 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2V80P4W053116 for perforce@freebsd.org; Sat, 31 Mar 2007 08:00:25 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 31 Mar 2007 08:00:25 GMT Message-Id: <200703310800.l2V80P4W053116@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 117002 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Mar 2007 08:00:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=117002 Change 117002 by hselasky@hselasky_mini_itx on 2007/03/31 07:59:28 Use "usbd_callback_t" when defining USB device driver callback prototypes. Affected files ... .. //depot/projects/usb/src/sys/dev/ata/ata-usb.c#12 edit .. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#8 edit .. //depot/projects/usb/src/sys/dev/usb/if_aue.c#19 edit .. //depot/projects/usb/src/sys/dev/usb/if_axe.c#17 edit .. //depot/projects/usb/src/sys/dev/usb/if_cdce.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/if_cue.c#15 edit .. //depot/projects/usb/src/sys/dev/usb/if_kue.c#17 edit .. //depot/projects/usb/src/sys/dev/usb/if_rue.c#16 edit .. //depot/projects/usb/src/sys/dev/usb/if_udav.c#16 edit .. //depot/projects/usb/src/sys/dev/usb/if_ural.c#20 edit .. //depot/projects/usb/src/sys/dev/usb/if_zyd.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/ubsa.c#15 edit .. //depot/projects/usb/src/sys/dev/usb/ubser.c#10 edit .. //depot/projects/usb/src/sys/dev/usb/ucycom.c#10 edit .. //depot/projects/usb/src/sys/dev/usb/udbp.c#8 edit .. //depot/projects/usb/src/sys/dev/usb/ufoma.c#14 edit .. //depot/projects/usb/src/sys/dev/usb/uftdi.c#14 edit .. //depot/projects/usb/src/sys/dev/usb/ugen.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/uhid.c#13 edit .. //depot/projects/usb/src/sys/dev/usb/ulpt.c#18 edit .. //depot/projects/usb/src/sys/dev/usb/umass.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/umct.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/umodem.c#16 edit .. //depot/projects/usb/src/sys/dev/usb/umoscom.c#2 edit .. //depot/projects/usb/src/sys/dev/usb/uplcom.c#17 edit .. //depot/projects/usb/src/sys/dev/usb/urio.c#8 edit .. //depot/projects/usb/src/sys/dev/usb/uscanner.c#8 edit .. //depot/projects/usb/src/sys/dev/usb/uvisor.c#13 edit .. //depot/projects/usb/src/sys/dev/usb/uvscom.c#17 edit .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#9 edit .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#5 edit Differences ... ==== //depot/projects/usb/src/sys/dev/ata/ata-usb.c#12 (text) ==== @@ -130,6 +130,17 @@ static device_attach_t atausb_attach; static device_detach_t atausb_detach; +static usbd_callback_t atausb_t_bbb_reset1_callback; +static usbd_callback_t atausb_t_bbb_reset2_callback; +static usbd_callback_t atausb_t_bbb_reset3_callback; +static usbd_callback_t atausb_t_bbb_command_callback; +static usbd_callback_t atausb_t_bbb_data_read_callback; +static usbd_callback_t atausb_t_bbb_data_rd_cs_callback; +static usbd_callback_t atausb_t_bbb_data_write_callback; +static usbd_callback_t atausb_t_bbb_data_wr_cs_callback; +static usbd_callback_t atausb_t_bbb_status_callback; +static usbd_callback_t atausb_tr_error; + static void atausb_watchdog(void *arg); @@ -137,39 +148,9 @@ atausb_transfer_start(struct atausb_softc *sc, u_int8_t xfer_no); static void -atausb_t_bbb_reset1_callback(struct usbd_xfer *xfer); - -static void -atausb_t_bbb_reset2_callback(struct usbd_xfer *xfer); - -static void -atausb_t_bbb_reset3_callback(struct usbd_xfer *xfer); - -static void atausb_t_bbb_data_clear_stall_callback(struct usbd_xfer *xfer, u_int8_t next_xfer, u_int8_t stall_xfer); -static void -atausb_t_bbb_command_callback(struct usbd_xfer *xfer); - -static void -atausb_t_bbb_data_read_callback(struct usbd_xfer *xfer); - -static void -atausb_t_bbb_data_rd_cs_callback(struct usbd_xfer *xfer); - -static void -atausb_t_bbb_data_write_callback(struct usbd_xfer *xfer); - -static void -atausb_t_bbb_data_wr_cs_callback(struct usbd_xfer *xfer); - -static void -atausb_t_bbb_status_callback(struct usbd_xfer *xfer); - -static void -atausb_tr_error(struct usbd_xfer *xfer); - static int ata_usbchannel_begin_transaction(struct ata_request *request); ==== //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#8 (text+ko) ==== @@ -303,6 +303,14 @@ static device_attach_t uaudio_attach; static device_detach_t uaudio_detach; +static usbd_callback_t uaudio_chan_play_callback; +static usbd_callback_t uaudio_chan_record_callback; +static usbd_callback_t uaudio_mixer_write_cfg_callback; +static usbd_callback_t umidi_read_clear_stall_callback; +static usbd_callback_t umidi_bulk_read_callback; +static usbd_callback_t umidi_write_clear_stall_callback; +static usbd_callback_t umidi_bulk_write_callback; + #ifdef USB_DEBUG static void uaudio_chan_dump_ep_desc(const usb_endpoint_descriptor_audio_t *ed); @@ -317,12 +325,6 @@ uaudio_chan_fill_info(struct uaudio_softc *sc, struct usbd_device *udev); static void -uaudio_chan_play_callback(struct usbd_xfer *xfer); - -static void -uaudio_chan_record_callback(struct usbd_xfer *xfer); - -static void uaudio_mixer_add_ctl_sub(struct uaudio_softc *sc, struct uaudio_mixer_node *mc); static void @@ -399,9 +401,6 @@ static u_int16_t uaudio_mixer_get(struct usbd_device *udev, u_int8_t what, struct uaudio_mixer_node *mc); -static void -uaudio_mixer_write_cfg_callback(struct usbd_xfer *xfer); - static usbd_status uaudio_set_speed(struct usbd_device *udev, u_int8_t endpt, u_int32_t speed); @@ -417,21 +416,9 @@ static void uaudio_mixer_init(struct uaudio_softc *sc); -static void -umidi_read_clear_stall_callback(struct usbd_xfer *xfer); - -static void -umidi_bulk_read_callback(struct usbd_xfer *xfer); - -static void -umidi_write_clear_stall_callback(struct usbd_xfer *xfer); - static u_int8_t umidi_convert_to_usb(struct umidi_sub_chan *sub, u_int8_t cn, u_int8_t b); -static void -umidi_bulk_write_callback(struct usbd_xfer *xfer); - static struct umidi_sub_chan * umidi_sub_by_cdev(struct usb_cdev *cdev); ==== //depot/projects/usb/src/sys/dev/usb/if_aue.c#19 (text+ko) ==== @@ -190,11 +190,20 @@ }; #define aue_lookup(v, p) ((const struct aue_type *)usb_lookup(aue_devs, v, p)) +/* prototypes */ + static device_probe_t aue_probe; static device_attach_t aue_attach; static device_detach_t aue_detach; static device_shutdown_t aue_shutdown; +static usbd_callback_t aue_intr_clear_stall_callback; +static usbd_callback_t aue_intr_callback; +static usbd_callback_t aue_bulk_read_clear_stall_callback; +static usbd_callback_t aue_bulk_read_callback; +static usbd_callback_t aue_bulk_write_clear_stall_callback; +static usbd_callback_t aue_bulk_write_callback; + static void aue_cfg_do_request(struct aue_softc *sc, usb_device_request_t *req, void *data); @@ -239,24 +248,6 @@ aue_cfg_reset(struct aue_softc *sc); static void -aue_intr_clear_stall_callback(struct usbd_xfer *xfer); - -static void -aue_intr_callback(struct usbd_xfer *xfer); - -static void -aue_bulk_read_clear_stall_callback(struct usbd_xfer *xfer); - -static void -aue_bulk_read_callback(struct usbd_xfer *xfer); - -static void -aue_bulk_write_clear_stall_callback(struct usbd_xfer *xfer); - -static void -aue_bulk_write_callback(struct usbd_xfer *xfer); - -static void aue_start_cb(struct ifnet *ifp); static void ==== //depot/projects/usb/src/sys/dev/usb/if_axe.c#17 (text+ko) ==== @@ -146,6 +146,13 @@ static device_detach_t axe_detach; static device_shutdown_t axe_shutdown; +static usbd_callback_t axe_intr_clear_stall_callback; +static usbd_callback_t axe_intr_callback; +static usbd_callback_t axe_bulk_read_clear_stall_callback; +static usbd_callback_t axe_bulk_read_callback; +static usbd_callback_t axe_bulk_write_clear_stall_callback; +static usbd_callback_t axe_bulk_write_callback; + static void axe_cfg_cmd(struct axe_softc *sc, u_int16_t cmd, u_int16_t index, u_int16_t val, void *buf); @@ -175,24 +182,6 @@ axe_cfg_reset(struct axe_softc *sc); static void -axe_intr_clear_stall_callback(struct usbd_xfer *xfer); - -static void -axe_intr_callback(struct usbd_xfer *xfer); - -static void -axe_bulk_read_clear_stall_callback(struct usbd_xfer *xfer); - -static void -axe_bulk_read_callback(struct usbd_xfer *xfer); - -static void -axe_bulk_write_clear_stall_callback(struct usbd_xfer *xfer); - -static void -axe_bulk_write_callback(struct usbd_xfer *xfer); - -static void axe_start_cb(struct ifnet *ifp); static void ==== //depot/projects/usb/src/sys/dev/usb/if_cdce.c#12 (text+ko) ==== @@ -74,18 +74,17 @@ static device_detach_t cdce_detach; static device_shutdown_t cdce_shutdown; +static usbd_callback_t cdce_bulk_write_clear_stall_callback; +static usbd_callback_t cdce_bulk_write_callback; +static usbd_callback_t cdce_bulk_read_clear_stall_callback; +static usbd_callback_t cdce_bulk_read_callback; + static void cdce_start_cb(struct ifnet *ifp); static void cdce_start_transfers(struct cdce_softc *sc); -static void -cdce_bulk_write_clear_stall_callback(struct usbd_xfer *xfer); - -static void -cdce_bulk_write_callback(struct usbd_xfer *xfer); - static u_int32_t cdce_m_crc32(struct mbuf *m, u_int32_t src_offset, u_int32_t src_len); @@ -98,12 +97,6 @@ static void cdce_init_cb(void *arg); -static void -cdce_bulk_read_clear_stall_callback(struct usbd_xfer *xfer); - -static void -cdce_bulk_read_callback(struct usbd_xfer *xfer); - static int cdce_ifmedia_upd_cb(struct ifnet *ifp); ==== //depot/projects/usb/src/sys/dev/usb/if_cue.c#15 (text+ko) ==== @@ -103,6 +103,11 @@ static device_detach_t cue_detach; static device_shutdown_t cue_shutdown; +static usbd_callback_t cue_bulk_read_clear_stall_callback; +static usbd_callback_t cue_bulk_read_callback; +static usbd_callback_t cue_bulk_write_clear_stall_callback; +static usbd_callback_t cue_bulk_write_callback; + static usbd_config_td_command_t cue_cfg_promisc_upd; static usbd_config_td_command_t cue_config_copy; static usbd_config_td_command_t cue_cfg_first_time_setup; @@ -137,24 +142,12 @@ cue_cfg_reset(struct cue_softc *sc); static void -cue_bulk_read_clear_stall_callback(struct usbd_xfer *xfer); - -static void -cue_bulk_read_callback(struct usbd_xfer *xfer); - -static void cue_start_cb(struct ifnet *ifp); static void cue_start_transfers(struct cue_softc *sc); static void -cue_bulk_write_clear_stall_callback(struct usbd_xfer *xfer); - -static void -cue_bulk_write_callback(struct usbd_xfer *xfer); - -static void cue_init_cb(void *arg); static int ==== //depot/projects/usb/src/sys/dev/usb/if_kue.c#17 (text+ko) ==== @@ -127,11 +127,18 @@ { 0, 0 } }; +/* prototypes */ + static device_probe_t kue_probe; static device_attach_t kue_attach; static device_detach_t kue_detach; static device_shutdown_t kue_shutdown; +static usbd_callback_t kue_bulk_read_clear_stall_callback; +static usbd_callback_t kue_bulk_read_callback; +static usbd_callback_t kue_bulk_write_clear_stall_callback; +static usbd_callback_t kue_bulk_write_callback; + static usbd_config_td_command_t kue_cfg_promisc_upd; static usbd_config_td_command_t kue_config_copy; static usbd_config_td_command_t kue_cfg_first_time_setup; @@ -157,18 +164,6 @@ kue_cfg_reset(struct kue_softc *sc); static void -kue_bulk_read_clear_stall_callback(struct usbd_xfer *xfer); - -static void -kue_bulk_read_callback(struct usbd_xfer *xfer); - -static void -kue_bulk_write_clear_stall_callback(struct usbd_xfer *xfer); - -static void -kue_bulk_write_callback(struct usbd_xfer *xfer); - -static void kue_start_cb(struct ifnet *ifp); static void ==== //depot/projects/usb/src/sys/dev/usb/if_rue.c#16 (text+ko) ==== @@ -138,6 +138,13 @@ static device_detach_t rue_detach; static device_shutdown_t rue_shutdown; +static usbd_callback_t rue_intr_clear_stall_callback; +static usbd_callback_t rue_intr_callback; +static usbd_callback_t rue_bulk_read_clear_stall_callback; +static usbd_callback_t rue_bulk_read_callback; +static usbd_callback_t rue_bulk_write_clear_stall_callback; +static usbd_callback_t rue_bulk_write_callback; + static usbd_config_td_command_t rue_config_copy; static usbd_config_td_command_t rue_cfg_promisc_upd; static usbd_config_td_command_t rue_cfg_first_time_setup; @@ -180,24 +187,6 @@ rue_cfg_reset(struct rue_softc *sc); static void -rue_intr_clear_stall_callback(struct usbd_xfer *xfer); - -static void -rue_intr_callback(struct usbd_xfer *xfer); - -static void -rue_bulk_read_clear_stall_callback(struct usbd_xfer *xfer); - -static void -rue_bulk_read_callback(struct usbd_xfer *xfer); - -static void -rue_bulk_write_clear_stall_callback(struct usbd_xfer *xfer); - -static void -rue_bulk_write_callback(struct usbd_xfer *xfer); - -static void rue_start_cb(struct ifnet *ifp); static void ==== //depot/projects/usb/src/sys/dev/usb/if_udav.c#16 (text+ko) ==== @@ -96,6 +96,13 @@ static device_detach_t udav_detach; static device_shutdown_t udav_shutdown; +static usbd_callback_t udav_bulk_write_clear_stall_callback; +static usbd_callback_t udav_bulk_write_callback; +static usbd_callback_t udav_bulk_read_clear_stall_callback; +static usbd_callback_t udav_bulk_read_callback; +static usbd_callback_t udav_intr_clear_stall_callback; +static usbd_callback_t udav_intr_callback; + static usbd_config_td_command_t udav_cfg_first_time_setup; static usbd_config_td_command_t udav_cfg_pre_init; static usbd_config_td_command_t udav_cfg_init; @@ -133,24 +140,6 @@ static void udav_start_transfers(struct udav_softc *sc); -static void -udav_bulk_write_clear_stall_callback(struct usbd_xfer *xfer); - -static void -udav_bulk_write_callback(struct usbd_xfer *xfer); - -static void -udav_bulk_read_clear_stall_callback(struct usbd_xfer *xfer); - -static void -udav_bulk_read_callback(struct usbd_xfer *xfer); - -static void -udav_intr_clear_stall_callback(struct usbd_xfer *xfer); - -static void -udav_intr_callback(struct usbd_xfer *xfer); - static int udav_ioctl_cb(struct ifnet *ifp, u_long cmd, caddr_t data); ==== //depot/projects/usb/src/sys/dev/usb/if_ural.c#20 (text+ko) ==== @@ -88,10 +88,16 @@ #endif /* prototypes */ + static device_probe_t ural_probe; static device_attach_t ural_attach; static device_detach_t ural_detach; +static usbd_callback_t ural_bulk_read_callback; +static usbd_callback_t ural_bulk_read_clear_stall_callback; +static usbd_callback_t ural_bulk_write_callback; +static usbd_callback_t ural_bulk_write_clear_stall_callback; + static usbd_config_td_command_t ural_cfg_first_time_setup; static usbd_config_td_command_t ural_config_copy; static usbd_config_td_command_t ural_cfg_set_chan; @@ -149,12 +155,6 @@ static int ural_rxrate(struct ural_rx_desc *desc); -static void -ural_bulk_read_callback(struct usbd_xfer *xfer); - -static void -ural_bulk_read_clear_stall_callback(struct usbd_xfer *xfer); - static u_int16_t ural_ack_rate(struct ieee80211com *ic, u_int16_t rate); @@ -169,12 +169,6 @@ ural_setup_tx_desc(struct ural_softc *sc, u_int32_t flags, u_int16_t len, u_int16_t rate); static void -ural_bulk_write_callback(struct usbd_xfer *xfer); - -static void -ural_bulk_write_clear_stall_callback(struct usbd_xfer *xfer); - -static void ural_watchdog(void *arg); static void ==== //depot/projects/usb/src/sys/dev/usb/if_zyd.c#6 (text+ko) ==== @@ -82,6 +82,15 @@ static device_attach_t zyd_attach; static device_detach_t zyd_detach; +static usbd_callback_t zyd_intr_read_clear_stall_callback; +static usbd_callback_t zyd_intr_read_callback; +static usbd_callback_t zyd_intr_write_clear_stall_callback; +static usbd_callback_t zyd_intr_write_callback; +static usbd_callback_t zyd_bulk_read_clear_stall_callback; +static usbd_callback_t zyd_bulk_read_callback; +static usbd_callback_t zyd_bulk_write_clear_stall_callback; +static usbd_callback_t zyd_bulk_write_callback; + static usbd_config_td_command_t zyd_cfg_first_time_setup; static usbd_config_td_command_t zyd_cfg_set_run; static usbd_config_td_command_t zyd_cfg_update_promisc; @@ -96,11 +105,7 @@ static void zyd_cfg_usbrequest(struct zyd_softc *sc, uint8_t type, uint8_t request, uint16_t value, uint16_t index, uint16_t length, uint8_t *data); static void zyd_cfg_usbrequestzc(struct zyd_softc *sc, struct zyd_control *zc); static void zyd_cfg_reset(struct zyd_softc *sc); -static void zyd_intr_read_clear_stall_callback(struct usbd_xfer *xfer); -static void zyd_intr_read_callback(struct usbd_xfer *xfer); static void zyd_cfg_usb_intr_read(struct zyd_softc *sc, void *data, uint32_t size); -static void zyd_intr_write_clear_stall_callback(struct usbd_xfer *xfer); -static void zyd_intr_write_callback(struct usbd_xfer *xfer); static void zyd_cfg_usb_intr_write(struct zyd_softc *sc, void *data, uint32_t size); static uint32_t zyd_addrinc(uint32_t addr); static void zyd_cfg_read16(struct zyd_softc *sc, uint32_t addr, uint16_t *value); @@ -116,8 +121,6 @@ static void zyd_cfg_rfwrite(struct zyd_softc *sc, uint32_t value, uint8_t bits); static void zyd_cfg_stateoutput(struct zyd_softc *sc) __used; static void zyd_rxframeproc(struct usbd_xfer *xfer, uint16_t offset, uint16_t len); -static void zyd_bulk_read_clear_stall_callback(struct usbd_xfer *xfer); -static void zyd_bulk_read_callback(struct usbd_xfer *xfer); static uint8_t zyd_cfg_uploadfirmware(struct zyd_softc *sc); static void zyd_cfg_lock_phy(struct zyd_softc *sc); static void zyd_cfg_unlock_phy(struct zyd_softc *sc); @@ -159,8 +162,6 @@ static uint8_t zyd_tx_frame(struct usbd_xfer *xfer, struct mbuf *m0, struct ieee80211_node *ni, uint8_t rate); static void zyd_start_transfers(struct zyd_softc *sc); static void zyd_start_cb(struct ifnet *ifp); -static void zyd_bulk_write_clear_stall_callback(struct usbd_xfer *xfer); -static void zyd_bulk_write_callback(struct usbd_xfer *xfer); static void zyd_init_cb(void *arg); static int zyd_reset_cb(struct ifnet *ifp); static int zyd_ioctl_cb(struct ifnet *ifp, u_long command, caddr_t data); ==== //depot/projects/usb/src/sys/dev/usb/ubsa.c#15 (text+ko) ==== @@ -167,6 +167,13 @@ static device_attach_t ubsa_attach; static device_detach_t ubsa_detach; +static usbd_callback_t ubsa_write_callback; +static usbd_callback_t ubsa_write_clear_stall_callback; +static usbd_callback_t ubsa_read_callback; +static usbd_callback_t ubsa_read_clear_stall_callback; +static usbd_callback_t ubsa_intr_callback; +static usbd_callback_t ubsa_intr_clear_stall_callback; + static void ubsa_cfg_request(struct ubsa_softc *sc, u_int8_t index, u_int16_t value); static void ubsa_cfg_set_dtr(struct ucom_softc *ucom, u_int8_t onoff); static void ubsa_cfg_set_rts(struct ucom_softc *ucom, u_int8_t onoff); @@ -178,12 +185,6 @@ static void ubsa_start_write(struct ucom_softc *ucom); static void ubsa_stop_write(struct ucom_softc *ucom); static void ubsa_cfg_get_status(struct ucom_softc *ucom, u_int8_t *lsr, u_int8_t *msr); -static void ubsa_write_callback(struct usbd_xfer *xfer); -static void ubsa_write_clear_stall_callback(struct usbd_xfer *xfer); -static void ubsa_read_callback(struct usbd_xfer *xfer); -static void ubsa_read_clear_stall_callback(struct usbd_xfer *xfer); -static void ubsa_intr_callback(struct usbd_xfer *xfer); -static void ubsa_intr_clear_stall_callback(struct usbd_xfer *xfer); static const struct usbd_config ubsa_config[UBSA_N_TRANSFER] = { ==== //depot/projects/usb/src/sys/dev/usb/ubser.c#10 (text+ko) ==== @@ -136,15 +136,18 @@ uint8_t sc_name[16]; }; +/* prototypes */ + static device_probe_t ubser_probe; static device_attach_t ubser_attach; static device_detach_t ubser_detach; +static usbd_callback_t ubser_write_clear_stall_callback; +static usbd_callback_t ubser_write_callback; +static usbd_callback_t ubser_read_clear_stall_callback; +static usbd_callback_t ubser_read_callback; + static int ubser_pre_param(struct ucom_softc *ucom, struct termios *t); -static void ubser_write_clear_stall_callback(struct usbd_xfer *xfer); -static void ubser_write_callback(struct usbd_xfer *xfer); -static void ubser_read_clear_stall_callback(struct usbd_xfer *xfer); -static void ubser_read_callback(struct usbd_xfer *xfer); static void ubser_cfg_set_break(struct ucom_softc *ucom, u_int8_t onoff); static void ubser_cfg_get_status(struct ucom_softc *ucom, u_int8_t *lsr, u_int8_t *msr); static void ubser_start_read(struct ucom_softc *ucom); ==== //depot/projects/usb/src/sys/dev/usb/ucycom.c#10 (text+ko) ==== @@ -97,17 +97,18 @@ static device_attach_t ucycom_attach; static device_detach_t ucycom_detach; +static usbd_callback_t ucycom_ctrl_write_callback; +static usbd_callback_t ucycom_intr_read_clear_stall_callback; +static usbd_callback_t ucycom_intr_read_callback; + static void ucycom_cfg_open(struct ucom_softc *ucom); static void ucycom_start_read(struct ucom_softc *ucom); static void ucycom_stop_read(struct ucom_softc *ucom); static void ucycom_start_write(struct ucom_softc *ucom); static void ucycom_stop_write(struct ucom_softc *ucom); -static void ucycom_ctrl_write_callback(struct usbd_xfer *xfer); static void ucycom_cfg_write(struct ucycom_softc *sc, uint32_t baud, uint8_t cfg); static int ucycom_pre_param(struct ucom_softc *ucom, struct termios *t); static void ucycom_cfg_param(struct ucom_softc *ucom, struct termios *t); -static void ucycom_intr_read_clear_stall_callback(struct usbd_xfer *xfer); -static void ucycom_intr_read_callback(struct usbd_xfer *xfer); static const struct usbd_config ucycom_config[UCYCOM_ENDPT_MAX] = { ==== //depot/projects/usb/src/sys/dev/usb/udbp.c#8 (text+ko) ==== @@ -119,6 +119,8 @@ u_int8_t sc_name[16]; }; +/* prototypes */ + static int udbp_modload(module_t mod, int event, void *data); @@ -126,21 +128,14 @@ static device_attach_t udbp_attach; static device_detach_t udbp_detach; -static void -udbp_bulk_read_callback(struct usbd_xfer *xfer); +static usbd_callback_t udbp_bulk_read_callback; +static usbd_callback_t udbp_bulk_read_clear_stall_callback; +static usbd_callback_t udbp_bulk_write_callback; +static usbd_callback_t udbp_bulk_write_clear_stall_callback; static void -udbp_bulk_read_clear_stall_callback(struct usbd_xfer *xfer); - -static void udbp_bulk_read_complete(node_p node, hook_p hook, void *arg1, int arg2); -static void -udbp_bulk_write_callback(struct usbd_xfer *xfer); - -static void -udbp_bulk_write_clear_stall_callback(struct usbd_xfer *xfer); - static ng_constructor_t ng_udbp_constructor; static ng_rcvmsg_t ng_udbp_rcvmsg; static ng_shutdown_t ng_udbp_rmnode; ==== //depot/projects/usb/src/sys/dev/usb/ufoma.c#14 (text+ko) ==== @@ -184,18 +184,19 @@ static device_attach_t ufoma_attach; static device_detach_t ufoma_detach; +static usbd_callback_t ufoma_ctrl_read_callback; +static usbd_callback_t ufoma_ctrl_write_callback; +static usbd_callback_t ufoma_intr_clear_stall_callback; +static usbd_callback_t ufoma_intr_callback; +static usbd_callback_t ufoma_bulk_write_callback; +static usbd_callback_t ufoma_bulk_write_clear_stall_callback; +static usbd_callback_t ufoma_bulk_read_callback; +static usbd_callback_t ufoma_bulk_read_clear_stall_callback; + static void ufoma_cfg_do_request(struct ufoma_softc *sc, usb_device_request_t *req, void *data); static void * ufoma_get_intconf(usb_config_descriptor_t *cd, usb_interface_descriptor_t *id, u_int8_t type, u_int8_t subtype); static void ufoma_cfg_link_state(struct ufoma_softc *sc); static void ufoma_cfg_activate_state(struct ufoma_softc *sc, u_int16_t state); -static void ufoma_ctrl_read_callback(struct usbd_xfer *xfer); -static void ufoma_ctrl_write_callback(struct usbd_xfer *xfer); -static void ufoma_intr_clear_stall_callback(struct usbd_xfer *xfer); -static void ufoma_intr_callback(struct usbd_xfer *xfer); -static void ufoma_bulk_write_callback(struct usbd_xfer *xfer); -static void ufoma_bulk_write_clear_stall_callback(struct usbd_xfer *xfer); -static void ufoma_bulk_read_callback(struct usbd_xfer *xfer); -static void ufoma_bulk_read_clear_stall_callback(struct usbd_xfer *xfer); static void ufoma_cfg_open(struct ucom_softc *ucom); static void ufoma_cfg_close(struct ucom_softc *ucom); static void ufoma_cfg_set_break(struct ucom_softc *ucom, u_int8_t onoff); ==== //depot/projects/usb/src/sys/dev/usb/uftdi.c#14 (text+ko) ==== @@ -130,12 +130,13 @@ static device_attach_t uftdi_attach; static device_detach_t uftdi_detach; +static usbd_callback_t uftdi_write_callback; +static usbd_callback_t uftdi_write_clear_stall_callback; +static usbd_callback_t uftdi_read_callback; +static usbd_callback_t uftdi_read_clear_stall_callback; + static void uftdi_cfg_do_request(struct uftdi_softc *sc, usb_device_request_t *req, void *data); static void uftdi_cfg_open(struct ucom_softc *ucom); -static void uftdi_write_callback(struct usbd_xfer *xfer); -static void uftdi_write_clear_stall_callback(struct usbd_xfer *xfer); -static void uftdi_read_callback(struct usbd_xfer *xfer); -static void uftdi_read_clear_stall_callback(struct usbd_xfer *xfer); static void uftdi_cfg_set_dtr(struct ucom_softc *ucom, u_int8_t onoff); static void uftdi_cfg_set_rts(struct ucom_softc *ucom, u_int8_t onoff); static void uftdi_cfg_set_break(struct ucom_softc *ucom, u_int8_t onoff); ==== //depot/projects/usb/src/sys/dev/usb/ugen.c#12 (text+ko) ==== @@ -130,20 +130,21 @@ extern cdevsw_t ugen_cdevsw; -static void -ugen_make_devnodes(struct ugen_softc *sc); +/* prototypes */ -static void -ugen_destroy_devnodes(struct ugen_softc *sc, int skip_first); +static device_probe_t ugen_probe; +static device_attach_t ugen_attach; +static device_detach_t ugen_detach; -static void -ugen_interrupt_callback(struct usbd_xfer *xfer); +static usbd_callback_t ugen_interrupt_callback; +static usbd_callback_t ugenisoc_read_callback; +static usbd_callback_t ugenisoc_write_callback; static void -ugenisoc_read_callback(struct usbd_xfer *xfer); +ugen_make_devnodes(struct ugen_softc *sc); static void -ugenisoc_write_callback(struct usbd_xfer *xfer); +ugen_destroy_devnodes(struct ugen_softc *sc, int skip_first); static int ugen_set_config(struct ugen_softc *sc, int configno); ==== //depot/projects/usb/src/sys/dev/usb/uhid.c#13 (text+ko) ==== @@ -124,6 +124,18 @@ static u_int8_t uhid_graphire_report_descr[] = { UHID_GRAPHIRE_REPORT_DESCR() }; static u_int8_t uhid_graphire3_4x5_report_descr[] = { UHID_GRAPHIRE3_4X5_REPORT_DESCR() }; +/* prototypes */ + +static device_probe_t uhid_probe; +static device_attach_t uhid_attach; +static device_detach_t uhid_detach; + +static usbd_callback_t uhid_intr_callback; +static usbd_callback_t uhid_intr_clear_stall_callback; +static usbd_callback_t uhid_write_callback; +static usbd_callback_t uhid_read_callback; +static usbd_callback_t uhid_ioctl_callback; + static void uhid_intr_callback(struct usbd_xfer *xfer) { @@ -586,10 +598,6 @@ return error; } -static device_probe_t uhid_probe; -static device_attach_t uhid_attach; -static device_detach_t uhid_detach; - static int uhid_probe(device_t dev) { ==== //depot/projects/usb/src/sys/dev/usb/ulpt.c#18 (text+ko) ==== @@ -103,6 +103,19 @@ u_int8_t sc_last_status; }; +/* prototypes */ + +static device_probe_t ulpt_probe; +static device_attach_t ulpt_attach; +static device_detach_t ulpt_detach; + +static usbd_callback_t ulpt_write_callback; +static usbd_callback_t ulpt_write_clear_stall_callback; +static usbd_callback_t ulpt_read_callback; +static usbd_callback_t ulpt_read_clear_stall_callback; +static usbd_callback_t ulpt_status_callback; +static usbd_callback_t ulpt_reset_callback; + static void ulpt_watchdog(void *__sc) { @@ -489,13 +502,6 @@ return ENODEV; } - -/* prototypes */ - -static device_probe_t ulpt_probe; -static device_attach_t ulpt_attach; -static device_detach_t ulpt_detach; - static int ulpt_probe(device_t dev) { ==== //depot/projects/usb/src/sys/dev/usb/umass.c#12 (text+ko) ==== @@ -599,6 +599,27 @@ static device_attach_t umass_attach; static device_detach_t umass_detach; +static usbd_callback_t umass_tr_error; +static usbd_callback_t umass_t_bbb_reset1_callback; +static usbd_callback_t umass_t_bbb_reset2_callback; +static usbd_callback_t umass_t_bbb_reset3_callback; +static usbd_callback_t umass_t_bbb_command_callback; +static usbd_callback_t umass_t_bbb_data_read_callback; +static usbd_callback_t umass_t_bbb_data_rd_cs_callback; +static usbd_callback_t umass_t_bbb_data_write_callback; +static usbd_callback_t umass_t_bbb_data_wr_cs_callback; +static usbd_callback_t umass_t_bbb_status_callback; +static usbd_callback_t umass_t_cbi_reset1_callback; +static usbd_callback_t umass_t_cbi_reset2_callback; +static usbd_callback_t umass_t_cbi_reset3_callback; +static usbd_callback_t umass_t_cbi_reset4_callback; +static usbd_callback_t umass_t_cbi_command_callback; +static usbd_callback_t umass_t_cbi_data_read_callback; +static usbd_callback_t umass_t_cbi_data_rd_cs_callback; +static usbd_callback_t umass_t_cbi_data_write_callback; +static usbd_callback_t umass_t_cbi_data_wr_cs_callback; +static usbd_callback_t umass_t_cbi_status_callback; + static void umass_init_shuttle(struct umass_softc *sc); @@ -606,40 +627,10 @@ umass_reset(struct umass_softc *sc); static void -umass_tr_error(struct usbd_xfer *xfer); - -static void -umass_t_bbb_reset1_callback(struct usbd_xfer *xfer); - -static void -umass_t_bbb_reset2_callback(struct usbd_xfer *xfer); - -static void -umass_t_bbb_reset3_callback(struct usbd_xfer *xfer); - -static void umass_t_bbb_data_clear_stall_callback(struct usbd_xfer *xfer, u_int8_t next_xfer, u_int8_t stall_xfer); static void -umass_t_bbb_command_callback(struct usbd_xfer *xfer); - -static void -umass_t_bbb_data_read_callback(struct usbd_xfer *xfer); - -static void -umass_t_bbb_data_rd_cs_callback(struct usbd_xfer *xfer); - -static void -umass_t_bbb_data_write_callback(struct usbd_xfer *xfer); - -static void -umass_t_bbb_data_wr_cs_callback(struct usbd_xfer *xfer); - -static void -umass_t_bbb_status_callback(struct usbd_xfer *xfer); - -static void umass_command_start(struct umass_softc *sc, u_int8_t dir, void *data_ptr, u_int32_t data_len, u_int32_t data_timeout, umass_callback_t *callback, @@ -651,39 +642,9 @@ umass_cbi_start_status(struct umass_softc *sc); static void -umass_t_cbi_reset1_callback(struct usbd_xfer *xfer); - -static void -umass_t_cbi_reset2_callback(struct usbd_xfer *xfer); - -static void -umass_t_cbi_reset3_callback(struct usbd_xfer *xfer); - -static void -umass_t_cbi_reset4_callback(struct usbd_xfer *xfer); - -static void umass_t_cbi_data_clear_stall_callback(struct usbd_xfer *xfer, u_int8_t next_xfer, u_int8_t stall_xfer); -static void -umass_t_cbi_command_callback(struct usbd_xfer *xfer); - -static void -umass_t_cbi_data_read_callback(struct usbd_xfer *xfer); - -static void -umass_t_cbi_data_rd_cs_callback(struct usbd_xfer *xfer); - -static void -umass_t_cbi_data_write_callback(struct usbd_xfer *xfer); - -static void -umass_t_cbi_data_wr_cs_callback(struct usbd_xfer *xfer); - -static void -umass_t_cbi_status_callback(struct usbd_xfer *xfer); - static int umass_cam_attach_sim(struct umass_softc *sc); ==== //depot/projects/usb/src/sys/dev/usb/umct.c#12 (text+ko) ==== @@ -101,13 +101,20 @@ u_int8_t sc_iface_no; }; +/* prototypes */ + static device_probe_t umct_probe; static device_attach_t umct_attach; static device_detach_t umct_detach; +static usbd_callback_t umct_intr_clear_stall_callback; +static usbd_callback_t umct_intr_callback; +static usbd_callback_t umct_write_callback; +static usbd_callback_t umct_write_clear_stall_callback; +static usbd_callback_t umct_read_callback; +static usbd_callback_t umct_read_clear_stall_callback; + static void umct_cfg_do_request(struct umct_softc *sc, u_int8_t request, u_int16_t len, u_int32_t value); -static void umct_intr_clear_stall_callback(struct usbd_xfer *xfer); -static void umct_intr_callback(struct usbd_xfer *xfer); static void umct_cfg_get_status(struct ucom_softc *ucom, u_int8_t *lsr, u_int8_t *msr); static void umct_cfg_set_break(struct ucom_softc *ucom, u_int8_t onoff); static void umct_cfg_set_dtr(struct ucom_softc *ucom, u_int8_t onoff); @@ -119,10 +126,6 @@ static void umct_stop_read(struct ucom_softc *ucom); static void umct_start_write(struct ucom_softc *ucom); static void umct_stop_write(struct ucom_softc *ucom); -static void umct_write_callback(struct usbd_xfer *xfer); -static void umct_write_clear_stall_callback(struct usbd_xfer *xfer); -static void umct_read_callback(struct usbd_xfer *xfer); -static void umct_read_clear_stall_callback(struct usbd_xfer *xfer); static const struct usbd_config umct_config[UMCT_ENDPT_MAX] = { ==== //depot/projects/usb/src/sys/dev/usb/umodem.c#16 (text+ko) ==== @@ -161,6 +161,13 @@ static device_attach_t umodem_attach; static device_detach_t umodem_detach; +static usbd_callback_t umodem_intr_callback; +static usbd_callback_t umodem_intr_clear_stall_callback; +static usbd_callback_t umodem_write_callback; +static usbd_callback_t umodem_read_callback; +static usbd_callback_t umodem_write_clear_stall_callback; +static usbd_callback_t umodem_read_clear_stall_callback; + static void umodem_start_read(struct ucom_softc *ucom); static void umodem_stop_read(struct ucom_softc *ucom); static void umodem_start_write(struct ucom_softc *ucom); @@ -173,12 +180,6 @@ static void umodem_cfg_set_dtr(struct ucom_softc *ucom, u_int8_t onoff); static void umodem_cfg_set_rts(struct ucom_softc *ucom, u_int8_t onoff); static void umodem_cfg_set_break(struct ucom_softc *ucom, u_int8_t onoff); -static void umodem_intr_callback(struct usbd_xfer *xfer); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Mar 31 18:06:40 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1198516A418; Sat, 31 Mar 2007 18:06:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AFA1516A40B for ; Sat, 31 Mar 2007 18:06:39 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7C33A13C4B7 for ; Sat, 31 Mar 2007 18:06:37 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2VI6bA7038863 for ; Sat, 31 Mar 2007 18:06:37 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2VI69w0038834 for perforce@freebsd.org; Sat, 31 Mar 2007 18:06:09 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 31 Mar 2007 18:06:09 GMT Message-Id: <200703311806.l2VI69w0038834@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 117018 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Mar 2007 18:06:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=117018 Change 117018 by kmacy@kmacy_vt-x:opentoe_init on 2007/03/31 18:06:00 IFC Affected files ... .. //depot/projects/opentoe/ObsoleteFiles.inc#3 integrate .. //depot/projects/opentoe/contrib/bzip2/CHANGES#2 integrate .. //depot/projects/opentoe/contrib/bzip2/FREEBSD-upgrade#2 integrate .. //depot/projects/opentoe/contrib/bzip2/LICENSE#2 integrate .. //depot/projects/opentoe/contrib/bzip2/Makefile#2 integrate .. //depot/projects/opentoe/contrib/bzip2/Makefile-libbz2_so#2 integrate .. //depot/projects/opentoe/contrib/bzip2/README#2 integrate .. //depot/projects/opentoe/contrib/bzip2/README.COMPILATION.PROBLEMS#2 integrate .. //depot/projects/opentoe/contrib/bzip2/Y2K_INFO#2 delete .. //depot/projects/opentoe/contrib/bzip2/blocksort.c#2 integrate .. //depot/projects/opentoe/contrib/bzip2/bzip2.1#2 integrate .. //depot/projects/opentoe/contrib/bzip2/bzip2.c#2 integrate .. //depot/projects/opentoe/contrib/bzip2/bzip2recover.c#2 integrate .. //depot/projects/opentoe/contrib/bzip2/bzlib.c#2 integrate .. //depot/projects/opentoe/contrib/bzip2/bzlib.h#2 integrate .. //depot/projects/opentoe/contrib/bzip2/bzlib_private.h#2 integrate .. //depot/projects/opentoe/contrib/bzip2/compress.c#2 integrate .. //depot/projects/opentoe/contrib/bzip2/crctable.c#2 integrate .. //depot/projects/opentoe/contrib/bzip2/decompress.c#2 integrate .. //depot/projects/opentoe/contrib/bzip2/dlltest.c#2 integrate .. //depot/projects/opentoe/contrib/bzip2/huffman.c#2 integrate .. //depot/projects/opentoe/contrib/bzip2/manual.texi#2 delete .. //depot/projects/opentoe/contrib/bzip2/randtable.c#2 integrate .. //depot/projects/opentoe/contrib/bzip2/sample1.bz2.uu#2 integrate .. //depot/projects/opentoe/contrib/bzip2/sample1.ref.gz.uu#2 integrate .. //depot/projects/opentoe/contrib/bzip2/sample2.bz2.uu#2 integrate .. //depot/projects/opentoe/contrib/bzip2/sample2.ref.gz.uu#2 integrate .. //depot/projects/opentoe/contrib/bzip2/sample3.bz2.uu#2 integrate .. //depot/projects/opentoe/contrib/bzip2/sample3.ref.gz.uu#2 integrate .. //depot/projects/opentoe/contrib/bzip2/spewG.c#2 integrate .. //depot/projects/opentoe/contrib/bzip2/unzcrash.c#2 integrate .. //depot/projects/opentoe/contrib/bzip2/words0#2 integrate .. //depot/projects/opentoe/contrib/bzip2/words2#2 integrate .. //depot/projects/opentoe/contrib/bzip2/words3#2 integrate .. //depot/projects/opentoe/contrib/netcat/nc.1#2 integrate .. //depot/projects/opentoe/contrib/netcat/netcat.c#2 integrate .. //depot/projects/opentoe/contrib/netcat/socks.c#2 integrate .. //depot/projects/opentoe/etc/defaults/rc.conf#2 integrate .. //depot/projects/opentoe/etc/network.subr#2 integrate .. //depot/projects/opentoe/etc/rc.d/dhclient#2 integrate .. //depot/projects/opentoe/etc/rc.d/isdnd#2 integrate .. //depot/projects/opentoe/etc/rc.d/nfslocking#2 integrate .. //depot/projects/opentoe/etc/rc.d/syscons#2 integrate .. //depot/projects/opentoe/games/fortune/datfiles/fortunes#2 integrate .. //depot/projects/opentoe/games/fortune/datfiles/fortunes-o.real#2 integrate .. //depot/projects/opentoe/lib/libarchive/Makefile#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_read_support_compression_bzip2.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_write_disk.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_write_disk_perms.c#2 integrate .. //depot/projects/opentoe/lib/libc/gen/valloc.3#2 integrate .. //depot/projects/opentoe/lib/libc/net/inet.3#2 integrate .. //depot/projects/opentoe/lib/libc/stdlib/malloc.3#2 integrate .. //depot/projects/opentoe/lib/libc/stdlib/malloc.c#3 integrate .. //depot/projects/opentoe/lib/libc/stdlib/posix_memalign.3#2 integrate .. //depot/projects/opentoe/lib/libelf/elf_getarhdr.3#2 integrate .. //depot/projects/opentoe/lib/libelf/elf_rand.3#2 integrate .. //depot/projects/opentoe/lib/libelf/libelf_ar.c#2 integrate .. //depot/projects/opentoe/lib/libpam/modules/pam_unix/pam_unix.8#2 integrate .. //depot/projects/opentoe/lib/libpam/modules/pam_unix/pam_unix.c#2 integrate .. //depot/projects/opentoe/lib/libpmc/pmc.3#2 integrate .. //depot/projects/opentoe/lib/libypclnt/Makefile#2 integrate .. //depot/projects/opentoe/lib/libypclnt/ypclnt.3#2 delete .. //depot/projects/opentoe/release/doc/en_US.ISO8859-1/relnotes/article.sgml#2 integrate .. //depot/projects/opentoe/sbin/geom/core/geom.c#2 integrate .. //depot/projects/opentoe/sbin/ifconfig/ifconfig.8#2 integrate .. //depot/projects/opentoe/sbin/ifconfig/ifconfig.c#2 integrate .. //depot/projects/opentoe/sbin/ifconfig/ifieee80211.c#2 integrate .. //depot/projects/opentoe/share/man/man3/pthread_cond_timedwait.3#2 integrate .. //depot/projects/opentoe/share/man/man3/pthread_cond_wait.3#2 integrate .. //depot/projects/opentoe/share/man/man4/Makefile#2 integrate .. //depot/projects/opentoe/share/man/man4/edsc.4#1 branch .. //depot/projects/opentoe/share/man/man4/ng_fec.4#2 integrate .. //depot/projects/opentoe/share/man/man4/watchdog.4#2 integrate .. //depot/projects/opentoe/share/man/man9/Makefile#2 integrate .. //depot/projects/opentoe/share/man/man9/condvar.9#2 integrate .. //depot/projects/opentoe/share/man/man9/lock.9#2 integrate .. //depot/projects/opentoe/share/man/man9/mtx_pool.9#2 integrate .. //depot/projects/opentoe/share/man/man9/mutex.9#2 integrate .. //depot/projects/opentoe/share/man/man9/rwlock.9#2 integrate .. //depot/projects/opentoe/share/man/man9/sema.9#2 integrate .. //depot/projects/opentoe/share/man/man9/sleep.9#2 integrate .. //depot/projects/opentoe/share/man/man9/sx.9#2 integrate .. //depot/projects/opentoe/share/man/man9/watchdog.9#2 integrate .. //depot/projects/opentoe/share/misc/Makefile#2 integrate .. //depot/projects/opentoe/share/misc/committers-doc.dot#1 branch .. //depot/projects/opentoe/share/misc/committers-ports.dot#1 branch .. //depot/projects/opentoe/share/misc/committers-src.dot#1 branch .. //depot/projects/opentoe/sys/Makefile#2 integrate .. //depot/projects/opentoe/sys/amd64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/opentoe/sys/amd64/acpica/madt.c#2 integrate .. //depot/projects/opentoe/sys/amd64/amd64/cpu_switch.S#2 integrate .. //depot/projects/opentoe/sys/amd64/amd64/genassym.c#2 integrate .. //depot/projects/opentoe/sys/amd64/amd64/identcpu.c#3 integrate .. //depot/projects/opentoe/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/opentoe/sys/amd64/amd64/nexus.c#3 integrate .. //depot/projects/opentoe/sys/amd64/amd64/prof_machdep.c#2 integrate .. //depot/projects/opentoe/sys/amd64/amd64/support.S#2 integrate .. //depot/projects/opentoe/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/opentoe/sys/amd64/amd64/tsc.c#2 integrate .. //depot/projects/opentoe/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/opentoe/sys/amd64/include/acpica_machdep.h#2 integrate .. //depot/projects/opentoe/sys/amd64/include/pcb.h#2 integrate .. //depot/projects/opentoe/sys/amd64/include/segments.h#2 integrate .. //depot/projects/opentoe/sys/amd64/linux32/linux.h#2 integrate .. //depot/projects/opentoe/sys/amd64/linux32/linux32_dummy.c#2 integrate .. //depot/projects/opentoe/sys/amd64/linux32/linux32_locore.s#2 integrate .. //depot/projects/opentoe/sys/amd64/linux32/linux32_machdep.c#2 integrate .. //depot/projects/opentoe/sys/amd64/linux32/linux32_proto.h#2 integrate .. //depot/projects/opentoe/sys/amd64/linux32/linux32_syscall.h#2 integrate .. //depot/projects/opentoe/sys/amd64/linux32/linux32_sysent.c#2 integrate .. //depot/projects/opentoe/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/opentoe/sys/amd64/linux32/syscalls.master#2 integrate .. //depot/projects/opentoe/sys/arm/arm/cpufunc_asm_arm9.S#2 integrate .. //depot/projects/opentoe/sys/arm/at91/at91_st.c#2 integrate .. //depot/projects/opentoe/sys/arm/at91/at91_twi.c#2 integrate .. //depot/projects/opentoe/sys/arm/at91/at91_twireg.h#2 integrate .. //depot/projects/opentoe/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/opentoe/sys/arm/conf/KB920X#2 integrate .. //depot/projects/opentoe/sys/arm/conf/KB920X.hints#1 branch .. //depot/projects/opentoe/sys/arm/include/bootconfig.h#2 integrate .. //depot/projects/opentoe/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/opentoe/sys/arm/include/undefined.h#2 integrate .. //depot/projects/opentoe/sys/arm/xscale/i80321/i80321_wdog.c#2 integrate .. //depot/projects/opentoe/sys/arm/xscale/ixp425/ixp425_wdog.c#2 integrate .. //depot/projects/opentoe/sys/boot/arm/at91/boot2/boot2.c#2 integrate .. //depot/projects/opentoe/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#2 integrate .. //depot/projects/opentoe/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#2 integrate .. //depot/projects/opentoe/sys/boot/arm/at91/libat91/emac.c#2 integrate .. //depot/projects/opentoe/sys/boot/arm/at91/libat91/getc.c#2 integrate .. //depot/projects/opentoe/sys/boot/arm/at91/libat91/memcmp.c#2 integrate .. //depot/projects/opentoe/sys/boot/arm/at91/libat91/sd-card.c#2 integrate .. //depot/projects/opentoe/sys/boot/arm/at91/libat91/spi_flash.c#2 integrate .. //depot/projects/opentoe/sys/boot/arm/at91/libat91/strlen.c#2 integrate .. //depot/projects/opentoe/sys/boot/ficl/ficl.h#2 integrate .. //depot/projects/opentoe/sys/boot/ficl/float.c#2 integrate .. //depot/projects/opentoe/sys/boot/ficl/softwords/fileaccess.fr#2 integrate .. //depot/projects/opentoe/sys/boot/ficl/softwords/jhlocal.fr#2 integrate .. //depot/projects/opentoe/sys/boot/ficl/softwords/oo.fr#2 integrate .. //depot/projects/opentoe/sys/boot/ficl/softwords/prefix.fr#2 integrate .. //depot/projects/opentoe/sys/boot/ficl/softwords/softcore.awk#2 integrate .. //depot/projects/opentoe/sys/boot/ficl/tools.c#2 integrate .. //depot/projects/opentoe/sys/boot/ficl/unix.c#2 integrate .. //depot/projects/opentoe/sys/boot/ficl/vm.c#2 integrate .. //depot/projects/opentoe/sys/boot/ficl/words.c#2 integrate .. //depot/projects/opentoe/sys/boot/i386/boot0/boot0.S#2 integrate .. //depot/projects/opentoe/sys/boot/i386/libi386/biosacpi.c#2 integrate .. //depot/projects/opentoe/sys/boot/ia64/ski/acpi_stub.c#2 integrate .. //depot/projects/opentoe/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/opentoe/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/opentoe/sys/compat/linux/linux_futex.c#2 integrate .. //depot/projects/opentoe/sys/compat/linux/linux_util.h#2 integrate .. //depot/projects/opentoe/sys/conf/NOTES#2 integrate .. //depot/projects/opentoe/sys/conf/files#2 integrate .. //depot/projects/opentoe/sys/conf/kern.post.mk#2 integrate .. //depot/projects/opentoe/sys/conf/kmod.mk#2 integrate .. //depot/projects/opentoe/sys/conf/options#3 integrate .. //depot/projects/opentoe/sys/contrib/altq/altq/altq_subr.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/CHANGES.txt#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/acapps.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/acconfig.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/acdebug.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/acdisasm.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/acdispat.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/acefi.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/acenv.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/acevents.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/acexcep.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/acfreebsd.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/acgcc.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/acglobal.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/achware.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/acinterp.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/aclocal.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/acmacros.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/acnames.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/acnamesp.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/acobject.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/acopcode.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/acoutput.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/acparser.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/acpi.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/acpica_prep.sh#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/acpiosxf.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/acpixf.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/acresrc.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/acstruct.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/actables.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/actbl.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/actbl1.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/actbl2.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/actypes.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/acutils.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/aecommon.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/aeexec.c#2 delete .. //depot/projects/opentoe/sys/contrib/dev/acpica/amlcode.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/amlresrc.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/common/adfile.c#1 branch .. //depot/projects/opentoe/sys/contrib/dev/acpica/common/adisasm.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/common/adwalk.c#1 branch .. //depot/projects/opentoe/sys/contrib/dev/acpica/common/dmrestag.c#1 branch .. //depot/projects/opentoe/sys/contrib/dev/acpica/common/dmtable.c#1 branch .. //depot/projects/opentoe/sys/contrib/dev/acpica/common/dmtbdump.c#1 branch .. //depot/projects/opentoe/sys/contrib/dev/acpica/common/dmtbinfo.c#1 branch .. //depot/projects/opentoe/sys/contrib/dev/acpica/common/getopt.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/compiler/aslanalyze.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/compiler/aslcodegen.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/compiler/aslcompile.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/compiler/aslcompiler.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/compiler/aslcompiler.l#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/compiler/asldefine.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/compiler/aslerror.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/compiler/aslfiles.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/compiler/aslfold.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/compiler/aslglobal.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/compiler/asllength.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/compiler/asllisting.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/compiler/aslload.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/compiler/asllookup.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/compiler/aslmain.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/compiler/aslmap.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/compiler/aslopcodes.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/compiler/asloperands.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/compiler/aslopt.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/compiler/aslresource.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/compiler/aslrestype1.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/compiler/aslrestype2.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/compiler/aslstubs.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/compiler/asltransform.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/compiler/asltree.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/compiler/asltypes.h#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/compiler/aslutils.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/dbcmds.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/dbdisply.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/dbexec.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/dbfileio.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/dbhistry.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/dbinput.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/dbstats.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/dbutils.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/dbxface.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/dmbuffer.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/dmnames.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/dmobject.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/dmopcode.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/dmresrc.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/dmresrcl.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/dmresrcs.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/dmutils.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/dmwalk.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/dsfield.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/dsinit.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/dsmethod.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/dsmthdat.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/dsobject.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/dsopcode.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/dsutils.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/dswexec.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/dswload.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/dswscope.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/dswstate.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/evevent.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/evgpe.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/evgpeblk.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/evmisc.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/evregion.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/evrgnini.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/evsci.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/evxface.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/evxfevnt.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/evxfregn.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/exconfig.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/exconvrt.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/excreate.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/exdump.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/exfield.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/exfldio.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/exmisc.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/exmutex.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/exnames.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/exoparg1.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/exoparg2.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/exoparg3.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/exoparg6.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/exprep.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/exregion.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/exresnte.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/exresolv.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/exresop.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/exstore.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/exstoren.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/exstorob.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/exsystem.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/exutils.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/hwacpi.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/hwgpe.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/hwregs.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/hwsleep.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/hwtimer.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/nsaccess.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/nsalloc.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/nsdump.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/nsdumpdv.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/nseval.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/nsinit.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/nsload.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/nsnames.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/nsobject.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/nsparse.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/nssearch.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/nsutils.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/nswalk.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/nsxfeval.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/nsxfname.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/nsxfobj.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/osunixxf.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/psargs.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/psloop.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/psopcode.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/psparse.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/psscope.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/pstree.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/psutils.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/pswalk.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/psxface.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/rsaddr.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/rscalc.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/rscreate.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/rsdump.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/rsinfo.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/rsio.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/rsirq.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/rslist.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/rsmemory.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/rsmisc.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/rsutils.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/rsxface.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/tbconvrt.c#2 delete .. //depot/projects/opentoe/sys/contrib/dev/acpica/tbfadt.c#1 branch .. //depot/projects/opentoe/sys/contrib/dev/acpica/tbfind.c#1 branch .. //depot/projects/opentoe/sys/contrib/dev/acpica/tbget.c#2 delete .. //depot/projects/opentoe/sys/contrib/dev/acpica/tbgetall.c#2 delete .. //depot/projects/opentoe/sys/contrib/dev/acpica/tbinstal.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/tbrsdt.c#2 delete .. //depot/projects/opentoe/sys/contrib/dev/acpica/tbutils.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/tbxface.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/tbxfroot.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/utalloc.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/utcache.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/utclib.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/utcopy.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/utdebug.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/utdelete.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/uteval.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/utglobal.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/utinit.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/utmath.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/utmisc.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/utmutex.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/utobject.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/utresrc.c#1 branch .. //depot/projects/opentoe/sys/contrib/dev/acpica/utstate.c#2 integrate .. //depot/projects/opentoe/sys/contrib/dev/acpica/uttrack.c#1 branch .. //depot/projects/opentoe/sys/contrib/dev/acpica/utxface.c#2 integrate .. //depot/projects/opentoe/sys/crypto/via/padlock.c#2 integrate .. //depot/projects/opentoe/sys/dev/acpi_support/acpi_asus.c#2 integrate .. //depot/projects/opentoe/sys/dev/acpi_support/acpi_fujitsu.c#2 integrate .. //depot/projects/opentoe/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/opentoe/sys/dev/acpica/Osd/OsdDebug.c#2 integrate .. //depot/projects/opentoe/sys/dev/acpica/Osd/OsdMemory.c#2 integrate .. //depot/projects/opentoe/sys/dev/acpica/Osd/OsdSchedule.c#2 integrate .. //depot/projects/opentoe/sys/dev/acpica/Osd/OsdSynch.c#2 integrate .. //depot/projects/opentoe/sys/dev/acpica/Osd/OsdTable.c#2 integrate .. //depot/projects/opentoe/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/opentoe/sys/dev/acpica/acpi_acad.c#2 integrate .. //depot/projects/opentoe/sys/dev/acpica/acpi_button.c#2 integrate .. //depot/projects/opentoe/sys/dev/acpica/acpi_cmbat.c#2 integrate .. //depot/projects/opentoe/sys/dev/acpica/acpi_cpu.c#2 integrate .. //depot/projects/opentoe/sys/dev/acpica/acpi_dock.c#2 integrate .. //depot/projects/opentoe/sys/dev/acpica/acpi_ec.c#3 integrate .. //depot/projects/opentoe/sys/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/opentoe/sys/dev/acpica/acpi_lid.c#2 integrate .. //depot/projects/opentoe/sys/dev/acpica/acpi_pci_link.c#2 integrate .. //depot/projects/opentoe/sys/dev/acpica/acpi_perf.c#2 integrate .. //depot/projects/opentoe/sys/dev/acpica/acpi_quirk.c#2 integrate .. //depot/projects/opentoe/sys/dev/acpica/acpi_resource.c#2 integrate .. //depot/projects/opentoe/sys/dev/acpica/acpi_throttle.c#2 integrate .. //depot/projects/opentoe/sys/dev/acpica/acpi_timer.c#2 integrate .. //depot/projects/opentoe/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/opentoe/sys/dev/ar/if_ar.c#2 integrate .. //depot/projects/opentoe/sys/dev/ce/if_ce.c#2 integrate .. //depot/projects/opentoe/sys/dev/cm/smc90cx6.c#2 integrate .. //depot/projects/opentoe/sys/dev/cp/if_cp.c#2 integrate .. //depot/projects/opentoe/sys/dev/ctau/if_ct.c#2 integrate .. //depot/projects/opentoe/sys/dev/cx/if_cx.c#2 integrate .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_adapter.h#3 integrate .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_main.c#3 integrate .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_osdep.h#3 integrate .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/opentoe/sys/dev/ed/if_ed.c#2 integrate .. //depot/projects/opentoe/sys/dev/exca/exca.c#2 integrate .. //depot/projects/opentoe/sys/dev/firewire/firewire.c#2 integrate .. //depot/projects/opentoe/sys/dev/firewire/fwohci_pci.c#3 integrate .. //depot/projects/opentoe/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/opentoe/sys/dev/hifn/hifn7751.c#2 integrate .. //depot/projects/opentoe/sys/dev/hifn/hifn7751reg.h#2 integrate .. //depot/projects/opentoe/sys/dev/hifn/hifn7751var.h#2 integrate .. //depot/projects/opentoe/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/opentoe/sys/dev/iicbus/icee.c#1 branch .. //depot/projects/opentoe/sys/dev/iicbus/iic.c#2 integrate .. //depot/projects/opentoe/sys/dev/iicbus/iicbb.c#2 integrate .. //depot/projects/opentoe/sys/dev/iicbus/iicbus.c#2 integrate .. //depot/projects/opentoe/sys/dev/iicbus/iicbus.h#2 integrate .. //depot/projects/opentoe/sys/dev/iicbus/iiconf.c#2 integrate .. //depot/projects/opentoe/sys/dev/ipmi/ipmi.c#2 integrate .. //depot/projects/opentoe/sys/dev/ipw/if_ipw.c#2 integrate .. //depot/projects/opentoe/sys/dev/isp/isp.c#2 integrate .. //depot/projects/opentoe/sys/dev/isp/isp_library.c#2 integrate .. //depot/projects/opentoe/sys/dev/isp/isp_library.h#2 integrate .. //depot/projects/opentoe/sys/dev/isp/isp_pci.c#2 integrate .. //depot/projects/opentoe/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/opentoe/sys/dev/isp/ispvar.h#2 integrate .. //depot/projects/opentoe/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/opentoe/sys/dev/mk48txx/mk48txx.c#2 integrate .. //depot/projects/opentoe/sys/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/opentoe/sys/dev/pcf/envctrl.c#2 integrate .. //depot/projects/opentoe/sys/dev/pcf/pcf_ebus.c#2 integrate .. //depot/projects/opentoe/sys/dev/pcf/pcf_isa.c#2 integrate .. //depot/projects/opentoe/sys/dev/pci/pci.c#2 integrate .. //depot/projects/opentoe/sys/dev/pci/pcivar.h#2 integrate .. //depot/projects/opentoe/sys/dev/ppc/ppc.c#2 integrate .. //depot/projects/opentoe/sys/dev/re/if_re.c#2 integrate .. //depot/projects/opentoe/sys/dev/safe/safe.c#2 integrate .. //depot/projects/opentoe/sys/dev/scc/scc_bfe.h#2 integrate .. //depot/projects/opentoe/sys/dev/scc/scc_bfe_ebus.c#2 integrate .. //depot/projects/opentoe/sys/dev/scc/scc_bfe_macio.c#2 integrate .. //depot/projects/opentoe/sys/dev/scc/scc_bfe_sbus.c#2 integrate .. //depot/projects/opentoe/sys/dev/scc/scc_core.c#2 integrate .. //depot/projects/opentoe/sys/dev/scc/scc_if.m#2 integrate .. //depot/projects/opentoe/sys/dev/sio/sio_pci.c#2 integrate .. //depot/projects/opentoe/sys/dev/snp/snp.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/hda/hdac.c#3 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/via8233.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/via82c686.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pcm/buffer.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/opentoe/sys/dev/sr/if_sr.c#2 integrate .. //depot/projects/opentoe/sys/dev/uart/uart_core.c#2 integrate .. //depot/projects/opentoe/sys/dev/uart/uart_dev_ns8250.c#2 integrate .. //depot/projects/opentoe/sys/dev/ubsec/ubsec.c#2 integrate .. //depot/projects/opentoe/sys/dev/usb/uhci.c#2 integrate .. //depot/projects/opentoe/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/opentoe/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/opentoe/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/opentoe/sys/dev/watchdog/watchdog.c#2 integrate .. //depot/projects/opentoe/sys/dev/wl/if_wl.c#2 integrate .. //depot/projects/opentoe/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/opentoe/sys/fs/udf/udf_vnops.c#2 integrate .. //depot/projects/opentoe/sys/geom/eli/g_eli.c#2 integrate .. //depot/projects/opentoe/sys/geom/eli/g_eli_crypto.c#2 integrate .. //depot/projects/opentoe/sys/geom/geom_ctl.c#2 integrate .. //depot/projects/opentoe/sys/geom/geom_dev.c#2 integrate .. //depot/projects/opentoe/sys/geom/journal/g_journal.c#2 integrate .. //depot/projects/opentoe/sys/i386/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/opentoe/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/opentoe/sys/i386/acpica/madt.c#2 integrate .. //depot/projects/opentoe/sys/i386/conf/NOTES#2 integrate .. //depot/projects/opentoe/sys/i386/i386/elan-mmcr.c#2 integrate .. //depot/projects/opentoe/sys/i386/i386/geode.c#2 integrate .. //depot/projects/opentoe/sys/i386/i386/identcpu.c#3 integrate .. //depot/projects/opentoe/sys/i386/i386/locore.s#2 integrate .. //depot/projects/opentoe/sys/i386/i386/nexus.c#3 integrate .. //depot/projects/opentoe/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/opentoe/sys/i386/i386/support.s#2 integrate .. //depot/projects/opentoe/sys/i386/i386/trap.c#2 integrate .. //depot/projects/opentoe/sys/i386/i386/tsc.c#2 integrate .. //depot/projects/opentoe/sys/i386/ibcs2/ibcs2_misc.c#2 integrate .. //depot/projects/opentoe/sys/i386/include/acpica_machdep.h#2 integrate .. //depot/projects/opentoe/sys/i386/isa/prof_machdep.c#2 integrate .. //depot/projects/opentoe/sys/i386/linux/linux.h#2 integrate .. //depot/projects/opentoe/sys/i386/linux/linux_dummy.c#2 integrate .. //depot/projects/opentoe/sys/i386/linux/linux_proto.h#2 integrate .. //depot/projects/opentoe/sys/i386/linux/linux_syscall.h#2 integrate .. //depot/projects/opentoe/sys/i386/linux/linux_sysent.c#2 integrate .. //depot/projects/opentoe/sys/i386/linux/syscalls.master#2 integrate .. //depot/projects/opentoe/sys/ia64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/opentoe/sys/ia64/acpica/madt.c#2 integrate .. //depot/projects/opentoe/sys/ia64/ia64/nexus.c#2 integrate .. //depot/projects/opentoe/sys/ia64/include/acpica_machdep.h#2 integrate .. //depot/projects/opentoe/sys/kern/init_main.c#2 integrate .. //depot/projects/opentoe/sys/kern/kern_condvar.c#2 integrate .. //depot/projects/opentoe/sys/kern/kern_cpu.c#2 integrate .. //depot/projects/opentoe/sys/kern/kern_exec.c#2 integrate .. //depot/projects/opentoe/sys/kern/kern_exit.c#2 integrate .. //depot/projects/opentoe/sys/kern/kern_kse.c#2 integrate .. //depot/projects/opentoe/sys/kern/kern_lock.c#2 integrate .. //depot/projects/opentoe/sys/kern/kern_mutex.c#2 integrate .. //depot/projects/opentoe/sys/kern/kern_proc.c#2 integrate .. //depot/projects/opentoe/sys/kern/kern_rwlock.c#2 integrate .. //depot/projects/opentoe/sys/kern/kern_sig.c#2 integrate .. //depot/projects/opentoe/sys/kern/kern_sx.c#2 integrate .. //depot/projects/opentoe/sys/kern/kern_synch.c#2 integrate .. //depot/projects/opentoe/sys/kern/kern_thread.c#2 integrate .. //depot/projects/opentoe/sys/kern/subr_witness.c#2 integrate .. //depot/projects/opentoe/sys/kern/sysv_sem.c#2 integrate .. //depot/projects/opentoe/sys/kern/uipc_sockbuf.c#3 integrate .. //depot/projects/opentoe/sys/kern/uipc_socket.c#2 integrate .. //depot/projects/opentoe/sys/kern/uipc_socket2.c#2 delete .. //depot/projects/opentoe/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/opentoe/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/opentoe/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/opentoe/sys/kern/vfs_syscalls.c#2 integrate .. //depot/projects/opentoe/sys/modules/Makefile#2 integrate .. //depot/projects/opentoe/sys/modules/acpi/Makefile#2 integrate .. //depot/projects/opentoe/sys/modules/acpi/acpi/Makefile#2 integrate .. //depot/projects/opentoe/sys/modules/crypto/Makefile#2 integrate .. //depot/projects/opentoe/sys/modules/cxgb/Makefile#2 integrate .. //depot/projects/opentoe/sys/modules/hifn/Makefile#2 integrate .. //depot/projects/opentoe/sys/modules/if_edsc/Makefile#1 branch .. //depot/projects/opentoe/sys/modules/padlock/Makefile#2 integrate .. //depot/projects/opentoe/sys/modules/safe/Makefile#2 integrate .. //depot/projects/opentoe/sys/modules/ubsec/Makefile#2 integrate .. //depot/projects/opentoe/sys/net/if.c#3 integrate .. //depot/projects/opentoe/sys/net/if_disc.c#2 integrate .. //depot/projects/opentoe/sys/net/if_edsc.c#1 branch .. //depot/projects/opentoe/sys/net/if_ethersubr.c#3 integrate .. //depot/projects/opentoe/sys/net/rtsock.c#2 integrate .. //depot/projects/opentoe/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c#2 integrate .. //depot/projects/opentoe/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate .. //depot/projects/opentoe/sys/netgraph/netflow/ng_netflow.c#2 integrate .. //depot/projects/opentoe/sys/netgraph/netflow/ng_netflow.h#2 integrate .. //depot/projects/opentoe/sys/netgraph/ng_base.c#3 integrate .. //depot/projects/opentoe/sys/netinet/if_ether.c#2 integrate .. //depot/projects/opentoe/sys/netinet/in.c#3 integrate .. //depot/projects/opentoe/sys/netinet/in_pcb.h#2 integrate .. //depot/projects/opentoe/sys/netinet/ip_input.c#3 integrate .. //depot/projects/opentoe/sys/netinet/ip_output.c#2 integrate .. //depot/projects/opentoe/sys/netinet/sctp_auth.c#2 integrate .. //depot/projects/opentoe/sys/netinet/sctp_constants.h#2 integrate .. //depot/projects/opentoe/sys/netinet/sctp_indata.c#3 integrate .. //depot/projects/opentoe/sys/netinet/sctp_input.c#3 integrate .. //depot/projects/opentoe/sys/netinet/sctp_os_bsd.h#3 integrate .. //depot/projects/opentoe/sys/netinet/sctp_output.c#3 integrate .. //depot/projects/opentoe/sys/netinet/sctp_pcb.c#3 integrate .. //depot/projects/opentoe/sys/netinet/sctp_pcb.h#3 integrate .. //depot/projects/opentoe/sys/netinet/sctp_structs.h#3 integrate .. //depot/projects/opentoe/sys/netinet/sctp_sysctl.c#2 integrate .. //depot/projects/opentoe/sys/netinet/sctp_sysctl.h#2 integrate .. //depot/projects/opentoe/sys/netinet/sctp_uio.h#2 integrate .. //depot/projects/opentoe/sys/netinet/sctp_usrreq.c#3 integrate .. //depot/projects/opentoe/sys/netinet/sctputil.c#3 integrate .. //depot/projects/opentoe/sys/netinet/tcp.h#2 integrate .. //depot/projects/opentoe/sys/netinet/tcp_debug.h#2 integrate .. //depot/projects/opentoe/sys/netinet/tcp_hostcache.c#2 integrate .. //depot/projects/opentoe/sys/netinet/tcp_input.c#3 integrate .. //depot/projects/opentoe/sys/netinet/tcp_output.c#3 integrate .. //depot/projects/opentoe/sys/netinet/tcp_sack.c#3 integrate .. //depot/projects/opentoe/sys/netinet/tcp_subr.c#3 integrate .. //depot/projects/opentoe/sys/netinet/tcp_timer.c#3 integrate .. //depot/projects/opentoe/sys/netinet/tcp_usrreq.c#2 integrate .. //depot/projects/opentoe/sys/netinet/tcp_var.h#2 integrate .. //depot/projects/opentoe/sys/netinet6/sctp6_usrreq.c#3 integrate .. //depot/projects/opentoe/sys/netipsec/ipsec.c#2 integrate .. //depot/projects/opentoe/sys/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/opentoe/sys/nfsserver/nfs_serv.c#2 integrate .. //depot/projects/opentoe/sys/opencrypto/crypto.c#2 integrate .. //depot/projects/opentoe/sys/opencrypto/crypto_if.m#2 delete .. //depot/projects/opentoe/sys/opencrypto/cryptodev.c#2 integrate .. //depot/projects/opentoe/sys/opencrypto/cryptodev.h#2 integrate .. //depot/projects/opentoe/sys/opencrypto/cryptodev_if.m#1 branch .. //depot/projects/opentoe/sys/opencrypto/cryptosoft.c#2 integrate .. //depot/projects/opentoe/sys/opencrypto/cryptosoft.h#2 integrate .. //depot/projects/opentoe/sys/pc98/cbus/fdc.c#2 integrate .. //depot/projects/opentoe/sys/rpc/rpcclnt.c#2 integrate .. //depot/projects/opentoe/sys/sys/_mutex.h#2 integrate .. //depot/projects/opentoe/sys/sys/_rwlock.h#2 integrate .. //depot/projects/opentoe/sys/sys/condvar.h#2 integrate .. //depot/projects/opentoe/sys/sys/cpu.h#2 integrate .. //depot/projects/opentoe/sys/sys/eventhandler.h#2 integrate .. //depot/projects/opentoe/sys/sys/lock.h#2 integrate .. //depot/projects/opentoe/sys/sys/lockmgr.h#2 integrate .. //depot/projects/opentoe/sys/sys/mbuf.h#2 integrate .. //depot/projects/opentoe/sys/sys/mount.h#2 integrate .. //depot/projects/opentoe/sys/sys/mutex.h#2 integrate .. //depot/projects/opentoe/sys/sys/param.h#3 integrate .. //depot/projects/opentoe/sys/sys/proc.h#2 integrate .. //depot/projects/opentoe/sys/sys/rwlock.h#2 integrate .. //depot/projects/opentoe/sys/sys/sx.h#2 integrate .. //depot/projects/opentoe/sys/sys/systm.h#2 integrate .. //depot/projects/opentoe/sys/tools/acpi_quirks2h.awk#2 integrate .. //depot/projects/opentoe/sys/ufs/ffs/ffs_softdep.c#3 integrate .. //depot/projects/opentoe/sys/vm/vm_fault.c#2 integrate .. //depot/projects/opentoe/sys/vm/vm_map.c#2 integrate .. //depot/projects/opentoe/sys/vm/vm_object.c#2 integrate .. //depot/projects/opentoe/tools/regression/ipsec/ipsec.t#2 integrate .. //depot/projects/opentoe/tools/regression/ipsec/ipsec6.t#1 branch .. //depot/projects/opentoe/tools/tools/crypto/cryptokeytest.c#2 integrate .. //depot/projects/opentoe/tools/tools/crypto/cryptotest.c#2 integrate .. //depot/projects/opentoe/usr.bin/bzip2/Makefile#2 integrate .. //depot/projects/opentoe/usr.bin/bzip2/doc/Makefile#2 delete .. //depot/projects/opentoe/usr.bin/file2c/file2c.1#2 integrate .. //depot/projects/opentoe/usr.bin/file2c/file2c.c#2 integrate .. //depot/projects/opentoe/usr.bin/mail/mail.1#2 integrate .. //depot/projects/opentoe/usr.bin/nl/nl.1#2 integrate .. //depot/projects/opentoe/usr.bin/sockstat/sockstat.c#2 integrate .. //depot/projects/opentoe/usr.bin/tar/Makefile#2 integrate .. //depot/projects/opentoe/usr.bin/tar/bsdtar.c#2 integrate .. //depot/projects/opentoe/usr.sbin/acpi/acpidb/Makefile#2 integrate .. //depot/projects/opentoe/usr.sbin/acpi/acpidb/acpidb.c#2 integrate .. //depot/projects/opentoe/usr.sbin/acpi/acpidump/acpi.c#2 integrate .. //depot/projects/opentoe/usr.sbin/acpi/acpidump/acpi_user.c#2 integrate .. //depot/projects/opentoe/usr.sbin/acpi/acpidump/acpidump.h#2 integrate .. //depot/projects/opentoe/usr.sbin/acpi/iasl/Makefile#2 integrate .. //depot/projects/opentoe/usr.sbin/adduser/adduser.sh#2 integrate .. //depot/projects/opentoe/usr.sbin/arp/arp.4#2 integrate .. //depot/projects/opentoe/usr.sbin/gstat/gstat.c#2 integrate .. //depot/projects/opentoe/usr.sbin/ngctl/Makefile#2 integrate .. //depot/projects/opentoe/usr.sbin/pkg_install/lib/exec.c#2 integrate .. //depot/projects/opentoe/usr.sbin/pkg_install/lib/lib.h#2 integrate .. //depot/projects/opentoe/usr.sbin/pkg_install/lib/plist.c#2 integrate .. //depot/projects/opentoe/usr.sbin/pkg_install/lib/url.c#2 integrate .. //depot/projects/opentoe/usr.sbin/pw/cpdir.c#2 integrate .. //depot/projects/opentoe/usr.sbin/pw/pw.8#2 integrate .. //depot/projects/opentoe/usr.sbin/pw/pw.c#2 integrate .. //depot/projects/opentoe/usr.sbin/pw/pw.conf.5#2 integrate .. //depot/projects/opentoe/usr.sbin/pw/pw.h#2 integrate .. //depot/projects/opentoe/usr.sbin/pw/pw_conf.c#2 integrate .. //depot/projects/opentoe/usr.sbin/pw/pw_user.c#2 integrate .. //depot/projects/opentoe/usr.sbin/sysinstall/Makefile#2 integrate .. //depot/projects/opentoe/usr.sbin/sysinstall/biosmptable.c#2 integrate .. //depot/projects/opentoe/usr.sbin/sysinstall/dist.c#2 integrate Differences ... ==== //depot/projects/opentoe/ObsoleteFiles.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.76 2007/03/19 11:15:53 delphij Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.77 2007/03/28 07:49:57 delphij Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070328: bzip2 1.0.4 +OLD_FILES+=usr/share/info/bzip2.info.gz # 20070303: libarchive 2.0 OLD_LIBS+=usr/lib/libarchive.so.3 # 20070301: remove addr2ascii and ascii2addr ==== //depot/projects/opentoe/contrib/bzip2/CHANGES#2 (text+ko) ==== @@ -1,5 +1,18 @@ + ------------------------------------------------------------------ + This file is part of bzip2/libbzip2, a program and library for + lossless, block-sorting data compression. + bzip2/libbzip2 version 1.0.4 of 20 December 2006 + Copyright (C) 1996-2006 Julian Seward + Please read the WARNING, DISCLAIMER and PATENTS sections in the + README file. + + This program is released under the terms of the license contained + in the file LICENSE. + ------------------------------------------------------------------ + + 0.9.0 ~~~~~ First version. @@ -261,7 +274,7 @@ decompressor to crash, loop or access memory which does not belong to it. If you are using bzip2 or the library to decompress bitstreams from untrusted sources, an upgrade - to 1.0.3 is recommended. + to 1.0.3 is recommended. This fixes CAN-2005-1260. * The documentation has been converted to XML, from which html and pdf can be derived. @@ -273,3 +286,29 @@ * The BZ_NO_STDIO cpp symbol was not properly observed in 1.0.2. This has been fixed. + + +1.0.4 (20 Dec 06) +~~~~~~~~~~~~~~~~~ +Fixes some minor bugs since the last version, 1.0.3. + +* Fix file permissions race problem (CAN-2005-0953). + +* Avoid possible segfault in BZ2_bzclose. From Coverity's NetBSD + scan. + +* 'const'/prototype cleanups in the C code. + +* Change default install location to /usr/local, and handle multiple + 'make install's without error. + +* Sanitise file names more carefully in bzgrep. Fixes CAN-2005-0758 + to the extent that applies to bzgrep. + +* Use 'mktemp' rather than 'tempfile' in bzdiff. + +* Tighten up a couple of assertions in blocksort.c following automated + analysis. + +* Fix minor doc/comment bugs. + ==== //depot/projects/opentoe/contrib/bzip2/FREEBSD-upgrade#2 (text+ko) ==== @@ -1,18 +1,18 @@ -$FreeBSD: src/contrib/bzip2/FREEBSD-upgrade,v 1.2 2005/05/16 18:56:30 obrien Exp $ +$FreeBSD: src/contrib/bzip2/FREEBSD-upgrade,v 1.4 2007/03/30 16:33:05 delphij Exp $ Julian Seward's bzip2 - originals can be found at: http://sources.redhat.com/bzip2/ + originals can be found at: http://www.bzip.org/downloads.html Imported by: - cvs import -m "Virgin import (trimmed) of Bzip2 version 1.0.3." \ - src/contrib/bzip2 BZIP2 v1_0_3 + cvs import -m "Virgin import (trimmed) of Bzip2 version 1.0.4." \ + src/contrib/bzip2 BZIP2 v1_0_4 Notes: The following log shows details of trimming: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - tar xvfz bzip2-1.0.3.tar.gz -X FREEBSD-Xlist - cd bzip2-1.0.3 + tar xvfz bzip2-1.0.4.tar.gz -X FREEBSD-Xlist + cd bzip2-1.0.4 uuencode sample1.bz2 sample1.bz2 > sample1.bz2.uu uuencode sample2.bz2 sample2.bz2 > sample2.bz2.uu uuencode sample3.bz2 sample3.bz2 > sample3.bz2.uu ==== //depot/projects/opentoe/contrib/bzip2/LICENSE#2 (text+ko) ==== @@ -1,6 +1,8 @@ +-------------------------------------------------------------------------- + This program, "bzip2", the associated library "libbzip2", and all -documentation, are copyright (C) 1996-2005 Julian R Seward. All +documentation, are copyright (C) 1996-2006 Julian R Seward. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -35,6 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Julian Seward, Cambridge, UK. -jseward@acm.org -bzip2/libbzip2 version 1.0.3 of 15 February 2005 +jseward@bzip.org +bzip2/libbzip2 version 1.0.4 of 20 December 2006 +-------------------------------------------------------------------------- ==== //depot/projects/opentoe/contrib/bzip2/Makefile#2 (text+ko) ==== @@ -1,3 +1,16 @@ +# ------------------------------------------------------------------ +# This file is part of bzip2/libbzip2, a program and library for +# lossless, block-sorting data compression. +# +# bzip2/libbzip2 version 1.0.4 of 20 December 2006 +# Copyright (C) 1996-2006 Julian Seward +# +# Please read the WARNING, DISCLAIMER and PATENTS sections in the +# README file. +# +# This program is released under the terms of the license contained +# in the file LICENSE. +# ------------------------------------------------------------------ SHELL=/bin/sh @@ -8,10 +21,10 @@ LDFLAGS= BIGFILES=-D_FILE_OFFSET_BITS=64 -CFLAGS=-Wall -Winline -O -g $(BIGFILES) +CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) # Where you want it installed when you do 'make install' -PREFIX=/usr +PREFIX=/usr/local OBJS= blocksort.o \ @@ -77,14 +90,14 @@ cp -f libbz2.a $(PREFIX)/lib chmod a+r $(PREFIX)/lib/libbz2.a cp -f bzgrep $(PREFIX)/bin/bzgrep - ln $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep - ln $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep + ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep + ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep chmod a+x $(PREFIX)/bin/bzgrep cp -f bzmore $(PREFIX)/bin/bzmore - ln $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless + ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless chmod a+x $(PREFIX)/bin/bzmore cp -f bzdiff $(PREFIX)/bin/bzdiff - ln $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp + ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp chmod a+x $(PREFIX)/bin/bzdiff cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1 chmod a+r $(PREFIX)/man/man1/bzgrep.1 @@ -124,10 +137,10 @@ distclean: clean rm -f manual.ps manual.html manual.pdf -DISTNAME=bzip2-1.0.3 +DISTNAME=bzip2-1.0.4 dist: check manual rm -f $(DISTNAME) - ln -sf . $(DISTNAME) + ln -s -f . $(DISTNAME) tar cvf $(DISTNAME).tar \ $(DISTNAME)/blocksort.c \ $(DISTNAME)/huffman.c \ @@ -167,7 +180,6 @@ $(DISTNAME)/libbz2.dsp \ $(DISTNAME)/dlltest.dsp \ $(DISTNAME)/makefile.msc \ - $(DISTNAME)/Y2K_INFO \ $(DISTNAME)/unzcrash.c \ $(DISTNAME)/spewG.c \ $(DISTNAME)/mk251.c \ ==== //depot/projects/opentoe/contrib/bzip2/Makefile-libbz2_so#2 (text+ko) ==== @@ -1,15 +1,30 @@ # This Makefile builds a shared version of the library, -# libbz2.so.1.0.3, with soname libbz2.so.1.0, +# libbz2.so.1.0.4, with soname libbz2.so.1.0, # at least on x86-Linux (RedHat 7.2), # with gcc-2.96 20000731 (Red Hat Linux 7.1 2.96-98). -# Please see the README file for some -# important info about building the library like this. +# Please see the README file for some important info +# about building the library like this. + +# ------------------------------------------------------------------ +# This file is part of bzip2/libbzip2, a program and library for +# lossless, block-sorting data compression. +# +# bzip2/libbzip2 version 1.0.4 of 20 December 2006 +# Copyright (C) 1996-2006 Julian Seward +# +# Please read the WARNING, DISCLAIMER and PATENTS sections in the +# README file. +# +# This program is released under the terms of the license contained +# in the file LICENSE. +# ------------------------------------------------------------------ + SHELL=/bin/sh CC=gcc BIGFILES=-D_FILE_OFFSET_BITS=64 -CFLAGS=-fpic -fPIC -Wall -Winline -O -g +CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) OBJS= blocksort.o \ huffman.o \ @@ -20,13 +35,13 @@ bzlib.o all: $(OBJS) - $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.3 $(OBJS) - $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.3 + $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.4 $(OBJS) + $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.4 rm -f libbz2.so.1.0 - ln -s libbz2.so.1.0.3 libbz2.so.1.0 + ln -s libbz2.so.1.0.4 libbz2.so.1.0 clean: - rm -f $(OBJS) bzip2.o libbz2.so.1.0.3 libbz2.so.1.0 bzip2-shared + rm -f $(OBJS) bzip2.o libbz2.so.1.0.4 libbz2.so.1.0 bzip2-shared blocksort.o: blocksort.c $(CC) $(CFLAGS) -c blocksort.c ==== //depot/projects/opentoe/contrib/bzip2/README#2 (text+ko) ==== @@ -1,33 +1,48 @@ -This is the README for bzip2, a block-sorting file compressor, version -1.0.3. This version is fully compatible with the previous public -releases, versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1 and 1.0.2. +This is the README for bzip2/libzip2. +This version is fully compatible with the previous public releases. + +------------------------------------------------------------------ +This file is part of bzip2/libbzip2, a program and library for +lossless, block-sorting data compression. + +bzip2/libbzip2 version 1.0.4 of 20 December 2006 +Copyright (C) 1996-2006 Julian Seward + +Please read the WARNING, DISCLAIMER and PATENTS sections in this file. -bzip2-1.0.3 is distributed under a BSD-style license. For details, -see the file LICENSE. +This program is released under the terms of the license contained +in the file LICENSE. +------------------------------------------------------------------ Complete documentation is available in Postscript form (manual.ps), PDF (manual.pdf) or html (manual.html). A plain-text version of the -manual page is available as bzip2.txt. A statement about Y2K issues -is now included in the file Y2K_INFO. +manual page is available as bzip2.txt. HOW TO BUILD -- UNIX -Type `make'. This builds the library libbz2.a and then the -programs bzip2 and bzip2recover. Six self-tests are run. -If the self-tests complete ok, carry on to installation: +Type 'make'. This builds the library libbz2.a and then the programs +bzip2 and bzip2recover. Six self-tests are run. If the self-tests +complete ok, carry on to installation: + +To install in /usr/local/bin, /usr/local/lib, /usr/local/man and +/usr/local/include, type -To install in /usr/bin, /usr/lib, /usr/man and /usr/include, type make install -To install somewhere else, eg, /xxx/yyy/{bin,lib,man,include}, type + +To install somewhere else, eg, /xxx/yyy/{bin,lib,man,include}, type + make install PREFIX=/xxx/yyy + If you are (justifiably) paranoid and want to see what 'make install' is going to do, you can first do + make -n install or make -n install PREFIX=/xxx/yyy respectively. -The -n instructs make to show the commands it would execute, but -not actually execute them. + +The -n instructs make to show the commands it would execute, but not +actually execute them. HOW TO BUILD -- UNIX, shared library libbz2.so. @@ -49,23 +64,25 @@ bzCompress to BZ2_bzCompress, to avoid namespace pollution. Unfortunately this means that the libbz2.so created by Makefile-libbz2_so will not work with any program which used an older -version of the library. Sorry. I do encourage library clients to -make the effort to upgrade to use version 1.0, since it is both faster -and more robust than previous versions. +version of the library. I do encourage library clients to make the +effort to upgrade to use version 1.0, since it is both faster and more +robust than previous versions. HOW TO BUILD -- Windows 95, NT, DOS, Mac, etc. It's difficult for me to support compilation on all these platforms. My approach is to collect binaries for these platforms, and put them -on the master web page (http://sources.redhat.com/bzip2). Look there. -However (FWIW), bzip2-1.0.X is very standard ANSI C and should compile +on the master web site (http://www.bzip.org). Look there. However +(FWIW), bzip2-1.0.X is very standard ANSI C and should compile unmodified with MS Visual C. If you have difficulties building, you might want to read README.COMPILATION.PROBLEMS. At least using MS Visual C++ 6, you can build from the unmodified sources by issuing, in a command shell: + nmake -f makefile.msc + (you may need to first run the MSVC-provided script VCVARS32.BAT so as to set up paths to the MSVC tools correctly). @@ -86,18 +103,19 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Mar 31 20:40:49 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4025D16A40A; Sat, 31 Mar 2007 20:40:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1615F16A408 for ; Sat, 31 Mar 2007 20:40:49 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0806F13C465 for ; Sat, 31 Mar 2007 20:40:49 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2VKem26066601 for ; Sat, 31 Mar 2007 20:40:48 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2VKem63066596 for perforce@freebsd.org; Sat, 31 Mar 2007 20:40:48 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 31 Mar 2007 20:40:48 GMT Message-Id: <200703312040.l2VKem63066596@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 117021 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Mar 2007 20:40:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=117021 Change 117021 by kmacy@kmacy_vt-x:opentoe_init on 2007/03/31 20:40:35 only modify lo_flags when the lock is held move LOCK_PROFILING_FAST into initial acquisition so we can skip tracking statistics for an uncontested lock entirely MFP4 after: 2 days Affected files ... .. //depot/projects/opentoe/sys/kern/subr_lock.c#2 edit .. //depot/projects/opentoe/sys/sys/lock_profile.h#2 edit Differences ... ==== //depot/projects/opentoe/sys/kern/subr_lock.c#2 (text+ko) ==== @@ -258,9 +258,11 @@ if (l->lpo_acqtime == 0) { lo->lo_profile_obj.lpo_contest_holding = 0; - if (contested) - lo->lo_profile_obj.lpo_contest_locking++; - + if (contested) { + lo->lo_flags |= LO_CONTESTED; + lo->lo_profile_obj.lpo_contest_locking++; + } + l->lpo_filename = file; l->lpo_lineno = line; l->lpo_acqtime = nanoseconds(); ==== //depot/projects/opentoe/sys/sys/lock_profile.h#2 (text+ko) ==== @@ -122,7 +122,6 @@ if (lock_prof_enable && *contested == 0) { *waittime = nanoseconds(); - lo->lo_flags |= LO_CONTESTED; atomic_add_int(&l->lpo_contest_holding, 1); *contested = 1; } @@ -131,18 +130,19 @@ static inline void lock_profile_obtain_lock_success(struct lock_object *lo, int contested, uint64_t waittime, const char *file, int line) { if (lock_prof_enable) { - _lock_profile_obtain_lock_success(lo, contested, waittime, file, line); +#ifdef LOCK_PROFILE_FAST + if (contested == 0) + return; +#endif + _lock_profile_obtain_lock_success(lo, contested, waittime, file, line); } } static inline void lock_profile_release_lock(struct lock_object *lo) { struct lock_profile_object *l = &lo->lo_profile_obj; -#ifdef LOCK_PROFILING_FAST - if((lo->lo_flags & LO_CONTESTED) == 0) - return; -#endif - if (lock_prof_enable || l->lpo_acqtime) { + + if (l->lpo_acqtime) { lo->lo_flags &= ~LO_CONTESTED; _lock_profile_release_lock(lo); } From owner-p4-projects@FreeBSD.ORG Sat Mar 31 21:04:22 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CFB8516A407; Sat, 31 Mar 2007 21:04:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AC83316A406 for ; Sat, 31 Mar 2007 21:04:21 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9E2D413C4C2 for ; Sat, 31 Mar 2007 21:04:21 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2VL4Lce080647 for ; Sat, 31 Mar 2007 21:04:21 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2VL4LkL080644 for perforce@freebsd.org; Sat, 31 Mar 2007 21:04:21 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 31 Mar 2007 21:04:21 GMT Message-Id: <200703312104.l2VL4LkL080644@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 117026 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Mar 2007 21:04:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=117026 Change 117026 by kmacy@kmacy_vt-x:opentoe_init on 2007/03/31 21:03:29 remove LO_CONTESTED flag Affected files ... .. //depot/projects/opentoe/sys/kern/subr_lock.c#3 edit .. //depot/projects/opentoe/sys/sys/lock.h#3 edit .. //depot/projects/opentoe/sys/sys/lock_profile.h#3 edit Differences ... ==== //depot/projects/opentoe/sys/kern/subr_lock.c#3 (text+ko) ==== @@ -258,10 +258,8 @@ if (l->lpo_acqtime == 0) { lo->lo_profile_obj.lpo_contest_holding = 0; - if (contested) { - lo->lo_flags |= LO_CONTESTED; + if (contested) lo->lo_profile_obj.lpo_contest_locking++; - } l->lpo_filename = file; l->lpo_lineno = line; ==== //depot/projects/opentoe/sys/sys/lock.h#3 (text+ko) ==== @@ -79,7 +79,6 @@ #define LO_ENROLLPEND 0x00800000 /* On the pending enroll list. */ #define LO_CLASSMASK 0x0f000000 /* Class index bitmask. */ #define LO_NOPROFILE 0x10000000 /* Don't profile this lock */ -#define LO_CONTESTED 0x20000000 /* Lock was contested */ /* * Lock classes are statically assigned an index into the gobal lock_classes ==== //depot/projects/opentoe/sys/sys/lock_profile.h#3 (text+ko) ==== @@ -142,10 +142,8 @@ { struct lock_profile_object *l = &lo->lo_profile_obj; - if (l->lpo_acqtime) { - lo->lo_flags &= ~LO_CONTESTED; + if (l->lpo_acqtime) _lock_profile_release_lock(lo); - } } #else /* !LOCK_PROFILING */ From owner-p4-projects@FreeBSD.ORG Sat Mar 31 21:04:22 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 381ED16A521; Sat, 31 Mar 2007 21:04:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EC84616A47B for ; Sat, 31 Mar 2007 21:04:21 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D940713C480 for ; Sat, 31 Mar 2007 21:04:21 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2VL4LEu080654 for ; Sat, 31 Mar 2007 21:04:21 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2VL4LWF080650 for perforce@freebsd.org; Sat, 31 Mar 2007 21:04:21 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 31 Mar 2007 21:04:21 GMT Message-Id: <200703312104.l2VL4LWF080650@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 117027 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Mar 2007 21:04:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=117027 Change 117027 by kmacy@kmacy_vt-x:opentoe_init on 2007/03/31 21:04:17 style(9) fixes Affected files ... .. //depot/projects/opentoe/sys/kern/subr_lock.c#4 edit Differences ... ==== //depot/projects/opentoe/sys/kern/subr_lock.c#4 (text+ko) ==== @@ -250,7 +250,9 @@ #endif #ifdef LOCK_PROFILING -void _lock_profile_obtain_lock_success(struct lock_object *lo, int contested, uint64_t waittime, const char *file, int line) +void +_lock_profile_obtain_lock_success(struct lock_object *lo, int contested, + uint64_t waittime, const char *file, int line) { struct lock_profile_object *l = &lo->lo_profile_obj; @@ -271,7 +273,8 @@ } } -void _lock_profile_release_lock(struct lock_object *lo) +void +_lock_profile_release_lock(struct lock_object *lo) { struct lock_profile_object *l = &lo->lo_profile_obj;